From 6b8ea07929ba19836a4587f4cd6f1df885971775 Mon Sep 17 00:00:00 2001 From: sbriat Date: Thu, 4 May 2023 12:33:31 +0200 Subject: [PATCH 1/2] add ad service --- src/modules/logger.module.ts | 38 ++++++++ .../adapters/primaries/ad.controller.ts | 97 +++++++++++++++++++ 2 files changed, 135 insertions(+) create mode 100644 src/modules/logger/adapters/primaries/ad.controller.ts diff --git a/src/modules/logger.module.ts b/src/modules/logger.module.ts index 4db9c83..011bb47 100644 --- a/src/modules/logger.module.ts +++ b/src/modules/logger.module.ts @@ -10,6 +10,7 @@ import { TerritoryController } from './logger/adapters/primaries/territory.contr import { GatewayApiController } from './logger/adapters/primaries/gateway-api.controller'; import { AdminApiController } from './logger/adapters/primaries/admin-api.controller'; import { MatcherController } from './logger/adapters/primaries/matcher.controller'; +import { AdController } from './logger/adapters/primaries/ad.controller'; @Module({ imports: [ @@ -31,6 +32,42 @@ import { MatcherController } from './logger/adapters/primaries/matcher.controlle exchange: configService.get('RMQ_EXCHANGE'), routingKey: 'logging.admin-api.health.crit', }, + loggingAdCreateInfo: { + exchange: configService.get('RMQ_EXCHANGE'), + routingKey: 'logging.ad.create.info', + }, + loggingAdCreateWarning: { + exchange: configService.get('RMQ_EXCHANGE'), + routingKey: 'logging.ad.create.warning', + }, + loggingAdCreateCrit: { + exchange: configService.get('RMQ_EXCHANGE'), + routingKey: 'logging.ad.create.crit', + }, + loggingAdDeleteInfo: { + exchange: configService.get('RMQ_EXCHANGE'), + routingKey: 'logging.ad.delete.info', + }, + loggingAdDeleteCrit: { + exchange: configService.get('RMQ_EXCHANGE'), + routingKey: 'logging.ad.delete.crit', + }, + loggingAdReadWarning: { + exchange: configService.get('RMQ_EXCHANGE'), + routingKey: 'logging.ad.read.warning', + }, + loggingAdUpdateInfo: { + exchange: configService.get('RMQ_EXCHANGE'), + routingKey: 'logging.ad.update.info', + }, + loggingAdUpdateCrit: { + exchange: configService.get('RMQ_EXCHANGE'), + routingKey: 'logging.ad.update.crit', + }, + loggingAdHealthCrit: { + exchange: configService.get('RMQ_EXCHANGE'), + routingKey: 'logging.ad.health.crit', + }, loggingAuthCreateCrit: { exchange: configService.get('RMQ_EXCHANGE'), routingKey: 'logging.auth.create.crit', @@ -184,6 +221,7 @@ import { MatcherController } from './logger/adapters/primaries/matcher.controlle }), ], controllers: [ + AdController, AuthController, UserController, ConfigurationController, diff --git a/src/modules/logger/adapters/primaries/ad.controller.ts b/src/modules/logger/adapters/primaries/ad.controller.ts new file mode 100644 index 0000000..d10abd9 --- /dev/null +++ b/src/modules/logger/adapters/primaries/ad.controller.ts @@ -0,0 +1,97 @@ +import { RabbitSubscribe } from '@golevelup/nestjs-rabbitmq'; +import { Controller, Inject } from '@nestjs/common'; +import { WINSTON_MODULE_PROVIDER } from 'nest-winston'; +import { Logger } from 'winston'; +import { level } from './logger/level.enum'; +import loggerOptions from './logger/logger'; + +@Controller() +export class UserController { + constructor( + @Inject(WINSTON_MODULE_PROVIDER) private readonly logger: Logger, + ) {} + + @RabbitSubscribe({ + name: 'loggingUserCreateInfo', + }) + public async userCreatedInfoHandler(message: string) { + this.logger.configure(loggerOptions('user', level.info, 'info', 'create')); + this.logger.info(JSON.parse(message)); + } + + @RabbitSubscribe({ + name: 'loggingUserCreateWarning', + }) + public async userCreatedWarningHandler(message: string) { + this.logger.configure( + loggerOptions('user', level.warning, 'warning', 'create'), + ); + this.logger.warning(JSON.parse(message)); + } + + @RabbitSubscribe({ + name: 'loggingUserCreateCrit', + }) + public async userCreatedCriticalHandler(message: string) { + this.logger.configure( + loggerOptions('user', level.crit, 'critical', 'create'), + ); + this.logger.crit(JSON.parse(message)); + } + + @RabbitSubscribe({ + name: 'loggingUserDeleteInfo', + }) + public async userDeletedInfoHandler(message: string) { + this.logger.configure(loggerOptions('user', level.info, 'info', 'delete')); + this.logger.info(JSON.parse(message)); + } + + @RabbitSubscribe({ + name: 'loggingUserDeleteCrit', + }) + public async userDeletedCriticalHandler(message: string) { + this.logger.configure( + loggerOptions('user', level.crit, 'critical', 'delete'), + ); + this.logger.crit(JSON.parse(message)); + } + + @RabbitSubscribe({ + name: 'loggingUserReadWarning', + }) + public async userReadWarningHandler(message: string) { + this.logger.configure( + loggerOptions('user', level.warning, 'warning', 'read'), + ); + this.logger.warning(JSON.parse(message)); + } + + @RabbitSubscribe({ + name: 'loggingUserUpdateInfo', + }) + public async userUpdatedInfoHandler(message: string) { + this.logger.configure(loggerOptions('user', level.info, 'info', 'update')); + this.logger.info(JSON.parse(message)); + } + + @RabbitSubscribe({ + name: 'loggingUserUpdateCrit', + }) + public async userUpdatedCriticalHandler(message: string) { + this.logger.configure( + loggerOptions('user', level.crit, 'critical', 'update'), + ); + this.logger.crit(JSON.parse(message)); + } + + @RabbitSubscribe({ + name: 'loggingUserHealthCrit', + }) + public async userHealthCriticalHandler(message: string) { + this.logger.configure( + loggerOptions('user', level.crit, 'critical', 'health'), + ); + this.logger.crit(JSON.parse(message)); + } +} From 9b612ce083f69c587e715a60f0142ebf5a9f8859 Mon Sep 17 00:00:00 2001 From: sbriat Date: Thu, 4 May 2023 12:35:05 +0200 Subject: [PATCH 2/2] add ad service --- .../adapters/primaries/ad.controller.ts | 56 +++++++++---------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/src/modules/logger/adapters/primaries/ad.controller.ts b/src/modules/logger/adapters/primaries/ad.controller.ts index d10abd9..c0fd7f9 100644 --- a/src/modules/logger/adapters/primaries/ad.controller.ts +++ b/src/modules/logger/adapters/primaries/ad.controller.ts @@ -6,91 +6,91 @@ import { level } from './logger/level.enum'; import loggerOptions from './logger/logger'; @Controller() -export class UserController { +export class AdController { constructor( @Inject(WINSTON_MODULE_PROVIDER) private readonly logger: Logger, ) {} @RabbitSubscribe({ - name: 'loggingUserCreateInfo', + name: 'loggingAdCreateInfo', }) - public async userCreatedInfoHandler(message: string) { - this.logger.configure(loggerOptions('user', level.info, 'info', 'create')); + public async adCreatedInfoHandler(message: string) { + this.logger.configure(loggerOptions('ad', level.info, 'info', 'create')); this.logger.info(JSON.parse(message)); } @RabbitSubscribe({ - name: 'loggingUserCreateWarning', + name: 'loggingAdCreateWarning', }) - public async userCreatedWarningHandler(message: string) { + public async adCreatedWarningHandler(message: string) { this.logger.configure( - loggerOptions('user', level.warning, 'warning', 'create'), + loggerOptions('ad', level.warning, 'warning', 'create'), ); this.logger.warning(JSON.parse(message)); } @RabbitSubscribe({ - name: 'loggingUserCreateCrit', + name: 'loggingAdCreateCrit', }) - public async userCreatedCriticalHandler(message: string) { + public async adCreatedCriticalHandler(message: string) { this.logger.configure( - loggerOptions('user', level.crit, 'critical', 'create'), + loggerOptions('ad', level.crit, 'critical', 'create'), ); this.logger.crit(JSON.parse(message)); } @RabbitSubscribe({ - name: 'loggingUserDeleteInfo', + name: 'loggingAdDeleteInfo', }) - public async userDeletedInfoHandler(message: string) { - this.logger.configure(loggerOptions('user', level.info, 'info', 'delete')); + public async adDeletedInfoHandler(message: string) { + this.logger.configure(loggerOptions('ad', level.info, 'info', 'delete')); this.logger.info(JSON.parse(message)); } @RabbitSubscribe({ - name: 'loggingUserDeleteCrit', + name: 'loggingAdDeleteCrit', }) - public async userDeletedCriticalHandler(message: string) { + public async adDeletedCriticalHandler(message: string) { this.logger.configure( - loggerOptions('user', level.crit, 'critical', 'delete'), + loggerOptions('ad', level.crit, 'critical', 'delete'), ); this.logger.crit(JSON.parse(message)); } @RabbitSubscribe({ - name: 'loggingUserReadWarning', + name: 'loggingAdReadWarning', }) - public async userReadWarningHandler(message: string) { + public async adReadWarningHandler(message: string) { this.logger.configure( - loggerOptions('user', level.warning, 'warning', 'read'), + loggerOptions('ad', level.warning, 'warning', 'read'), ); this.logger.warning(JSON.parse(message)); } @RabbitSubscribe({ - name: 'loggingUserUpdateInfo', + name: 'loggingAdUpdateInfo', }) - public async userUpdatedInfoHandler(message: string) { - this.logger.configure(loggerOptions('user', level.info, 'info', 'update')); + public async adUpdatedInfoHandler(message: string) { + this.logger.configure(loggerOptions('ad', level.info, 'info', 'update')); this.logger.info(JSON.parse(message)); } @RabbitSubscribe({ - name: 'loggingUserUpdateCrit', + name: 'loggingAdUpdateCrit', }) - public async userUpdatedCriticalHandler(message: string) { + public async adUpdatedCriticalHandler(message: string) { this.logger.configure( - loggerOptions('user', level.crit, 'critical', 'update'), + loggerOptions('ad', level.crit, 'critical', 'update'), ); this.logger.crit(JSON.parse(message)); } @RabbitSubscribe({ - name: 'loggingUserHealthCrit', + name: 'loggingAdHealthCrit', }) - public async userHealthCriticalHandler(message: string) { + public async adHealthCriticalHandler(message: string) { this.logger.configure( - loggerOptions('user', level.crit, 'critical', 'health'), + loggerOptions('ad', level.crit, 'critical', 'health'), ); this.logger.crit(JSON.parse(message)); }