Merge pull request #376 from boostcampwm2023/BE-feature/crdt

제네릭 타입 제거
boostcampwm2023 · Feb 1, 2025 · 183940f · 183940f
2 parents c3e5a4c + e050cc3
commit 183940f
Show file tree

Hide file tree

Showing 9 changed files with 111 additions and 119 deletions.
diff --git a/nestjs-BE/server/src/board-trees/board-trees.gateway.ts b/nestjs-BE/server/src/board-trees/board-trees.gateway.ts
@@ -60,10 +60,10 @@ export class BoardTreesGateway implements OnGatewayConnection {
     const { boardId, operation: serializedOperation } = payloadObject;
 
     const operationTypeMap = {
-      add: OperationAdd.parse<string>,
-      delete: OperationDelete.parse<string>,
-      move: OperationMove.parse<string>,
-      update: OperationUpdate.parse<string>,
+      add: OperationAdd.parse,
+      delete: OperationDelete.parse,
+      move: OperationMove.parse,
+      update: OperationUpdate.parse,
     };
 
     const operation =

diff --git a/nestjs-BE/server/src/board-trees/board-trees.service.ts b/nestjs-BE/server/src/board-trees/board-trees.service.ts
@@ -11,7 +11,7 @@ export class BoardTreesService {
     @InjectModel(BoardTree.name) private boardTreeModel: Model<BoardTree>,
   ) {}
 
-  private boardTrees = new Map<string, CrdtTree<string>>();
+  private boardTrees = new Map<string, CrdtTree>();
 
   async create(boardId: string, tree: string) {
     const createdTree = new this.boardTreeModel({
@@ -33,16 +33,16 @@ export class BoardTreesService {
   async initBoardTree(boardId: string, boardName: string) {
     const existingTree = await this.findByBoardId(boardId);
     if (existingTree) {
-      this.boardTrees.set(boardId, CrdtTree.parse<string>(existingTree.tree));
+      this.boardTrees.set(boardId, CrdtTree.parse(existingTree.tree));
     } else {
-      const newTree = new CrdtTree<string>(boardId);
+      const newTree = new CrdtTree(boardId);
       newTree.tree.get('root').description = boardName;
       this.create(boardId, JSON.stringify(newTree));
       this.boardTrees.set(boardId, newTree);
     }
   }
 
-  applyOperation(boardId: string, operation: Operation<string>) {
+  applyOperation(boardId: string, operation: Operation) {
     const boardTree = this.boardTrees.get(boardId);
     boardTree.applyOperation(operation);
   }

diff --git a/nestjs-BE/server/src/crdt/crdt-tree.spec.ts b/nestjs-BE/server/src/crdt/crdt-tree.spec.ts
@@ -2,8 +2,8 @@ import { CrdtTree } from './crdt-tree';
 import { Node } from './node';
 
 it('crdt tree 동기화', () => {
-  const tree1 = new CrdtTree<string>('1');
-  const tree2 = new CrdtTree<string>('2');
+  const tree1 = new CrdtTree('1');
+  const tree2 = new CrdtTree('2');
 
   const op_1_1 = tree1.generateOperationAdd('a', 'root', 'hello');
   const op_1_2 = tree1.generateOperationAdd('b', 'root', 'hi');
@@ -45,7 +45,7 @@ it('crdt tree 동기화', () => {
 });
 
 it('crdt tree 역직렬화', () => {
-  const tree = new CrdtTree<string>('1');
+  const tree = new CrdtTree('1');
 
   const op1 = tree.generateOperationAdd('a', 'root', 'hello');
   const op2 = tree.generateOperationAdd('b', 'root', 'hi');
@@ -56,13 +56,13 @@ it('crdt tree 역직렬화', () => {
 
   expect(JSON.stringify(tree));
 
-  const parsedTree = CrdtTree.parse<string>(JSON.stringify(tree));
+  const parsedTree = CrdtTree.parse(JSON.stringify(tree));
 
   expect(JSON.stringify(tree)).toEqual(JSON.stringify(parsedTree));
 });
 
 it('crdt tree 순환', () => {
-  const tree = new CrdtTree<string>('1');
+  const tree = new CrdtTree('1');
 
   const op1 = tree.generateOperationAdd('a', 'root', 'hello');
   const op2 = tree.generateOperationAdd('b', 'root', 'hi');
@@ -72,5 +72,5 @@ it('crdt tree 순환', () => {
   const op6 = tree.generateOperationMove('b', 'a');
 
   tree.applyOperations([op1, op2, op3, op4, op5, op6]);
-  expect((tree.tree.get('b') as Node<string>).parentId).toEqual('root');
+  expect((tree.tree.get('b') as Node).parentId).toEqual('root');
 });
diff --git a/nestjs-BE/server/src/crdt/crdt-tree.ts b/nestjs-BE/server/src/crdt/crdt-tree.ts
@@ -14,75 +14,75 @@ import {
 import { Tree } from './tree';
 import { Node } from './node';
 
-export class CrdtTree<T> {
-  operationLogs: OperationLog<T>[] = [];
+export class CrdtTree {
+  operationLogs: OperationLog[] = [];
   clock: Clock;
-  tree = new Tree<T>();
+  tree = new Tree();
 
   constructor(id: string) {
     this.clock = new Clock(id);
   }
 
-  get(id: string): Node<T> | undefined {
+  get(id: string): Node | undefined {
     return this.tree.get(id);
   }
 
-  addLog(log: OperationLog<T>) {
+  addLog(log: OperationLog) {
     this.operationLogs.push(log);
   }
 
   generateOperationAdd(
     targetId: string,
     parentId: string,
-    description: T,
-  ): OperationAdd<T> {
+    description: string,
+  ): OperationAdd {
     this.clock.increment();
     const clock = this.clock.copy();
-    const input: OperationAddInput<T> = {
+    const input: OperationAddInput = {
       id: targetId,
       parentId,
       description,
       clock,
     };
-    return new OperationAdd<T>(input);
+    return new OperationAdd(input);
   }
 
-  generateOperationDelete(targetId: string): OperationDelete<T> {
+  generateOperationDelete(targetId: string): OperationDelete {
     this.clock.increment();
     const clock = this.clock.copy();
     const input: OperationInput = {
       id: targetId,
       clock,
     };
-    return new OperationDelete<T>(input);
+    return new OperationDelete(input);
   }
 
-  generateOperationMove(targetId: string, parentId: string): OperationMove<T> {
+  generateOperationMove(targetId: string, parentId: string): OperationMove {
     this.clock.increment();
     const clock = this.clock.copy();
     const input: OperationMoveInput = {
       id: targetId,
       parentId,
       clock,
     };
-    return new OperationMove<T>(input);
+    return new OperationMove(input);
   }
 
   generateOperationUpdate(
     targetId: string,
-    description: T,
-  ): OperationUpdate<T> {
+    description: string,
+  ): OperationUpdate {
     this.clock.increment();
     const clock = this.clock.copy();
-    const input: OperationUpdateInput<T> = {
+    const input: OperationUpdateInput = {
       id: targetId,
       description,
       clock,
     };
-    return new OperationUpdate<T>(input);
+    return new OperationUpdate(input);
   }
 
-  applyOperation(operation: Operation<T>) {
+  applyOperation(operation: Operation) {
     this.clock = this.clock.merge(operation.clock);
 
     if (this.operationLogs.length === 0) {
@@ -94,7 +94,7 @@ export class CrdtTree<T> {
     const lastOperation =
       this.operationLogs[this.operationLogs.length - 1].operation;
     if (operation.clock.compare(lastOperation.clock) === COMPARE.LESS) {
-      const prevLog = this.operationLogs.pop() as OperationLog<T>;
+      const prevLog = this.operationLogs.pop() as OperationLog;
       prevLog.operation.undoOperation(this.tree, prevLog);
       this.applyOperation(operation);
       const redoLog = prevLog.operation.redoOperation(this.tree, prevLog);
@@ -105,25 +105,25 @@ export class CrdtTree<T> {
     }
   }
 
-  applyOperations(operations: Operation<T>[]) {
+  applyOperations(operations: Operation[]) {
     for (const operation of operations) this.applyOperation(operation);
   }
 
-  static parse<T>(json: string) {
+  static parse(json: string) {
     const parsedJson = JSON.parse(json);
-    const crdtTree = new CrdtTree<T>('0');
+    const crdtTree = new CrdtTree('0');
     crdtTree.clock = Clock.parse(JSON.stringify(parsedJson.clock));
-    crdtTree.tree = Tree.parse<T>(JSON.stringify(parsedJson.tree));
+    crdtTree.tree = Tree.parse(JSON.stringify(parsedJson.tree));
 
     const operationTypeMap = {
-      add: OperationAdd.parse<T>,
-      delete: OperationDelete.parse<T>,
-      move: OperationMove.parse<T>,
-      update: OperationUpdate.parse<T>,
+      add: OperationAdd.parse,
+      delete: OperationDelete.parse,
+      move: OperationMove.parse,
+      update: OperationUpdate.parse,
     };
 
     const parsedOperationLogs = parsedJson.operationLogs.map(
-      (operationLog: OperationLog<T>) => {
+      (operationLog: OperationLog) => {
         const operationType = operationLog.operation.operationType;
         operationLog.operation = operationTypeMap[operationType](
           operationLog.operation,

diff --git a/nestjs-BE/server/src/crdt/node.spec.ts b/nestjs-BE/server/src/crdt/node.spec.ts
@@ -1,8 +1,8 @@
 import { Node } from './node';
 
 it('node 역직렬화', () => {
-  const node = new Node<string>('1', 'root', 'hello');
-  const parsedNode = Node.parse<string>(JSON.stringify(node));
+  const node = new Node('1', 'root', 'hello');
+  const parsedNode = Node.parse(JSON.stringify(node));
 
   expect(JSON.stringify(node)).toEqual(JSON.stringify(parsedNode));
 });
diff --git a/nestjs-BE/server/src/crdt/node.ts b/nestjs-BE/server/src/crdt/node.ts
@@ -1,22 +1,22 @@
-export class Node<T> {
+export class Node {
   targetId: string;
   parentId: string;
-  description: T | null;
+  description?: string;
   children = new Array<string>();
 
   constructor(
     targetId: string,
     parentId: string = '0',
-    description: T | null = null,
+    description: string = null,
   ) {
     this.targetId = targetId;
     this.parentId = parentId;
     this.description = description;
   }
 
-  static parse<T>(json: string) {
+  static parse(json: string) {
     const parsedJson = JSON.parse(json);
-    const node = new Node<T>(
+    const node = new Node(
       parsedJson.targetId,
       parsedJson.parentId,
       parsedJson.description,