Merge branch 'develop' into feature-be-#312

Author: ezcolin2

apps/backend/src/auth/auth.service.spec.ts

@@ -68,14 +68,39 @@ describe('AuthService', () => {
         provider: 'naver',
         email: '[email protected]',
       };
-      const user = new User();
-      jest.spyOn(userRepository, 'create').mockReturnValue(user);
-      jest.spyOn(userRepository, 'save').mockResolvedValue(user);
+      const generated
+      
+      flakeId = Snowflake.generate(); // Snowflake.generate()의 mock 값을 준비
+      const newDate = new Date();
+      const createdUser = {
+        providerId: dto.providerId,
+        provider: dto.provider,
+        email: dto.email,
+        snowflakeId: generatedSnowflakeId,
+      };
+      const savedUser = {
+        providerId: dto.providerId,
+        provider: dto.provider,
+        email: dto.email,
+        snowflakeId: generatedSnowflakeId,
+        id: 1,
+        createdAt: newDate,
+      };
+
+      jest.spyOn(Snowflake, 'generate').mockReturnValue(generatedSnowflakeId);
+      jest.spyOn(userRepository, 'create').mockReturnValue(createdUser as User);
+      jest.spyOn(userRepository, 'save').mockResolvedValue(savedUser as User);
 
       const result = await authService.signUp(dto);
-      expect(result).toEqual(user);
-      expect(userRepository.create).toHaveBeenCalledWith(dto);
-      expect(userRepository.save).toHaveBeenCalledWith(user);
+
+      // Then
+      expect(result).toEqual(savedUser); // 반환된 값이 예상된 저장된 사용자와 동일
+      expect(Snowflake.generate).toHaveBeenCalled(); // Snowflake.generate 호출 확인
+      expect(userRepository.create).toHaveBeenCalledWith({
+        ...dto,
+        snowflakeId: generatedSnowflakeId,
+      });
+      expect(userRepository.save).toHaveBeenCalledWith(createdUser);
     });
   });
 

apps/backend/src/auth/auth.service.ts

@@ -5,6 +5,7 @@ import { SignUpDto } from './dtos/signUp.dto';
 import { UpdateUserDto } from './dtos/UpdateUser.dto';
 import { UserNotFoundException } from '../exception/user.exception';
 
+
 @Injectable()
 export class AuthService {
   constructor(private readonly userRepository: UserRepository) {}
@@ -20,7 +21,10 @@ export class AuthService {
   }
 
   async signUp(dto: SignUpDto): Promise<User> {
-    const user = this.userRepository.create(dto);
+    const user = this.userRepository.create({
+      ...dto,
+      snowflakeId: Snowflake.generate(),
+    });
     return this.userRepository.save(user);
   }
 

apps/backend/src/auth/token/token.service.ts

@@ -1,7 +1,6 @@
 import { Injectable } from '@nestjs/common';
 import { JwtService } from '@nestjs/jwt';
 import { Response } from 'express';
-import { InvalidTokenException } from '../../exception/invalid.exception';
 
 const HOUR = 60 * 60;
 const DAY = 24 * 60 * 60;
@@ -34,13 +33,9 @@ export class TokenService {
   }
 
   verifyInviteToken(token: string): { workspaceId: string; role: string } {
-    try {
-      return this.jwtService.verify(token, {
-        secret: process.env.JWT_SECRET,
-      });
-    } catch (error) {
-      throw new InvalidTokenException();
-    }
+    return this.jwtService.verify(token, {
+      secret: process.env.JWT_SECRET,
+    });
   }
 
   // 후에 DB 로직 (지금은 refreshToken이 DB로 관리 X)

apps/backend/src/edge/edge.service.spec.ts

@@ -125,7 +125,7 @@ describe('EdgeService', () => {
   describe('findEdgesByWorkspace', () => {
     it('특정 워크스페이스에 존재하는 모든 엣지를 반환한다.', async () => {
       const workspaceId = '123456789012345678'; // Snowflake ID
-      const workspace: Workspace = {
+      const workspace = {
         id: 1,
         snowflakeId: workspaceId,
         owner: null,
@@ -138,7 +138,7 @@ describe('EdgeService', () => {
         edges: [],
         pages: [],
         nodes: [],
-      };
+      } as Workspace;
       const node3 = {
         id: 3,
         x: 0,

apps/backend/src/page/page.service.spec.ts

@@ -61,7 +61,7 @@ describe('PageService', () => {
   describe('createPage', () => {
     it('페이지를 성공적으로 생성한다.', async () => {
       const newDate1 = new Date();
-      const workspace1: Workspace = {
+      const workspace1 = {
         id: 1,
         snowflakeId: 'snowflake-id-1',
         owner: null,
@@ -74,7 +74,7 @@ describe('PageService', () => {
         edges: [],
         pages: [],
         nodes: [],
-      };
+      } as Workspace;
 
       // 페이지 dto
       const newPageDto: CreatePageDto = {
@@ -254,7 +254,7 @@ describe('PageService', () => {
   describe('findPagesByWorkspace', () => {
     it('특정 워크스페이스에 존재하는 페이지들을 content 없이 반환한다.', async () => {
       const workspaceId = '123456789012345678'; // Snowflake ID
-      const workspace: Workspace = {
+      const workspace = {
         id: 1,
         snowflakeId: workspaceId,
         owner: null,
@@ -267,7 +267,7 @@ describe('PageService', () => {
         edges: [],
         pages: [],
         nodes: [],
-      };
+      } as Workspace;
 
       const page1: Page = {
         id: 1,

apps/backend/src/user/user.entity.ts

@@ -6,7 +6,6 @@ import {
   CreateDateColumn,
   Index,
 } from 'typeorm';
-import { Snowflake } from '@theinternetfolks/snowflake';
 
 @Entity()
 export class User {
@@ -15,7 +14,7 @@ export class User {
 
   @Column({ unique: true })
   @Index()
-  snowflakeId: string = Snowflake.generate();
+  snowflakeId: string;
 
   @Column({ unique: true })
   providerId: string; // 네이버/카카오 ID

apps/backend/src/workspace/dtos/getUserWorkspacesResponse.dto.ts

@@ -17,14 +17,16 @@ export class GetUserWorkspacesResponseDto {
         title: 'naver-boostcamp-9th',
         description: '네이버 부스트캠프 9기 워크스페이스입니다',
         thumbnailUrl: 'https://example.com/image1.png',
-        role: 'owner',
+        role: 'guest',
+        visibility: 'private',
       },
       {
         workspaceId: 'snowflake-id-2',
         title: '2024-fall-컴퓨터구조',
         description: null,
         thumbnailUrl: null,
-        role: 'guest',
+        role: 'owner',
+        visibility: 'public',
       },
     ],
     description: '사용자가 속한 모든 워크스페이스 배열',

apps/backend/src/workspace/dtos/userWorkspace.dto.ts

@@ -4,4 +4,5 @@ export class UserWorkspaceDto {
   description: string | null;
   thumbnailUrl: string | null;
   role: 'owner' | 'guest';
+  visibility: 'public' | 'private';
 }

apps/backend/src/workspace/workspace.controller.spec.ts

@@ -27,6 +27,7 @@ describe('WorkspaceController', () => {
             generateInviteUrl: jest.fn(),
             processInviteUrl: jest.fn(),
             checkAccess: jest.fn(),
+            updateVisibility: jest.fn(),
           },
         },
         {

apps/backend/src/workspace/workspace.controller.ts

@@ -3,6 +3,7 @@ import {
   Post,
   Delete,
   Get,
+  Patch,
   UseGuards,
   Request,
   Body,
@@ -27,6 +28,8 @@ export enum WorkspaceResponseMessage {
   WORKSPACE_INVITED = '워크스페이스 게스트 초대 링크가 생성되었습니다.',
   WORKSPACE_JOINED = '워크스페이스에 게스트로 등록되었습니다.',
   WORKSPACE_ACCESS_CHECKED = '워크스페이스에 대한 사용자의 접근 권한이 확인되었습니다.',
+  WORKSPACE_UPDATED_TO_PUBLIC = '워크스페이스가 공개로 설정되었습니다.',
+  WORKSPACE_UPDATED_TO_PRIVATE = '워크스페이스가 비공개로 설정되었습니다.',
 }
 
 @Controller('workspace')
@@ -152,4 +155,34 @@ export class WorkspaceController {
       message: WorkspaceResponseMessage.WORKSPACE_ACCESS_CHECKED,
     };
   }
+
+  @ApiResponse({
+    type: MessageResponseDto,
+  })
+  @ApiOperation({
+    summary: '워크스페이스를 비공개에서 공개로 설정합니다.',
+  })
+  @Patch('/:id/public')
+  @UseGuards(JwtAuthGuard) // 로그인 인증
+  @HttpCode(HttpStatus.OK)
+  async makeWorkspacePublic(@Request() req, @Param('id') id: string) {
+    const userId = req.user.sub; // 인증된 사용자 ID
+    await this.workspaceService.updateVisibility(userId, id, 'public');
+    return { message: WorkspaceResponseMessage.WORKSPACE_UPDATED_TO_PUBLIC };
+  }
+
+  @ApiResponse({
+    type: MessageResponseDto,
+  })
+  @ApiOperation({
+    summary: '워크스페이스를 공개에서 비공개로 설정합니다.',
+  })
+  @Patch('/:id/private')
+  @UseGuards(JwtAuthGuard) // 로그인 인증
+  @HttpCode(HttpStatus.OK)
+  async makeWorkspacePrivate(@Request() req, @Param('id') id: string) {
+    const userId = req.user.sub; // 인증된 사용자 ID
+    await this.workspaceService.updateVisibility(userId, id, 'private');
+    return { message: WorkspaceResponseMessage.WORKSPACE_UPDATED_TO_PRIVATE };
+  }
 }