Merge pull request #407 from boostcampwm-2024/bug-be-#398

각종 이슈 해결

Author: github-actions[bot]

apps/backend/src/app.controller.ts

@@ -14,7 +14,7 @@ export class AppController {
   healthCheck() {
     return {
       status: 'ok',
-      timestamp: new Date().toISOString()
+      timestamp: new Date().toISOString(),
     };
   }
 }

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

@@ -35,12 +35,10 @@ export class PageService {
    */
   async createPage(dto: CreatePageDto): Promise<Page> {
     const { title, content, workspaceId, x, y, emoji } = dto;
-
     // 워크스페이스 DB에서 해당 워크스페이스의 내부 id를 찾는다
     const workspace = await this.workspaceRepository.findOneBy({
       snowflakeId: workspaceId,
     });
-
     if (!workspace) {
       throw new WorkspaceNotFoundException();
     }

apps/backend/src/tasks/tasks.service.ts

@@ -179,14 +179,19 @@ export class TasksService {
 
       const fromNode = await nodeRepository.findOne({
         where: { id: redisData.fromNode },
+        relations: ['workspace'],
       });
 
       const toNode = await nodeRepository.findOne({
         where: { id: redisData.toNode },
       });
 
       if (redisData.type === 'add') {
-        await edgeRepository.save({ fromNode, toNode });
+        await edgeRepository.save({
+          fromNode,
+          toNode,
+          workspace: fromNode.workspace,
+        });
       }
 
       if (redisData.type === 'delete') {

apps/backend/src/workspace/workspace.module.ts

@@ -9,7 +9,7 @@ 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 { ConfigModule } from '@nestjs/config'; 
+import { ConfigModule } from '@nestjs/config';
 
 @Module({
   imports: [

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

@@ -216,7 +216,7 @@ export class WorkspaceService {
       // 권한이 없으면 예외 발생
       throw new ForbiddenAccessException();
     }
-  
+
     return {
       workspaceId: workspace.snowflakeId,
       title: workspace.title,
@@ -227,7 +227,6 @@ export class WorkspaceService {
     };
   }
 
-
   /**
    * 가장 처음에 모두가 접속할 수 있는 main workspace를 생성한다.
    */
@@ -284,9 +283,9 @@ export class WorkspaceService {
         workspace: findWorkspace,
         user: findOwner,
         role: 'owner',
-      });}
+      });
     }
-  
+  }
 
   async updateVisibility(
     userId: number,

apps/websocket/src/app.controller.ts

@@ -9,7 +9,7 @@ export class AppController {
   healthCheck() {
     return {
       status: 'ok',
-      timestamp: new Date().toISOString()
+      timestamp: new Date().toISOString(),
     };
   }
 }

apps/websocket/src/yjs/yjs.service.ts

@@ -130,6 +130,11 @@ export class YjsService
     const edgeResponse = await axios.get(
       `http://backend:3000/api/edge/workspace/${workspaceId}`,
     );
+
+    if (nodeResponse.status === 404 || edgeResponse.status === 404) {
+      this.logger.error('워크 스페이스가 존재하지 않습니다.');
+      return;
+    }
     const edges = edgeResponse.data.edges;
 
     const nodesMap = doc.getMap('nodes');
@@ -258,6 +263,19 @@ export class YjsService
   ) {
     for (const [key, change] of event.changes.keys) {
       // TODO: change.action이 'add', 'delete'일 때 처리를 추가하여 REST API 사용 제거
+      // if (change.action === 'add') {
+      //   const node = nodesMap.get(key);
+      //   const { title, id, emoji } = node.data;
+      //   const { x, y } = node.position;
+      //   axios.post('http://backend:3000/api/page', {
+      //     title,
+      //     content,
+      //     workspaceId,
+      //     x,
+      //     y,
+      //     emoji,
+      //   });
+      // }
       if (change.action !== 'update') continue;
 
       const node: any = nodesMap.get(key);
@@ -272,6 +290,10 @@ export class YjsService
       const pageResponse = await axios.get(
         `http://backend:3000/api/page/${id}`,
       );
+      if (pageResponse.status === 404) {
+        this.logger.error('페이지가 존재하지 않습니다.');
+        return;
+      }
       const findPage = pageResponse.data.page;
 
       await this.redisService.setField(`node:${findPage.node.id}`, 'x', x);