From cab3dd83d5df34fce4db40d1094710710ff5a75d Mon Sep 17 00:00:00 2001 From: Julian Krauser Date: Mon, 14 Jul 2025 14:29:54 +0200 Subject: [PATCH 1/3] 1.7.3 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index cfbc2a5..e07b212 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "ff-admin-server", - "version": "1.7.2", + "version": "1.7.3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "ff-admin-server", - "version": "1.7.2", + "version": "1.7.3", "license": "AGPL-3.0-only", "dependencies": { "cors": "^2.8.5", diff --git a/package.json b/package.json index cf7f32c..0500825 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ff-admin-server", - "version": "1.7.2", + "version": "1.7.3", "description": "Feuerwehr/Verein Mitgliederverwaltung Server", "main": "dist/index.js", "scripts": { From 013cb9f95d8bb541dc7002e87d21ff058112c13d Mon Sep 17 00:00:00 2001 From: Julian Krauser Date: Mon, 14 Jul 2025 16:05:18 +0200 Subject: [PATCH 2/3] fix: compatability with old querybuilder objects --- src/helpers/dynamicQueryBuilder.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/helpers/dynamicQueryBuilder.ts b/src/helpers/dynamicQueryBuilder.ts index 25d7554..5548ffd 100644 --- a/src/helpers/dynamicQueryBuilder.ts +++ b/src/helpers/dynamicQueryBuilder.ts @@ -65,7 +65,7 @@ export default abstract class DynamicQueryBuilder { count?: number; noLimit?: boolean; }): SelectQueryBuilder { - 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}`); From 399c4d84a1f66fcf7d79bbd06fe5ba83121a8b6b Mon Sep 17 00:00:00 2001 From: Julian Krauser Date: Mon, 14 Jul 2025 16:12:12 +0200 Subject: [PATCH 3/3] change: relation of newsletter receivers to query --- src/data-source.ts | 7 ++- src/entity/club/newsletter/newsletter.ts | 2 +- ...502069178-updateNewsletterQueryRelation.ts | 44 +++++++++++++++++++ 3 files changed, 51 insertions(+), 2 deletions(-) create mode 100644 src/migrations/1752502069178-updateNewsletterQueryRelation.ts diff --git a/src/data-source.ts b/src/data-source.ts index ed56dad..74399a3 100644 --- a/src/data-source.ts +++ b/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: [], diff --git a/src/entity/club/newsletter/newsletter.ts b/src/entity/club/newsletter/newsletter.ts index ead7052..c17aa98 100644 --- a/src/entity/club/newsletter/newsletter.ts +++ b/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"], }) diff --git a/src/migrations/1752502069178-updateNewsletterQueryRelation.ts b/src/migrations/1752502069178-updateNewsletterQueryRelation.ts new file mode 100644 index 0000000..759820c --- /dev/null +++ b/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 { + 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 { + 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", + }) + ); + } +}