From 25d3d123199a3b77df32205e69e65baca1dba48b Mon Sep 17 00:00:00 2001
From: zomars <zomars@me.com>
Date: Fri, 14 Oct 2022 15:52:09 -0600
Subject: [PATCH] Adds custom inputs to eventTypes responses

---
 lib/validations/event-type.ts      | 3 ++-
 pages/api/event-types/[id]/_get.ts | 2 +-
 pages/api/event-types/_get.ts      | 4 +++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/validations/event-type.ts b/lib/validations/event-type.ts
index 462990d65e..ce168925d0 100644
--- a/lib/validations/event-type.ts
+++ b/lib/validations/event-type.ts
@@ -1,6 +1,6 @@
 import { z } from "zod";
 
-import { _EventTypeModel as EventType } from "@calcom/prisma/zod";
+import { _EventTypeCustomInputModel, _EventTypeModel as EventType } from "@calcom/prisma/zod";
 
 import { Frequency } from "@lib/types";
 
@@ -116,5 +116,6 @@ export const schemaEventTypeReadPublic = EventType.pick({
       )
       .nullable(),
     metadata: jsonSchema.nullable(),
+    customInputs: _EventTypeCustomInputModel.array().optional(),
   })
 );
diff --git a/pages/api/event-types/[id]/_get.ts b/pages/api/event-types/[id]/_get.ts
index 13301a9f38..5ce12e2c86 100644
--- a/pages/api/event-types/[id]/_get.ts
+++ b/pages/api/event-types/[id]/_get.ts
@@ -36,7 +36,7 @@ import { schemaQueryIdParseInt } from "@lib/validations/shared/queryIdTransformP
 export async function getHandler(req: NextApiRequest) {
   const { prisma, query } = req;
   const { id } = schemaQueryIdParseInt.parse(query);
-  const event_type = await prisma.eventType.findUnique({ where: { id } });
+  const event_type = await prisma.eventType.findUnique({ where: { id }, include: { customInputs: true } });
   return { event_type: schemaEventTypeReadPublic.parse(event_type) };
 }
 
diff --git a/pages/api/event-types/_get.ts b/pages/api/event-types/_get.ts
index 3a3b968b8b..b126da8a28 100644
--- a/pages/api/event-types/_get.ts
+++ b/pages/api/event-types/_get.ts
@@ -27,7 +27,9 @@ import { schemaQuerySingleOrMultipleUserIds } from "@lib/validations/shared/quer
  */
 async function getHandler(req: NextApiRequest) {
   const { userId, isAdmin, prisma } = req;
-  const args: Prisma.EventTypeFindManyArgs = isAdmin ? {} : { where: { userId } };
+  const args: Prisma.EventTypeFindManyArgs = isAdmin
+    ? {}
+    : { where: { userId }, include: { customInputs: true } };
   /** Only admins can query other users */
   if (!isAdmin && req.query.userId) throw new HttpError({ statusCode: 401, message: "ADMIN required" });
   if (isAdmin && req.query.userId) {