fix: wip

packages/lib/server-only/team/get-team.ts

@@ -1,71 +1,61 @@
-import type { Prisma } from '@prisma/client';
-import type { z } from 'zod';
+import { TeamMemberRole } from '@prisma/client';
+import { z } from 'zod';
 
 import { prisma } from '@documenso/prisma';
 import { TeamEmailSchema } from '@documenso/prisma/generated/zod/modelSchema/TeamEmailSchema';
-import { TeamGlobalSettingsSchema } from '@documenso/prisma/generated/zod/modelSchema/TeamGlobalSettingsSchema';
-import { TeamMemberSchema } from '@documenso/prisma/generated/zod/modelSchema/TeamMemberSchema';
 import { TeamSchema } from '@documenso/prisma/generated/zod/modelSchema/TeamSchema';
 
 import { AppError, AppErrorCode } from '../../errors/app-error';
+import { buildTeamWhereQuery, getHighestTeamRoleInGroup } from '../../utils/teams';
 
 export type GetTeamByIdOptions = {
-  userId?: number;
+  userId: number;
   teamId: number;
 };
 
 export const ZGetTeamByIdResponseSchema = TeamSchema.extend({
   teamEmail: TeamEmailSchema.nullable(),
-  teamGlobalSettings: TeamGlobalSettingsSchema.nullable(),
-  currentTeamMember: TeamMemberSchema.pick({
-    role: true,
-  }).nullable(),
+  currentTeamRole: z.nativeEnum(TeamMemberRole),
 });
 
 export type TGetTeamByIdResponse = z.infer<typeof ZGetTeamByIdResponseSchema>;
 
-/**
- * Get a team given a teamId.
- *
- * Provide an optional userId to check that the user is a member of the team.
- */
 export const getTeamById = async ({
   userId,
   teamId,
 }: GetTeamByIdOptions): Promise<TGetTeamByIdResponse> => {
-  const whereFilter: Prisma.TeamWhereUniqueInput = {
-    id: teamId,
-  };
-
-  if (userId !== undefined) {
-    whereFilter['members'] = {
-      some: {
-        userId,
-      },
-    };
-  }
-
-  const result = await prisma.team.findUniqueOrThrow({
-    where: whereFilter,
+  // Todo: orgs test
+  const result = await prisma.team.findFirst({
+    where: buildTeamWhereQuery(teamId, userId),
     include: {
       teamEmail: true,
-      teamGlobalSettings: true,
-      members: {
+      teamGroups: {
         where: {
-          userId,
-        },
-        select: {
-          role: true,
+          organisationGroup: {
+            organisationGroupMembers: {
+              some: {
+                organisationMember: {
+                  userId,
+                },
+              },
+            },
+          },
         },
       },
     },
   });
 
-  const { members, ...team } = result;
+  if (!result) {
+    throw new AppError(AppErrorCode.NOT_FOUND, {
+      message: 'Team not found',
+    });
+  }
+
+  const { teamGroups, ...team } = result;
 
   return {
     ...team,
-    currentTeamMember: userId !== undefined ? members[0] : null,
+    currentTeamRole: getHighestTeamRoleInGroup(teamGroups),
   };
 };
 
@@ -80,20 +70,23 @@ export type TGetTeamByUrlResponse = Awaited<ReturnType<typeof getTeamByUrl>>;
  * Get a team given a team URL.
  */
 export const getTeamByUrl = async ({ userId, teamUrl }: GetTeamByUrlOptions) => {
-  const whereFilter: Prisma.TeamWhereUniqueInput = {
-    url: teamUrl,
-  };
-
-  if (userId !== undefined) {
-    whereFilter['members'] = {
-      some: {
-        userId,
-      },
-    };
-  }
-
   const result = await prisma.team.findFirst({
-    where: whereFilter,
+    where: {
+      url: teamUrl,
+      teamGroups: {
+        some: {
+          organisationGroup: {
+            organisationGroupMembers: {
+              some: {
+                organisationMember: {
+                  userId,
+                },
+              },
+            },
+          },
+        },
+      },
+    },
     include: {
       teamEmail: true,
       emailVerification: {
@@ -103,21 +96,17 @@ export const getTeamByUrl = async ({ userId, teamUrl }: GetTeamByUrlOptions) =>
           email: true,
         },
       },
-      transferVerification: {
-        select: {
-          expiresAt: true,
-          name: true,
-          email: true,
-        },
-      },
-      subscription: true,
-      teamGlobalSettings: true,
-      members: {
+      teamGroups: {
         where: {
-          userId,
-        },
-        select: {
-          role: true,
+          organisationGroup: {
+            organisationGroupMembers: {
+              some: {
+                organisationMember: {
+                  userId,
+                },
+              },
+            },
+          },
         },
       },
     },
@@ -127,10 +116,10 @@ export const getTeamByUrl = async ({ userId, teamUrl }: GetTeamByUrlOptions) =>
     throw new AppError(AppErrorCode.NOT_FOUND);
   }
 
-  const { members, ...team } = result;
+  const { teamGroups, ...team } = result;
 
   return {
     ...team,
-    currentTeamMember: members[0],
+    currentTeamRole: getHighestTeamRoleInGroup(teamGroups),
   };
 };