Uncodedtech
diff --git a/‎.gitignore‎
Lines changed: 2 additions & 1 deletion b/‎.gitignore‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎apps/api/v1/lib/validations/api-key.ts‎
Lines changed: 1 addition & 1 deletion b/‎apps/api/v1/lib/validations/api-key.ts‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎apps/api/v1/lib/validations/attendee.ts‎
Lines changed: 3 additions & 3 deletions b/‎apps/api/v1/lib/validations/attendee.ts‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎apps/api/v1/lib/validations/availability.ts‎
Lines changed: 5 additions & 4 deletions b/‎apps/api/v1/lib/validations/availability.ts‎
Lines changed: 5 additions & 4 deletions
diff --git a/‎apps/api/v1/lib/validations/booking-reference.ts‎
Lines changed: 5 additions & 5 deletions b/‎apps/api/v1/lib/validations/booking-reference.ts‎
Lines changed: 5 additions & 5 deletions
diff --git a/‎apps/api/v1/lib/validations/booking.ts‎
Lines changed: 25 additions & 25 deletions b/‎apps/api/v1/lib/validations/booking.ts‎
Lines changed: 25 additions & 25 deletions
diff --git a/‎apps/api/v1/lib/validations/destination-calendar.ts‎
Lines changed: 3 additions & 3 deletions b/‎apps/api/v1/lib/validations/destination-calendar.ts‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎apps/api/v1/lib/validations/event-type-custom-input.ts‎
Lines changed: 3 additions & 3 deletions b/‎apps/api/v1/lib/validations/event-type-custom-input.ts‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎apps/api/v1/lib/validations/event-type.ts‎
Lines changed: 5 additions & 4 deletions b/‎apps/api/v1/lib/validations/event-type.ts‎
Lines changed: 5 additions & 4 deletions
diff --git a/‎apps/api/v1/lib/validations/membership.ts‎
Lines changed: 12 additions & 5 deletions b/‎apps/api/v1/lib/validations/membership.ts‎
Lines changed: 12 additions & 5 deletions
@@ -66,7 +66,8 @@ tsconfig.tsbuildinfo
 .turbo
 
 # Prisma generated files
-packages/prisma/zod/*.ts
+packages/prisma/client/*
+packages/prisma/zod/**/*.ts
 packages/prisma/enums
 
 # Builds
 
@@ -1,6 +1,6 @@
 import { z } from "zod";
 
-import { _ApiKeyModel as ApiKey } from "@calcom/prisma/zod";
+import { ApiKeySchema as ApiKey } from "@calcom/prisma/zod/modelSchema/ApiKeySchema";
 
 export const apiKeyCreateBodySchema = ApiKey.pick({
   note: true,
 
@@ -1,11 +1,11 @@
 import { z } from "zod";
 
 import { emailSchema } from "@calcom/lib/emailSchema";
-import { _AttendeeModel as Attendee } from "@calcom/prisma/zod";
+import { AttendeeSchema } from "@calcom/prisma/zod/modelSchema/AttendeeSchema";
 
 import { timeZone } from "~/lib/validations/shared/timeZone";
 
-export const schemaAttendeeBaseBodyParams = Attendee.pick({
+export const schemaAttendeeBaseBodyParams = AttendeeSchema.pick({
   bookingId: true,
   email: true,
   name: true,
@@ -31,7 +31,7 @@ const schemaAttendeeEditParams = z
 export const schemaAttendeeEditBodyParams = schemaAttendeeBaseBodyParams.merge(schemaAttendeeEditParams);
 export const schemaAttendeeCreateBodyParams = schemaAttendeeBaseBodyParams.merge(schemaAttendeeCreateParams);
 
-export const schemaAttendeeReadPublic = Attendee.pick({
+export const schemaAttendeeReadPublic = AttendeeSchema.pick({
   id: true,
   bookingId: true,
   name: true,
 
@@ -1,16 +1,17 @@
 import { z } from "zod";
 
-import { _AvailabilityModel as Availability, _ScheduleModel as Schedule } from "@calcom/prisma/zod";
 import { denullishShape } from "@calcom/prisma/zod-utils";
+import { AvailabilitySchema } from "@calcom/prisma/zod/modelSchema/AvailabilitySchema";
+import { ScheduleSchema } from "@calcom/prisma/zod/modelSchema/ScheduleSchema";
 
 export const schemaAvailabilityBaseBodyParams = /** We make all these properties required */ denullishShape(
-  Availability.pick({
+  AvailabilitySchema.pick({
     /** We need to pass the schedule where this availability belongs to */
     scheduleId: true,
   })
 );
 
-export const schemaAvailabilityReadPublic = Availability.pick({
+export const schemaAvailabilityReadPublic = AvailabilitySchema.pick({
   id: true,
   startTime: true,
   endTime: true,
@@ -19,7 +20,7 @@ export const schemaAvailabilityReadPublic = Availability.pick({
   days: true,
   // eventTypeId: true /** @deprecated */,
   // userId: true /** @deprecated */,
-}).merge(z.object({ success: z.boolean().optional(), Schedule: Schedule.partial() }).partial());
+}).merge(z.object({ success: z.boolean().optional(), Schedule: ScheduleSchema.partial() }).partial());
 
 const schemaAvailabilityCreateParams = z
   .object({
 
@@ -1,7 +1,7 @@
-import { _BookingReferenceModel as BookingReference } from "@calcom/prisma/zod";
 import { denullishShape } from "@calcom/prisma/zod-utils";
+import { BookingReferenceSchema } from "@calcom/prisma/zod/modelSchema/BookingReferenceSchema";
 
-export const schemaBookingReferenceBaseBodyParams = BookingReference.pick({
+export const schemaBookingReferenceBaseBodyParams = BookingReferenceSchema.pick({
   type: true,
   bookingId: true,
   uid: true,
@@ -11,7 +11,7 @@ export const schemaBookingReferenceBaseBodyParams = BookingReference.pick({
   deleted: true,
 }).partial();
 
-export const schemaBookingReferenceReadPublic = BookingReference.pick({
+export const schemaBookingReferenceReadPublic = BookingReferenceSchema.pick({
   id: true,
   type: true,
   bookingId: true,
@@ -22,7 +22,7 @@ export const schemaBookingReferenceReadPublic = BookingReference.pick({
   deleted: true,
 });
 
-export const schemaBookingCreateBodyParams = BookingReference.omit({ id: true, bookingId: true })
-  .merge(denullishShape(BookingReference.pick({ bookingId: true })))
+export const schemaBookingCreateBodyParams = BookingReferenceSchema.omit({ id: true, bookingId: true })
+  .merge(denullishShape(BookingReferenceSchema.pick({ bookingId: true })))
   .strict();
 export const schemaBookingEditBodyParams = schemaBookingCreateBodyParams.partial();
@@ -1,15 +1,13 @@
 import { z } from "zod";
 
-import {
-  _AttendeeModel,
-  _BookingModel as Booking,
-  _EventTypeModel,
-  _PaymentModel,
-  _TeamModel,
-  _UserModel,
-} from "@calcom/prisma/zod";
+import { extendedBookingCreateBody } from "@calcom/features/bookings/lib/bookingCreateBodySchema";
 import { iso8601 } from "@calcom/prisma/zod-utils";
-import { extendedBookingCreateBody } from "@calcom/prisma/zod/custom/booking";
+import { AttendeeSchema } from "@calcom/prisma/zod/modelSchema/AttendeeSchema";
+import { BookingSchema as Booking } from "@calcom/prisma/zod/modelSchema/BookingSchema";
+import { EventTypeSchema } from "@calcom/prisma/zod/modelSchema/EventTypeSchema";
+import { PaymentSchema } from "@calcom/prisma/zod/modelSchema/PaymentSchema";
+import { TeamSchema } from "@calcom/prisma/zod/modelSchema/TeamSchema";
+import { UserSchema } from "@calcom/prisma/zod/modelSchema/UserSchema";
 
 import { schemaQueryUserId } from "./shared/queryUserId";
 
@@ -72,17 +70,16 @@ export const schemaBookingEditBodyParams = schemaBookingBaseBodyParams
   .merge(schemaBookingEditParams)
   .omit({ uid: true });
 
-const teamSchema = _TeamModel.pick({
+const teamSchema = TeamSchema.pick({
   name: true,
   slug: true,
 });
 
 export const schemaBookingReadPublic = Booking.extend({
-  eventType: _EventTypeModel
-    .pick({
-      title: true,
-      slug: true,
-    })
+  eventType: EventTypeSchema.pick({
+    title: true,
+    slug: true,
+  })
     .merge(
       z.object({
         team: teamSchema.nullish(),
@@ -91,7 +88,7 @@ export const schemaBookingReadPublic = Booking.extend({
     .nullish(),
   attendees: z
     .array(
-      _AttendeeModel.pick({
+      AttendeeSchema.pick({
         id: true,
         email: true,
         name: true,
@@ -100,17 +97,15 @@ export const schemaBookingReadPublic = Booking.extend({
       })
     )
     .optional(),
-  user: _UserModel
-    .pick({
-      email: true,
-      name: true,
-      timeZone: true,
-      locale: true,
-    })
-    .nullish(),
+  user: UserSchema.pick({
+    email: true,
+    name: true,
+    timeZone: true,
+    locale: true,
+  }).nullish(),
   payment: z
     .array(
-      _PaymentModel.pick({
+      PaymentSchema.pick({
         id: true,
         success: true,
         paymentOption: true,
@@ -140,3 +135,8 @@ export const schemaBookingReadPublic = Booking.extend({
   rescheduledBy: true,
   createdAt: true,
 });
+
+export {
+  bookingCreateSchemaLegacyPropsForApi,
+  bookingCreateBodySchemaForApi,
+} from "@calcom/features/bookings/lib/bookingCreateBodySchema";
@@ -1,8 +1,8 @@
 import { z } from "zod";
 
-import { _DestinationCalendarModel as DestinationCalendar } from "@calcom/prisma/zod";
+import { DestinationCalendarSchema } from "@calcom/prisma/zod/modelSchema/DestinationCalendarSchema";
 
-export const schemaDestinationCalendarBaseBodyParams = DestinationCalendar.pick({
+export const schemaDestinationCalendarBaseBodyParams = DestinationCalendarSchema.pick({
   integration: true,
   externalId: true,
   eventTypeId: true,
@@ -38,7 +38,7 @@ export const schemaDestinationCalendarEditBodyParams = schemaDestinationCalendar
   schemaDestinationCalendarEditParams
 );
 
-export const schemaDestinationCalendarReadPublic = DestinationCalendar.pick({
+export const schemaDestinationCalendarReadPublic = DestinationCalendarSchema.pick({
   id: true,
   integration: true,
   externalId: true,
 
@@ -1,10 +1,10 @@
-import { _EventTypeCustomInputModel as EventTypeCustomInput } from "@calcom/prisma/zod";
+import { EventTypeCustomInputSchema } from "@calcom/prisma/zod/modelSchema/EventTypeCustomInputSchema";
 
-export const schemaEventTypeCustomInputBaseBodyParams = EventTypeCustomInput.omit({
+export const schemaEventTypeCustomInputBaseBodyParams = EventTypeCustomInputSchema.omit({
   id: true,
 });
 
-export const schemaEventTypeCustomInputPublic = EventTypeCustomInput.omit({});
+export const schemaEventTypeCustomInputPublic = EventTypeCustomInputSchema.omit({});
 
 export const schemaEventTypeCustomInputBodyParams = schemaEventTypeCustomInputBaseBodyParams.strict();
 
 
@@ -6,8 +6,9 @@ import {
   MIN_EVENT_DURATION_MINUTES,
 } from "@calcom/lib/constants";
 import slugify from "@calcom/lib/slugify";
-import { _EventTypeModel as EventType, _HostModel } from "@calcom/prisma/zod";
 import { customInputSchema, eventTypeBookingFields } from "@calcom/prisma/zod-utils";
+import { EventTypeSchema } from "@calcom/prisma/zod/modelSchema/EventTypeSchema";
+import { HostSchema } from "@calcom/prisma/zod/modelSchema/HostSchema";
 
 import { Frequency } from "~/lib/types";
 
@@ -24,7 +25,7 @@ const recurringEventInputSchema = z.object({
   tzid: timeZone.optional(),
 });
 
-const hostSchema = _HostModel.pick({
+const hostSchema = HostSchema.pick({
   isFixed: true,
   userId: true,
   scheduleId: true,
@@ -35,7 +36,7 @@ export const childrenSchema = z.object({
   userId: z.number().int(),
 });
 
-export const schemaEventTypeBaseBodyParams = EventType.pick({
+export const schemaEventTypeBaseBodyParams = EventTypeSchema.pick({
   title: true,
   description: true,
   slug: true,
@@ -117,7 +118,7 @@ const schemaEventTypeEditParams = z
   .strict();
 
 export const schemaEventTypeEditBodyParams = schemaEventTypeBaseBodyParams.merge(schemaEventTypeEditParams);
-export const schemaEventTypeReadPublic = EventType.pick({
+export const schemaEventTypeReadPublic = EventTypeSchema.pick({
   id: true,
   title: true,
   slug: true,
 
@@ -1,19 +1,24 @@
 import { z } from "zod";
 
 import { MembershipRole } from "@calcom/prisma/enums";
-import { _MembershipModel as Membership, _TeamModel } from "@calcom/prisma/zod";
 import { stringOrNumber } from "@calcom/prisma/zod-utils";
+import { MembershipSchema } from "@calcom/prisma/zod/modelSchema/MembershipSchema";
+import { TeamSchema } from "@calcom/prisma/zod/modelSchema/TeamSchema";
 
 import { schemaQueryIdAsString } from "~/lib/validations/shared/queryIdString";
 import { schemaQueryIdParseInt } from "~/lib/validations/shared/queryIdTransformParseInt";
 
-export const schemaMembershipBaseBodyParams = Membership.omit({});
+export const schemaMembershipBaseBodyParams = MembershipSchema.omit({});
 
 const schemaMembershipRequiredParams = z.object({
   teamId: z.number(),
 });
 
-export const membershipCreateBodySchema = Membership.omit({ id: true })
+export const membershipCreateBodySchema = MembershipSchema.omit({
+  id: true,
+  createdAt: true,
+  updatedAt: true,
+})
   .partial({
     accepted: true,
     role: true,
@@ -26,11 +31,13 @@ export const membershipCreateBodySchema = Membership.omit({ id: true })
     ...v,
   }));
 
-export const membershipEditBodySchema = Membership.omit({
+export const membershipEditBodySchema = MembershipSchema.omit({
   /** To avoid complication, let's avoid updating these, instead you can delete and create a new invite */
   teamId: true,
   userId: true,
   id: true,
+  createdAt: true,
+  updatedAt: true,
 })
   .partial({
     accepted: true,
@@ -43,7 +50,7 @@ export const schemaMembershipBodyParams = schemaMembershipBaseBodyParams.merge(
   schemaMembershipRequiredParams
 );
 
-export const schemaMembershipPublic = Membership.merge(z.object({ team: _TeamModel }).partial());
+export const schemaMembershipPublic = MembershipSchema.merge(z.object({ team: TeamSchema }).partial());
 
 /** We extract userId and teamId from compound ID string */
 export const membershipIdSchema = schemaQueryIdAsString