log: add winston

apps/api/src/lib/utils/csv.utils.ts

@@ -10,6 +10,7 @@ import { Numero } from '@/shared/entities/numero.entity';
 import { Toponyme } from '@/shared/entities/toponyme.entity';
 import { Row } from '../types/validator.types';
 import { ObjectId } from 'mongodb';
+import { Logger } from '@/shared/utils/logger.utils';
 
 export type FromCsvType = {
   isValid?: boolean;
@@ -211,8 +212,11 @@ export async function extractFromCsv(
       toponymes: communesData.toponymes,
     };
   } catch (error) {
-    console.log('ERROR extractFromCsv');
-    console.error(error);
+    Logger.error(
+      `Impossible d'extraire la BAL sur CSV`,
+      error,
+      extractFromCsv.name,
+    );
     return { isValid: false, validationError: error.message };
   }
 }

apps/api/src/main.ts

@@ -3,10 +3,13 @@ import { ValidationPipe } from '@nestjs/common';
 import { SwaggerModule, DocumentBuilder } from '@nestjs/swagger';
 
 import { ApiModule } from './api.module';
+import { WinstonLogger } from '@/shared/modules/logger/logger.service';
+import { Logger } from '@/shared/utils/logger.utils';
 
 async function bootstrap() {
   const app = await NestFactory.create(ApiModule, {
     cors: true,
+    logger: new WinstonLogger(Logger),
   });
 
   const config = new DocumentBuilder()

apps/api/src/modules/base_locale/sub_modules/habilitation/habilitation.module.ts

@@ -1,4 +1,4 @@
-import { Module, MiddlewareConsumer, forwardRef } from '@nestjs/common';
+import { Module, MiddlewareConsumer, forwardRef, Logger } from '@nestjs/common';
 
 import { ApiDepotModule } from '@/shared/modules/api_depot/api_depot.module';
 
@@ -14,7 +14,7 @@ import { PublicationModule } from '@/shared/modules/publication/publication.modu
     forwardRef(() => BaseLocaleModule),
     PublicationModule,
   ],
-  providers: [HabilitationService, BaseLocaleMiddleware],
+  providers: [HabilitationService, BaseLocaleMiddleware, Logger],
   controllers: [HabilitationController],
   exports: [HabilitationService],
 })

apps/api/src/modules/base_locale/sub_modules/habilitation/habilitation.service.ts

@@ -1,28 +1,70 @@
-import { HttpException, HttpStatus, Injectable } from '@nestjs/common';
+import { HttpException, HttpStatus, Injectable, Logger } from '@nestjs/common';
+import { ObjectId } from 'mongodb';
 
 import {
   Habilitation,
   StatusHabiliation,
 } from '@/shared/modules/api_depot/types/habilitation.type';
 import { ApiDepotService } from '@/shared/modules/api_depot/api_depot.service';
 import { BaseLocale } from '@/shared/entities/base_locale.entity';
-
 import { BaseLocaleService } from '../../base_locale.service';
 
 @Injectable()
 export class HabilitationService {
   constructor(
     private readonly baseLocaleService: BaseLocaleService,
     private readonly apiDepotService: ApiDepotService,
+    private readonly logger: Logger,
   ) {}
 
   async findOne(habilitationId: string): Promise<Habilitation> {
-    return this.apiDepotService.findOneHabiliation(habilitationId);
+    if (!ObjectId.isValid(habilitationId)) {
+      throw new HttpException(
+        'L’identifiant de l’habilitation est invalide',
+        HttpStatus.BAD_REQUEST,
+      );
+    }
+
+    try {
+      return await this.apiDepotService.findOneHabiliation(habilitationId);
+    } catch (error) {
+      this.logger.error(
+        `Impossible de trouver l'habilitation ${habilitationId}`,
+        error.response?.data || 'No server response',
+        HabilitationService.name,
+      );
+      throw new HttpException(
+        (error.response?.data as any).message || 'No server response',
+        HttpStatus.BAD_GATEWAY,
+      );
+    }
   }
 
   async isValid(habilitationId: string): Promise<boolean> {
-    const habilitation: Habilitation =
-      await this.apiDepotService.findOneHabiliation(habilitationId);
+    let habilitation: Habilitation;
+
+    if (!ObjectId.isValid(habilitationId)) {
+      throw new HttpException(
+        'L’identifiant de l’habilitation est invalide',
+        HttpStatus.NOT_FOUND,
+      );
+    }
+
+    try {
+      habilitation =
+        await this.apiDepotService.findOneHabiliation(habilitationId);
+    } catch (error) {
+      this.logger.error(
+        `Impossible de trouver l'habilitation ${habilitationId}`,
+        error.response?.data || 'No server response',
+        HabilitationService.name,
+      );
+      throw new HttpException(
+        (error.response?.data as any).message || 'No server response',
+        HttpStatus.BAD_GATEWAY,
+      );
+    }
+
     // On verifie que l'habilitation est valide
     if (habilitation.status !== StatusHabiliation.ACCEPTED) {
       return false;
@@ -51,9 +93,21 @@ export class HabilitationService {
         );
       }
     }
-
-    const habilitation: Habilitation =
-      await this.apiDepotService.createOneHabiliation(baseLocale);
+    let habilitation: Habilitation;
+    try {
+      habilitation =
+        await this.apiDepotService.createOneHabiliation(baseLocale);
+    } catch (error) {
+      this.logger.error(
+        `Impossible de créer une habilitation pour la commune ${baseLocale.commune}`,
+        error.response?.data || 'No server response',
+        HabilitationService.name,
+      );
+      throw new HttpException(
+        (error.response?.data as any).message || 'No server response',
+        HttpStatus.BAD_GATEWAY,
+      );
+    }
 
     await this.baseLocaleService.updateHabilitation(baseLocale, habilitation);
 
@@ -72,8 +126,15 @@ export class HabilitationService {
     try {
       await this.apiDepotService.sendPinCodeHabiliation(habilitationId);
     } catch (error) {
-      const { statusCode, message } = error.response.data;
-      throw new HttpException(message, statusCode);
+      this.logger.error(
+        `Impossible d'envoyer le code pour l'habilitation ${habilitationId}`,
+        error.response?.data || 'No server response',
+        HabilitationService.name,
+      );
+      throw new HttpException(
+        (error.response?.data as any).message || 'No server response',
+        HttpStatus.BAD_GATEWAY,
+      );
     }
   }
 
@@ -94,8 +155,15 @@ export class HabilitationService {
       );
       return data;
     } catch (error) {
-      const { statusCode, message } = error.response.data;
-      throw new HttpException(message, statusCode);
+      this.logger.error(
+        `Impossible de valider le code pour l'habilitation ${habilitationId}`,
+        error.response?.data || 'No server response',
+        HabilitationService.name,
+      );
+      throw new HttpException(
+        (error.response?.data as any).message || 'No server response',
+        HttpStatus.BAD_GATEWAY,
+      );
     }
   }
 }

apps/api/src/modules/base_locale/sub_modules/populate/populate.module.ts

@@ -1,4 +1,4 @@
-import { Module, forwardRef } from '@nestjs/common';
+import { Logger, Module, forwardRef } from '@nestjs/common';
 import { PopulateService } from './populate.service';
 import { BaseLocaleModule } from '../../base_locale.module';
 import { ApiDepotModule } from '@/shared/modules/api_depot/api_depot.module';
@@ -10,7 +10,7 @@ import { BanPlateformModule } from '@/shared/modules/ban_plateform/ban_plateform
     forwardRef(() => ApiDepotModule),
     forwardRef(() => BanPlateformModule),
   ],
-  providers: [PopulateService],
+  providers: [PopulateService, Logger],
   exports: [PopulateService],
 })
 export class PopulateModule {}

apps/api/src/modules/base_locale/sub_modules/populate/populate.service.ts

@@ -1,14 +1,15 @@
 import { FromCsvType, extractFromCsv } from '@/lib/utils/csv.utils';
 import { ApiDepotService } from '@/shared/modules/api_depot/api_depot.service';
 import { BanPlateformService } from '@/shared/modules/ban_plateform/ban_plateform.service';
-import { Inject, Injectable, forwardRef } from '@nestjs/common';
+import { Inject, Injectable, forwardRef, Logger } from '@nestjs/common';
 
 @Injectable()
 export class PopulateService {
   constructor(
     private apiDepotService: ApiDepotService,
     @Inject(forwardRef(() => BanPlateformService))
     private banPlateformService: BanPlateformService,
+    private readonly logger: Logger,
   ) {}
 
   private async extractFromApiDepot(codeCommune: string): Promise<FromCsvType> {
@@ -17,7 +18,6 @@ export class PopulateService {
         await this.apiDepotService.downloadCurrentRevisionFile(codeCommune);
 
       const result: FromCsvType = await extractFromCsv(fileData, codeCommune);
-
       if (!result.isValid) {
         throw new Error('Invalid CSV file');
       }
@@ -32,7 +32,6 @@ export class PopulateService {
         await this.banPlateformService.getBanAssemblage(codeCommune);
 
       const result = await extractFromCsv(file, codeCommune);
-
       if (!result.isValid) {
         throw new Error('Invalid CSV file');
       }
@@ -50,8 +49,10 @@ export class PopulateService {
       return data;
     }
 
-    console.error(
+    this.logger.error(
       `Aucune adresse n’a pu être extraite avec le code commune: ${codeCommune}`,
+      null,
+      PopulateService.name,
     );
 
     return { voies: [], numeros: [], toponymes: [] };

apps/api/test/habilitation.e2e-spec.ts

@@ -198,10 +198,10 @@ describe('HABILITATION MODULE', () => {
       const response = await request(app.getHttpServer())
         .get(`/bases-locales/${balId}/habilitation`)
         .set('Authorization', `Bearer ${token}`)
-        .expect(404);
+        .expect(502);
 
       const responseExpected = {
-        statusCode: 404,
+        statusCode: 502,
         message: 'L’identifiant de l’habilitation demandé n’existe pas',
       };
 
@@ -434,10 +434,10 @@ describe('HABILITATION MODULE', () => {
         .post(`/bases-locales/${balId}/habilitation/email/validate-pin-code`)
         .set('Authorization', `Bearer ${token}`)
         .send({ code: '123456' })
-        .expect(412);
+        .expect(502);
 
       expect(response.body).toEqual({
-        statusCode: 412,
+        statusCode: 502,
         message: 'Code non valide, 9 tentatives restantes',
       });
     });

apps/cron/src/cron.module.ts

@@ -1,4 +1,4 @@
-import { Module } from '@nestjs/common';
+import { Logger, Module } from '@nestjs/common';
 import { ScheduleModule } from '@nestjs/schedule';
 import { ConfigModule, ConfigService } from '@nestjs/config';
 import { MailerModule } from '@nestjs-modules/mailer';
@@ -51,6 +51,7 @@ import { CacheModule } from '@/shared/modules/cache/cache.module';
     DetectConflictTask,
     RemoveSoftDeleteBalTask,
     RemoveDemoBalTask,
+    Logger,
   ],
 })
 export class CronModule {}

apps/cron/src/main.ts

@@ -1,7 +1,12 @@
 import { NestFactory } from '@nestjs/core';
 import { CronModule } from './cron.module';
 
+import { WinstonLogger } from '@/shared/modules/logger/logger.service';
+import { Logger } from '@/shared/utils/logger.utils';
+
 async function bootstrap() {
-  await NestFactory.createApplicationContext(CronModule);
+  await NestFactory.createApplicationContext(CronModule, {
+    logger: new WinstonLogger(Logger),
+  });
 }
 bootstrap();

apps/cron/src/task_queue.class.ts

@@ -1,3 +1,5 @@
+import { Logger } from '@/shared/utils/logger.utils';
+
 export type Task = {
   title: string;
   run(): Promise<void>;
@@ -19,14 +21,20 @@ export class TaskQueue {
 
     while (this.queue.length > 0) {
       const task = this.queue.shift();
-      console.log(`TASK START ${task.title}`);
+      Logger.info(
+        `[${TaskQueue.name}] TASK START ${task.title}`,
+        TaskQueue.name,
+      );
       try {
         await task.run();
       } catch (error) {
-        console.error(`TASK ERROR ${task.title}`);
-        console.error(error);
+        Logger.error(
+          `[${TaskQueue.name}] TASK ERROR ${task.title}`,
+          error,
+          TaskQueue.name,
+        );
       }
-      console.log(`TASK END ${task.title}`);
+      Logger.info(`[${TaskQueue.name}] TASK END ${task.title}`, TaskQueue.name);
     }
 
     this.isTaskRunning = false;

apps/cron/src/tasks/detect_conflict.task.ts

@@ -1,4 +1,4 @@
-import { Injectable } from '@nestjs/common';
+import { Injectable, Logger } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 import { In, Repository } from 'typeorm';
 
@@ -25,6 +25,7 @@ export class DetectConflictTask implements Task {
     @InjectRepository(BaseLocale)
     private basesLocalesRepository: Repository<BaseLocale>,
     private cacheService: CacheService,
+    private readonly logger: Logger,
   ) {}
 
   public async run() {
@@ -33,14 +34,17 @@ export class DetectConflictTask implements Task {
       KEY_DETECT_CONFLICT_PUBLISHED_SINCE,
     );
     const detectConflictPublishedSince = new Date(cache?.value || '1970-01-01');
-    console.log('Detect conflict since : ', detectConflictPublishedSince);
+    this.logger.log(
+      `Detect conflict since : ${detectConflictPublishedSince}`,
+      DetectConflictTask.name,
+    );
     const currentRevisions: Revision[] =
       await this.apiDepotService.getCurrentRevisions(
         detectConflictPublishedSince,
       );
-    console.log(
-      'Number of current revisions processed : ',
-      currentRevisions.length,
+    this.logger.log(
+      `Number of current revisions processed : ${currentRevisions.length}`,
+      DetectConflictTask.name,
     );
     const revisedCommunes = currentRevisions.map((r) => r.codeCommune);
 
@@ -53,8 +57,11 @@ export class DetectConflictTask implements Task {
       try {
         await this.updateConflictStatus(codeCommune);
       } catch (error) {
-        console.error(`Unable to detect conflict for ${codeCommune}`);
-        console.error(error);
+        this.logger.error(
+          `Unable to detect conflict for ${codeCommune}`,
+          error,
+          DetectConflictTask.name,
+        );
       }
     }
   }
@@ -73,8 +80,10 @@ export class DetectConflictTask implements Task {
       await this.apiDepotService.getCurrentRevision(codeCommune);
 
     if (!currentRevision) {
-      console.error(
+      this.logger.error(
         `Comportement inattendu : pas de révision courante pour la commune ${codeCommune}`,
+        null,
+        DetectConflictTask.name,
       );
       return;
     }