test(backend): fix test too long and time zone issues

ZhiXin18 · Nov 1, 2024 · 491c132 · 491c132
1 parent 299cf49
commit 491c132
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/backend/services/congestion.test.ts b/backend/services/congestion.test.ts
@@ -55,9 +55,9 @@ describe("CongestionSvc", () => {
       groupby: "hour",
       agg: "max",
       begin: "2024-10-29T20:00:00+08:00",
-      end: "2024-10-30T20:00:00+08:00",
+      end: "2024-10-29T23:00:00+08:00",
     });
-    expect(grouped.length).toEqual(24);
+    expect(grouped.length).toEqual(3);
     expect(grouped.every((c) => typeof c.rating.value === "number")).toBe(true);
     // check first group is aggregated correctly
     const firstHour = await congestion.getCongestions({

diff --git a/backend/services/congestion.ts b/backend/services/congestion.ts
@@ -67,7 +67,9 @@ export class CongestionSvc {
       // performance: only query last updated_on if 'begin' or 'end' timestamp is omitted.
       const lastUpdated = await this.lastUpdatedOn();
       beginDate = await this.lastUpdatedOn();
-      endDate = addDate<TZDate, TZDate>(lastUpdated, { days: 1 });
+      endDate = new TZDate(addDate(lastUpdated, { days: 1 })).withTimeZone(
+        "Asia/Singapore",
+      );
     }
 
     // filter by camera_id if specified
@@ -160,7 +162,7 @@ export class CongestionSvc {
         // first congestion of each rating value sorted group is min.
         grouped.push(await getFirst());
       } else {
-        // first congestion of each rating value sorted in descending order group is max
+        // agg is max: first congestion of each rating value sorted in descending order group is max
         grouped.push(
           (
             await group.orderBy("rating.value", "desc").limit(1).get()