From a6e199be670fbc6252399133e3620996ebf3055b Mon Sep 17 00:00:00 2001
From: Agusti Fernandez Pardo <git@agusti.me>
Date: Tue, 5 Jul 2022 23:05:29 +0200
Subject: [PATCH] fix: make availability for teamId work

---
 pages/api/availability/_get.ts | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/pages/api/availability/_get.ts b/pages/api/availability/_get.ts
index 1a461c0039..0d9afa6100 100644
--- a/pages/api/availability/_get.ts
+++ b/pages/api/availability/_get.ts
@@ -7,8 +7,6 @@ import { defaultResponder } from "@calcom/lib/server";
 import { availabilityUserSelect } from "@calcom/prisma";
 import { stringOrNumber } from "@calcom/prisma/zod-utils";
 
-import { User } from ".prisma/client";
-
 const availabilitySchema = z
   .object({
     userId: stringOrNumber.optional(),
@@ -46,17 +44,27 @@ async function handler(req: NextApiRequest) {
     select: availabilityUserSelect,
   });
   if (!isAdmin) throw new HttpError({ statusCode: 401, message: "Unauthorized" });
-  return members.map(
-    async (user) =>
-      await getUserAvailability(
+  const availabilities = members.map(async (user) => {
+    return {
+      userId: user.id,
+      availability: await getUserAvailability(
         {
+          userId: user.id,
           dateFrom,
           dateTo,
           eventTypeId,
         },
         { user }
-      )
-  );
+      ),
+    };
+  });
+  const settled = await Promise.all(availabilities);
+  if (!settled)
+    throw new HttpError({
+      statusCode: 401,
+      message: "We had an issue retrieving all your members availabilities",
+    });
+  if (settled) return settled;
 }
 
 export default defaultResponder(handler);