545-Replace req user with req userEntity in the user.controller.ts (#579

)

* Replace req["user"] with req["userEntity"] in the user.controller.ts

* clean up

* use the service method user.getUserProfile rather than returning req["user"]

* cc points

* use getUserProfile

src/user/user.controller.ts

@@ -46,16 +46,16 @@ export class UserController {
   @Get('/me')
   @UseGuards(FirebaseAuthGuard)
   async getUserByFirebaseId(@Req() req: Request): Promise<GetUserDto> {
-    const user = req['user'];
-    this.userService.updateUser({ lastActiveAt: new Date() }, user.user.id);
-    return user as GetUserDto;
+    const user = req['userEntity'];
+    this.userService.updateUser({ lastActiveAt: new Date() }, user.id);
+    return (await this.userService.getUserProfile(user.id)).userDto;
   }
 
   @ApiBearerAuth()
   @Delete()
   @UseGuards(FirebaseAuthGuard)
   async deleteUser(@Req() req: Request): Promise<UserEntity> {
-    return await this.userService.deleteUser(req['user'].user as UserEntity);
+    return await this.userService.deleteUser(req['userEntity']);
   }
 
   // This route must go before the Delete user route below as we want nestjs to check against this one first
@@ -84,8 +84,8 @@ export class UserController {
   @ApiBearerAuth()
   @Patch()
   @UseGuards(FirebaseAuthGuard)
-  async updateUser(@Body() updateUserDto: UpdateUserDto, @Req() req: Request) {
-    return await this.userService.updateUser(updateUserDto, req['user'].user.id);
+  async updateUser(@Body() updateUserDto: UpdateUserDto, @Req() req: Request): Promise<UserEntity> {
+    return await this.userService.updateUser(updateUserDto, req['userEntity'].id);
   }
 
   @ApiBearerAuth()

src/user/user.service.ts

@@ -135,6 +135,34 @@ export class UserService {
     return { userEntity: queryResult, userDto: formatUserObject(queryResult) };
   }
 
+  public async getUserProfile(id: string): Promise<{
+    userEntity: UserEntity | undefined;
+    userDto: GetUserDto | undefined;
+  }> {
+    const queryResult = await this.userRepository
+      .createQueryBuilder('user')
+      .leftJoinAndSelect('user.partnerAccess', 'partnerAccess')
+      .leftJoinAndSelect('user.partnerAdmin', 'partnerAdmin')
+      .leftJoinAndSelect('partnerAccess.therapySession', 'therapySession')
+      .leftJoinAndSelect('partnerAccess.partner', 'partner')
+      .leftJoinAndSelect('partnerAccess.partner', 'partnerAccessPartner')
+      .leftJoinAndSelect('partnerAdmin.partner', 'partnerAdminPartner')
+      .leftJoinAndSelect('user.courseUser', 'courseUser')
+      .leftJoinAndSelect('courseUser.course', 'course')
+      .leftJoinAndSelect('courseUser.sessionUser', 'sessionUser')
+      .leftJoinAndSelect('sessionUser.session', 'session')
+      .leftJoinAndSelect('user.subscriptionUser', 'subscriptionUser')
+      .leftJoinAndSelect('subscriptionUser.subscription', 'subscription')
+      .where('user.id = :id', { id })
+      .getOne();
+
+    if (!queryResult) {
+      throw new HttpException('USER NOT FOUND', HttpStatus.NOT_FOUND);
+    }
+
+    return { userEntity: queryResult, userDto: formatUserObject(queryResult) };
+  }
+
   public async getUserById(id: string): Promise<UserEntity | undefined> {
     const queryResult = await this.userRepository
       .createQueryBuilder('user')