Skip to content

Commit 563d0fd

Browse files
author
hersveit
committed
remove logger
1 parent 1a5e2d9 commit 563d0fd

File tree

6 files changed

+7
-97
lines changed

6 files changed

+7
-97
lines changed

src/controllers/auth/__tests__/auth.e2e.spec.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import { JwtRefreshTokenStrategy } from '../../../services/auth/strategies/jwt-r
1818
import { getUserStub } from '../../../__mocks__/user.stub';
1919
import { DatabaseServiceProvider } from '../../../services/database/database.service';
2020
import { ModuleRef } from '@nestjs/core';
21-
import { LoggerProvider } from '../../../core/logger.core';
2221

2322
describe('AuthController', () => {
2423
const appWrap = {} as AppWrap;
@@ -79,7 +78,6 @@ describe('AuthController', () => {
7978
new HttpInterceptor(
8079
createMock<ModuleRef>(),
8180
db as unknown as DatabaseServiceProvider,
82-
createMock<LoggerProvider>(),
8381
),
8482
);
8583
appWrap.app.use(cookieParser());

src/controllers/user/__tests__/user.e2e.spec.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import { JwtRefreshTokenStrategy } from '../../../services/auth/strategies/jwt-r
1515
import { getUserStub } from '../../../__mocks__/user.stub';
1616
import { DatabaseServiceProvider } from '../../../services/database/database.service';
1717
import { ModuleRef } from '@nestjs/core';
18-
import { LoggerProvider } from '../../../core/logger.core';
1918
import { UserControllerProvider } from '../user.controller';
2019
import { EmailConfirm, RefreshToken, User } from '@prisma/client';
2120
import {
@@ -70,7 +69,6 @@ describe('UserController', () => {
7069
new HttpInterceptor(
7170
createMock<ModuleRef>(),
7271
db as unknown as DatabaseServiceProvider,
73-
createMock<LoggerProvider>(),
7472
),
7573
);
7674
appWrap.app.use(cookieParser());

src/core/__tests__/interceptor.spec.ts

Lines changed: 3 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import { BaseError } from '../errors.core';
22
import { createMock, DeepMocked } from '@golevelup/ts-jest';
33
import { DatabaseServiceProvider } from '../../services/database/database.service';
44
import { HttpInterceptor } from '../interceptor.core';
5-
import { Logger, LoggerProvider } from '../logger.core';
65
import { ModuleRef } from '@nestjs/core';
76
import { Controller, Get } from '@nestjs/common';
87
import { ErrorHandleMiddlewareProvider } from '../errorHandleMiddleware.core';
@@ -28,7 +27,6 @@ describe('Interceptor', () => {
2827
const appWrap = {} as AppWrap;
2928

3029
let interceptor: HttpInterceptor;
31-
let logger: DeepMocked<LoggerProvider>;
3230
let moduleRef: DeepMocked<ModuleRef>;
3331
let db: {
3432
Prisma: DeepMocked<DatabaseServiceProvider['Prisma']>;
@@ -52,23 +50,17 @@ describe('Interceptor', () => {
5250
},
5351
},
5452
},
55-
{
56-
provide: LoggerProvider,
57-
useValue: createMock<Logger>(),
58-
},
5953
],
6054
controllers: [TestController],
6155
}).compile();
6256

6357
moduleRef = createMock<ModuleRef>();
6458

6559
db = module.get(DatabaseServiceProvider);
66-
logger = module.get(LoggerProvider);
6760

6861
interceptor = new HttpInterceptor(
6962
moduleRef,
7063
db as unknown as DatabaseServiceProvider,
71-
logger,
7264
);
7365
appWrap.app = module.createNestApplication();
7466
appWrap.app.useGlobalInterceptors(interceptor);
@@ -80,7 +72,6 @@ describe('Interceptor', () => {
8072

8173
afterEach(() => {
8274
moduleRef.resolve.mockClear();
83-
logger.log.mockClear();
8475
testResponse.response.mockClear();
8576
});
8677

@@ -203,29 +194,14 @@ describe('Interceptor', () => {
203194
describe('onModuleInit and errorHandleMiddleware', () => {
204195
const errorHandleMiddleware = createMock<ErrorHandleMiddlewareProvider>();
205196

206-
it('should log a message if error handler not provided', async () => {
207-
moduleRef.resolve.mockResolvedValueOnce(null);
208-
209-
await interceptor.onModuleInit();
210-
211-
expect(moduleRef.resolve).toBeCalledTimes(1);
212-
expect(logger.log).toBeCalledTimes(1);
213-
expect(logger.log).toBeCalledWith('No error handler where provided');
214-
});
215-
216-
it('no logs on successful resolve ErrorHandleMiddlewareProvider', async () => {
217-
moduleRef.resolve.mockResolvedValueOnce(errorHandleMiddleware);
218-
219-
await interceptor.onModuleInit();
220-
221-
expect(moduleRef.resolve).toBeCalledTimes(1);
222-
expect(logger.log).toBeCalledTimes(0);
223-
});
224197

225198
it('errorHandleMiddleware should be called', async () => {
199+
moduleRef.resolve.mockResolvedValueOnce(errorHandleMiddleware);
226200
testResponse.response.mockImplementationOnce(() => {
227201
throw 'Test error';
228202
});
203+
204+
await interceptor.onModuleInit();
229205
await request(appWrap.app.getHttpServer()).get('/test/request').send();
230206

231207
expect(errorHandleMiddleware.handleError).toBeCalledTimes(1);

src/core/interceptor.core.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import {
55
ExecutionContext,
66
HttpStatus,
77
Injectable,
8+
Logger,
89
NestInterceptor,
910
OnModuleInit,
1011
} from '@nestjs/common';
@@ -20,16 +21,15 @@ import {
2021
ErrorHandleMiddlewareProvider,
2122
} from './errorHandleMiddleware.core';
2223
import { ModuleRef } from '@nestjs/core';
23-
import { LoggerProvider } from './logger.core';
2424

2525
@Injectable()
2626
export class HttpInterceptor implements NestInterceptor, OnModuleInit {
2727
private errorHandleMiddleware: ErrorHandleMiddlewareProvider | null = null;
28+
private logger = new Logger(HttpInterceptor.name);
2829

2930
constructor(
3031
private moduleRef: ModuleRef,
3132
private db: DatabaseServiceProvider,
32-
private logger: LoggerProvider,
3333
) {}
3434

3535
async onModuleInit() {

src/core/logger.core.ts

Lines changed: 0 additions & 61 deletions
This file was deleted.

src/services/database/database.service.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
import { Module } from '@nestjs/common';
1+
import { Logger, Module } from '@nestjs/common';
22
import { ConfigService, ConfigServiceProvider } from '../config/config.service';
33
import { Injectable } from '@nestjs/common';
44
import { PrismaClient } from '@prisma/client';
5-
import { Logger, LoggerProvider } from '../../core/logger.core';
65

76
@Injectable()
87
export class DatabaseServiceProvider {
98
private readonly prisma: PrismaClient;
9+
private readonly logger = new Logger(DatabaseServiceProvider.name);
1010

1111
/**
1212
* !!! NO DB TRANSACTION INSTANCE !!!
@@ -18,7 +18,6 @@ export class DatabaseServiceProvider {
1818
constructor(
1919
// import the config to make sure it is initialized first
2020
private cfg: ConfigServiceProvider,
21-
private logger: LoggerProvider,
2221
) {
2322
this.prisma = new PrismaClient();
2423
this.prisma

0 commit comments

Comments
 (0)