Merge pull request #1836 from bcgov/bugfix/ALCS-2234

Fix "For Discussion" Column Showing the Furthest Date Instead of Closest
bcgov · Sep 9, 2024 · 79fc293 · 79fc293
2 parents e59c435 + 1e1b157
commit 79fc293
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 3 deletions.
diff --git a/...src/alcs/application/application-decision-meeting/application-decision-meeting.service.ts b/...src/alcs/application/application-decision-meeting/application-decision-meeting.service.ts
@@ -131,7 +131,17 @@ export class ApplicationDecisionMeetingService {
   > {
     return await this.appDecisionMeetingRepository
       .createQueryBuilder('meeting')
-      .select('reconsideration.uuid, MAX(meeting.date) as next_meeting')
+      .select('reconsideration.uuid', 'uuid')
+      .addSelect(
+        `
+        CASE
+          WHEN MIN(CASE WHEN meeting.date >= (CURRENT_DATE) THEN meeting.date END) is NOT NULL
+          THEN MIN(CASE WHEN meeting.date >= (CURRENT_DATE) THEN meeting.date END)
+        ELSE MAX(CASE WHEN meeting.date < (CURRENT_DATE) THEN meeting.date END)
+        END
+        `,
+        'next_meeting',
+      )
       .innerJoin('meeting.application', 'application')
       .innerJoin('application.reconsiderations', 'reconsideration')
       .innerJoin('reconsideration.card', 'card')
@@ -145,7 +155,17 @@ export class ApplicationDecisionMeetingService {
   > {
     return await this.appDecisionMeetingRepository
       .createQueryBuilder('meeting')
-      .select('application.uuid, MAX(meeting.date) as next_meeting')
+      .select('application.uuid', 'uuid')
+      .addSelect(
+        `
+        CASE
+          WHEN MIN(CASE WHEN meeting.date >= (CURRENT_DATE) THEN meeting.date END) is NOT NULL
+          THEN MIN(CASE WHEN meeting.date >= (CURRENT_DATE) THEN meeting.date END)
+        ELSE MAX(CASE WHEN meeting.date < (CURRENT_DATE) THEN meeting.date END)
+        END
+        `,
+        'next_meeting',
+      )
       .innerJoin('meeting.application', 'application')
       .innerJoin('application.card', 'card')
       .where(`card.status_code != '${CARD_STATUS.DECISION_RELEASED}'`)

diff --git a/.../alcs/src/alcs/planning-review/planning-review-meeting/planning-review-meeting.service.ts b/.../alcs/src/alcs/planning-review/planning-review-meeting/planning-review-meeting.service.ts
@@ -102,7 +102,17 @@ export class PlanningReviewMeetingService {
   > {
     return await this.meetingRepository
       .createQueryBuilder('meeting')
-      .select('planningReview.uuid, MAX(meeting.date) as next_meeting')
+      .select('planningReview.uuid', 'uuid')
+      .addSelect(
+        `
+        CASE
+          WHEN MIN(CASE WHEN meeting.date >= (CURRENT_DATE) THEN meeting.date END) is NOT NULL
+          THEN MIN(CASE WHEN meeting.date >= (CURRENT_DATE) THEN meeting.date END)
+        ELSE MAX(CASE WHEN meeting.date < (CURRENT_DATE) THEN meeting.date END)
+        END
+        `,
+        'next_meeting',
+      )
       .innerJoin('meeting.planningReview', 'planningReview')
       .innerJoin('planningReview.referrals', 'referrals')
       .innerJoin('referrals.card', 'card')