fix date time calculation caused by day light saving (different timez…

…one offset during the year) (#419)
idaho · Oct 7, 2024 · 425bce4 · 425bce4
1 parent 7e0b251
commit 425bce4
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 19 deletions.
diff --git a/src/utils/getCalendarData.ts b/src/utils/getCalendarData.ts
@@ -40,7 +40,7 @@ const getCalendarData = async (
   debuggerInstance.log(`timezone`, timezoneOffset);
   debuggerInstance.log(`calendar data`, rawCalendarEvents);
 
-  const normalisedEvents = normaliseEvents(rawCalendarEvents, timezoneOffset);
+  const normalisedEvents = normaliseEvents(rawCalendarEvents);
 
   normalisedEvents.sort((evtA, evtB) => evtA.date.start.getTime() - evtB.date.start.getTime());
 

diff --git a/src/utils/normaliseEvents.test.ts b/src/utils/normaliseEvents.test.ts
@@ -1,20 +1,18 @@
 /* eslint-disable @typescript-eslint/naming-convention */
 import calendarEvents from '../../mocks/calendarData.json';
-import { getTimeZoneOffset } from './getTimeZoneOffset';
 import { normaliseEvents } from './normaliseEvents';
 
 import type { RawCalendarEvent } from './calendarEvents';
 
 describe('normaliseEvents', (): void => {
   test('normaliseEvents', async () => {
-    const timezoneOffset = getTimeZoneOffset();
-    const result = normaliseEvents(calendarEvents as RawCalendarEvent[], timezoneOffset);
+    const result = normaliseEvents(calendarEvents as RawCalendarEvent[]);
 
     const expectedResult = [
       {
         date: {
-          start: new Date(`2023-12-10T00:00:00${timezoneOffset}`),
-          end: new Date(`2023-12-11T00:00:00${timezoneOffset}`)
+          start: new Date(`2023-12-10T00:00:00`),
+          end: new Date(`2023-12-11T00:00:00`)
         },
         isWholeDayEvent: true,
         content: {

diff --git a/src/utils/normaliseEvents.ts b/src/utils/normaliseEvents.ts
@@ -1,6 +1,8 @@
+import { getTimeZoneOffset } from './getTimeZoneOffset';
+
 import type { CalendarEvent, RawCalendarEvent } from './calendarEvents';
 
-const normaliseEvents = (events: RawCalendarEvent[], timezoneOffset: string): CalendarEvent[] => {
+const normaliseEvents = (events: RawCalendarEvent[]): CalendarEvent[] => {
   const beginingTime = new Date();
 
   beginingTime.setUTCHours(0);
@@ -9,20 +11,25 @@ const normaliseEvents = (events: RawCalendarEvent[], timezoneOffset: string): Ca
   beginingTime.setMilliseconds(0);
 
   const isoDateString = beginingTime.toISOString();
-  const timeAtZero = `${isoDateString.slice(isoDateString.indexOf(`T`), -1)}${timezoneOffset}`;
 
   return events.
-    map((item): CalendarEvent => ({
-      date: {
-        start: new Date('date' in item.start ? `${item.start.date}${timeAtZero}` : item.start.dateTime),
-        end: new Date('date' in item.end ? `${item.end.date}${timeAtZero}` : item.end.dateTime)
-      },
-      isWholeDayEvent: Boolean('date' in item.start),
-      content: {
-        ...Object.fromEntries(Object.entries(item).filter(([ key ]) =>
-          ![ 'end', 'start' ].includes(key))) as CalendarEvent['content']
-      }
-    }));
+    map((item): CalendarEvent => {
+      const start = 'date' in item.start ? item.start.date : item.start.dateTime;
+      const tzo = getTimeZoneOffset(new Date(start));
+      const timeAtZero = `${isoDateString.slice(isoDateString.indexOf(`T`), -1)}${tzo}`;
+
+      return {
+        date: {
+          start: new Date('date' in item.start ? `${item.start.date}${timeAtZero}` : item.start.dateTime),
+          end: new Date('date' in item.end ? `${item.end.date}${timeAtZero}` : item.end.dateTime)
+        },
+        isWholeDayEvent: Boolean('date' in item.start),
+        content: {
+          ...Object.fromEntries(Object.entries(item).filter(([ key ]) =>
+            ![ 'end', 'start' ].includes(key))) as CalendarEvent['content']
+        }
+      };
+    });
 };
 
 export {