Merge pull request #12 from YouthCatalyst/TECH-174-1

TECH-174: Enhancement on Getting Cal.com User based on Availability
YouthCatalyst · Sep 1, 2024 · bf2e1c4 · bf2e1c4
2 parents 3bdf298 + 54a0bad
commit bf2e1c4
Showing 1 changed file with 20 additions and 49 deletions.
diff --git a/apps/web/pages/api/availabilities/mentor-by-availability.ts b/apps/web/pages/api/availabilities/mentor-by-availability.ts
@@ -7,8 +7,8 @@ import prisma from "@calcom/prisma";
 export default async function handler(req: NextApiRequest, res: NextApiResponse) {
   const getMentorsSchema = z
     .object({
-      startTime: z.date().or(z.string()),
-      endTime: z.date().or(z.string()),
+      startTime: z.string(),
+      endTime: z.string(),
       take: z.number().optional(),
       skip: z.number().optional(),
     })
@@ -17,44 +17,10 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
   const { startTime, endTime, take, skip } = getMentorsSchema.parse(req.query);
 
   if (req.method === "GET") {
-    const parsedStartTime = new Date(startTime as string);
-    const parsedEndTime = new Date(endTime as string);
-
     const selectedUsers = await prisma.user.findMany({
       where: {
-        schedules: {
-          some: {
-            availability: {
-              some: {
-                OR: [
-                  ...(startTime
-                    ? [
-                        {
-                          startTime: {
-                            lte: parsedStartTime,
-                          },
-                          endTime: {
-                            gte: parsedStartTime,
-                          },
-                        },
-                      ]
-                    : []),
-                  ...(endTime
-                    ? [
-                        {
-                          startTime: {
-                            lte: parsedEndTime,
-                          },
-                          endTime: {
-                            gte: parsedEndTime,
-                          },
-                        },
-                      ]
-                    : []),
-                ].filter(Boolean),
-              },
-            },
-          },
+        emailVerified: {
+          not: null,
         },
       },
       select: {
@@ -75,17 +41,22 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
           returnDateOverrides: true,
         },
       })
-    ).map(({ busy, dateRanges, oooExcludedDateRanges, timeZone, datesOutOfOffice }, index) => {
-      const currentUser = selectedUsers[index];
-      return {
-        timeZone,
-        dateRanges,
-        oooExcludedDateRanges,
-        busy,
-        user: currentUser,
-        datesOutOfOffice,
-      };
-    });
+    )
+      .map(({ busy, dateRanges, oooExcludedDateRanges, timeZone, datesOutOfOffice }, index) => {
+        const currentUser = selectedUsers[index];
+
+        if (dateRanges.length == 0) return null;
+
+        return {
+          timeZone,
+          dateRanges,
+          oooExcludedDateRanges,
+          busy,
+          user: currentUser,
+          datesOutOfOffice,
+        };
+      })
+      .filter((item) => item !== null);
 
     res.status(200).json({
       mentors: allUsersAvailability,