Merge pull request #2022 from bcgov/feature/ALCS-2312-fix-orphaned-dates

Fix date saving issues
bcgov · Dec 17, 2024 · dd75e43 · dd75e43
2 parents 788641b + 41142df
commit dd75e43
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 0 deletions.
diff --git a/...ndition/application-decision-condition-date/application-decision-condition-date.entity.ts b/...ndition/application-decision-condition-date/application-decision-condition-date.entity.ts
@@ -24,6 +24,8 @@ export class ApplicationDecisionConditionDate extends Base {
   @ManyToOne(() => ApplicationDecisionCondition, {
     cascade: true,
     onDelete: 'CASCADE',
+    orphanedRowAction: 'delete',
+    nullable: false,
   })
   condition: ApplicationDecisionCondition;
 

diff --git a/...tice-of-intent-decision-condition-date/notice-of-intent-decision-condition-date.entity.ts b/...tice-of-intent-decision-condition-date/notice-of-intent-decision-condition-date.entity.ts
@@ -24,6 +24,8 @@ export class NoticeOfIntentDecisionConditionDate extends Base {
   @ManyToOne(() => NoticeOfIntentDecisionCondition, {
     cascade: true,
     onDelete: 'CASCADE',
+    orphanedRowAction: 'delete',
+    nullable: false,
   })
   condition: NoticeOfIntentDecisionCondition;
 

diff --git a/.../alcs/src/providers/typeorm/migrations/1734395224473-clean_up_orphaned_condition_dates.ts b/.../alcs/src/providers/typeorm/migrations/1734395224473-clean_up_orphaned_condition_dates.ts
@@ -0,0 +1,22 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class CleanUpOrphanedConditionDates1734395224473 implements MigrationInterface {
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    queryRunner.query(`
+        delete
+        from
+            alcs.application_decision_condition_date adcd
+        where
+            adcd.condition_uuid is null
+    `);
+    queryRunner.query(`
+        delete
+        from
+            alcs.notice_of_intent_decision_condition_date noidcd
+        where
+            noidcd.condition_uuid is null
+    `);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {}
+}
diff --git a/...iders/typeorm/migrations/1734395531473-make_condition_date_condition_uuid_not_nullable.ts b/...iders/typeorm/migrations/1734395531473-make_condition_date_condition_uuid_not_nullable.ts
@@ -0,0 +1,24 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class MakeConditionDateConditionUuidNotNullable1734395531473 implements MigrationInterface {
+    name = 'MakeConditionDateConditionUuidNotNullable1734395531473'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "alcs"."application_decision_condition_date" DROP CONSTRAINT "FK_b7a541bf441dc27322bd2acc473"`);
+        await queryRunner.query(`ALTER TABLE "alcs"."application_decision_condition_date" ALTER COLUMN "condition_uuid" SET NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "alcs"."notice_of_intent_decision_condition_date" DROP CONSTRAINT "FK_0bd2f73af4ca611761c69769fc2"`);
+        await queryRunner.query(`ALTER TABLE "alcs"."notice_of_intent_decision_condition_date" ALTER COLUMN "condition_uuid" SET NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "alcs"."application_decision_condition_date" ADD CONSTRAINT "FK_b7a541bf441dc27322bd2acc473" FOREIGN KEY ("condition_uuid") REFERENCES "alcs"."application_decision_condition"("uuid") ON DELETE CASCADE ON UPDATE NO ACTION`);
+        await queryRunner.query(`ALTER TABLE "alcs"."notice_of_intent_decision_condition_date" ADD CONSTRAINT "FK_0bd2f73af4ca611761c69769fc2" FOREIGN KEY ("condition_uuid") REFERENCES "alcs"."notice_of_intent_decision_condition"("uuid") ON DELETE CASCADE ON UPDATE NO ACTION`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "alcs"."notice_of_intent_decision_condition_date" DROP CONSTRAINT "FK_0bd2f73af4ca611761c69769fc2"`);
+        await queryRunner.query(`ALTER TABLE "alcs"."application_decision_condition_date" DROP CONSTRAINT "FK_b7a541bf441dc27322bd2acc473"`);
+        await queryRunner.query(`ALTER TABLE "alcs"."notice_of_intent_decision_condition_date" ALTER COLUMN "condition_uuid" DROP NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "alcs"."notice_of_intent_decision_condition_date" ADD CONSTRAINT "FK_0bd2f73af4ca611761c69769fc2" FOREIGN KEY ("condition_uuid") REFERENCES "alcs"."notice_of_intent_decision_condition"("uuid") ON DELETE CASCADE ON UPDATE NO ACTION`);
+        await queryRunner.query(`ALTER TABLE "alcs"."application_decision_condition_date" ALTER COLUMN "condition_uuid" DROP NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "alcs"."application_decision_condition_date" ADD CONSTRAINT "FK_b7a541bf441dc27322bd2acc473" FOREIGN KEY ("condition_uuid") REFERENCES "alcs"."application_decision_condition"("uuid") ON DELETE CASCADE ON UPDATE NO ACTION`);
+    }
+
+}