From 3a4cda31e4b6b5b07427f5c232c7b59aadfe2af6 Mon Sep 17 00:00:00 2001
From: Hyunjun KIM <hihj070914@icloud.com>
Date: Thu, 21 Nov 2024 11:44:46 +0900
Subject: [PATCH] =?UTF-8?q?feat:=20isHolding=20=ED=95=84=EB=93=9C=EB=A5=BC?=
 =?UTF-8?q?=20=ED=86=B5=ED=95=9C=20=EC=97=85=EB=8D=B0=EC=9D=B4=ED=8A=B8=20?=
 =?UTF-8?q?=EC=BF=BC=EB=A6=AC=20=EB=94=94=EB=B0=94=EC=9A=B4=EC=8B=B1=20-?=
 =?UTF-8?q?=20=EB=8D=B0=EB=AA=A8=EB=95=8C=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20?=
 =?UTF-8?q?=ED=95=B4=EB=B3=B4=EA=B3=A0=20=EB=8D=94=20=EC=A7=80=EC=BC=9C?=
 =?UTF-8?q?=EB=B4=90=EC=95=BC=20=ED=95=A0=20=EA=B2=83=20=EA=B0=99=EC=8A=B5?=
 =?UTF-8?q?=EB=8B=88=EB=8B=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Summer Min <summersummerwhy@users.noreply.github.com>
Co-authored-by: ez <ezcolin2@users.noreply.github.com>
---
 apps/backend/src/yjs/yjs.service.ts | 53 +++++++++++++++--------------
 1 file changed, 28 insertions(+), 25 deletions(-)

diff --git a/apps/backend/src/yjs/yjs.service.ts b/apps/backend/src/yjs/yjs.service.ts
index 5c440976..bde7019e 100644
--- a/apps/backend/src/yjs/yjs.service.ts
+++ b/apps/backend/src/yjs/yjs.service.ts
@@ -15,16 +15,12 @@ import { NodeCacheService } from '../node-cache/node-cache.service';
 import {
   yXmlFragmentToProsemirrorJSON,
   prosemirrorJSONToYXmlFragment,
-  prosemirrorJSONToYDoc,
-  yDocToProsemirrorJSON,
 } from 'y-prosemirror';
 import { novelEditorSchema } from './yjs.schema';
-import { Schema } from 'prosemirror-model';
 import { EdgeService } from '../edge/edge.service';
 import { Node } from 'src/node/node.entity';
 import { Edge } from 'src/edge/edge.entity';
 import { YMapEdge } from './yjs.type';
-import { YMapNode } from './yjs.type';
 
 // Y.Doc에는 name 컬럼이 없어서 생성했습니다.
 class CustomDoc extends Y.Doc {
@@ -49,8 +45,10 @@ export class YjsService
     private readonly edgeService: EdgeService,
     private readonly nodeCacheService: NodeCacheService,
   ) {}
+
   @WebSocketServer()
   server: Server;
+
   insertProseMirrorDataToXmlFragment(xmlFragment: Y.XmlFragment, data: any[]) {
     // XML Fragment 초기화
     xmlFragment.delete(0, xmlFragment.length);
@@ -72,6 +70,7 @@ export class YjsService
       xmlFragment.push([yNode]);
     });
   }
+
   afterInit() {
     if (!this.server) {
       this.logger.error('서버 초기화 안됨..!');
@@ -131,37 +130,39 @@ export class YjsService
       this.initializeYEdgeMap(edges, edgesMap);
 
       // node의 변경 사항을 감지한다.
-      nodesMap.observe(() => {
+      nodesMap.observe(async () => {
         const nodes = Object.values(doc.getMap('nodes').toJSON());
 
         // 모든 노드에 대해 검사한다.
-        nodes.forEach((node: YMapNode) => {
-          const { title, id } = node.data;
+        for await (const node of nodes) {
+          const { title, id } = node.data; // TODO: 이모지 추가
           const { x, y } = node.position;
-          // 만약 캐쉬에 노드가 존재하지 않다면 갱신 후 캐쉬에 노드를 넣는다.
-          if (!this.nodeCacheService.has(id)) {
-            this.nodeService.updateNode(id, { title, x, y });
-            this.nodeCacheService.set(id, title);
-            return;
+          const isHolding = node.isHolding;
+          const updateCondition =
+            !(await this.nodeCacheService.has(id)) ||
+            !(await this.nodeCacheService.hasSameTitle(id, title)) ||
+            !(await this.nodeCacheService.isHoldingStatusChanged(
+              id,
+              isHolding,
+            ));
+
+          if (updateCondition) {
+            await this.nodeService.updateNode(id, { title, x, y });
+            await this.nodeCacheService.set(id, title);
           }
-
-          // 만약 캐쉬에 노드가 존재하고 title이 다르다면 갱신한다.
-          if (!this.nodeCacheService.hasSameTitle(id, title)) {
-            this.nodeService.updateNode(id, { title, x, y });
-            this.nodeCacheService.set(id, title);
-            return;
-          }
-          // 만약 캐쉬에 노드가 존재하고 title이 동일하다면 패스한다.
-        });
+        }
       });
+
       // edge의 변경 사항을 감지한다.
-      edgesMap.observe(() => {
-        const edges = Object.values(doc.getMap('edges').toJSON());
-        edges.forEach(async (edge: YMapEdge) => {
+      edgesMap.observe(async () => {
+        const edges: YMapEdge[] = Object.values(doc.getMap('edges').toJSON());
+
+        for await (const edge of edges) {
           const findEdge = await this.edgeService.findEdgeByFromNodeAndToNode(
             parseInt(edge.source),
             parseInt(edge.target),
           );
+
           // 연결된 노드가 없을 때만 edge 생성
           if (!findEdge) {
             await this.edgeService.createEdge({
@@ -169,7 +170,7 @@ export class YjsService
               toNode: parseInt(edge.target),
             });
           }
-        });
+        }
       });
     });
   }
@@ -193,6 +194,7 @@ export class YjsService
         },
         selected: false, // 기본적으로 선택되지 않음
         dragging: true,
+        isHolding: false,
       });
     });
   }
@@ -212,6 +214,7 @@ export class YjsService
       });
     });
   }
+
   // yXmlFragment에 content를 넣어준다.
   initializePageContent(content: Object, yXmlFragment: Y.XmlFragment) {
     prosemirrorJSONToYXmlFragment(novelEditorSchema, content, yXmlFragment);