Merge pull request #323 from boostcampwm-2024/feature-be-#312

유저 cursorColor, nickname 변경 api 구현

Author: ezcolin2

Diff for: apps/backend/src/auth/auth.controller.ts

@@ -1,11 +1,21 @@
-import { Controller, Get, UseGuards, Req, Res, Post } from '@nestjs/common';
+import {
+  Controller,
+  Get,
+  UseGuards,
+  Req,
+  Res,
+  Post,
+  Patch,
+  Body,
+} from '@nestjs/common';
 import { AuthGuard } from '@nestjs/passport';
 import { AuthService } from './auth.service';
 import { JwtAuthGuard } from './guards/jwt-auth.guard';
 import { Response } from 'express';
 import { MessageResponseDto } from './dtos/messageResponse.dto';
 import { ApiOperation, ApiResponse } from '@nestjs/swagger';
 import { TokenService } from './token/token.service';
+import { UpdateUserDto } from './dtos/UpdateUser.dto';
 
 export enum AuthResponseMessage {
   AUTH_LOGGED_OUT = '로그아웃하였습니다.',
@@ -93,6 +103,15 @@ export class AuthController {
     return {
       message: '인증된 사용자 정보',
       snowflakeId: user.snowflakeId,
+      nickname: user.nickname,
+      cursorColor: user.cursorColor,
+      profileImage: user.profileImage,
     };
   }
+
+  @Patch('profile')
+  @UseGuards(JwtAuthGuard)
+  async updateProfile(@Req() req, @Body() body: UpdateUserDto) {
+    await this.authService.updateUser(req.user.sub, body);
+  }
 }

Diff for: apps/backend/src/auth/auth.service.spec.ts

@@ -3,7 +3,8 @@ import { AuthService } from './auth.service';
 import { UserRepository } from '../user/user.repository';
 import { SignUpDto } from './dtos/signUp.dto';
 import { User } from '../user/user.entity';
-import { Snowflake } from '@theinternetfolks/snowflake';
+import { UpdateUserDto } from './dtos/UpdateUser.dto';
+import { UserNotFoundException } from '../exception/user.exception';
 
 describe('AuthService', () => {
   let authService: AuthService;
@@ -17,6 +18,7 @@ describe('AuthService', () => {
           provide: UserRepository,
           useValue: {
             findOne: jest.fn(),
+            findOneBy: jest.fn(),
             create: jest.fn(),
             save: jest.fn(),
           },
@@ -66,7 +68,9 @@ describe('AuthService', () => {
         provider: 'naver',
         email: '[email protected]',
       };
-      const generatedSnowflakeId = Snowflake.generate(); // Snowflake.generate()의 mock 값을 준비
+      const generated
+      
+      flakeId = Snowflake.generate(); // Snowflake.generate()의 mock 값을 준비
       const newDate = new Date();
       const createdUser = {
         providerId: dto.providerId,
@@ -99,4 +103,55 @@ describe('AuthService', () => {
       expect(userRepository.save).toHaveBeenCalledWith(createdUser);
     });
   });
+
+  describe('updateUser', () => {
+    it('사용자를 성공적으로 갱신한다', async () => {
+      const dto: UpdateUserDto = {
+        cursorColor: '#FFFFFF',
+        nickname: 'new-nickname',
+      };
+
+      // 현재 날짜
+      const currentDate = new Date();
+      const originUser = {
+        id: 1,
+        snowflakeId: '123456789012345678',
+        providerId: 'kakao_12345',
+        provider: 'kakao',
+        email: '[email protected]',
+        cursorColor: '#FF8A8A',
+        nickname: 'origin-nickname',
+        profileImage: 'https://example.com/profile.jpg',
+        createdAt: currentDate,
+      } as User;
+
+      const newUser = {
+        id: 1,
+        snowflakeId: '123456789012345678',
+        providerId: 'kakao_12345',
+        provider: 'kakao',
+        email: '[email protected]',
+        cursorColor: '#FFFFFF',
+        nickname: 'new-nickname',
+        profileImage: 'https://example.com/profile.jpg',
+        createdAt: currentDate,
+      };
+
+      jest.spyOn(userRepository, 'findOneBy').mockResolvedValue(originUser);
+      await authService.updateUser(1, dto);
+      expect(userRepository.save).toHaveBeenCalledWith(newUser);
+    });
+
+    it('사용자가 존재하지 않으면 예외를 던진다.', async () => {
+      const dto: UpdateUserDto = {
+        cursorColor: '#FFFFFF',
+        nickname: 'new-nickname',
+      };
+
+      jest.spyOn(userRepository, 'findOneBy').mockResolvedValue(null);
+      expect(authService.updateUser(1, dto)).rejects.toThrow(
+        UserNotFoundException,
+      );
+    });
+  });
 });

Diff for: apps/backend/src/auth/auth.service.ts

@@ -2,8 +2,11 @@ import { Injectable } from '@nestjs/common';
 import { UserRepository } from '../user/user.repository';
 import { User } from '../user/user.entity';
 import { SignUpDto } from './dtos/signUp.dto';
+import { UpdateUserDto } from './dtos/UpdateUser.dto';
+import { UserNotFoundException } from '../exception/user.exception';
 import { Snowflake } from '@theinternetfolks/snowflake';
 
+
 @Injectable()
 export class AuthService {
   constructor(private readonly userRepository: UserRepository) {}
@@ -29,4 +32,17 @@ export class AuthService {
   async findUserById(id: number): Promise<User | null> {
     return await this.userRepository.findOneBy({ id });
   }
+  async updateUser(id: number, dto: UpdateUserDto) {
+    // 유저를 찾는다.
+    const findUser = await this.userRepository.findOneBy({ id });
+
+    // 유저가 없으면 오류
+    if (!findUser) {
+      throw new UserNotFoundException();
+    }
+
+    // 유저 갱신
+    const newPage = Object.assign({}, findUser, dto);
+    await this.userRepository.save(newPage);
+  }
 }

Diff for: apps/backend/src/auth/dtos/UpdateUser.dto.ts

@@ -0,0 +1,20 @@
+import { ApiProperty } from '@nestjs/swagger';
+import { IsString, IsOptional } from 'class-validator';
+
+export class UpdateUserDto {
+  @ApiProperty({
+    example: '#FF8A8A',
+    description: '유저의 커서 색상',
+  })
+  @IsString()
+  @IsOptional()
+  cursorColor?: string;
+
+  @ApiProperty({
+    example: 'nickname',
+    description: '유저 닉네임',
+  })
+  @IsString()
+  @IsOptional()
+  nickname?: string;
+}

Diff for: apps/backend/src/node/node.service.spec.ts

@@ -5,7 +5,6 @@ import { PageRepository } from '../page/page.repository';
 import { NodeNotFoundException } from '../exception/node.exception';
 import { Node } from './node.entity';
 import { Page } from '../page/page.entity';
-import { Workspace } from '../workspace/workspace.entity';
 import { CreateNodeDto } from './dtos/createNode.dto';
 import { UpdateNodeDto } from './dtos/updateNode.dto';
 import { MoveNodeDto } from './dtos/moveNode.dto';
@@ -15,7 +14,6 @@ describe('NodeService', () => {
   let service: NodeService;
   let nodeRepository: jest.Mocked<NodeRepository>;
   let pageRepository: jest.Mocked<PageRepository>;
-  let workspaceRepository: WorkspaceRepository;
 
   beforeEach(async () => {
     const module: TestingModule = await Test.createTestingModule({

Diff for: apps/backend/src/user/user.entity.ts

@@ -25,6 +25,11 @@ export class User {
   @Column()
   email: string;
 
+  @Column({
+    default: '#FF8A8A',
+  })
+  cursorColor: string;
+
   @Column({ nullable: true })
   nickname: string;
 

Diff for: apps/backend/src/workspace/workspace.module.ts

@@ -9,7 +9,6 @@ import { RoleModule } from '../role/role.module';
 import { JwtAuthGuard } from '../auth/guards/jwt-auth.guard';
 import { TokenModule } from '../auth/token/token.module';
 import { TokenService } from '../auth/token/token.service';
-import { JwtService } from '@nestjs/jwt';
 
 @Module({
   imports: [