Merge pull request #2088 from bcgov/hotfix/ALCS-2487-create-new-dates-instead-of-update-DEV-MERGE

ALCS-2478 Create new dates when duplicating conditions

Author: fbarreta

services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision-v2.service.ts

@@ -32,6 +32,7 @@ import { ApplicationDecisionComponentType } from './component/application-decisi
 import { ApplicationDecisionComponent } from './component/application-decision-component.entity';
 import { ApplicationDecisionComponentService } from './component/application-decision-component.service';
 import { ApplicationDecisionConditionCardService } from '../../application-decision-condition/application-decision-condition-card/application-decision-condition-card.service';
+import { ApplicationDecisionConditionDate } from '../../application-decision-condition/application-decision-condition-date/application-decision-condition-date.entity';
 
 @Injectable()
 export class ApplicationDecisionV2Service {
@@ -428,10 +429,17 @@ export class ApplicationDecisionV2Service {
           conditions: [],
         }),
     );
+
     const savedDecision = await this.appDecisionRepository.save(decision);
 
     savedDecision.conditions = existingDecision.conditions.map((condition) => {
       const conditionsComponents = condition.components?.map((component) => component.uuid);
+      condition.dates = condition.dates?.map((d) => {
+        return new ApplicationDecisionConditionDate({
+          ...d,
+          uuid: undefined,
+        });
+      });
       return new ApplicationDecisionCondition({
         ...condition,
         uuid: undefined,

services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision-v2/notice-of-intent-decision-v2.service.ts

@@ -32,6 +32,7 @@ import {
 } from '../notice-of-intent-decision.dto';
 import { NoticeOfIntentDecision } from '../notice-of-intent-decision.entity';
 import { NoticeOfIntentModification } from '../notice-of-intent-modification/notice-of-intent-modification.entity';
+import { NoticeOfIntentDecisionConditionDate } from '../notice-of-intent-decision-condition/notice-of-intent-decision-condition-date/notice-of-intent-decision-condition-date.entity';
 
 @Injectable()
 export class NoticeOfIntentDecisionV2Service {
@@ -292,26 +293,15 @@ export class NoticeOfIntentDecisionV2Service {
     });
 
     if (isDraftExists) {
-      throw new ServiceValidationException(
-        'Draft decision already exists for this notice of intent.',
-      );
+      throw new ServiceValidationException('Draft decision already exists for this notice of intent.');
     }
 
-    await this.validateResolutionNumber(
-      createDto.resolutionNumber,
-      createDto.resolutionYear,
-    );
+    await this.validateResolutionNumber(createDto.resolutionNumber, createDto.resolutionYear);
 
     let decisionComponents: NoticeOfIntentDecisionComponent[] = [];
     if (createDto.decisionComponents) {
-      this.decisionComponentService.validate(
-        createDto.decisionComponents,
-        createDto.isDraft,
-      );
-      decisionComponents = await this.decisionComponentService.createOrUpdate(
-        createDto.decisionComponents,
-        false,
-      );
+      this.decisionComponentService.validate(createDto.decisionComponents, createDto.isDraft);
+      decisionComponents = await this.decisionComponentService.createOrUpdate(createDto.decisionComponents, false);
     }
 
     const decision = new NoticeOfIntentDecision({
@@ -321,27 +311,20 @@ export class NoticeOfIntentDecisionV2Service {
       resolutionYear: createDto.resolutionYear,
       decisionMaker: createDto.decisionMaker,
       decisionMakerName: createDto.decisionMakerName,
-      auditDate: createDto.auditDate
-        ? new Date(createDto.auditDate)
-        : undefined,
+      auditDate: createDto.auditDate ? new Date(createDto.auditDate) : undefined,
       isDraft: true,
       isSubjectToConditions: createDto.isSubjectToConditions,
       decisionDescription: createDto.decisionDescription,
-      rescindedDate: createDto.rescindedDate
-        ? new Date(createDto.rescindedDate)
-        : null,
+      rescindedDate: createDto.rescindedDate ? new Date(createDto.rescindedDate) : null,
       rescindedComment: createDto.rescindedComment,
       noticeOfIntent,
       modifies,
       components: decisionComponents,
     });
 
-    const savedDecision = await this.noticeOfIntentDecisionRepository.save(
-      decision,
-      {
-        transaction: true,
-      },
-    );
+    const savedDecision = await this.noticeOfIntentDecisionRepository.save(decision, {
+      transaction: true,
+    });
 
     if (createDto.decisionToCopy) {
       await this.copyDecisionFields(createDto.decisionToCopy, savedDecision);
@@ -350,10 +333,7 @@ export class NoticeOfIntentDecisionV2Service {
     return this.get(savedDecision.uuid);
   }
 
-  private async copyDecisionFields(
-    decisionToCopy: string,
-    decision: NoticeOfIntentDecision,
-  ) {
+  private async copyDecisionFields(decisionToCopy: string, decision: NoticeOfIntentDecision) {
     //It is intentional to only copy select fields
     const existingDecision = await this.get(decisionToCopy);
     decision.decisionMaker = existingDecision.decisionMaker;
@@ -377,23 +357,22 @@ export class NoticeOfIntentDecisionV2Service {
           conditions: [],
         }),
     );
-    const savedDecision =
-      await this.noticeOfIntentDecisionRepository.save(decision);
+    const savedDecision = await this.noticeOfIntentDecisionRepository.save(decision);
 
     savedDecision.conditions = existingDecision.conditions.map((condition) => {
-      const conditionsComponents = condition.components?.map(
-        (component) => component.uuid,
-      );
+      const conditionsComponents = condition.components?.map((component) => component.uuid);
+      condition.dates = condition.dates?.map((d) => {
+        return new NoticeOfIntentDecisionConditionDate({
+          ...d,
+          uuid: undefined,
+        });
+      });
       return new NoticeOfIntentDecisionCondition({
         ...condition,
         uuid: undefined,
         components: savedDecision.components.filter((component) => {
           const oldUuid = newToOldComponentsUuid.get(component.uuid);
-          return (
-            !!oldUuid &&
-            conditionsComponents &&
-            conditionsComponents.includes(oldUuid)
-          );
+          return !!oldUuid && conditionsComponents && conditionsComponents.includes(oldUuid);
         }),
       });
     });