Merge pull request #1858 from bcgov/hotfix/ALCS-2250

Fix Timezone Difference Issue Not Showing Some Meetings Happening on Today
bcgov · Sep 16, 2024 · 2162a57 · 2162a57
2 parents 79f9bef + c0ff763
commit 2162a57
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 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
@@ -135,9 +135,9 @@ export class ApplicationDecisionMeetingService {
       .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)
+          WHEN MIN(CASE WHEN meeting.date >= (CURRENT_DATE AT TIME ZONE \'America/Vancouver\') THEN meeting.date END) is NOT NULL
+          THEN MIN(CASE WHEN meeting.date >= (CURRENT_DATE AT TIME ZONE \'America/Vancouver\') THEN meeting.date END)
+        ELSE MAX(CASE WHEN meeting.date < (CURRENT_DATE AT TIME ZONE \'America/Vancouver\') THEN meeting.date END)
         END
         `,
         'next_meeting',
@@ -161,9 +161,9 @@ export class ApplicationDecisionMeetingService {
       .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)
+          WHEN MIN(CASE WHEN meeting.date >= (CURRENT_DATE AT TIME ZONE \'America/Vancouver\') THEN meeting.date END) is NOT NULL
+          THEN MIN(CASE WHEN meeting.date >= (CURRENT_DATE AT TIME ZONE \'America/Vancouver\') THEN meeting.date END)
+        ELSE MAX(CASE WHEN meeting.date < (CURRENT_DATE AT TIME ZONE \'America/Vancouver\') THEN meeting.date END)
         END
         `,
         'next_meeting',

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
@@ -106,9 +106,9 @@ export class PlanningReviewMeetingService {
       .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)
+          WHEN MIN(CASE WHEN meeting.date >= (CURRENT_DATE AT TIME ZONE \'America/Vancouver\') THEN meeting.date END) is NOT NULL
+          THEN MIN(CASE WHEN meeting.date >= (CURRENT_DATE AT TIME ZONE \'America/Vancouver\') THEN meeting.date END)
+        ELSE MAX(CASE WHEN meeting.date < (CURRENT_DATE AT TIME ZONE \'America/Vancouver\') THEN meeting.date END)
         END
         `,
         'next_meeting',