Merge pull request #222 from boostcampwm-2024/feat/#221-refactor-user-decorator

♻️ refactor: 유저 주입 데코레이터 최적화

Author: Donggle0315

back/src/auth/service/auth.service.ts

@@ -12,12 +12,13 @@ export class AuthService {
     this.redis = this.redisService.getOrThrow();
   }
 
-  async getUserIdFromSession(sid: string): Promise<number | null> {
+  async getUserIdFromSession(sid: string): Promise<[number, string] | null> {
     const session = JSON.parse(await this.redis.get(`user:${sid}`));
     if (!session) return null;
     const userId = session.id;
-    if (!userId) return null;
-    return userId;
+    const userLoginId = session.loginId;
+    if (!userId || !userLoginId) return null;
+    return [userId, userLoginId];
   }
 
   async setUserStatusLogin(sid: string) {

back/src/domains/user/service/user.service.ts

@@ -34,10 +34,6 @@ export class UserService {
     this.redis = this.redisService.getOrThrow();
   }
 
-  async getUser(userId: number) {
-    return await this.userRepository.findById(userId);
-  }
-
   async registerUser(userCreateDto: UserCreateDto, role: string = USER_ROLE.USER) {
     if (await this.userRepository.findByLoginId(userCreateDto.loginId)) {
       throw new ConflictException('이미 존재하는 사용자입니다.');

back/src/util/user-injection/user.decorator.service.ts

@@ -1,26 +1,19 @@
 import { Injectable } from '@nestjs/common';
 
 import { AuthService } from 'src/auth/service/auth.service';
-import { User } from 'src/domains/user/entity/user.entity';
-import { UserService } from 'src/domains/user/service/user.service';
 
 import { UserParamDto } from './userParamDto';
 
 @Injectable()
 export class UserDecoratorService {
-  constructor(
-    private readonly userService: UserService,
-    private readonly authService: AuthService,
-  ) {}
+  constructor(private readonly authService: AuthService) {}
 
   async getUserParam(ctx: any) {
     const req = ctx.switchToHttp().getRequest();
     const sid = req.cookies['SID'];
-    const userId = await this.authService.getUserIdFromSession(sid);
-
-    if (!userId) return null;
-
-    const user: User = await this.userService.getUser(userId);
-    return new UserParamDto(user);
+    if (!sid) return;
+    const [userId, userLoginId] = await this.authService.getUserIdFromSession(sid);
+    if (!userId || !userLoginId) return null;
+    return new UserParamDto({ id: userId, loginId: userLoginId });
   }
 }

back/src/util/user-injection/userParamDto.ts

@@ -1,11 +1,9 @@
 export class UserParamDto {
-  constructor({ id, loginId, loginPassword }) {
+  constructor({ id, loginId }) {
     this.id = id;
     this.loginId = loginId;
-    this.loginPassword = loginPassword;
   }
 
   id: number;
   loginId: string;
-  loginPassword: string;
 }