fix: test, lint 및 build 오류 수정

boostcampwm-2024 · Nov 29, 2024 · a4f9000 · a4f9000
1 parent ba70c75
commit a4f9000
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 15 deletions.
diff --git a/apps/backend/src/auth/auth.module.ts b/apps/backend/src/auth/auth.module.ts
@@ -1,6 +1,6 @@
 import { Module } from '@nestjs/common';
 import { UserRepository } from '../user/user.repository';
-import { UserModule } from 'src/user/user.module';
+import { UserModule } from '../user/user.module';
 import { AuthService } from './auth.service';
 import { AuthController } from './auth.controller';
 import { NaverStrategy } from './strategies/naver.strategy';

diff --git a/apps/backend/src/auth/auth.service.spec.ts b/apps/backend/src/auth/auth.service.spec.ts
@@ -5,6 +5,7 @@ import { SignUpDto } from './dtos/signUp.dto';
 import { User } from '../user/user.entity';
 import { UpdateUserDto } from './dtos/UpdateUser.dto';
 import { UserNotFoundException } from '../exception/user.exception';
+import { Snowflake } from '@theinternetfolks/snowflake';
 
 describe('AuthService', () => {
   let authService: AuthService;
@@ -68,9 +69,8 @@ describe('AuthService', () => {
         provider: 'naver',
         email: 'new@naver.com',
       };
-      const generated
-
-      flakeId = Snowflake.generate(); // Snowflake.generate()의 mock 값을 준비
+
+      const generatedSnowflakeId = Snowflake.generate(); // Snowflake.generate()의 mock 값을 준비
       const newDate = new Date();
       const createdUser = {
         providerId: dto.providerId,

diff --git a/apps/backend/src/auth/auth.service.ts b/apps/backend/src/auth/auth.service.ts
@@ -6,7 +6,6 @@ import { UpdateUserDto } from './dtos/UpdateUser.dto';
 import { UserNotFoundException } from '../exception/user.exception';
 import { Snowflake } from '@theinternetfolks/snowflake';
 
-
 @Injectable()
 export class AuthService {
   constructor(private readonly userRepository: UserRepository) {}

diff --git a/apps/backend/src/node/node.service.spec.ts b/apps/backend/src/node/node.service.spec.ts
@@ -9,14 +9,14 @@ import { CreateNodeDto } from './dtos/createNode.dto';
 import { UpdateNodeDto } from './dtos/updateNode.dto';
 import { MoveNodeDto } from './dtos/moveNode.dto';
 import { WorkspaceRepository } from '../workspace/workspace.repository';
+import { Workspace } from '../workspace/workspace.entity';
 
 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({
       providers: [

diff --git a/apps/backend/src/page/page.entity.ts b/apps/backend/src/page/page.entity.ts
@@ -8,7 +8,6 @@ import {
   CreateDateColumn,
   UpdateDateColumn,
   VersionColumn,
-  IsNull,
 } from 'typeorm';
 import { Node } from '../node/node.entity';
 import { Workspace } from '../workspace/workspace.entity';

diff --git a/apps/backend/src/page/page.service.spec.ts b/apps/backend/src/page/page.service.spec.ts
@@ -28,6 +28,7 @@ describe('PageService', () => {
             save: jest.fn(),
             delete: jest.fn(),
             findOneBy: jest.fn(),
+            findOne: jest.fn(),
             findPagesByWorkspace: jest.fn(),
           },
         },
@@ -135,6 +136,7 @@ describe('PageService', () => {
         content: {} as JSON,
         emoji: undefined,
         workspace: workspace1,
+        node: newNode,
       });
     });
   });
@@ -235,19 +237,22 @@ describe('PageService', () => {
         emoji: null,
         workspace: null,
       };
-      jest.spyOn(pageRepository, 'findOneBy').mockResolvedValue(expectedPage);
+      jest.spyOn(pageRepository, 'findOne').mockResolvedValue(expectedPage);
 
       await expect(service.findPageById(1)).resolves.toEqual(expectedPage);
     });
 
     it('id에 해당하는 페이지가 없을 경우 PageNotFoundException을 throw한다.', async () => {
-      jest.spyOn(pageRepository, 'findOneBy').mockResolvedValue(undefined);
+      jest.spyOn(pageRepository, 'findOne').mockResolvedValue(undefined);
 
       await expect(service.findPageById(1)).rejects.toThrow(
         PageNotFoundException,
       );
 
-      expect(pageRepository.findOneBy).toHaveBeenCalledWith({ id: 1 });
+      expect(pageRepository.findOne).toHaveBeenCalledWith({
+        where: { id: 1 },
+        relations: ['node'],
+      });
     });
   });
 

diff --git a/apps/backend/src/tasks/tasks.service.ts b/apps/backend/src/tasks/tasks.service.ts
@@ -2,7 +2,6 @@ import { Injectable, Logger } from '@nestjs/common';
 import { Cron, CronExpression } from '@nestjs/schedule';
 import { RedisService } from '../redis/redis.service';
 import { PageService } from '../page/page.service';
-import { PageNotFoundException } from 'src/exception/page.exception';
 
 @Injectable()
 export class TasksService {

diff --git a/apps/backend/src/yjs/yjs.module.ts b/apps/backend/src/yjs/yjs.module.ts
@@ -1,6 +1,6 @@
 import { Module } from '@nestjs/common';
 import { YjsService } from './yjs.service';
-import { NodeModule } from 'src/node/node.module';
+import { NodeModule } from '../node/node.module';
 import { PageModule } from '../page/page.module';
 import { EdgeModule } from '../edge/edge.module';
 import { RedisModule } from '../redis/redis.module';

diff --git a/apps/backend/src/yjs/yjs.service.ts b/apps/backend/src/yjs/yjs.service.ts
@@ -17,11 +17,11 @@ import {
 } from 'y-prosemirror';
 import { novelEditorSchema } from './yjs.schema';
 import { EdgeService } from '../edge/edge.service';
-import { Node } from 'src/node/node.entity';
-import { Edge } from 'src/edge/edge.entity';
+import { Node } from '../node/node.entity';
+import { Edge } from '../edge/edge.entity';
 import { YMapEdge } from './yjs.type';
 import { RedisService } from '../redis/redis.service';
-import { PageNotFoundException } from 'src/exception/page.exception';
+import { PageNotFoundException } from '../exception/page.exception';
 
 // Y.Doc에는 name 컬럼이 없어서 생성했습니다.
 class CustomDoc extends Y.Doc {