Merge branch 'develop' into be-feature-#188

Author: Tolerblanc

Diff for: .gitignore

@@ -49,3 +49,4 @@ lerna-debug.log*
 !.vscode/launch.json
 !.vscode/extensions.json
 db.sqlite
+apps/backend/db.sqlite

Diff for: .vscode/settings.json

@@ -1,8 +1,5 @@
 import { ApiProperty } from '@nestjs/swagger';
-import { IsString, IsNumber, IsIn } from 'class-validator';
-// import { Direction } from '../edge.entity';
-
-const Direction = ['N', 'S', 'E', 'W'];
+import { IsNumber } from 'class-validator';
 
 export class CreateEdgeDto {
   @IsNumber()
@@ -12,26 +9,10 @@ export class CreateEdgeDto {
   })
   fromNode: number;
 
-  @IsString()
-  @IsIn(Direction)
-  @ApiProperty({
-    example: 'N',
-    description: '출발 노드 지점 방향 (N, S, E, W 중 하나)',
-  })
-  fromPoint: string;
-
   @IsNumber()
   @ApiProperty({
     example: 1,
     description: '도착 노드의 ID',
   })
   toNode: number;
-
-  @IsString()
-  @IsIn(Direction)
-  @ApiProperty({
-    example: 'N',
-    description: '도착 노드 지점 방향 (N, S, E, W 중 하나)',
-  })
-  toPoint: string;
 }

Diff for: apps/backend/src/edge/dtos/createEdge.dto.ts

@@ -15,9 +15,7 @@ export class FindEdgesResponseDto {
       {
         id: 1,
         fromNode: 2,
-        fromPoint: 'N',
         toNode: 7,
-        toPoint: 'W',
       },
     ],
     description: '모든 Edge 배열',

Diff for: apps/backend/src/edge/dtos/findEdgesResponse.dto.ts

@@ -1,25 +1,120 @@
 import { Test, TestingModule } from '@nestjs/testing';
 import { EdgeController } from './edge.controller';
 import { EdgeService } from './edge.service';
+import { CreateEdgeDto } from './dtos/createEdge.dto';
+import { EdgeResponseMessage } from './edge.controller';
+import { EdgeNotFoundException } from '../exception/edge.exception';
+import { Edge } from './edge.entity';
+import { Node } from '../node/node.entity';
 
 describe('EdgeController', () => {
   let controller: EdgeController;
+  let edgeService: EdgeService;
 
   beforeEach(async () => {
     const module: TestingModule = await Test.createTestingModule({
       controllers: [EdgeController],
       providers: [
         {
           provide: EdgeService,
-          useValue: {},
+          useValue: {
+            createEdge: jest.fn(),
+            deleteEdge: jest.fn(),
+            findEdges: jest.fn(),
+          },
         },
       ],
     }).compile();
 
     controller = module.get<EdgeController>(EdgeController);
+    edgeService = module.get<EdgeService>(EdgeService);
   });
 
   it('컨트롤러 클래스가 정상적으로 인스턴스화된다.', () => {
     expect(controller).toBeDefined();
   });
+
+  describe('createEdge', () => {
+    it('엣지가 성공적으로 만들어진다', async () => {
+      const dto: CreateEdgeDto = { fromNode: 1, toNode: 3 };
+      const expectedResponse = {
+        message: EdgeResponseMessage.EDGE_CREATED,
+      };
+
+      jest.spyOn(edgeService, 'createEdge').mockResolvedValue(undefined);
+      const result = await controller.createEdge(dto);
+
+      expect(edgeService.createEdge).toHaveBeenCalledWith(dto);
+      expect(result).toEqual(expectedResponse);
+    });
+  });
+
+  describe('deleteEdge', () => {
+    it('id에 해당하는 엣지를 찾아 삭제한다.', async () => {
+      const id = 2;
+      const expectedResponse = {
+        message: EdgeResponseMessage.EDGE_DELETED,
+      };
+
+      const result = await controller.deleteEdge(id);
+
+      expect(edgeService.deleteEdge).toHaveBeenCalledWith(id);
+      expect(result).toEqual(expectedResponse);
+    });
+
+    it('id에 해당하는 엣지가 존재하지 않으면 NodeNotFoundException을 throw한다.', async () => {
+      jest
+        .spyOn(edgeService, 'deleteEdge')
+        .mockRejectedValue(new EdgeNotFoundException());
+
+      await expect(controller.deleteEdge(1)).rejects.toThrow(
+        EdgeNotFoundException,
+      );
+    });
+  });
+
+  describe('findEdges', () => {
+    it('모든 엣지 목록을 반환한다.', async () => {
+      const node3 = {
+        id: 3,
+        x: 0,
+        y: 0,
+        title: 'Node Title',
+        page: null,
+        outgoingEdges: [],
+        incomingEdges: [],
+      } as Node;
+      const node4 = {
+        id: 4,
+        x: 0,
+        y: 0,
+        title: 'Node Title',
+        page: null,
+        outgoingEdges: [],
+        incomingEdges: [],
+      } as Node;
+      const node5 = {
+        id: 5,
+        x: 0,
+        y: 0,
+        title: 'Node Title',
+        page: null,
+        outgoingEdges: [],
+        incomingEdges: [],
+      } as Node;
+
+      const expectedEdges = [
+        { id: 1, fromNode: node3, toNode: node5 },
+        { id: 2, fromNode: node3, toNode: node4 },
+      ] as Edge[];
+      node3.outgoingEdges = [];
+
+      jest.spyOn(edgeService, 'findEdges').mockResolvedValue(expectedEdges);
+
+      await expect(controller.findEdges()).resolves.toEqual({
+        message: EdgeResponseMessage.EDGE_ALL_RETURNED,
+        edges: expectedEdges,
+      });
+    });
+  });
 });

Diff for: apps/backend/src/edge/edge.controller.spec.ts

@@ -33,11 +33,11 @@ export class EdgeController {
   })
   @Get('/')
   @HttpCode(HttpStatus.OK)
-  async getNodes() {
-    const nodes = await this.edgeService.findEdges();
+  async findEdges() {
+    const edges = await this.edgeService.findEdges();
     return {
       message: EdgeResponseMessage.EDGE_ALL_RETURNED,
-      nodes: nodes,
+      edges: edges,
     };
   }
 
@@ -56,7 +56,7 @@ export class EdgeController {
   @ApiOperation({ summary: '엣지를 삭제합니다.' })
   @Delete('/:id')
   @HttpCode(HttpStatus.OK)
-  async deleteNode(
+  async deleteEdge(
     @Param('id', ParseIntPipe) id: number,
   ): Promise<{ message: string }> {
     await this.edgeService.deleteEdge(id);

Diff for: apps/backend/src/edge/edge.controller.ts

@@ -2,20 +2,12 @@
 import {
   Entity,
   PrimaryGeneratedColumn,
-  Column,
+  // Column,
   ManyToOne,
   JoinColumn,
 } from 'typeorm';
 import { Node } from '../node/node.entity';
 
-// TODO: frontend, backend가 공유하는 shared에 direction.enum.ts로 분리
-// export enum Direction {
-//   NORTH = 'N',
-//   SOUTH = 'S',
-//   EAST = 'E',
-//   WEST = 'W',
-// }
-
 @Entity()
 export class Edge {
   @PrimaryGeneratedColumn('increment')
@@ -29,15 +21,9 @@ export class Edge {
   @JoinColumn({ name: 'to_node_id' })
   toNode: Node;
 
-  @Column()
-  fromPoint: string;
-
-  @Column()
-  toPoint: string;
-
-  @Column({ nullable: true })
-  type: string;
+  // @Column({ nullable: true })
+  // type: string;
 
-  @Column({ nullable: true })
-  color: string;
+  // @Column({ nullable: true })
+  // color: string;
 }