Merge branch 'develop' into feature-fe-#316

Author: yewonJin

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 };
+  }
 }

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

@@ -256,6 +256,7 @@ describe('WorkspaceService', () => {
           description: 'Workspace Description',
           thumbnailUrl: 'http://example.com/thumbnail.png',
           role: 'owner',
+          visibility: 'private',
         },
       ]);
       expect(roleRepository.find).toHaveBeenCalledWith({

apps/backend/src/workspace/workspace.service.ts

@@ -110,6 +110,7 @@ export class WorkspaceService {
       description: role.workspace.description || null,
       thumbnailUrl: role.workspace.thumbnailUrl || null,
       role: role.role as 'owner' | 'guest',
+      visibility: role.workspace.visibility as 'public' | 'private',
     }));
   }
 
@@ -264,4 +265,34 @@ export class WorkspaceService {
       });
     }
   }
+
+  async updateVisibility(
+    userId: number,
+    workspaceId: string,
+    visibility: 'public' | 'private',
+  ): Promise<void> {
+    // 워크스페이스가 존재하는지 확인
+    const workspace = await this.workspaceRepository.findOneBy({
+      snowflakeId: workspaceId,
+    });
+
+    if (!workspace) {
+      throw new WorkspaceNotFoundException();
+    }
+
+    // Role Repository에서 해당 workspace의 owner인지 확인
+    const role = await this.roleRepository.findOneBy({
+      workspaceId: workspace.id,
+      userId: userId,
+      role: 'owner',
+    });
+    // 아니면 exception 뱉기
+    if (!role) {
+      throw new NotWorkspaceOwnerException();
+    }
+
+    // 가시성 변경
+    workspace.visibility = visibility;
+    await this.workspaceRepository.save(workspace);
+  }
 }

apps/frontend/src/features/workspace/api/workspaceStatusApi.ts

@@ -0,0 +1,14 @@
+import { Post } from "@/shared/api";
+import { SetWorkspaceStatusResponse } from "../model/workspaceInviteTypes";
+
+export const setWorkspaceStatusToPrivate = async (id: string) => {
+  // TODO: URL 맞게 고치기.
+  const url = `/api/workspace/${id}/private`;
+  await Post<SetWorkspaceStatusResponse, null>(url);
+};
+
+export const setWorkspaceStatusToPublic = async (id: string) => {
+  // TODO: URL 맞게 고치기.
+  const url = `/api/workspace/${id}/public`;
+  await Post<SetWorkspaceStatusResponse, null>(url);
+};

apps/frontend/src/features/workspace/api/worskspaceInviteApi.ts

@@ -0,0 +1,23 @@
+import { Get, Post } from "@/shared/api";
+import {
+  WorkspaceInviteLinkRequest,
+  WorkspaceInviteLinkResponse,
+  ValidateWorkspaceLinkResponse,
+} from "@/features/workspace/model/workspaceInviteTypes";
+
+export const createWorkspaceInviteLink = async (id: string) => {
+  const url = `/api/workspace/${id}/invite`;
+
+  const res = await Post<
+    WorkspaceInviteLinkResponse,
+    WorkspaceInviteLinkRequest
+  >(url, { id });
+
+  return res.data.inviteUrl;
+};
+
+export const validateWorkspaceInviteLink = async (token: string) => {
+  const url = `/api/workspace/join?token=${token}`;
+  const res = await Get<ValidateWorkspaceLinkResponse>(url);
+  return res.data;
+};

apps/frontend/src/features/workspace/model/useInviteLinkStore.ts

@@ -0,0 +1,11 @@
+import { create } from "zustand";
+
+type InviteLinkStore = {
+  inviteLink: string | null;
+  setInviteLink: (link: string) => void;
+};
+
+export const useInviteLinkStore = create<InviteLinkStore>((set) => ({
+  inviteLink: null,
+  setInviteLink: (link) => set({ inviteLink: link }),
+}));

apps/frontend/src/features/workspace/model/useWorkspaceInvite.ts

@@ -0,0 +1,17 @@
+import { useMutation } from "@tanstack/react-query";
+import {
+  createWorkspaceInviteLink,
+  validateWorkspaceInviteLink,
+} from "../api/worskspaceInviteApi";
+
+export const useCreateWorkspaceInviteLink = () => {
+  return useMutation({
+    mutationFn: (id: string) => createWorkspaceInviteLink(id),
+  });
+};
+
+export const useValidateWorkspaceInviteLink = () => {
+  return useMutation({
+    mutationFn: (token: string) => validateWorkspaceInviteLink(token),
+  });
+};