Implement getUserProfile (#25)

* Implement getUserProfile

* Fix test suit

* Check role before findSportArea

Makefile

@@ -1,5 +1,6 @@
 proto:
 	protoc --plugin=./node_modules/.bin/protoc-gen-ts_proto -I=./src/proto --ts_proto_out=./src/auth src/proto/auth.proto --ts_proto_opt=nestJs=true --ts_proto_opt=fileSuffix=.pb
+	protoc --plugin=./node_modules/.bin/protoc-gen-ts_proto -I=./src/proto --ts_proto_out=./src/user src/proto/user.proto --ts_proto_opt=nestJs=true --ts_proto_opt=fileSuffix=.pb
 
 server:
 	yarn start:dev

src/file/file.service.ts

@@ -3,6 +3,8 @@ import { ClientGrpc } from '@nestjs/microservices';
 import { catchError, firstValueFrom } from 'rxjs';
 import {
   FileServiceClient,
+  GetSignedURLRequest,
+  GetSignedURLResponse,
   UploadFileRequest,
   UploadFileResponse,
 } from './file.pb';
@@ -26,4 +28,14 @@ export class FileService {
       ),
     );
   }
+  async getSignedUrl(request: GetSignedURLRequest): Promise<GetSignedURLResponse> {
+    return await firstValueFrom(
+      this.fileClient.getSignedUrl(request).pipe(
+        catchError((error) => {
+          this.logger.error(error);
+          throw error;
+        }),
+      ),
+    );
+  }
 }

src/proto/user.proto

@@ -4,6 +4,7 @@ package user;
 
 service UserService {
   rpc GetUserSportArea(GetUserSportAreaRequest) returns (GetUserSportAreaResponse) {}
+  rpc GetUserProfile(GetUserProfileRequest) returns (GetUserProfileResponse) {}
 }
 
 message GetUserSportAreaRequest {
@@ -13,4 +14,18 @@ message GetUserSportAreaRequest {
 message GetUserSportAreaResponse {
   string userId = 1;
   string sportAreaId =2;
+}
+
+message GetUserProfileRequest {
+  string userId = 1;
+}
+
+message GetUserProfileResponse {
+  string id = 1;
+  string firstName = 2;
+  string lastName = 3;
+  string email = 4;
+  string profileUrl = 5;
+  string role = 6;
+  string sportAreaId = 7;
 }

src/repository/sportAreaList.repository.ts

@@ -7,7 +7,7 @@ import { UserRepository } from './user.repository';
 
 @Injectable()
 export class SportAreaListRepository {
-  constructor(private db: PrismaService) {}
+  constructor(private db: PrismaService) { }
 
   async addSportArea(
     updateInfo: UpdateUserSportAreaRequest,
@@ -25,4 +25,12 @@ export class SportAreaListRepository {
       where: { SportAreaId: sportAreaId },
     });
   }
+
+  async findSportAreaByUser(userId: string): Promise<SportArea> {
+    return await this.db.sportArea.findFirst({
+      where: {
+        userId: userId
+      }
+    })
+  }
 }

src/user/user.controller.spec.ts

@@ -8,6 +8,8 @@ describe('UserController', () => {
     findAllUsers: jest.fn(),
     banUser: jest.fn(),
     unbanUser: jest.fn(),
+    getUserProfile: jest.fn(),
+
   };
 
   beforeEach(async () => {

src/user/user.controller.ts

@@ -1,12 +1,12 @@
 import { Body, Controller, Get, Param, Patch, Post } from '@nestjs/common';
 import { UserService } from './user.service';
 import { User } from 'src/model/user.dto';
-import { GetUserSportAreaRequest, GetUserSportAreaResponse } from './user.pb';
+import { GetUserProfileRequest, GetUserProfileResponse, GetUserSportAreaRequest, GetUserSportAreaResponse } from './user.pb';
 import { GrpcMethod } from '@nestjs/microservices';
 
 @Controller('user')
 export class UserController {
-  constructor(private userService: UserService) {}
+  constructor(private userService: UserService) { }
 
   @Get()
   findAllUsers() {
@@ -29,4 +29,13 @@ export class UserController {
   ): Promise<GetUserSportAreaResponse> {
     return this.userService.getUserSportArea(request);
   }
+
+  @GrpcMethod('UserService', 'GetUserProfile')
+  getUserProfile(
+    request: GetUserProfileRequest,
+  ): Promise<GetUserProfileResponse> {
+    return this.userService.getUserProfile(request);
+  }
+
+
 }

src/user/user.module.ts

@@ -4,10 +4,11 @@ import { UserService } from './user.service';
 import { UserRepository } from 'src/repository/user.repository';
 import { PrismaModule } from 'src/prisma/prisma.module';
 import { SportAreaListRepository } from '../repository/sportAreaList.repository';
+import { FileModule } from 'src/file/file.module';
 
 @Module({
-  imports: [PrismaModule],
+  imports: [PrismaModule, FileModule],
   controllers: [UserController],
   providers: [UserService, UserRepository, SportAreaListRepository],
 })
-export class UserModule {}
+export class UserModule { }

src/user/user.pb.ts

@@ -13,21 +13,41 @@ export interface GetUserSportAreaResponse {
   sportAreaId: string;
 }
 
+export interface GetUserProfileRequest {
+  userId: string;
+}
+
+export interface GetUserProfileResponse {
+  id: string;
+  firstName: string;
+  lastName: string;
+  email: string;
+  profileUrl: string;
+  role: string;
+  sportAreaId: string;
+}
+
 export const USER_PACKAGE_NAME = "user";
 
 export interface UserServiceClient {
   getUserSportArea(request: GetUserSportAreaRequest): Observable<GetUserSportAreaResponse>;
+
+  getUserProfile(request: GetUserProfileRequest): Observable<GetUserProfileResponse>;
 }
 
 export interface UserServiceController {
   getUserSportArea(
     request: GetUserSportAreaRequest,
   ): Promise<GetUserSportAreaResponse> | Observable<GetUserSportAreaResponse> | GetUserSportAreaResponse;
+
+  getUserProfile(
+    request: GetUserProfileRequest,
+  ): Promise<GetUserProfileResponse> | Observable<GetUserProfileResponse> | GetUserProfileResponse;
 }
 
 export function UserServiceControllerMethods() {
   return function (constructor: Function) {
-    const grpcMethods: string[] = ["getUserSportArea"];
+    const grpcMethods: string[] = ["getUserSportArea", "getUserProfile"];
     for (const method of grpcMethods) {
       const descriptor: any = Reflect.getOwnPropertyDescriptor(constructor.prototype, method);
       GrpcMethod("UserService", method)(constructor.prototype[method], method, descriptor);

src/user/user.service.spec.ts

@@ -2,14 +2,19 @@ import { Test, TestingModule } from '@nestjs/testing';
 import { UserService } from './user.service';
 import { UserRepository } from '../repository/user.repository';
 import { SportAreaListRepository } from '../repository/sportAreaList.repository';
+import { FileService } from '../file/file.service';
 
 describe('UserService', () => {
   let service: UserService;
   const mockUserRepository = {
     findUserById: jest.fn(),
     update: jest.fn(),
     exclude: jest.fn(),
+
   };
+  const mockFileService = {
+
+  }
 
   const mockSportAreaListRepo = {};
 
@@ -25,6 +30,11 @@ describe('UserService', () => {
           provide: SportAreaListRepository,
           useValue: mockSportAreaListRepo,
         },
+        {
+          provide: FileService,
+          useValue: mockFileService,
+
+        }
       ],
     }).compile();
 

src/user/user.service.ts

@@ -9,17 +9,22 @@ import {
   UserServiceController,
   GetUserSportAreaRequest,
   GetUserSportAreaResponse,
+  GetUserProfileRequest,
+  GetUserProfileResponse,
 } from './user.pb';
 import { SportAreaListRepository } from '../repository/sportAreaList.repository';
 import { status } from '@grpc/grpc-js';
 import { RpcException } from '@nestjs/microservices';
+import { FileService } from '../file/file.service';
+import { use } from 'passport';
 
 @Injectable()
 export class UserService implements UserServiceController {
   constructor(
     private userRepo: UserRepository,
     private sportAreaListRepo: SportAreaListRepository,
-  ) {}
+    private fileService: FileService,
+  ) { }
 
   findAllUsers() {
     try {
@@ -97,4 +102,32 @@ export class UserService implements UserServiceController {
       throw err;
     }
   }
+
+  async getUserProfile(request: GetUserProfileRequest): Promise<GetUserProfileResponse> {
+    try {
+      const userId = request.userId
+      let user = await this.userRepo.findUserById(userId);
+      let userSportArea = ((user.role === 'USER') ? null : await this.sportAreaListRepo.findSportAreaByUser(userId))
+      const photoURL = ((user.photoURL == null) ? (await this.fileService.getSignedUrl({ filename: user.photoFileName, userId: userId })).url : user.photoURL)
+      return {
+        id: user.id,
+        firstName: user.firstName,
+        lastName: user.lastName,
+        email: user.email,
+        profileUrl: photoURL,
+        role: user.role,
+        sportAreaId: ((userSportArea == null) ? null : userSportArea.SportAreaId),
+      }
+
+    } catch (err: any) {
+      console.log(err);
+      if (!(err instanceof RpcException)) {
+        throw new RpcException({
+          code: status.INTERNAL,
+          message: 'internal server error cant get user profile',
+        });
+      }
+      throw err;
+    }
+  }
 }