fix(logs): 🐛 logs of import (#3913)🐛

Author: hbalty

packages/backend/src/usagers/controllers/import/import.controller.ts

@@ -142,7 +142,7 @@ export class ImportController {
     const importPreviewRows: ImportPreviewRow[] = [];
 
     const usagersRows: UsagersImportUsager[] = [];
-
+    const previewUsagersRow: UsagersImportUsager[] = [];
     const maxErrors = 20;
 
     processTracker.read.end = new Date();
@@ -174,6 +174,9 @@ export class ImportController {
         });
       if (errors.length || importMode === "preview") {
         importErrors = importErrors.concat(errors);
+        if (usagerRow && usagerRow.statutDom === "VALIDE") {
+          previewUsagersRow.push(usagerRow);
+        }
         importPreviewRows.push({
           isValid: errors.length === 0,
           rowNumber,
@@ -228,7 +231,7 @@ export class ImportController {
         structureId: user.structureId,
         role: user.role,
         context: {
-          nombreActifs: extractUsagersNumber(usagersRows),
+          nombreActifs: previewUsagersRow.length,
           nombreErreurs: importErrors.length,
           nombreTotal: importPreviewRows.length,
         },
@@ -252,12 +255,12 @@ export class ImportController {
       };
 
       await this.appLogsService.create<SuccessfulUsagerImportLogContext>({
-        action: "IMPORT_USAGERS_SUCCESS",
+        action: "IMPORT_USAGERS_PREVIEW",
         userId: user.id,
         role: user.role,
         structureId: user.structureId,
         context: {
-          nombreActifs: extractUsagersNumber(usagersRows),
+          nombreActifs: previewUsagersRow.length,
           nombreTotal: importPreviewRows.length,
         },
       });
@@ -297,16 +300,6 @@ export class ImportController {
       errorsCount: importErrors.length,
       rows: [], // don't return rows
     };
-    await this.appLogsService.create<SuccessfulUsagerImportLogContext>({
-      action: "IMPORT_USAGERS_SUCCESS",
-      userId: user.id,
-      structureId: user.structureId,
-      role: user.role,
-      context: {
-        nombreActifs: extractUsagersNumber(usagersRows),
-        nombreTotal: usagersRows.length,
-      },
-    });
     return res.status(HttpStatus.OK).json({
       importMode,
       previewTable,
@@ -331,8 +324,3 @@ export class ImportController {
     });
   }
 }
-
-export const extractUsagersNumber = (
-  usagersImportRow: UsagersImportUsager[]
-): number =>
-  usagersImportRow.filter((row) => row.statutDom === "VALIDE").length;

packages/backend/src/usagers/controllers/import/step3-create/usagersImportCreator.service.ts

@@ -1,3 +1,4 @@
+import { AppLogsService } from "./../../../../modules/app-logs/app-logs.service";
 import { ImportProcessTracker } from "../ImportProcessTracker.type";
 import { UsagersImportUsager } from "../step2-validate-row";
 import { usagersImportBuilder } from "./usagersImportBuilder.service";
@@ -14,11 +15,13 @@ import { UsagerHistoryStateService, usagersCreator } from "../../../services";
 
 import { Injectable } from "@nestjs/common";
 import { UserStructure } from "@domifa/common";
+import { SuccessfulUsagerImportLogContext } from "../../../../modules/app-logs/app-log-context.types";
 
 @Injectable()
 export class ImportCreatorService {
   constructor(
-    private readonly usagerHistoryStateService: UsagerHistoryStateService
+    private readonly usagerHistoryStateService: UsagerHistoryStateService,
+    private readonly appLogsService: AppLogsService
   ) {}
 
   public async createFromImport({
@@ -27,13 +30,27 @@ export class ImportCreatorService {
     processTracker,
   }: {
     usagersRows: UsagersImportUsager[];
-    user: Pick<UserStructure, "id" | "structureId" | "prenom" | "nom">;
+    user: Pick<UserStructure, "id" | "structureId" | "prenom" | "nom" | "role">;
     processTracker: ImportProcessTracker;
   }) {
     const usagers = usagersImportBuilder.buildUsagers({
       usagersRows,
       user,
     });
+    const nombreUsagersActifs = usagers.filter(
+      (usager) => usager.statut === "VALIDE"
+    ).length;
+
+    await this.appLogsService.create<SuccessfulUsagerImportLogContext>({
+      action: "IMPORT_USAGERS_SUCCESS",
+      userId: user.id,
+      structureId: user.structureId,
+      role: user.role,
+      context: {
+        nombreActifs: nombreUsagersActifs,
+        nombreTotal: usagers.length,
+      },
+    });
 
     let nextRef = await usagersCreator.findNextUsagerRef(user.structureId);
     const usagersToPersist = usagers.map((data) => {