module 3 task 1 версия 2

js-tasks-ru · Dec 19, 2024 · 77dca19 · 77dca19
1 parent 5443036
commit 77dca19
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 7 deletions.
diff --git a/03-di/01-notification-service/1734634566473/logs.txt b/03-di/01-notification-service/1734634566473/logs.txt
@@ -0,0 +1,3 @@
+[21:56:11 GMT+0300 (Moscow Standard Time)]: Email sent to [email protected]: [Новая задача] Вы назначены ответственным за задачу: "Сделать домашнюю работу"
+[21:56:12 GMT+0300 (Moscow Standard Time)]: Email sent to [email protected]: [Новая задача] Вы назначены ответственным за задачу: "Сделать домашнюю работу"
+[21:56:13 GMT+0300 (Moscow Standard Time)]: Email sent to [email protected]: [Новая задача] Вы назначены ответственным за задачу: "Сделать домашнюю работу"
diff --git a/03-di/01-notification-service/providers/Logger.ts b/03-di/01-notification-service/providers/Logger.ts
@@ -2,6 +2,8 @@ import {ILogger} from './types';
 import * as fs from 'node:fs';
 import * as path from 'node:path';
 
+export const LoggerService = 'LoggerService';
+
 export class FileLoggerService implements ILogger {
   constructor(private path: string, private fileName: string) {
     try {

diff --git a/03-di/01-notification-service/providers/NotificationService.ts b/03-di/01-notification-service/providers/NotificationService.ts
@@ -1,7 +1,10 @@
+import { Injectable, Inject } from "@nestjs/common";
+import { LoggerService } from './Logger';
 import { ILogger } from './types';
 
+@Injectable()
 export class NotificationService {
-  constructor(private logger?: ILogger) {
+  constructor(@Inject(LoggerService) private logger: ILogger) {
     console.log('NotificationService', logger);
   };
 
@@ -10,14 +13,14 @@ export class NotificationService {
 
     console.log(mess);
 
-    this.logger?.log(mess);
+    this.logger.log(mess);
   }
 
   sendSMS(to: string, message: string): void {
     const mess = `SMS sent to ${to}: ${message}`;
 
     console.log(mess);
 
-    this.logger?.log(mess);
+    this.logger.log(mess);
   }
 }
diff --git a/03-di/01-notification-service/tasks/tasks.module.ts b/03-di/01-notification-service/tasks/tasks.module.ts
@@ -3,13 +3,13 @@ import { TasksController } from "./tasks.controller";
 import { TasksService } from "./tasks.service";
 import { UsersModule } from "../users/users.module";
 import { NotificationService } from "../providers/NotificationService";
-import { FileLoggerService, ConsoleLoggerService } from '../providers/Logger';
+import { FileLoggerService, ConsoleLoggerService, LoggerService } from '../providers/Logger';
 
-const logger = process.env.LOGGER === 'file' ? new FileLoggerService(Date.now().toString(), 'logs.txt') : new ConsoleLoggerService();
+const getLogger = () => process.env.LOGGER === 'file' ? new FileLoggerService(Date.now().toString(), 'logs.txt') : new ConsoleLoggerService();
 
 @Module({
   imports: [UsersModule],
   controllers: [TasksController],
-  providers: [TasksService, { provide: NotificationService, useFactory: () =>  new NotificationService(logger) }],
+  providers: [TasksService, NotificationService, { provide:  LoggerService, useFactory: () => getLogger()}],
 })
 export class TasksModule {}
diff --git a/03-di/01-notification-service/tasks/tasks.service.ts b/03-di/01-notification-service/tasks/tasks.service.ts
@@ -9,7 +9,7 @@ export class TasksService {
 
   constructor(
     private usersService: UsersService, 
-    @Inject(NotificationService) private notificationService: NotificationService
+    private notificationService: NotificationService
   ) {};
 
   async createTask(createTaskDto: CreateTaskDto) {