Merge pull request #329 from boostcampwm-2024/bug-be-#326

초기 데이터 세팅 이슈 해결

Author: github-actions[bot]

apps/backend/src/node/node.repository.ts

@@ -14,6 +14,9 @@ export class NodeRepository extends Repository<Node> {
   }
 
   async findNodesByWorkspace(workspaceId: number): Promise<Node[]> {
-    return this.find({ where: { workspace: { id: workspaceId } } });
+    return this.find({
+      where: { workspace: { id: workspaceId } },
+      relations: ['page'],
+    });
   }
 }

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

@@ -14,6 +14,8 @@ describe('NodeService', () => {
   let service: NodeService;
   let nodeRepository: jest.Mocked<NodeRepository>;
   let pageRepository: jest.Mocked<PageRepository>;
+  let workspaceRepository: jest.Mocked<WorkspaceRepository>;
+
 
   beforeEach(async () => {
     const module: TestingModule = await Test.createTestingModule({
@@ -51,11 +53,14 @@ describe('NodeService', () => {
     service = module.get<NodeService>(NodeService);
     nodeRepository = module.get(NodeRepository);
     pageRepository = module.get(PageRepository);
-    workspaceRepository = module.get<WorkspaceRepository>(WorkspaceRepository);
+    workspaceRepository = module.get(WorkspaceRepository);
   });
 
   it('서비스 클래스가 정상적으로 인스턴스화된다.', () => {
     expect(service).toBeDefined();
+    expect(nodeRepository).toBeDefined();
+    expect(pageRepository).toBeDefined();
+    expect(workspaceRepository).toBeDefined();
   });
 
   describe('createNode', () => {
@@ -254,5 +259,26 @@ describe('NodeService', () => {
     });
   });
 
-  describe('findNodesByWorkspace', () => {});
+  describe('findNodesByWorkspace', () => {
+    it('workspace에 해당하는 노드 조회 성공', async () => {
+      const currentDate = new Date();
+      const workspace = {
+        id: 1,
+        snowflakeId: '1234567890',
+        title: 'workspace',
+        description: 'workspace description',
+        visibility: 'private',
+        createdAt: currentDate,
+        updatedAt: currentDate,
+        thumbnailUrl: 'https://example.com/thumbnail.jpg',
+      } as Workspace;
+
+      jest.spyOn(workspaceRepository, 'findOneBy').mockResolvedValue(workspace);
+      await service.findNodesByWorkspace(workspace.snowflakeId);
+
+      expect(nodeRepository.findNodesByWorkspace).toHaveBeenCalledWith(
+        workspace.id,
+      );
+    });
+  });
 });

apps/backend/src/yjs/yjs.service.ts

@@ -44,9 +44,7 @@ export class YjsService
     private readonly pageService: PageService,
     private readonly edgeService: EdgeService,
     private readonly redisService: RedisService,
-  ) {
-    
-  }
+  ) {}
 
   @WebSocketServer()
   server: Server;
@@ -71,6 +69,8 @@ export class YjsService
       // document name이 flow-room이라면 모든 노드들을 볼 수 있는 화면입니다.
       // 노드를 클릭해 페이지를 열었을 때만 해당 페이지 값을 가져와서 초기 데이터로 세팅해줍니다.
       if (customDoc.name?.startsWith('document-')) {
+        const workspaceId = doc.guid;
+        console.log('workspaceid', workspaceId);
         const pageId = parseInt(customDoc.name.split('-')[1]);
         const findPage = await this.pageService.findPageById(pageId);
 
@@ -112,8 +112,13 @@ export class YjsService
       // node, edge, page content 가져오기
 
       // TODO: 서비스 함수 workspaceId 입력해야하도록 수정되었습니다!!
-      const nodes = await this.nodeService.findNodesByWorkspace('temp');
-      const edges = await this.edgeService.findEdgesByWorkspace('temp');
+
+      if (!customDoc.name?.startsWith('flow-room-')) {
+        return;
+      }
+      const workspaceId = customDoc.name.split('-')[2];
+      const nodes = await this.nodeService.findNodesByWorkspace(workspaceId);
+      const edges = await this.edgeService.findEdgesByWorkspace(workspaceId);
       const nodesMap = doc.getMap('nodes');
       const title = doc.getMap('title');
       const emoji = doc.getMap('emoji');