From 3538c6a0ddbc32b010f264eb33d84b20293065d0 Mon Sep 17 00:00:00 2001
From: jnile <jaidevnileshkumar2002@gmail.com>
Date: Sun, 23 Mar 2025 12:14:39 +0000
Subject: [PATCH 1/2] Reschedule single updated to use microsoft id

---
 public/swagger/swagger.json            | 41 +++++++++++++++++++++-----
 shared                                 |  2 +-
 src/components/calendar-overview.tsx   |  8 +++--
 src/components/reschedule-requests.tsx |  6 ++--
 src/types/client.ts                    | 32 ++++++++++++++------
 5 files changed, 65 insertions(+), 24 deletions(-)

diff --git a/public/swagger/swagger.json b/public/swagger/swagger.json
index 7f553b3..244af9c 100644
--- a/public/swagger/swagger.json
+++ b/public/swagger/swagger.json
@@ -348,6 +348,14 @@
               "type": "string"
             },
             "required": true
+          },
+          {
+            "in": "query",
+            "name": "isICalUId",
+            "schema": {
+              "type": "boolean"
+            },
+            "required": true
           }
         ],
         "responses": {
@@ -2440,7 +2448,6 @@
         "description": "Request body of the details of the two meetings",
         "type": "object",
         "required": [
-          "newMeeting",
           "oldMeeting"
         ],
         "properties": {
@@ -2473,12 +2480,18 @@
           "oldMeeting": {
             "type": "object",
             "required": [
-              "msftMeetingID"
+              "msftMeetingID",
+              "ownerEmail"
             ],
             "properties": {
+              "ownerEmail": {
+                "type": "string",
+                "format": "email",
+                "description": "The email of the owner of the old meeting"
+              },
               "msftMeetingID": {
                 "type": "string",
-                "description": "The microsoft meeting ID of the old meeting if it exists"
+                "description": "The microsoft iCalUId meeting ID of the old meeting"
               },
               "isOrganizerOptional": {
                 "type": "boolean",
@@ -2557,13 +2570,17 @@
             "type": "object",
             "required": [
               "msftMeetingID",
-              "meetingStartTime",
-              "meetingOwner"
+              "ownerEmail"
             ],
             "properties": {
+              "ownerEmail": {
+                "type": "string",
+                "format": "email",
+                "description": "The email of the owner of the old meeting"
+              },
               "msftMeetingID": {
                 "type": "string",
-                "description": "The microsoft meeting ID of the old meeting"
+                "description": "The microsoft iCalUId meeting ID of the old meeting"
               }
             }
           }
@@ -2573,12 +2590,17 @@
         "description": "Request body of the details of the old meeting",
         "type": "object",
         "required": [
-          "msftMeetingID"
+          "msftMeetingID",
+          "ownerEmail"
         ],
         "properties": {
+          "ownerEmail": {
+            "type": "string",
+            "format": "email"
+          },
           "msftMeetingID": {
             "type": "string",
-            "description": "The microsoft meeting ID of the old meeting"
+            "description": "The microsoft iCalUId meeting ID of the old meeting"
           }
         }
       },
@@ -2878,6 +2900,9 @@
           "id": {
             "type": "string"
           },
+          "iCalUId": {
+            "type": "string"
+          },
           "attendees": {
             "type": "array",
             "items": {
diff --git a/shared b/shared
index 2c24047..ad6b08e 160000
--- a/shared
+++ b/shared
@@ -1 +1 @@
-Subproject commit 2c2404713126cdb23c1729b63d8f2596600af3da
+Subproject commit ad6b08eda774e4a1e680ae38a80b7257e380a7bc
diff --git a/src/components/calendar-overview.tsx b/src/components/calendar-overview.tsx
index 07f5375..ca9d20d 100644
--- a/src/components/calendar-overview.tsx
+++ b/src/components/calendar-overview.tsx
@@ -151,11 +151,13 @@ export function CalendarOverview() {
     return (doc.body.textContent || '').trim()
   }
 
-  const handleReschedule = async (selectedEventID: string) => {
+  const handleReschedule = async (selectedEventID: string, ownerEmail: string) => {
     if (!selectedEventID) return
+    if (!ownerEmail) return
     try {
       await slotifyClient.PostAPIRescheduleRequestSingle({
         msftMeetingID: selectedEventID,
+        ownerEmail: ownerEmail,
       })
       toast({
         title: 'Reschedule sent',
@@ -509,8 +511,8 @@ export function CalendarOverview() {
                 <Button
                   variant='destructive'
                   onClick={() => {
-                    console.log('Reschedule event: ', selectedEvent.id)
-                    handleReschedule(selectedEvent.id!.toString())
+                    console.log('Reschedule event: ', selectedEvent.iCalUId!.toString())
+                    handleReschedule(selectedEvent.iCalUId!.toString(), selectedEvent.organizer!.toString())
                     setIsDayEventsDialogOpen(false)
                   }}
                 >
diff --git a/src/components/reschedule-requests.tsx b/src/components/reschedule-requests.tsx
index d758814..3e8894f 100644
--- a/src/components/reschedule-requests.tsx
+++ b/src/components/reschedule-requests.tsx
@@ -84,7 +84,7 @@ export function RescheduleRequests() {
     myRequests?.forEach(async request => {
       const requestedBy = await getUserByID(request.requested_by)
       const oldEvent = await slotifyClient.GetAPICalendarEvent({
-        queries: { msftID: request.oldMeeting.msftMeetingID },
+        queries: { msftID: request.oldMeeting.msftMeetingID , isICalUId: true},
       })
       const newEvent =
         request.newMeeting?.startTime === '0001-01-01T00:00:00Z'
@@ -191,8 +191,8 @@ export function RescheduleRequests() {
                       <div className='space-y-3'>
                         <div>
                           <h4 className='font-medium leading-none'>
-                            {request.newMeeting?.title
-                              ? request.newMeeting.title
+                            {fullRequests[request.request_id]
+                              ? fullRequests[request.request_id]!.oldEvent.subject
                               : '(No name)'}
                           </h4>
                           <p className='text-sm text-muted-foreground mt-1'>
diff --git a/src/types/client.ts b/src/types/client.ts
index 878b49d..408fa50 100644
--- a/src/types/client.ts
+++ b/src/types/client.ts
@@ -33,12 +33,15 @@ type ReschedulingRequestNewMeeting = {
   attendees: Array<number> | null;
 };
 type ReschedulingCheckBodySchema = {
-  newMeeting: {
-    title: string;
-    meetingDuration: string;
-    attendees: Array<AttendeeBase>;
-  };
+  newMeeting?:
+    | {
+        title: string;
+        meetingDuration: string;
+        attendees: Array<AttendeeBase>;
+      }
+    | undefined;
   oldMeeting: {
+    ownerEmail: string;
     msftMeetingID: string;
     isOrganizerOptional?: boolean | undefined;
   };
@@ -144,6 +147,7 @@ type Attendee = {
 };
 type CalendarEvent = {
   id?: string | undefined;
+  iCalUId?: string | undefined;
   attendees: Array<Attendee>;
   body?: string | undefined;
   created?: string | undefined;
@@ -245,6 +249,7 @@ const Location: z.ZodType<Location> = z
 const CalendarEvent: z.ZodType<CalendarEvent> = z
   .object({
     id: z.string().optional(),
+    iCalUId: z.string().optional(),
     attendees: z.array(Attendee),
     body: z.string().optional(),
     created: z.string().datetime({ offset: true }).optional(),
@@ -423,9 +428,11 @@ const ReschedulingCheckBodySchema: z.ZodType<ReschedulingCheckBodySchema> = z
         meetingDuration: z.string(),
         attendees: z.array(AttendeeBase),
       })
-      .passthrough(),
+      .passthrough()
+      .optional(),
     oldMeeting: z
       .object({
+        ownerEmail: z.string().email(),
         msftMeetingID: z.string(),
         isOrganizerOptional: z.boolean().optional().default(false),
       })
@@ -483,11 +490,13 @@ const ReschedulingRequestBodySchema = z
         endRangeTime: z.string().datetime({ offset: true }),
       })
       .passthrough(),
-    oldMeeting: z.object({ msftMeetingID: z.string() }).passthrough(),
+    oldMeeting: z
+      .object({ ownerEmail: z.string().email(), msftMeetingID: z.string() })
+      .passthrough(),
   })
   .passthrough();
 const ReschedulingRequestSingleBodySchema = z
-  .object({ msftMeetingID: z.string() })
+  .object({ ownerEmail: z.string().email(), msftMeetingID: z.string() })
   .passthrough();
 const MSFTGroup = z.object({ id: z.string(), name: z.string() }).passthrough();
 const MSFTUser = z
@@ -626,6 +635,11 @@ const endpoints = makeApi([
         type: "Query",
         schema: z.string(),
       },
+      {
+        name: "isICalUId",
+        type: "Query",
+        schema: z.boolean(),
+      },
     ],
     response: CalendarEvent,
     errors: [
@@ -1498,7 +1512,7 @@ const endpoints = makeApi([
       {
         name: "body",
         type: "Body",
-        schema: z.object({ msftMeetingID: z.string() }).passthrough(),
+        schema: ReschedulingRequestSingleBodySchema,
       },
     ],
     response: z.number(),

From 3c9a12a88e6e39eae423c8186f1dc37d99fb1847 Mon Sep 17 00:00:00 2001
From: aevinj <ajjaevinjais@gmail.com>
Date: Sun, 23 Mar 2025 14:29:33 +0000
Subject: [PATCH 2/2] prettier changes

---
 shared                                 |  2 +-
 src/components/calendar-overview.tsx   | 15 ++++++++++++---
 src/components/reschedule-requests.tsx |  5 +++--
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/shared b/shared
index ad6b08e..e2c5f6a 160000
--- a/shared
+++ b/shared
@@ -1 +1 @@
-Subproject commit ad6b08eda774e4a1e680ae38a80b7257e380a7bc
+Subproject commit e2c5f6a98764cc26aaf91b29ddee6a33f83eb5b0
diff --git a/src/components/calendar-overview.tsx b/src/components/calendar-overview.tsx
index ca9d20d..5027b24 100644
--- a/src/components/calendar-overview.tsx
+++ b/src/components/calendar-overview.tsx
@@ -151,7 +151,10 @@ export function CalendarOverview() {
     return (doc.body.textContent || '').trim()
   }
 
-  const handleReschedule = async (selectedEventID: string, ownerEmail: string) => {
+  const handleReschedule = async (
+    selectedEventID: string,
+    ownerEmail: string,
+  ) => {
     if (!selectedEventID) return
     if (!ownerEmail) return
     try {
@@ -511,8 +514,14 @@ export function CalendarOverview() {
                 <Button
                   variant='destructive'
                   onClick={() => {
-                    console.log('Reschedule event: ', selectedEvent.iCalUId!.toString())
-                    handleReschedule(selectedEvent.iCalUId!.toString(), selectedEvent.organizer!.toString())
+                    console.log(
+                      'Reschedule event: ',
+                      selectedEvent.iCalUId!.toString(),
+                    )
+                    handleReschedule(
+                      selectedEvent.iCalUId!.toString(),
+                      selectedEvent.organizer!.toString(),
+                    )
                     setIsDayEventsDialogOpen(false)
                   }}
                 >
diff --git a/src/components/reschedule-requests.tsx b/src/components/reschedule-requests.tsx
index 3e8894f..8e4f963 100644
--- a/src/components/reschedule-requests.tsx
+++ b/src/components/reschedule-requests.tsx
@@ -84,7 +84,7 @@ export function RescheduleRequests() {
     myRequests?.forEach(async request => {
       const requestedBy = await getUserByID(request.requested_by)
       const oldEvent = await slotifyClient.GetAPICalendarEvent({
-        queries: { msftID: request.oldMeeting.msftMeetingID , isICalUId: true},
+        queries: { msftID: request.oldMeeting.msftMeetingID, isICalUId: true },
       })
       const newEvent =
         request.newMeeting?.startTime === '0001-01-01T00:00:00Z'
@@ -192,7 +192,8 @@ export function RescheduleRequests() {
                         <div>
                           <h4 className='font-medium leading-none'>
                             {fullRequests[request.request_id]
-                              ? fullRequests[request.request_id]!.oldEvent.subject
+                              ? fullRequests[request.request_id]!.oldEvent
+                                  .subject
                               : '(No name)'}
                           </h4>
                           <p className='text-sm text-muted-foreground mt-1'>