Remove cancelled cards from schedule page meetings

bcgov · Sep 16, 2024 · 27f19e0 · 27f19e0
1 parent 5156fcd
commit 27f19e0
Show file tree

Hide file tree

Showing 2 changed files with 9 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
@@ -145,7 +145,9 @@ export class ApplicationDecisionMeetingService {
       .innerJoin('meeting.application', 'application')
       .innerJoin('application.reconsiderations', 'reconsideration')
       .innerJoin('reconsideration.card', 'card')
-      .where(`card.status_code != '${CARD_STATUS.DECISION_RELEASED}'`)
+      .where('card.status_code NOT IN (:...values)', {
+        values: [CARD_STATUS.DECISION_RELEASED, CARD_STATUS.CANCELLED],
+      })
       .groupBy('reconsideration.uuid')
       .getRawMany();
   }
@@ -168,7 +170,9 @@ export class ApplicationDecisionMeetingService {
       )
       .innerJoin('meeting.application', 'application')
       .innerJoin('application.card', 'card')
-      .where(`card.status_code != '${CARD_STATUS.DECISION_RELEASED}'`)
+      .where('card.status_code NOT IN (:...values)', {
+        values: [CARD_STATUS.DECISION_RELEASED, CARD_STATUS.CANCELLED],
+      })
       .groupBy('application.uuid')
       .getRawMany();
   }

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
@@ -116,7 +116,9 @@ export class PlanningReviewMeetingService {
       .innerJoin('meeting.planningReview', 'planningReview')
       .innerJoin('planningReview.referrals', 'referrals')
       .innerJoin('referrals.card', 'card')
-      .where(`card.status_code != '${CARD_STATUS.DECISION_RELEASED}'`)
+      .where('card.status_code NOT IN (:...values)', {
+        values: [CARD_STATUS.DECISION_RELEASED, CARD_STATUS.CANCELLED],
+      })
       .groupBy('planningReview.uuid')
       .getRawMany();
   }