Feat: yjs doc 데이터 같은 곳꺼를 사용하도록 수정

Author: dungbik

src/collaboration/infrastructure/gateway/collaboration.gateway.ts

@@ -94,14 +94,10 @@ export class CollaborationGateway
         this.pendingUpdates.delete(client.id);
         for (const pending of buffered) {
           const updateBuffer = new Uint8Array(pending.update);
-          let pendingDoc = await this.yjsDocumentService.loadDocument(pending.cardsetId);
-          if (!pendingDoc) pendingDoc = new Y.Doc();
-          Y.applyUpdate(pendingDoc, updateBuffer);
-          await this.yjsDocumentService.saveUpdate(pending.cardsetId, updateBuffer);
-          const newState = Y.encodeStateAsUpdate(pendingDoc);
+          const finalState = await this.yjsDocumentService.saveUpdate(pending.cardsetId, updateBuffer);
           this.server.to(`cardset:${pending.cardsetId}`).emit('sync', {
             cardsetId: pending.cardsetId,
-            update: newState,
+            update: finalState,
           });
           this.logger.log(
             `[버퍼 처리 완료] cardsetId=${pending.cardsetId}, clientId=${client.id}`,
@@ -204,23 +200,12 @@ export class CollaborationGateway
         return;
       }
 
-      let doc = await this.yjsDocumentService.loadDocument(cardsetId);
-      if (!doc) {
-        doc = new Y.Doc();
-        this.logger.log(
-          `Created new Yjs document for cardset ${cardsetId} during update`,
-        );
-      }
-
       const updateBuffer = new Uint8Array(update);
-      Y.applyUpdate(doc, updateBuffer);
+      const finalState = await this.yjsDocumentService.saveUpdate(cardsetId, updateBuffer);
 
-      await this.yjsDocumentService.saveUpdate(cardsetId, updateBuffer);
-
-      const state = Y.encodeStateAsUpdate(doc);
       this.server.to(`cardset:${cardsetId}`).emit('sync', {
         cardsetId,
-        update: state,
+        update: finalState,
       });
       this.logger.log(
         `Sync update from user ${user.userId} broadcasted to all clients in cardset ${cardsetId}`,

src/collaboration/infrastructure/redis/yjs-document.service.ts

@@ -89,36 +89,28 @@ export class YjsDocumentService implements OnModuleInit, OnModuleDestroy {
     }
   }
 
-  async saveUpdate(cardsetId: string, update: Uint8Array): Promise<void> {
+  async saveUpdate(cardsetId: string, update: Uint8Array): Promise<Uint8Array> {
     try {
-      if (!this.redisClient) return;
+      if (!this.redisClient) return update;
       const key = `yjs:cardset:${cardsetId}`;
       const historyKey = `yjs:cardset:${cardsetId}:updates`;
-      const updateBuffer = Buffer.from(update);
 
+      const doc = new Y.Doc();
       const existingData = await this.redisClient.getBuffer(key);
       if (existingData) {
-        const doc = new Y.Doc();
         Y.applyUpdate(doc, existingData);
-        Y.applyUpdate(doc, update);
-        const newState = Y.encodeStateAsUpdate(doc);
-        this.logger.log(
-          `[saveUpdate] Redis 저장 전 doc 내용 - cardsetId=${cardsetId}, cards=${JSON.stringify(doc.getArray('cards').toJSON())}`,
-        );
-        await this.redisClient.set(key, Buffer.from(newState));
-      } else {
-        const doc = new Y.Doc();
-        Y.applyUpdate(doc, update);
-        const state = Y.encodeStateAsUpdate(doc);
-        this.logger.log(
-          `[saveUpdate] Redis 저장 전 doc 내용 (신규) - cardsetId=${cardsetId}, cards=${JSON.stringify(doc.getArray('cards').toJSON())}`,
-        );
-        await this.redisClient.set(key, Buffer.from(state));
       }
+      Y.applyUpdate(doc, update);
+      const newState = Y.encodeStateAsUpdate(doc);
+      this.logger.log(
+        `[saveUpdate] Redis 저장 전 doc 내용 - cardsetId=${cardsetId}, cards=${JSON.stringify(doc.getArray('cards').toJSON())}`,
+      );
+      await this.redisClient.set(key, Buffer.from(newState));
       await this.redisClient.expire(key, 86400 * 7);
-      await this.redisClient.rpush(historyKey, updateBuffer.toString('base64'));
+      await this.redisClient.rpush(historyKey, Buffer.from(update).toString('base64'));
 
       this.scheduleMySqlPersistence(cardsetId);
+      return newState;
     } catch (error) {
       this.logger.error(
         `Failed to save update for cardset ${cardsetId}:`,