Merge pull request 'patches v1.7.4' (#123) from develop into main

Reviewed-on: #123

src/data-source.ts

@@ -50,6 +50,7 @@ import { memberEducations } from "./entity/club/member/memberEducations";
 
 import { BackupAndResetDatabase1749296262915 } from "./migrations/1749296262915-BackupAndResetDatabase";
 import { CreateSchema1749296280721 } from "./migrations/1749296280721-CreateSchema";
+import { UpdateNewsletterQueryRelation1752502069178 } from "./migrations/1752502069178-updateNewsletterQueryRelation";
 
 configCheck();
 
@@ -108,7 +109,11 @@ const dataSource = new DataSource({
     webapiPermission,
     setting,
   ],
-  migrations: [BackupAndResetDatabase1749296262915, CreateSchema1749296280721],
+  migrations: [
+    BackupAndResetDatabase1749296262915,
+    CreateSchema1749296280721,
+    UpdateNewsletterQueryRelation1752502069178,
+  ],
   migrationsRun: true,
   migrationsTransactionMode: "each",
   subscribers: [],

src/entity/club/newsletter/newsletter.ts

@@ -40,7 +40,7 @@ export class newsletter {
 
   @ManyToOne(() => query, {
     nullable: true,
-    onDelete: "CASCADE",
+    onDelete: "SET NULL",
     onUpdate: "RESTRICT",
     cascade: ["insert"],
   })

src/helpers/dynamicQueryBuilder.ts

@@ -65,7 +65,7 @@ export default abstract class DynamicQueryBuilder {
     count?: number;
     noLimit?: boolean;
   }): SelectQueryBuilder<ObjectLiteral> {
-    let affix = queryObj.id.replaceAll("-", "") ?? StringHelper.random(10);
+    let affix = queryObj.id?.replaceAll("-", "") ?? StringHelper.random(10);
     let query = dataSource.getRepository(queryObj.table).createQueryBuilder(`${affix}_${queryObj.table}`);
 
     this.buildDynamicQuery(query, queryObj, affix);
@@ -118,7 +118,7 @@ export default abstract class DynamicQueryBuilder {
 
     if (queryObject.join) {
       for (const join of queryObject.join) {
-        let subaffix = join.id.replaceAll("-", "") ?? StringHelper.random(10);
+        let subaffix = join.id?.replaceAll("-", "") ?? StringHelper.random(10);
         if (join.type == undefined) join.type = "defined";
         if (join.type == "defined") {
           query.innerJoin(`${alias}.${join.foreignColumn}`, `${subaffix}_${join.table}`);

src/migrations/1752502069178-updateNewsletterQueryRelation.ts

@@ -0,0 +1,44 @@
+import { MigrationInterface, QueryRunner, TableForeignKey } from "typeorm";
+import { newsletter_table } from "./baseSchemaTables/newsletter";
+
+export class UpdateNewsletterQueryRelation1752502069178 implements MigrationInterface {
+  name = "UpdateNewsletterQueryRelation1752502069178";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    const table = await queryRunner.getTable("newsletter");
+    const foreignKey = table?.foreignKeys.find((fk) => fk.columnNames.includes("recipientsByQueryId"));
+    if (foreignKey) {
+      await queryRunner.dropForeignKey("newsletter", foreignKey);
+    }
+
+    await queryRunner.createForeignKey(
+      newsletter_table,
+      new TableForeignKey({
+        columnNames: ["recipientsByQueryId"],
+        referencedColumnNames: ["id"],
+        referencedTableName: "query",
+        onDelete: "SET NULL",
+        onUpdate: "RESTRICT",
+      })
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    const table = await queryRunner.getTable("newsletter");
+    const foreignKey = table?.foreignKeys.find((fk) => fk.columnNames.includes("recipientsByQueryId"));
+    if (foreignKey) {
+      await queryRunner.dropForeignKey("newsletter", foreignKey);
+    }
+
+    await queryRunner.createForeignKey(
+      newsletter_table,
+      new TableForeignKey({
+        columnNames: ["recipientsByQueryId"],
+        referencedColumnNames: ["id"],
+        referencedTableName: "query",
+        onDelete: "CASCADE",
+        onUpdate: "RESTRICT",
+      })
+    );
+  }
+}