From 27f19e01fb2af92bd64d56a64bc17774315594c6 Mon Sep 17 00:00:00 2001 From: abradat Date: Mon, 16 Sep 2024 15:00:50 -0700 Subject: [PATCH] Remove cancelled cards from schedule page meetings --- .../application-decision-meeting.service.ts | 8 ++++++-- .../planning-review-meeting.service.ts | 4 +++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/services/apps/alcs/src/alcs/application/application-decision-meeting/application-decision-meeting.service.ts b/services/apps/alcs/src/alcs/application/application-decision-meeting/application-decision-meeting.service.ts index 57dbb5a96..f55208c4d 100644 --- a/services/apps/alcs/src/alcs/application/application-decision-meeting/application-decision-meeting.service.ts +++ b/services/apps/alcs/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/services/apps/alcs/src/alcs/planning-review/planning-review-meeting/planning-review-meeting.service.ts b/services/apps/alcs/src/alcs/planning-review/planning-review-meeting/planning-review-meeting.service.ts index 3df8e7b7d..ad42ceb76 100644 --- a/services/apps/alcs/src/alcs/planning-review/planning-review-meeting/planning-review-meeting.service.ts +++ b/services/apps/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(); }