Skip to content

Commit dd75e43

Browse files
authored
Merge pull request #2022 from bcgov/feature/ALCS-2312-fix-orphaned-dates
Fix date saving issues
2 parents 788641b + 41142df commit dd75e43

File tree

4 files changed

+50
-0
lines changed

4 files changed

+50
-0
lines changed

services/apps/alcs/src/alcs/application-decision/application-decision-condition/application-decision-condition-date/application-decision-condition-date.entity.ts

+2
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ export class ApplicationDecisionConditionDate extends Base {
2424
@ManyToOne(() => ApplicationDecisionCondition, {
2525
cascade: true,
2626
onDelete: 'CASCADE',
27+
orphanedRowAction: 'delete',
28+
nullable: false,
2729
})
2830
condition: ApplicationDecisionCondition;
2931

services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-condition/notice-of-intent-decision-condition-date/notice-of-intent-decision-condition-date.entity.ts

+2
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ export class NoticeOfIntentDecisionConditionDate extends Base {
2424
@ManyToOne(() => NoticeOfIntentDecisionCondition, {
2525
cascade: true,
2626
onDelete: 'CASCADE',
27+
orphanedRowAction: 'delete',
28+
nullable: false,
2729
})
2830
condition: NoticeOfIntentDecisionCondition;
2931

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
import { MigrationInterface, QueryRunner } from 'typeorm';
2+
3+
export class CleanUpOrphanedConditionDates1734395224473 implements MigrationInterface {
4+
public async up(queryRunner: QueryRunner): Promise<void> {
5+
queryRunner.query(`
6+
delete
7+
from
8+
alcs.application_decision_condition_date adcd
9+
where
10+
adcd.condition_uuid is null
11+
`);
12+
queryRunner.query(`
13+
delete
14+
from
15+
alcs.notice_of_intent_decision_condition_date noidcd
16+
where
17+
noidcd.condition_uuid is null
18+
`);
19+
}
20+
21+
public async down(queryRunner: QueryRunner): Promise<void> {}
22+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
import { MigrationInterface, QueryRunner } from "typeorm";
2+
3+
export class MakeConditionDateConditionUuidNotNullable1734395531473 implements MigrationInterface {
4+
name = 'MakeConditionDateConditionUuidNotNullable1734395531473'
5+
6+
public async up(queryRunner: QueryRunner): Promise<void> {
7+
await queryRunner.query(`ALTER TABLE "alcs"."application_decision_condition_date" DROP CONSTRAINT "FK_b7a541bf441dc27322bd2acc473"`);
8+
await queryRunner.query(`ALTER TABLE "alcs"."application_decision_condition_date" ALTER COLUMN "condition_uuid" SET NOT NULL`);
9+
await queryRunner.query(`ALTER TABLE "alcs"."notice_of_intent_decision_condition_date" DROP CONSTRAINT "FK_0bd2f73af4ca611761c69769fc2"`);
10+
await queryRunner.query(`ALTER TABLE "alcs"."notice_of_intent_decision_condition_date" ALTER COLUMN "condition_uuid" SET NOT NULL`);
11+
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`);
12+
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`);
13+
}
14+
15+
public async down(queryRunner: QueryRunner): Promise<void> {
16+
await queryRunner.query(`ALTER TABLE "alcs"."notice_of_intent_decision_condition_date" DROP CONSTRAINT "FK_0bd2f73af4ca611761c69769fc2"`);
17+
await queryRunner.query(`ALTER TABLE "alcs"."application_decision_condition_date" DROP CONSTRAINT "FK_b7a541bf441dc27322bd2acc473"`);
18+
await queryRunner.query(`ALTER TABLE "alcs"."notice_of_intent_decision_condition_date" ALTER COLUMN "condition_uuid" DROP NOT NULL`);
19+
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`);
20+
await queryRunner.query(`ALTER TABLE "alcs"."application_decision_condition_date" ALTER COLUMN "condition_uuid" DROP NOT NULL`);
21+
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`);
22+
}
23+
24+
}

0 commit comments

Comments
 (0)