Merge pull request #2054 from bcgov/hotfix/ALCS-2467-check-decision-on-conditions-retrieved-dev

ALCS-2467 Check decisions MERGE HOTFIX ON DEV

Author: fbarreta

alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types-dialog/decision-condition-types-dialog.component.ts

@@ -196,18 +196,18 @@ export class DecisionConditionTypesDialogComponent {
   hasAnyDates(
     conditions: Partial<ApplicationDecisionConditionDto>[] | Partial<NoticeOfIntentDecisionConditionDto>[],
   ): boolean {
-    return conditions.some((condition) => condition.dates && condition.dates.length > 0);
+    return conditions.filter((c) => c.decision !== null).some((condition) => condition.dates && condition.dates.length > 0);
   }
 
   hasAdminFee(
     conditions: Partial<ApplicationDecisionConditionDto>[] | Partial<NoticeOfIntentDecisionConditionDto>[],
   ): boolean {
-    return conditions.map((c) => c.administrativeFee).filter((f) => f !== null && f !== undefined && f > 0).length > 0;
+    return conditions.filter((c) => c.decision !== null).map((c) => c.administrativeFee).filter((f) => f !== null && f !== undefined && f > 0).length > 0;
   }
 
   hasSecurityAmount(
     conditions: Partial<ApplicationDecisionConditionDto>[] | Partial<NoticeOfIntentDecisionConditionDto>[],
   ): boolean {
-    return conditions.map((c) => c.securityAmount).filter((f) => f !== null && f !== undefined && f > 0).length > 0;
+    return conditions.filter((c) => c.decision !== null).map((c) => c.securityAmount).filter((f) => f !== null && f !== undefined && f > 0).length > 0;
   }
 }

alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.dto.ts

@@ -253,6 +253,7 @@ export interface ApplicationDecisionConditionDto {
   type?: ApplicationDecisionConditionTypeDto | null;
   components?: ApplicationDecisionComponentDto[] | null;
   dates?: ApplicationDecisionConditionDateDto[];
+  decision: ApplicationDecisionDto | null;
 }
 
 export interface UpdateApplicationDecisionConditionDto {

alcs-frontend/src/app/services/notice-of-intent/decision-v2/notice-of-intent-decision.dto.ts

@@ -93,6 +93,7 @@ export interface NoticeOfIntentDecisionConditionDto {
   componentUuid: string | null;
   components?: NoticeOfIntentDecisionComponentDto[];
   dates?: NoticeOfIntentDecisionConditionDateDto[];
+  decision: NoticeOfIntentDecisionDto | null;
 }
 
 export interface ComponentToCondition {

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

@@ -33,7 +33,7 @@ export class ApplicationDecisionConditionService {
           code: typeCode,
         },
       },
-      relations: ['dates'],
+      relations: ['dates', 'decision'],
     });
   }
 

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

@@ -27,7 +27,7 @@ export class NoticeOfIntentDecisionConditionService {
           code: typeCode,
         },
       },
-      relations: ['dates'],
+      relations: ['dates', 'decision'],
     });
   }