Enhance calBookings mapping and schema: Added fallback for reschedulingReason, updated eventType and meetingUrl to support null values, and improved MeetingDetails component with URL validation. (#69)

Author: zhyd1997

lib/dto/calBookings.ts

@@ -162,6 +162,15 @@ export const mapCalBookingToMeetingRecord = (booking: CalBooking): MeetingRecord
       }))
     : [];
   const normalizedGuests = Array.isArray(booking?.guests) ? booking.guests : [];
+  
+  // Extract rescheduleReason from bookingFieldsResponses if not at top level
+  const bookingFields = (booking.bookingFieldsResponses as Record<string, unknown> | undefined) ?? {};
+  const rescheduleReasonFromFields = typeof bookingFields.rescheduleReason === "string" 
+    ? bookingFields.rescheduleReason 
+    : undefined;
+  
+  // Prefer top-level reschedulingReason, fallback to rescheduleReason from bookingFieldsResponses
+  const reschedulingReason = booking.reschedulingReason ?? rescheduleReasonFromFields;
 
   return {
     id: typeof booking.id === "number" ? booking.id : 0,
@@ -172,35 +181,31 @@ export const mapCalBookingToMeetingRecord = (booking: CalBooking): MeetingRecord
     status: typeof booking.status === "string" ? booking.status : "pending",
     cancellationReason: booking.cancellationReason ?? undefined,
     cancelledByEmail: booking.cancelledByEmail ?? undefined,
-    reschedulingReason: booking.reschedulingReason ?? undefined,
+    reschedulingReason: reschedulingReason ?? undefined,
     rescheduledByEmail: booking.rescheduledByEmail ?? undefined,
     rescheduledFromUid: booking.rescheduledFromUid ?? undefined,
     rescheduledToUid: booking.rescheduledToUid ?? undefined,
     start: booking.start ?? "",
     end: booking.end ?? "",
     duration: booking.duration ?? 0,
-    eventTypeId: booking.eventTypeId ?? (typeof eventType?.id === "number" ? eventType.id : 0),
-    eventType: {
-      id:
-        typeof eventType?.id === "number"
-          ? eventType.id
-          : typeof booking.eventTypeId === "number"
-            ? booking.eventTypeId
-            : 0,
-      slug: typeof eventType?.slug === "string" ? eventType.slug : "",
-    },
+    eventTypeId: booking.eventTypeId ?? null,
+    eventType: eventType
+      ? {
+          id: typeof eventType.id === "number" ? eventType.id : 0,
+          slug: typeof eventType.slug === "string" ? eventType.slug : "",
+        }
+      : null,
     meetingUrl: booking.meetingUrl ?? "",
     location: booking.location ?? "",
     absentHost: booking.absentHost ?? false,
     createdAt: booking.createdAt ?? "",
-    updatedAt: booking.updatedAt ?? "",
+    updatedAt: booking.updatedAt ?? null,
     metadata: (booking.metadata as Record<string, unknown> | undefined) ?? {},
-    rating: booking.rating ?? 0,
-    icsUid: booking.icsUid ?? "",
+    rating: booking.rating ?? null,
+    icsUid: booking.icsUid ?? null,
     attendees: normalizedAttendees,
     guests: normalizedGuests,
-    bookingFieldsResponses:
-      (booking.bookingFieldsResponses as Record<string, unknown> | undefined) ?? {},
+    bookingFieldsResponses: bookingFields,
   };
 };
 

lib/schemas/calBookings.ts

@@ -127,18 +127,20 @@ export const calBookingSchema = z.object({
   start: isoDateStringSchema,
   end: isoDateStringSchema,
   duration: z.number().nonnegative(),
-  eventTypeId: z.number(),
-  eventType: z.object({
-    id: z.number(),
-    slug: z.string(),
-  }),
-  meetingUrl: z.string().url(),
+  eventTypeId: z.number().nullable(),
+  eventType: z
+    .object({
+      id: z.number(),
+      slug: z.string(),
+    })
+    .nullable(),
+  meetingUrl: z.string(),
   location: z.string().nullable().optional(),
   absentHost: z.boolean().optional(),
   createdAt: isoDateStringSchema,
-  updatedAt: isoDateStringSchema,
+  updatedAt: isoDateStringSchema.nullable(),
   metadata: z.record(z.string(), z.unknown()).optional(),
-  rating: z.number().optional(),
+  rating: z.number().nullable().optional(),
   icsUid: z.string().nullable().optional(),
   attendees: z.array(bookingAttendeeSchema).optional(),
   guests: z.array(z.string().email()).optional(),

lib/types/meeting.ts

@@ -47,16 +47,16 @@ export interface MeetingItem {
   readonly start: string;
   readonly end: string;
   readonly duration: number;
-  readonly eventTypeId: number;
-  readonly eventType: MeetingEventType;
+  readonly eventTypeId: number | null;
+  readonly eventType: MeetingEventType | null;
   readonly meetingUrl: string;
   readonly location: string;
   readonly absentHost: boolean;
   readonly createdAt: string;
-  readonly updatedAt: string;
+  readonly updatedAt: string | null;
   readonly metadata: Record<string, unknown>;
-  readonly rating: number;
-  readonly icsUid: string;
+  readonly rating: number | null;
+  readonly icsUid: string | null;
   readonly attendees: readonly MeetingAttendee[];
   readonly guests: readonly string[];
   readonly bookingFieldsResponses: Record<string, unknown>;

modules/dashboard/MeetingDetails.tsx

@@ -31,9 +31,21 @@ export function MeetingDetails({ meeting }: MeetingDetailsProps) {
     if (url.includes('meet.google.com')) return 'Google Meet';
     if (url.includes('zoom.us')) return 'Zoom';
     if (url.includes('app.cal.com')) return 'Cal.com Video';
+    if (url.includes('integrations:google:meet')) return 'Google Meet';
+    if (url.includes('integrations:zoom')) return 'Zoom';
+    if (url.includes('integrations:daily')) return 'Cal.com Video';
     return 'Other';
   };
 
+  const isValidUrl = (url: string) => {
+    try {
+      new URL(url);
+      return true;
+    } catch {
+      return false;
+    }
+  };
+
   return (
     <div className="space-y-6">
       {/* Title and Status */}
@@ -129,14 +141,20 @@ export function MeetingDetails({ meeting }: MeetingDetailsProps) {
         <div className="flex-1">
           <div className="text-sm">Platform</div>
           <div className="text-muted-foreground text-sm">{getPlatformName(meeting.meetingUrl)}</div>
-          <a
-            href={meeting.meetingUrl}
-            target="_blank"
-            rel="noopener noreferrer"
-            className="text-xs text-primary hover:underline break-all mt-1 block"
-          >
-            {meeting.meetingUrl}
-          </a>
+          {isValidUrl(meeting.meetingUrl) ? (
+            <a
+              href={meeting.meetingUrl}
+              target="_blank"
+              rel="noopener noreferrer"
+              className="text-xs text-primary hover:underline break-all mt-1 block"
+            >
+              {meeting.meetingUrl}
+            </a>
+          ) : (
+            <div className="text-xs text-muted-foreground break-all mt-1">
+              {meeting.meetingUrl}
+            </div>
+          )}
         </div>
       </div>