1- import { Prisma } from "@prisma/client" ;
2-
31import type { Dayjs } from "@calcom/dayjs" ;
42import dayjs from "@calcom/dayjs" ;
53import type { DateRange } from "@calcom/lib/date-ranges" ;
@@ -29,22 +27,11 @@ async function getTeamMembers({
2927 cursor : number | null | undefined ;
3028 limit : number ;
3129} ) {
32- let whereQuery : Prisma . MembershipWhereInput = {
33- teamId,
34- } ;
35-
36- if ( teamIds ) {
37- whereQuery = {
38- teamId : {
39- in : teamIds ,
40- } ,
41- } ;
42- }
43-
4430 return await prisma . membership . findMany ( {
4531 where : {
46- ...whereQuery ,
47- accepted : true ,
32+ teamId : {
33+ in : teamId ? [ teamId ] : teamIds ,
34+ } ,
4835 } ,
4936 select : {
5037 id : true ,
@@ -116,23 +103,15 @@ async function getInfoForAllTeams({ ctx, input }: GetOptions) {
116103 } ,
117104 select : {
118105 id : true ,
106+ teamId : true ,
119107 } ,
120108 } )
121- . then ( ( memberships ) => memberships . map ( ( membership ) => membership . id ) ) ;
109+ . then ( ( memberships ) => memberships . map ( ( membership ) => membership . teamId ) ) ;
122110
123111 if ( ! teamIds . length ) {
124112 throw new TRPCError ( { code : "NOT_FOUND" , message : "User is not part of any organization or team." } ) ;
125113 }
126114
127- const getTotalMembers = await prisma . $queryRaw < {
128- count : number ;
129- } > ( Prisma . sql `
130- SELECT
131- COUNT(DISTINCT "userId") as "count"
132- FROM "Membership"
133- WHERE "teamId" IN (${ Prisma . join ( teamIds ) } )
134- ` ) ;
135-
136115 const teamMembers = await getTeamMembers ( {
137116 teamIds,
138117 cursor,
@@ -141,7 +120,7 @@ async function getInfoForAllTeams({ ctx, input }: GetOptions) {
141120
142121 return {
143122 teamMembers,
144- totalTeamMembers : getTotalMembers . count ,
123+ totalTeamMembers : teamMembers . length ,
145124 } ;
146125}
147126
0 commit comments