more tz fixes - utc with local time only in converter, snyk readme fix

dylmye · Jul 8, 2023 · abddfd8 · abddfd8
1 parent ae02778
commit abddfd8
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@
 <p align="center">
   <a href="https://github.com/dylmye/lets-plan/actions/workflows/firebase-hosting-merge.yml"><img alt="The status badge for this project's build" src="https://img.shields.io/github/actions/workflow/status/dylmye/lets-plan/firebase-hosting-merge.yml?logo=github"></a>
   <a href="https://app.fossa.com/projects/git%2Bgithub.com%2Fdylmye%2Flets-plan?ref=badge_shield"><img alt="FOSSA status" src="https://app.fossa.com/api/projects/git%2Bgithub.com%2Fdylmye%2Flets-plan.svg?type=shield"></a>
-  <a href="https://snyk.io"><img alt="The status badge for the Snyk-detected vulnerabilities count for this project" src="https://img.shields.io/snyk/vulnerabilities/github/dylmye/lets-plan?logo=snyk"></a>
+  <a href="https://snyk.io"><img alt="This project is scanned by Snyk" src="https://snyk.io/test/github/dylmye/lets-plan/badge.svg"></a>
 </p>
 
 <p align="center">

diff --git a/src/components/TripItineraryItem/index.tsx b/src/components/TripItineraryItem/index.tsx
@@ -165,8 +165,8 @@ const TripItineraryItem = ({
     updateTripItem(trip.id, {
       ...values,
       id: item.id,
-      startsAt: dayjs(values.startsAt).utc(true).toISOString(),
-      endsAt: values?.endsAt && dayjs(values.endsAt).utc(true).toISOString(),
+      startsAt: dayjs(values.startsAt).format(),
+      endsAt: values?.endsAt && dayjs(values.endsAt).format(),
     });
     onToggleEditTripItem(item.id, false);
   };

diff --git a/src/helpers/converters.ts b/src/helpers/converters.ts
@@ -32,8 +32,9 @@ export const convertDateStringToTimestamp = (date: string): Timestamp =>
 export const convertTripDocument: FirestoreDataConverter<Trip> = {
   toFirestore(trip: Trip): TripSnapshot {
     const startsAt =
-      trip.startsAt && dayjs.utc(trip.startsAt).startOf("day").format();
-    const endsAt = trip.endsAt && dayjs.utc(trip.endsAt).endOf("day").format();
+      trip.startsAt && dayjs(trip.startsAt).utc(true).startOf("day").format();
+    const endsAt =
+      trip.endsAt && dayjs(trip.endsAt).utc(true).endOf("day").format();
 
     return {
       ...trip,
@@ -91,11 +92,13 @@ export const convertTripItemDocuments: FirestoreDataConverter<TripItem> = {
         tripItem[k] =
           !!tripItem[k as keyof TripItem] &&
           convertDateStringToTimestamp(
-            dayjs.utc(tripItem[k as keyof TripItem] as string).format()
+            dayjs(tripItem[k as keyof TripItem] as string)
+              .utc(true)
+              .format()
           );
       });
 
-    const startsAt = dayjs.utc(tripItem.startsAt).format();
+    const startsAt = dayjs(tripItem.startsAt).utc(true).format();
 
     return {
       ...tripItem,

diff --git a/src/store/features/trips/firestore.ts b/src/store/features/trips/firestore.ts
@@ -68,11 +68,13 @@ const deleteTripById: TripActions["deleteTripById"] = async (id) => {
 };
 
 const updateTripById: TripActions["updateTripById"] = async (data) => {
+  const startsAt = data.startsAt && dayjs(data.startsAt).utc(true).format();
+  const endsAt = data.endsAt && dayjs(data.endsAt).utc(true).format();
   try {
     await updateDoc(doc(tripsRef, data.id), {
       ...data,
-      startsAt: convertDateStringToTimestamp(data.startsAt as string),
-      endsAt: convertDateStringToTimestamp(data.endsAt as string),
+      startsAt: convertDateStringToTimestamp(startsAt!),
+      endsAt: convertDateStringToTimestamp(endsAt!),
       updatedAtUtc: serverTimestamp(),
     });
   } catch (e) {