[FEAT] User API 수정

apps/api-gateway/src/api/user/user.controller.ts

@@ -1,26 +1,26 @@
-import { Body, Controller, Delete, Get, Patch, Query, Res, Session } from '@nestjs/common';
-import { ConfigService } from '@nestjs/config';
+import { Body, Controller, Delete, Get, Patch, Res } from '@nestjs/common';
 import { UserService } from './user.service';
 import { Response } from 'express';
+import { AuthInfo } from '../../common/decorators/auth-info.decorator';
+import { IAuthInfo } from '../../common/interfaces/auth.interface';
 
 @Controller('users')
 export class UserController {
   constructor(private readonly userService: UserService) {}
 
   @Get()
-  async findUser(@Session() session, @Res() res: Response) {
-    const user = session.user;
+  async findUser(@AuthInfo() authInfo: IAuthInfo, @Res() res: Response) {
+    const { userId } = authInfo;
+    const userInfo = await this.userService.findUser(userId);
 
-    const findData = await this.userService.findUser(user);
-
-    return res.send(user);
+    return res.send(userInfo);
   }
 
   @Patch()
-  async modifyUser(@Body('username') username: string, @Session() session, @Res() res: Response) {
-    const user = session.user;
+  async modifyUser(@Body('username') username: string, @AuthInfo() authInfo: IAuthInfo, @Res() res: Response) {
+    const { userId } = authInfo;
 
-    const modifyData = await this.userService.modifyUser(username, user);
+    const modifyData = await this.userService.modifyUser(username, userId);
 
     return res.status(204).send({
       message: '사용자 이름 변경 완료',
@@ -29,10 +29,10 @@ export class UserController {
   }
 
   @Delete()
-  async removeUser(@Session() session, @Res() res: Response) {
-    const user = session.user;
+  async removeUser(@AuthInfo() authInfo: IAuthInfo, @Res() res: Response) {
+    const { userId } = authInfo;
 
-    const removeData = await this.userService.removeUser(user);
+    const removeData = await this.userService.removeUser(userId);
 
     return res.status(204).send({
       message: '사용자 정보 삭제 완료',

apps/api-gateway/src/api/user/user.service.ts

@@ -1,5 +1,6 @@
 import { Inject, Injectable } from '@nestjs/common';
 import { ClientProxy } from '@nestjs/microservices';
+import { lastValueFrom } from 'rxjs';
 
 @Injectable()
 export class UserService {
@@ -8,9 +9,11 @@ export class UserService {
     private readonly userClient: ClientProxy,
   ) {}
 
-  async findUser(user) {}
+  async findUser(userId: string) {
+    return await lastValueFrom(this.userClient.send({ cmd: 'find-user' }, userId));
+  }
 
-  async modifyUser(username: string, user) {}
+  async modifyUser(username: string, userId: string) {}
 
   async removeUser(user) {}
 }

apps/user/src/user.controller.ts

@@ -11,8 +11,8 @@ export class UserController {
     return await this.userService.createGuestUser(username);
   }
 
-  // @MessagePattern({ cmd: 'find-user' })
-  // async findUser(userId: string) {
-  //   return await this.userService.findUser(userId);
-  // }
+  @MessagePattern({ cmd: 'find-user' })
+  async findUser(userId: string) {
+    return await this.userService.findUser(userId);
+  }
 }

apps/user/src/user.service.ts

@@ -19,12 +19,12 @@ export class UserService {
     return await this.userRepository.save(guestUserInfo);
   }
 
-  // async findUser(userId: string) {
-  //   const userInfo: User = await this.userRepository.findOne({
-  //     where: {
-  //       id: userId,
-  //     },
-  //   });
-  //   return userInfo;
-  // }
+  async findUser(userId: string) {
+    const userInfo: User = await this.userRepository.findOne({
+      where: {
+        id: userId,
+      },
+    });
+    return userInfo;
+  }
 }