Fix/irl filters

apps/web-api/src/members/members.controller.ts

@@ -52,16 +52,21 @@ export class MemberController {
     const queryParams = request.query;
     const builder = new PrismaQueryBuilder(queryableFields);
     const builtQuery = builder.build(queryParams);
-    const { name__icontains } = queryParams;
+    const { name__icontains, isHost, isSpeaker } = queryParams;
     if (name__icontains) {
       delete builtQuery.where?.name;
     }
+    if (isHost || isSpeaker) {  //Remove isHost and isSpeaker from the default query since it is to be added in eventGuest.
+      delete builtQuery.where?.isHost;
+      delete builtQuery.where?.isSpeaker;
+    }
     builtQuery.where = {
       AND: [
         builtQuery.where,
         this.membersService.buildNameFilters(queryParams),
         this.membersService.buildRoleFilters(queryParams),
-        this.membersService.buildRecentMembersFilter(queryParams)
+        this.membersService.buildRecentMembersFilter(queryParams),
+        this.membersService.buildParticipationTypeFilter(queryParams)
       ],
     };
     return await this.membersService.findAll(builtQuery);
@@ -110,16 +115,21 @@ export class MemberController {
     const queryParams = request.query;
     const builder = new PrismaQueryBuilder(queryableFields);
     const builtQuery = builder.build(queryParams);
-    const { name__icontains } = queryParams;
+    const { name__icontains, isHost, isSpeaker } = queryParams;
     if (name__icontains) {
       delete builtQuery.where?.name;
     }
+    if (isHost || isSpeaker) { //Remove isHost and isSpeaker from the default query since it is to be added in eventGuest.
+      delete builtQuery.where?.isHost;
+      delete builtQuery.where?.isSpeaker;
+    }
     builtQuery.where = {
       AND: [
         builtQuery.where,
         this.membersService.buildNameFilters(queryParams),
         this.membersService.buildRoleFilters(queryParams),
-        this.membersService.buildRecentMembersFilter(queryParams)
+        this.membersService.buildRecentMembersFilter(queryParams),
+        this.membersService.buildParticipationTypeFilter(queryParams)
       ],
     };
     return await this.membersService.getMemberFilters(builtQuery);

apps/web-api/src/members/members.service.ts

@@ -273,7 +273,7 @@ export class MembersService {
                   slugURL: true,
                   startDate: true,
                   endDate: true,
-                  location:{
+                  location: {
                     select: {
                       location: true,
                       timezone: true,
@@ -1185,7 +1185,7 @@ export class MembersService {
           tx
         );
       }));
-    
+
       return result;
     });
     await this.cacheService.reset({ service: 'members' });

apps/web-api/src/teams/teams.controller.ts

@@ -53,12 +53,16 @@ export class TeamsController {
     );
     const builder = new PrismaQueryBuilder(queryableFields);
     const builtQuery = builder.build(request.query);
-    const { focusAreas }: any = request.query;
+    const { focusAreas, isHost } : any = request.query;
+    if(isHost) {  //Remove isHost from the default query since it is to be added in eventGuest.
+      delete builtQuery.where?.isHost;
+    }
     builtQuery.where = {
       AND: [
         builtQuery.where ? builtQuery.where : {},
         this.teamsService.buildFocusAreaFilters(focusAreas),
-        this.teamsService.buildRecentTeamsFilter(request.query)
+        this.teamsService.buildRecentTeamsFilter(request.query),
+        this.teamsService.buildParticipationTypeFilter(request.query)
       ]
     }
     return this.teamsService.findAll(builtQuery);

apps/web-api/src/teams/teams.service.ts

@@ -122,7 +122,7 @@ export class TeamsService {
                   slugURL: true,
                   startDate: true,
                   endDate: true,
-                  location:{
+                  location: {
                     select: {
                       location: true,
                       timezone: true,