Check if users are connected when doing an user search

eronka · May 3, 2024 · fd13e99 · fd13e99
1 parent 2f3f175
commit fd13e99
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 7 deletions.
diff --git a/src/schemas/user.properties.ts b/src/schemas/user.properties.ts
@@ -16,4 +16,5 @@ export const userProperties = {
 export const userExtraProps = {
   connectionsCount: { type: 'number' },
   ratingsCount: { type: 'number' },
+  isConnection: { type: 'boolean' },
 };
diff --git a/src/user/controller/user.controller.ts b/src/user/controller/user.controller.ts
@@ -7,6 +7,7 @@ import {
   Put,
   Query,
   UploadedFile,
+  UseGuards,
   UseInterceptors,
 } from '@nestjs/common';
 import { CurrentUser } from '../../decorators/current-user.decorator';
@@ -37,6 +38,7 @@ import {
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 import { Multer } from 'multer';
 import { Public } from '../../decorators/public.decorator';
+import { AuthGuard } from '../../auth/guard/auth/auth.guard';
 
 @Controller('user')
 @ApiBearerAuth()
@@ -265,7 +267,6 @@ export class UserController {
     return this.userService.getAvgUserRatings(user, false, userId);
   }
 
-  @Public()
   @Get('search')
   @ApiOperation({
     summary: 'Search users',
@@ -285,7 +286,11 @@ export class UserController {
     name: 'query',
     type: 'string',
   })
-  async searchUsers(@Query() { query }: { query: string }) {
-    return this.userService.searchUsers(query);
+  @UseGuards(AuthGuard)
+  async searchUsers(
+    @CurrentUser() user: User,
+    @Query() { query }: { query: string },
+  ) {
+    return this.userService.searchUsers(user.id, query);
   }
 }
diff --git a/src/user/service/user.service.ts b/src/user/service/user.service.ts
@@ -130,7 +130,7 @@ export class UserService {
     }));
   }
 
-  async searchUsers(searchTerm?: string) {
+  async searchUsers(userId: User['id'], searchTerm?: string) {
     if (!searchTerm) {
       throw new BadRequestException('Search term is required');
     }
@@ -149,17 +149,23 @@ export class UserService {
         isEmailVerified: true,
         jobTitle: true,
         profilePictureUrl: true,
+        connections: {
+          where: {
+            followerId: userId,
+          },
+        },
         _count: {
           select: {
             connections: true,
-            ratings: true,
+            ratingsReceived: true,
           },
         },
       },
     });
-    return users.map(({ _count, ...user }) => ({
+    return users.map(({ _count, connections, ...user }) => ({
       connectionsCount: _count.connections,
-      ratingsCount: _count.ratings,
+      ratingsCount: _count.ratingsReceived,
+      isConnection: connections.length == 0,
       ...user,
     }));
   }