From 5d57ace834c6c008c020a0aa8e914a1dda385a4f Mon Sep 17 00:00:00 2001
From: sakshibhatia17 <sakshibhatia696@gmail.com>
Date: Fri, 10 Jul 2026 03:46:13 +0530
Subject: [PATCH] fix: preserve local dates for mock calendar events (#108)

---
 client/src/pages/Home/BookRoomView/index.tsx          | 4 ++--
 client/src/pages/Home/MyEventsView/EditEventsView.tsx | 3 +--
 client/src/pages/Home/MyEventsView/index.tsx          | 4 ++--
 server/src/google-api/mock.database.ts                | 8 +++++---
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/client/src/pages/Home/BookRoomView/index.tsx b/client/src/pages/Home/BookRoomView/index.tsx
index 2a3d280..daf515c 100644
--- a/client/src/pages/Home/BookRoomView/index.tsx
+++ b/client/src/pages/Home/BookRoomView/index.tsx
@@ -157,7 +157,7 @@ export default function BookRoomView({ onRoomBooked }: BookRoomViewProps) {
   async function setAvailableRooms() {
     const { startTime, duration, seats } = formData;
     const { floor } = preferences;
-    const currentDate = date.toISOString().split('T')[0];
+    const currentDate = date.format('YYYY-MM-DD');
     const formattedStartTime = convertToRFC3339(currentDate, startTime);
 
     setRoomLoading(true);
@@ -214,7 +214,7 @@ export default function BookRoomView({ onRoomBooked }: BookRoomViewProps) {
       return;
     }
 
-    const formattedStartTime = convertToRFC3339(date.toISOString().split('T')[0], startTime);
+    const formattedStartTime = convertToRFC3339(date.format('YYYY-MM-DD'), startTime);
     const { floor, title: preferredTitle } = preferences;
 
     const payload: BookRoomDto = {
diff --git a/client/src/pages/Home/MyEventsView/EditEventsView.tsx b/client/src/pages/Home/MyEventsView/EditEventsView.tsx
index 0a56e13..9b8993a 100644
--- a/client/src/pages/Home/MyEventsView/EditEventsView.tsx
+++ b/client/src/pages/Home/MyEventsView/EditEventsView.tsx
@@ -6,7 +6,6 @@ import Dropdown, { DropdownOption } from '@components/Dropdown';
 import RoomsDropdown, { RoomsDropdownOption } from '@components/RoomsDropdown';
 import {
   chromeBackground,
-  convertToLocaleDate,
   convertToLocaleTime,
   convertToRFC3339,
   createDropdownOptions,
@@ -123,7 +122,7 @@ export default function EditEventsView({ open, event, handleClose, currentRoom,
   async function setAvailableRooms() {
     const { startTime, duration, seats } = formData;
     const { floor } = preferences;
-    const currentDate = convertToLocaleDate(new Date(date.toISOString()).toISOString());
+    const currentDate = date.format('YYYY-MM-DD');
     const formattedStartTime = convertToRFC3339(currentDate, startTime);
 
     setRoomLoading(true);
diff --git a/client/src/pages/Home/MyEventsView/index.tsx b/client/src/pages/Home/MyEventsView/index.tsx
index f050814..6b4c8c2 100644
--- a/client/src/pages/Home/MyEventsView/index.tsx
+++ b/client/src/pages/Home/MyEventsView/index.tsx
@@ -171,7 +171,7 @@ export default function MyEventsView({ redirectedDate }: MyEventsViewProps) {
     setEvents((prevEvents) =>
       prevEvents
         .map((event) => (event.eventId === data.eventId ? res.data : event))
-        .filter((event) => event.start.split('T')[0] === currentDate.toISOString().split('T')[0]),
+        .filter((event) => event.start.split('T')[0] === currentDate.format('YYYY-MM-DD')),
     );
 
     toast.success('Room has been updated');
@@ -210,7 +210,7 @@ export default function MyEventsView({ redirectedDate }: MyEventsViewProps) {
     setEvents((prevEvents) =>
       prevEvents
         .map((event) => (event.eventId === eventId ? { ...event, ...res.data } : event))
-        .filter((event) => event.start.split('T')[0] === currentDate.toISOString().split('T')[0]),
+        .filter((event) => event.start.split('T')[0] === currentDate.format('YYYY-MM-DD')),
     );
 
     toast.success('Event response has been updated');
diff --git a/server/src/google-api/mock.database.ts b/server/src/google-api/mock.database.ts
index adacaaf..9e0a60a 100644
--- a/server/src/google-api/mock.database.ts
+++ b/server/src/google-api/mock.database.ts
@@ -314,9 +314,11 @@ export class CalenderMockDb {
     });
 
     for (const event of filteredEvents) {
-      for (const attendee of event.attendees) {
-        if (attendee.email.includes('resource.calendar.google.com')) {
-          attendee.resource = true;
+      if (event.attendees) {
+        for (const attendee of event.attendees) {
+          if (attendee.email.includes('resource.calendar.google.com')) {
+            attendee.resource = true;
+          }
         }
       }
     }