fix: type errors

calcom · Jun 19, 2024 · cfffc1e · cfffc1e
1 parent 5e540f6
commit cfffc1e
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 16 deletions.
diff --git a/apps/web/lib/booking.ts b/apps/web/lib/booking.ts
@@ -88,11 +88,12 @@ export const getEventTypesFromDB = async (id: number) => {
   }
 
   const metadata = EventTypeMetaDataSchema.parse(eventType.metadata);
-  const isOrgTeamEvent = !!eventType?.team && !!eventType?.profile?.organizationId;
+  const { profile, ...restEventType } = eventType;
+  const isOrgTeamEvent = !!eventType?.team && !!profile?.organizationId;
 
   return {
     isDynamic: false,
-    ...eventType,
+    ...restEventType,
     bookingFields: getBookingFieldsWithSystemFields({ ...eventType, isOrgTeamEvent }),
     metadata,
   };

diff --git a/packages/features/bookings/lib/handleNewBooking.ts b/packages/features/bookings/lib/handleNewBooking.ts
@@ -281,15 +281,16 @@ export const getEventTypesFromDB = async (eventTypeId: number) => {
     },
   });
 
-  const isOrgTeamEvent = !!eventType?.team && !!eventType?.profile?.organizationId;
+  const { profile, ...restEventType } = eventType;
+  const isOrgTeamEvent = !!eventType?.team && !!profile?.organizationId;
 
   return {
-    ...eventType,
+    ...restEventType,
     metadata: EventTypeMetaDataSchema.parse(eventType?.metadata || {}),
     recurringEvent: parseRecurringEvent(eventType?.recurringEvent),
     customInputs: customInputSchema.array().parse(eventType?.customInputs || []),
     locations: (eventType?.locations ?? []) as LocationObject[],
-    bookingFields: getBookingFieldsWithSystemFields({ ...eventType, isOrgTeamEvent } || {}),
+    bookingFields: getBookingFieldsWithSystemFields({ ...restEventType, isOrgTeamEvent } || {}),
     isDynamic: false,
   };
 };
@@ -1017,7 +1018,7 @@ async function handler(
       ? getDefaultEvent(req.body.eventTypeSlug)
       : await getEventTypesFromDB(req.body.eventTypeId);
 
-  const isOrgTeamEvent = !!eventType?.team && !!eventType?.profile?.organizationId;
+  const isOrgTeamEvent = !!eventType?.team && !!eventType?.team?.parentId;
 
   eventType = {
     ...eventType,

diff --git a/packages/features/eventtypes/lib/bookingFieldsManager.ts b/packages/features/eventtypes/lib/bookingFieldsManager.ts
@@ -36,11 +36,13 @@ async function getEventType(eventTypeId: EventType["id"]) {
     throw new Error(`EventType:${eventTypeId} not found`);
   }
 
-  const isOrgTeamEvent = !!rawEventType?.teamId && !!rawEventType?.profile?.organizationId;
+  const { profile, ...restEventType } = rawEventType;
+
+  const isOrgTeamEvent = !!rawEventType?.teamId && !!profile?.organizationId;
 
   const eventType = {
-    ...rawEventType,
-    bookingFields: getBookingFieldsWithSystemFields({ ...rawEventType, isOrgTeamEvent }),
+    ...restEventType,
+    bookingFields: getBookingFieldsWithSystemFields({ ...restEventType, isOrgTeamEvent }),
   };
   return eventType;
 }

diff --git a/packages/features/instant-meeting/handleInstantMeeting.ts b/packages/features/instant-meeting/handleInstantMeeting.ts
@@ -90,7 +90,7 @@ const handleInstantMeetingWebhookTrigger = async (args: {
 
 async function handler(req: NextApiRequest) {
   let eventType = await getEventTypesFromDB(req.body.eventTypeId);
-  const isOrgTeamEvent = !!eventType?.team && !!eventType?.profile?.organizationId;
+  const isOrgTeamEvent = !!eventType?.team && !!eventType?.team?.parentId;
   eventType = {
     ...eventType,
     bookingFields: getBookingFieldsWithSystemFields({ ...eventType, isOrgTeamEvent }),

diff --git a/packages/lib/event-types/getEventTypeById.ts b/packages/lib/event-types/getEventTypeById.ts
@@ -127,11 +127,6 @@ export const getEventTypeById = async ({
           teamId: true,
         },
       },
-      profile: {
-        select: {
-          organizationId: true,
-        },
-      },
       teamId: true,
       team: {
         select: {
@@ -396,7 +391,7 @@ export const getEventTypeById = async ({
     });
   }
 
-  const isOrgTeamEvent = !!eventType?.teamId && !!eventType?.profile?.organizationId;
+  const isOrgTeamEvent = !!eventType?.teamId && !!eventType.team?.parentId;
   const eventTypeObject = Object.assign({}, eventType, {
     users: eventTypeUsers,
     periodStartDate: eventType.periodStartDate?.toString() ?? null,