Skip to content

Commit a4f9000

Browse files
committed
fix: test, lint 및 build 오류 수정
1 parent ba70c75 commit a4f9000

File tree

9 files changed

+17
-15
lines changed

9 files changed

+17
-15
lines changed

apps/backend/src/auth/auth.module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Module } from '@nestjs/common';
22
import { UserRepository } from '../user/user.repository';
3-
import { UserModule } from 'src/user/user.module';
3+
import { UserModule } from '../user/user.module';
44
import { AuthService } from './auth.service';
55
import { AuthController } from './auth.controller';
66
import { NaverStrategy } from './strategies/naver.strategy';

apps/backend/src/auth/auth.service.spec.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import { SignUpDto } from './dtos/signUp.dto';
55
import { User } from '../user/user.entity';
66
import { UpdateUserDto } from './dtos/UpdateUser.dto';
77
import { UserNotFoundException } from '../exception/user.exception';
8+
import { Snowflake } from '@theinternetfolks/snowflake';
89

910
describe('AuthService', () => {
1011
let authService: AuthService;
@@ -68,9 +69,8 @@ describe('AuthService', () => {
6869
provider: 'naver',
6970
7071
};
71-
const generated
72-
73-
flakeId = Snowflake.generate(); // Snowflake.generate()의 mock 값을 준비
72+
73+
const generatedSnowflakeId = Snowflake.generate(); // Snowflake.generate()의 mock 값을 준비
7474
const newDate = new Date();
7575
const createdUser = {
7676
providerId: dto.providerId,

apps/backend/src/auth/auth.service.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import { UpdateUserDto } from './dtos/UpdateUser.dto';
66
import { UserNotFoundException } from '../exception/user.exception';
77
import { Snowflake } from '@theinternetfolks/snowflake';
88

9-
109
@Injectable()
1110
export class AuthService {
1211
constructor(private readonly userRepository: UserRepository) {}

apps/backend/src/node/node.service.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ import { CreateNodeDto } from './dtos/createNode.dto';
99
import { UpdateNodeDto } from './dtos/updateNode.dto';
1010
import { MoveNodeDto } from './dtos/moveNode.dto';
1111
import { WorkspaceRepository } from '../workspace/workspace.repository';
12+
import { Workspace } from '../workspace/workspace.entity';
1213

1314
describe('NodeService', () => {
1415
let service: NodeService;
1516
let nodeRepository: jest.Mocked<NodeRepository>;
1617
let pageRepository: jest.Mocked<PageRepository>;
1718
let workspaceRepository: jest.Mocked<WorkspaceRepository>;
1819

19-
2020
beforeEach(async () => {
2121
const module: TestingModule = await Test.createTestingModule({
2222
providers: [

apps/backend/src/page/page.entity.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import {
88
CreateDateColumn,
99
UpdateDateColumn,
1010
VersionColumn,
11-
IsNull,
1211
} from 'typeorm';
1312
import { Node } from '../node/node.entity';
1413
import { Workspace } from '../workspace/workspace.entity';

apps/backend/src/page/page.service.spec.ts

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ describe('PageService', () => {
2828
save: jest.fn(),
2929
delete: jest.fn(),
3030
findOneBy: jest.fn(),
31+
findOne: jest.fn(),
3132
findPagesByWorkspace: jest.fn(),
3233
},
3334
},
@@ -135,6 +136,7 @@ describe('PageService', () => {
135136
content: {} as JSON,
136137
emoji: undefined,
137138
workspace: workspace1,
139+
node: newNode,
138140
});
139141
});
140142
});
@@ -235,19 +237,22 @@ describe('PageService', () => {
235237
emoji: null,
236238
workspace: null,
237239
};
238-
jest.spyOn(pageRepository, 'findOneBy').mockResolvedValue(expectedPage);
240+
jest.spyOn(pageRepository, 'findOne').mockResolvedValue(expectedPage);
239241

240242
await expect(service.findPageById(1)).resolves.toEqual(expectedPage);
241243
});
242244

243245
it('id에 해당하는 페이지가 없을 경우 PageNotFoundException을 throw한다.', async () => {
244-
jest.spyOn(pageRepository, 'findOneBy').mockResolvedValue(undefined);
246+
jest.spyOn(pageRepository, 'findOne').mockResolvedValue(undefined);
245247

246248
await expect(service.findPageById(1)).rejects.toThrow(
247249
PageNotFoundException,
248250
);
249251

250-
expect(pageRepository.findOneBy).toHaveBeenCalledWith({ id: 1 });
252+
expect(pageRepository.findOne).toHaveBeenCalledWith({
253+
where: { id: 1 },
254+
relations: ['node'],
255+
});
251256
});
252257
});
253258

apps/backend/src/tasks/tasks.service.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import { Injectable, Logger } from '@nestjs/common';
22
import { Cron, CronExpression } from '@nestjs/schedule';
33
import { RedisService } from '../redis/redis.service';
44
import { PageService } from '../page/page.service';
5-
import { PageNotFoundException } from 'src/exception/page.exception';
65

76
@Injectable()
87
export class TasksService {

apps/backend/src/yjs/yjs.module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Module } from '@nestjs/common';
22
import { YjsService } from './yjs.service';
3-
import { NodeModule } from 'src/node/node.module';
3+
import { NodeModule } from '../node/node.module';
44
import { PageModule } from '../page/page.module';
55
import { EdgeModule } from '../edge/edge.module';
66
import { RedisModule } from '../redis/redis.module';

apps/backend/src/yjs/yjs.service.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ import {
1717
} from 'y-prosemirror';
1818
import { novelEditorSchema } from './yjs.schema';
1919
import { EdgeService } from '../edge/edge.service';
20-
import { Node } from 'src/node/node.entity';
21-
import { Edge } from 'src/edge/edge.entity';
20+
import { Node } from '../node/node.entity';
21+
import { Edge } from '../edge/edge.entity';
2222
import { YMapEdge } from './yjs.type';
2323
import { RedisService } from '../redis/redis.service';
24-
import { PageNotFoundException } from 'src/exception/page.exception';
24+
import { PageNotFoundException } from '../exception/page.exception';
2525

2626
// Y.Doc에는 name 컬럼이 없어서 생성했습니다.
2727
class CustomDoc extends Y.Doc {

0 commit comments

Comments
 (0)