Ajout d'un message département + bug ip 🐛

MTES-MCT · Oct 17, 2024 · f3d72c3 · f3d72c3
1 parent 1baf5e5
commit f3d72c3
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 23 deletions.
diff --git a/src/core/interceptor/logger.interceptor.ts b/src/core/interceptor/logger.interceptor.ts
@@ -20,7 +20,7 @@ export class LoggerInterceptor implements NestInterceptor {
    */
   intercept(context: ExecutionContext, next: CallHandler): Observable<any> {
     const id = crypto.randomBytes(8).toString('hex');
-    const req = context.getArgByIndex(0);
+    const req = context.switchToHttp().getRequest();
     const body = { ...req.body };
     this._logger.log(
       `REQUEST - ${id} - ${req.ip} - ${req.session?.user?.email} - ${

diff --git a/src/subscriptions/subscriptions.controller.ts b/src/subscriptions/subscriptions.controller.ts
@@ -1,4 +1,4 @@
-import { Body, Controller, Delete, Get, HttpCode, Param, Post, Req, UseGuards } from '@nestjs/common';
+import { Body, Controller, Delete, Get, HttpCode, Ip, Param, Post, Req, UseGuards } from '@nestjs/common';
 import { SubscriptionsService } from './subscriptions.service';
 import { ApiExcludeController, ApiOperation, ApiResponse } from '@nestjs/swagger';
 import { CreateSubscriptionDto } from './dto/create_subscription.dto';
@@ -19,10 +19,11 @@ export class SubscriptionsController {
   async create(
     @Req() req,
     @Body() createSubscriptionsDto: CreateSubscriptionDto,
+    @Ip() ip: string
   ): Promise<SubscriptionDto> {
     return this.subscriptionsService.create(
       createSubscriptionsDto,
-      req,
+      ip,
     );
   }
 

diff --git a/src/subscriptions/subscriptions.service.ts b/src/subscriptions/subscriptions.service.ts
@@ -34,9 +34,9 @@ export class SubscriptionsService {
     });
   }
 
-  async create(createSubscriptionDto: CreateSubscriptionDto, req: any): Promise<any> {
+  async create(createSubscriptionDto: CreateSubscriptionDto, ip: string): Promise<any> {
     const subscription = <any>createSubscriptionDto;
-    subscription.ip = req.ip;
+    subscription.ip = ip;
 
     if (subscription.commune) {
       const commune = this.communesService.getCommune(subscription.commune);
@@ -83,7 +83,7 @@ export class SubscriptionsService {
     } : {
       lon: subscription.lon,
       lat: subscription.lat,
-    }
+    };
     const subscriptionExists = await this.abonnementMailRepository.exists({
       where: whereClause,
     });
@@ -234,6 +234,7 @@ export class SubscriptionsService {
       erreur: 0,
       nouveau: 0,
       mail_envoye: 0,
+      departements: [],
     };
 
     const subscriptions = await this.abonnementMailRepository.find({
@@ -254,16 +255,19 @@ export class SubscriptionsService {
         if (subscription.typesEau.includes('AEP') && AEP && subscription.situation?.AEP !== AEP) {
           stats[AEP]++;
           situationUpdated = true;
+          this.addStatDepartement(stats.departements, subscription.commune);
         }
 
         if (subscription.typesEau.includes('SOU') && SOU && subscription.situation?.SOU !== SOU) {
           stats[SOU]++;
           situationUpdated = true;
+          this.addStatDepartement(stats.departements, subscription.commune);
         }
 
         if (subscription.typesEau.includes('SUP') && SUP && subscription.situation?.SUP !== SUP) {
           stats[SUP]++;
           situationUpdated = true;
+          this.addStatDepartement(stats.departements, subscription.commune);
         }
 
         if (situationUpdated) {
@@ -300,6 +304,14 @@ export class SubscriptionsService {
     await this.sendMattermostNotification(stats);
   }
 
+  addStatDepartement(departements: string[], commune: string) {
+    const depCode = commune >= '97' ? commune.slice(0, 3) : commune.slice(0, 2);
+    if (departements.findIndex(d => d === depCode) >= 0) {
+      return;
+    }
+    departements.push(depCode);
+  }
+
   async sendMattermostNotification(stats) {
     const sentences = [];
     if (stats.mail_envoye) {
@@ -338,6 +350,10 @@ export class SubscriptionsService {
       sentences.push(`- **${stats.erreur}** usagers sont en erreur 🧨`);
     }
 
+    if (stats.departements?.length > 0) {
+      sentences.push(`- **${stats.departements.join(', ')}** départements concernés 🗺️`);
+    }
+
     const message = sentences.join('\n');
     await this.mattermostService.sendMessage(message);
   }

diff --git a/src/zones/entities/arrete_cadre.entity.ts b/src/zones/entities/arrete_cadre.entity.ts
@@ -46,23 +46,6 @@ export class ArreteCadre extends BaseEntity {
   // })
   // statut: StatutArreteCadre;
 
-  // @Column('enum', {
-  //   name: 'communeNiveauGraviteMax',
-  //   enum: ['all', 'aep', 'none'],
-  //   nullable: true,
-  // })
-  // communeNiveauGraviteMax: CommuneNiveauGraviteMax;
-
-  @Column({ nullable: true })
-  niveauGraviteSpecifiqueEap: boolean;
-
-  // @Column('enum', {
-  //   name: 'ressourceEapCommunique',
-  //   enum: ['esu', 'eso', 'max'],
-  //   nullable: true,
-  // })
-  // ressourceEapCommunique: RessourceEapCommunique;
-
   @ManyToMany(
     () => ArreteRestriction,
     (ArreteRestriction) => ArreteRestriction.arretesCadre,