Merge pull request #2015 from bcgov/feature/ACLS-2312-QA-2

Fix not nullable date field not allowing to save empty date
bcgov · Dec 12, 2024 · 4ae5c7f · 4ae5c7f
2 parents 02db183 + dc92c90
commit 4ae5c7f
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 10 deletions.
diff --git a/...-condition/application-decision-condition-date/application-decision-condition-date.dto.ts b/...-condition/application-decision-condition-date/application-decision-condition-date.dto.ts
@@ -5,9 +5,9 @@ export class ApplicationDecisionConditionDateDto {
   @IsString()
   uuid?: string;
 
-  @Transform(({ value }) => value.getTime())
+  @Transform(({ value }) => value && value.getTime())
   @IsNumber()
-  date?: number;
+  date?: number | null;
 
   @Transform(({ value }) => value && value.getTime())
   @IsNumber()

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
@@ -13,8 +13,8 @@ export class ApplicationDecisionConditionDate extends Base {
   }
 
   @AutoMap()
-  @Column({ type: 'timestamptz' })
-  date: Date;
+  @Column({ type: 'timestamptz', nullable: true })
+  date: Date | null;
 
   @AutoMap()
   @Column({ type: 'timestamptz', nullable: true })

diff --git a/.../notice-of-intent-decision-condition-date/notice-of-intent-decision-condition-date.dto.ts b/.../notice-of-intent-decision-condition-date/notice-of-intent-decision-condition-date.dto.ts
@@ -5,9 +5,9 @@ export class NoticeOfIntentDecisionConditionDateDto {
   @IsString()
   uuid?: string;
 
-  @Transform(({ value }) => value.getTime())
+  @Transform(({ value }) => value && value.getTime())
   @IsNumber()
-  date?: number;
+  date?: number | null;
 
   @Transform(({ value }) => value && value.getTime())
   @IsNumber()

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
@@ -13,8 +13,8 @@ export class NoticeOfIntentDecisionConditionDate extends Base {
   }
 
   @AutoMap()
-  @Column({ type: 'timestamptz' })
-  date: Date;
+  @Column({ type: 'timestamptz', nullable: true })
+  date: Date | null;
 
   @AutoMap()
   @Column({ type: 'timestamptz', nullable: true })

diff --git a/services/apps/alcs/src/common/automapper/application-decision-v2.automapper.profile.ts b/services/apps/alcs/src/common/automapper/application-decision-v2.automapper.profile.ts
@@ -238,7 +238,7 @@ export class ApplicationDecisionProfile extends AutomapperProfile {
         ApplicationDecisionConditionDateDto,
         forMember(
           (dto) => dto.date,
-          mapFrom((entity) => entity.date.getTime()),
+          mapFrom((entity) => entity.date && entity.date.getTime()),
         ),
         forMember(
           (dto) => dto.completedDate,

diff --git a/services/apps/alcs/src/common/automapper/notice-of-intent-decision.automapper.profile.ts b/services/apps/alcs/src/common/automapper/notice-of-intent-decision.automapper.profile.ts
@@ -171,7 +171,7 @@ export class NoticeOfIntentDecisionProfile extends AutomapperProfile {
         NoticeOfIntentDecisionConditionDateDto,
         forMember(
           (dto) => dto.date,
-          mapFrom((entity) => entity.date.getTime()),
+          mapFrom((entity) => entity.date && entity.date.getTime()),
         ),
         forMember(
           (dto) => dto.completedDate,

diff --git a/...alcs/src/providers/typeorm/migrations/1734030229522-make_condition_date_dates_nullable.ts b/...alcs/src/providers/typeorm/migrations/1734030229522-make_condition_date_dates_nullable.ts
@@ -0,0 +1,16 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class MakeConditionDateDatesNullable1734030229522 implements MigrationInterface {
+    name = 'MakeConditionDateDatesNullable1734030229522'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "alcs"."application_decision_condition_date" ALTER COLUMN "date" DROP NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "alcs"."notice_of_intent_decision_condition_date" ALTER COLUMN "date" DROP NOT NULL`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "alcs"."notice_of_intent_decision_condition_date" ALTER COLUMN "date" SET NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "alcs"."application_decision_condition_date" ALTER COLUMN "date" SET NOT NULL`);
+    }
+
+}