Better Timezone Handling (#6)

JustinDFuller · Aug 3, 2024 · 26bf823 · 26bf823
1 parent 9a197a8
commit 26bf823
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/index.ts b/index.ts
@@ -47,6 +47,7 @@ async function main() {
 
     core.debug(`Parsed Config: ${JSON.stringify(config, null, 2)}`);
 
+    dayjs.tz.setDefault(config.timeZone || "America/New_York");
     process(dayjs(), config, logger);
   } catch (error) {
     core.setFailed(error.message);

diff --git a/process.ts b/process.ts
@@ -66,13 +66,13 @@ export function process(
 
       for (const date of schedule.dates) {
         const start = dayjs(date, validDateFormats, true /* strict parsing */)
-          .tz(config.timeZone)
+          .tz(config.timeZone, true)
           .add(schedule.startHour, "hour")
           .add(schedule.startMinute || 0, "minute")
           .add(schedule.startSecond || 0, "second");
 
         const end = dayjs(date, validDateFormats, true /* strict parsing */)
-          .tz(config.timeZone)
+          .tz(config.timeZone, true)
           .add(schedule.endHour, "hour")
           .add(schedule.endMinute || 0, "minute")
           .add(schedule.endSecond || 0, "second");

diff --git a/test.ts b/test.ts
@@ -14,6 +14,8 @@ dayjs.extend(customParseFormat);
 dayjs.extend(isSameOrBefore);
 dayjs.extend(isSameOrAfter);
 
+dayjs.tz.setDefault("America/New_York");
+
 type Test = {
   name: string;
   now: dayjs.Dayjs;
@@ -99,6 +101,19 @@ const tests: Test[] = [
     expected: true,
     wantScheduleMatch: "LOCK_EARLY_DISMISSAL",
   },
+  {
+    name: "matches early dismissal in GMT",
+    now: dayjs()
+      .year(2024)
+      .month(7)
+      .date(9)
+      .hour(18)
+      .minute(0)
+      .second(0)
+      .tz("GMT", true),
+    expected: true,
+    wantScheduleMatch: "LOCK_EARLY_DISMISSAL",
+  },
 ];
 
 let failed = false;