ALCS-2560 Change MODI and RECON calls

Author: fbarreta

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

@@ -1,6 +1,6 @@
 import { Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
-import { FindOptionsWhere, In, IsNull, Repository } from 'typeorm';
+import { FindOptionsRelations, FindOptionsWhere, In, IsNull, Repository } from 'typeorm';
 import { ServiceValidationException } from '../../../../../../libs/common/src/exceptions/base.exception';
 import { ApplicationDecisionConditionToComponentLot } from '../application-condition-to-component-lot/application-decision-condition-to-component-lot.entity';
 import { ApplicationDecisionConditionComponentPlanNumber } from '../application-decision-component-to-condition/application-decision-component-to-condition-plan-number.entity';
@@ -32,6 +32,15 @@ export class ApplicationDecisionConditionService {
     assignee: true,
   };
 
+  private DEFAULT_APP_RELATIONS: FindOptionsRelations<ApplicationModification> = {
+    application: {
+      type: true,
+      region: true,
+      localGovernment: true,
+      decisionMeetings: true,
+    },
+  };
+
   constructor(
     @InjectRepository(ApplicationDecisionCondition)
     private repository: Repository<ApplicationDecisionCondition>,
@@ -109,19 +118,15 @@ export class ApplicationDecisionConditionService {
         const condition = this.mapper.map(c, ApplicationDecisionCondition, ApplicationDecisionConditionHomeDto);
         const decision = this.mapper.map(c.decision, ApplicationDecision, ApplicationDecisionHomeDto);
         const application = this.mapper.map(c.decision.application, Application, ApplicationHomeDto);
+
         const appModifications = await this.modificationRepository.find({
-          where: {
-            modifiesDecisions: {
-              uuid: c.decision?.uuid,
-            },
-          },
+          where: { application: { fileNumber: condition?.decision?.application.fileNumber } },
+          relations: this.DEFAULT_APP_RELATIONS,
         });
+
         const appReconsiderations = await this.reconsiderationRepository.find({
-          where: {
-            reconsidersDecisions: {
-              uuid: c.decision?.uuid,
-            },
-          },
+          where: { application: { fileNumber: condition?.decision?.application.fileNumber } },
+          relations: this.DEFAULT_APP_RELATIONS,
         });
 
         return {

services/apps/alcs/src/alcs/home/home.controller.ts

@@ -56,31 +56,13 @@ const DEFAULT_APP_RELATIONS: FindOptionsRelations<ApplicationModification> = {
     localGovernment: true,
     decisionMeetings: true,
   },
-  card: {
-    board: true,
-    type: true,
-    status: true,
-    assignee: true,
-  },
-  modifiesDecisions: true,
-  resultingDecision: true,
-  reviewOutcome: true,
 };
 
 const DEFAULT_NOI_RELATIONS: FindOptionsRelations<NoticeOfIntentModification> = {
   noticeOfIntent: {
     region: true,
     localGovernment: true,
   },
-  card: {
-    board: true,
-    type: true,
-    status: true,
-    assignee: true,
-  },
-  modifiesDecisions: true,
-  resultingDecision: true,
-  reviewOutcome: true,
 };
 
 @ApiOAuth2(config.get<string[]>('KEYCLOAK.SCOPES'))

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

@@ -116,7 +116,7 @@ export class NoticeOfIntentHomeDto {
   @AutoMap(() => NoticeOfIntentTypeDto)
   type: NoticeOfIntentTypeDto;
 
-  activeDays: number;
+  activeDays?: number;
   paused: boolean;
   pausedDays: number;
 }
@@ -126,7 +126,7 @@ export class NoticeOfIntentDecisionHomeDto {
   uuid: string;
 
   @AutoMap()
-  application: NoticeOfIntentHomeDto;
+  noticeOfIntent: NoticeOfIntentHomeDto;
 }
 
 export class NoticeOfIntentDecisionConditionHomeDto {

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

@@ -1,6 +1,6 @@
 import { Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
-import { FindOptionsWhere, In, IsNull, Repository } from 'typeorm';
+import { FindOptionsRelations, FindOptionsWhere, In, IsNull, Repository } from 'typeorm';
 import { ServiceValidationException } from '../../../../../../libs/common/src/exceptions/base.exception';
 import { NoticeOfIntentDecisionComponent } from '../notice-of-intent-decision-component/notice-of-intent-decision-component.entity';
 import { NoticeOfIntentDecisionConditionType } from './notice-of-intent-decision-condition-code.entity';
@@ -29,6 +29,14 @@ export class NoticeOfIntentDecisionConditionService {
     assignee: true,
   };
 
+  private DEFAULT_NOI_RELATIONS: FindOptionsRelations<NoticeOfIntentModification> = {
+    noticeOfIntent: {
+      type: true,
+      region: true,
+      localGovernment: true,
+    },
+  };
+
   constructor(
     @InjectRepository(NoticeOfIntentDecisionCondition)
     private repository: Repository<NoticeOfIntentDecisionCondition>,
@@ -132,11 +140,8 @@ export class NoticeOfIntentDecisionConditionService {
         const decision = this.mapper.map(c.decision, NoticeOfIntentDecision, NoticeOfIntentDecisionHomeDto);
         const noticeOfIntent = this.mapper.map(c.decision.noticeOfIntent, NoticeOfIntent, NoticeOfIntentHomeDto);
         const appModifications = await this.modificationRepository.find({
-          where: {
-            modifiesDecisions: {
-              uuid: c.decision?.uuid,
-            },
-          },
+          where: { noticeOfIntent: { fileNumber: condition?.decision?.noticeOfIntent.fileNumber } },
+          relations: this.DEFAULT_NOI_RELATIONS,
         });
 
         return {
@@ -147,7 +152,7 @@ export class NoticeOfIntentDecisionConditionService {
             noticeOfIntent: {
               ...noticeOfIntent,
               activeDays: undefined,
-              pausedDays: timeMap.get(noticeOfIntent.uuid)?.pausedDays ?? null,
+              pausedDays: timeMap.get(noticeOfIntent.uuid)!.pausedDays || 0,
               paused: timeMap.get(noticeOfIntent.uuid)?.pausedDays !== null,
             },
           },