From 8a19006ef3c959644e0eaaac7c65e333a256f5ba Mon Sep 17 00:00:00 2001 From: Sergii Mykyteiek Date: Fri, 8 Oct 2021 13:28:06 +0300 Subject: [PATCH] LT-18: Move tests to folder, refactor error logging approach --- src/middleware/error.middleware.ts | 3 +++ src/modules/stack/stack.controller.ts | 13 ------------- src/modules/ttl/ttl.controller.ts | 8 -------- src/shared/logger/index.ts | 2 -- src/shared/logger/logger.interfaces.ts | 11 ----------- src/shared/logger/logger.service.ts | 10 ---------- .../stack/stack.controller.spec.ts | 6 +++--- .../stack/stack.repository.spec.ts | 4 ++-- .../stack}/stack.validation-service.spec.ts | 2 +- src/{modules => tests}/ttl/ttl.controller.spec.ts | 6 +++--- .../ttl}/ttl.validation-service.spec.ts | 2 +- 11 files changed, 13 insertions(+), 54 deletions(-) delete mode 100644 src/shared/logger/index.ts delete mode 100644 src/shared/logger/logger.interfaces.ts delete mode 100644 src/shared/logger/logger.service.ts rename src/{modules => tests}/stack/stack.controller.spec.ts (94%) rename src/{modules => tests}/stack/stack.repository.spec.ts (93%) rename src/{modules/stack/validation => tests/stack}/stack.validation-service.spec.ts (95%) rename src/{modules => tests}/ttl/ttl.controller.spec.ts (96%) rename src/{modules/ttl/validation => tests/ttl}/ttl.validation-service.spec.ts (96%) diff --git a/src/middleware/error.middleware.ts b/src/middleware/error.middleware.ts index 33eca2c..cada33f 100644 --- a/src/middleware/error.middleware.ts +++ b/src/middleware/error.middleware.ts @@ -1,6 +1,9 @@ import { Response, Request, NextFunction } from 'express'; export const errorMiddleware = (error: Error, req: Request, res: Response, next: NextFunction) => { + // eslint-disable-next-line no-console + console.log(error); + delete error.stack; next(error); }; diff --git a/src/modules/stack/stack.controller.ts b/src/modules/stack/stack.controller.ts index b2d423c..abd24b3 100644 --- a/src/modules/stack/stack.controller.ts +++ b/src/modules/stack/stack.controller.ts @@ -4,7 +4,6 @@ import { ApiOperationGet, ApiOperationPost, ApiPath } from 'swagger-express-ts'; import { StackService } from './stack.service'; import { StackResponse } from './stack.dto'; import { StackValidationService } from './validation'; -import { LoggerService } from '../../shared/logger'; import { StatusCodes } from '../../common/constants'; @ApiPath({ @@ -16,7 +15,6 @@ export class StackController { constructor( private readonly stackService: StackService, private readonly validationService: StackValidationService, - private readonly logger: LoggerService, ) {} @ApiOperationPost({ @@ -50,12 +48,6 @@ export class StackController { return res.status(StatusCodes.CREATED).json(result); } catch (e) { - this.logger.error({ - placement: `[${this.constructor.name}].add`, - error: e, - arguments: Array.from([req.body]), - }); - next(e); } } @@ -78,11 +70,6 @@ export class StackController { return res.status(StatusCodes.OK_RESPONSE).json(result); } catch (e) { - this.logger.error({ - placement: `[${this.constructor.name}].get`, - error: e, - }); - next(e); } } diff --git a/src/modules/ttl/ttl.controller.ts b/src/modules/ttl/ttl.controller.ts index 61908aa..4318024 100644 --- a/src/modules/ttl/ttl.controller.ts +++ b/src/modules/ttl/ttl.controller.ts @@ -4,7 +4,6 @@ import { ApiPath, ApiOperationPost, ApiOperationGet, ApiOperationDelete } from ' import { TtlService } from './ttl.service'; import { TtlResponse } from './ttl.dto'; import { TtlValidationService } from './validation'; -import { LoggerService } from '../../shared/logger'; import { StatusCodes } from '../../common/constants'; @ApiPath({ @@ -16,7 +15,6 @@ export class TtlController { constructor( private readonly ttlService: TtlService, private readonly validationService: TtlValidationService, - private readonly logger: LoggerService, ) {} @ApiOperationPost({ @@ -52,12 +50,6 @@ export class TtlController { return res.status(StatusCodes.CREATED).json(result); } catch (e) { - this.logger.error({ - placement: `[${this.constructor.name}].add`, - error: e, - arguments: Array.from([req.body]), - }); - next(e); } } diff --git a/src/shared/logger/index.ts b/src/shared/logger/index.ts deleted file mode 100644 index 7e387e7..0000000 --- a/src/shared/logger/index.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from './logger.service'; -export * from './logger.interfaces'; diff --git a/src/shared/logger/logger.interfaces.ts b/src/shared/logger/logger.interfaces.ts deleted file mode 100644 index a850417..0000000 --- a/src/shared/logger/logger.interfaces.ts +++ /dev/null @@ -1,11 +0,0 @@ -export type LoggerMessage = - | string - | { - placement: string; - arguments?: any; - error?: Error | string; - }; - -export interface ILoggerError { - error(message: LoggerMessage): void; -} diff --git a/src/shared/logger/logger.service.ts b/src/shared/logger/logger.service.ts deleted file mode 100644 index 5d2a486..0000000 --- a/src/shared/logger/logger.service.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { Service } from 'typedi'; -import { ILoggerError, LoggerMessage } from './logger.interfaces'; - -@Service() -export class LoggerService implements ILoggerError { - error(message: LoggerMessage) { - // eslint-disable-next-line no-console - console.log(message); - } -} diff --git a/src/modules/stack/stack.controller.spec.ts b/src/tests/stack/stack.controller.spec.ts similarity index 94% rename from src/modules/stack/stack.controller.spec.ts rename to src/tests/stack/stack.controller.spec.ts index 7a5d7b1..d907765 100644 --- a/src/modules/stack/stack.controller.spec.ts +++ b/src/tests/stack/stack.controller.spec.ts @@ -1,8 +1,8 @@ import 'reflect-metadata'; import { Container } from 'typedi'; -import { StackController } from './stack.controller'; -import { StackService } from './stack.service'; -import { StackValidationService } from './validation'; +import { StackController } from '../../modules/stack/stack.controller'; +import { StackService } from '../../modules/stack/stack.service'; +import { StackValidationService } from '../../modules/stack/validation'; import { StatusCodes } from '../../common/constants'; const mockResponse = { diff --git a/src/modules/stack/stack.repository.spec.ts b/src/tests/stack/stack.repository.spec.ts similarity index 93% rename from src/modules/stack/stack.repository.spec.ts rename to src/tests/stack/stack.repository.spec.ts index b54f897..f1955d9 100644 --- a/src/modules/stack/stack.repository.spec.ts +++ b/src/tests/stack/stack.repository.spec.ts @@ -1,7 +1,7 @@ import 'reflect-metadata'; import { Container } from 'typedi'; -import { StackModel } from './stack.model'; -import { StackRepository } from './stack.repository'; +import { StackModel } from '../../modules/stack/stack.model'; +import { StackRepository } from '../../modules/stack/stack.repository'; describe('StackRepository', () => { let stackModel; diff --git a/src/modules/stack/validation/stack.validation-service.spec.ts b/src/tests/stack/stack.validation-service.spec.ts similarity index 95% rename from src/modules/stack/validation/stack.validation-service.spec.ts rename to src/tests/stack/stack.validation-service.spec.ts index 6f8ac79..674b6ef 100644 --- a/src/modules/stack/validation/stack.validation-service.spec.ts +++ b/src/tests/stack/stack.validation-service.spec.ts @@ -1,6 +1,6 @@ import 'reflect-metadata'; import { Container } from 'typedi'; -import { StackValidationService } from './stack.validation-service'; +import { StackValidationService } from '../../modules/stack/validation'; describe('StackValidationService', () => { let validateService: StackValidationService; diff --git a/src/modules/ttl/ttl.controller.spec.ts b/src/tests/ttl/ttl.controller.spec.ts similarity index 96% rename from src/modules/ttl/ttl.controller.spec.ts rename to src/tests/ttl/ttl.controller.spec.ts index bf80b84..3d6c3b7 100644 --- a/src/modules/ttl/ttl.controller.spec.ts +++ b/src/tests/ttl/ttl.controller.spec.ts @@ -1,8 +1,8 @@ import 'reflect-metadata'; import { Container } from 'typedi'; -import { TtlController } from './ttl.controller'; -import { TtlService } from './ttl.service'; -import { TtlValidationService } from './validation'; +import { TtlController } from '../../modules/ttl/ttl.controller'; +import { TtlService } from '../../modules/ttl/ttl.service'; +import { TtlValidationService } from '../../modules/ttl/validation'; import { StatusCodes } from '../../common/constants'; const mockResponse = { diff --git a/src/modules/ttl/validation/ttl.validation-service.spec.ts b/src/tests/ttl/ttl.validation-service.spec.ts similarity index 96% rename from src/modules/ttl/validation/ttl.validation-service.spec.ts rename to src/tests/ttl/ttl.validation-service.spec.ts index d1588bf..2a8acf4 100644 --- a/src/modules/ttl/validation/ttl.validation-service.spec.ts +++ b/src/tests/ttl/ttl.validation-service.spec.ts @@ -1,6 +1,6 @@ import 'reflect-metadata'; import { Container } from 'typedi'; -import { TtlValidationService } from './ttl.validation-service'; +import { TtlValidationService } from '../../modules/ttl/validation'; describe('TtlValidationService', () => { let validateService: TtlValidationService; -- GitLab