Merge pull request #420 from ITPNYU/hotfix/time_zone

Fix time zone function
ITPNYU · Sep 25, 2024 · 33a057d · 33a057d
2 parents 4ff6f1f + 0c54061
commit 33a057d
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 6 deletions.
diff --git a/booking-app/app.development.yaml b/booking-app/app.development.yaml
@@ -10,6 +10,7 @@ automatic_scaling:
 env_variables:
   NEXT_PUBLIC_BRANCH_NAME: "development"
   NODE_OPTIONS: "--max-old-space-size=4096"
+  TZ: "America/New_York"
 
 build_env_variables:
   NODE_OPTIONS: "--max-old-space-size=4096"

diff --git a/booking-app/app.production.yaml b/booking-app/app.production.yaml
@@ -10,6 +10,7 @@ automatic_scaling:
 env_variables:
   NEXT_PUBLIC_BRANCH_NAME: "production"
   NODE_OPTIONS: "--max-old-space-size=4096"
+  TZ: "America/New_York"
 
 build_env_variables:
   NODE_OPTIONS: "--max-old-space-size=4096"

diff --git a/booking-app/app.staging.yaml b/booking-app/app.staging.yaml
@@ -10,6 +10,7 @@ automatic_scaling:
 env_variables:
   NEXT_PUBLIC_BRANCH_NAME: "staging"
   NODE_OPTIONS: "--max-old-space-size=4096"
+  TZ: "America/New_York"
 
 build_env_variables:
   NODE_OPTIONS: "--max-old-space-size=4096"

diff --git a/booking-app/components/src/client/utils/serverDate.ts b/booking-app/components/src/client/utils/serverDate.ts
@@ -1,6 +1,7 @@
 import { Timestamp } from "firebase-admin/firestore";
-import { format } from "date-fns";
 import { toZonedTime } from "date-fns-tz";
+import { parseISO } from "date-fns";
+import { format } from "date-fns-tz";
 
 type DateInput = Date | Timestamp | { [key: string]: any } | number | string;
 
@@ -16,15 +17,24 @@ const parseTimestamp = (value: DateInput): Timestamp => {
 };
 
 export const serverFormatDate = (
-  input: DateInput,
+  input: string,
   timeZone: string = "America/New_York"
 ): string => {
   if (!input) return "";
   try {
-    const timestamp = parseTimestamp(input);
-    const utcDate = timestamp.toDate();
-    const zonedDate = toZonedTime(utcDate, timeZone);
-    const formattedResult = format(zonedDate, "yyyy-MM-dd hh:mm a");
+    const date = new Date(input);
+
+    const zonedDate = toZonedTime(date, timeZone);
+
+    const formattedResult = format(zonedDate, "yyyy-MM-dd hh:mm a", {
+      timeZone,
+    });
+
+    console.log("Input:", input);
+    console.log("Parsed Date:", date.toISOString());
+    console.log("Zoned Date:", zonedDate.toString());
+    console.log("Formatted Result:", formattedResult);
+    console.log("Timezone:", timeZone);
 
     return formattedResult;
   } catch (error) {