From f2e88ae7d1631cec0e8ea64e364f28ccc0128e99 Mon Sep 17 00:00:00 2001
From: hbalty <balty.houssem@gmail.com>
Date: Mon, 11 Aug 2025 15:08:39 +0200
Subject: [PATCH 1/2] fix(back): ajout de la structureId et le role aux logs
 d'import

---
 .../usagers/controllers/import/import.controller.spec.ts    | 6 ++++++
 .../src/usagers/controllers/import/import.controller.ts     | 4 ++++
 2 files changed, 10 insertions(+)

diff --git a/packages/backend/src/usagers/controllers/import/import.controller.spec.ts b/packages/backend/src/usagers/controllers/import/import.controller.spec.ts
index 6d134cf8fc..e6f505b6aa 100644
--- a/packages/backend/src/usagers/controllers/import/import.controller.spec.ts
+++ b/packages/backend/src/usagers/controllers/import/import.controller.spec.ts
@@ -75,6 +75,8 @@ describe("Import Controller", () => {
 
     const expectedLog: AppLog = {
       userId: authInfo.id,
+      structureId: authInfo.structureId,
+      role: authInfo.role,
       context: expectedLogContextEntree,
       action: "IMPORT_USAGERS_FAILED",
     };
@@ -117,6 +119,8 @@ describe("Import Controller", () => {
         nombreTotal: 0,
       },
       userId: authInfo.id,
+      structureId: authInfo.structureId,
+      role: authInfo.role,
     });
     expect(response.status).toBe(HttpStatus.OK);
     expect(JSON.parse(response.text)).toEqual({
@@ -150,6 +154,8 @@ describe("Import Controller", () => {
         nombreTotal: 0,
       },
       userId: authInfo.id,
+      structureId: authInfo.structureId,
+      role: authInfo.role,
     });
     expect(response.status).toBe(HttpStatus.OK);
     expect(JSON.parse(response.text)).toEqual({
diff --git a/packages/backend/src/usagers/controllers/import/import.controller.ts b/packages/backend/src/usagers/controllers/import/import.controller.ts
index 493bb98cef..c60c298a7a 100644
--- a/packages/backend/src/usagers/controllers/import/import.controller.ts
+++ b/packages/backend/src/usagers/controllers/import/import.controller.ts
@@ -223,6 +223,8 @@ export class ImportController {
       await this.appLogsService.create<FailedUsagerImportLogContext>({
         action: "IMPORT_USAGERS_FAILED",
         userId: user.id,
+        structureId: user.structureId,
+        role: user.role,
         context: {
           nombreActifs: extractUsagersNumber(usagersRows),
           nombreErreurs: importErrors.length,
@@ -250,6 +252,8 @@ export class ImportController {
       await this.appLogsService.create<SuccessfulUsagerImportLogContext>({
         action: "IMPORT_USAGERS_SUCCESS",
         userId: user.id,
+        role: user.role,
+        structureId: user.structureId,
         context: {
           nombreActifs: extractUsagersNumber(usagersRows),
           nombreTotal: importPreviewRows.length,

From 4d443aede4119e84ada185fd6be31402e2e7165a Mon Sep 17 00:00:00 2001
From: hbalty <balty.houssem@gmail.com>
Date: Mon, 11 Aug 2025 15:28:30 +0200
Subject: [PATCH 2/2] fix(tests): clearing mocks after each test case

---
 .../src/usagers/controllers/import/import.controller.spec.ts  | 4 ++++
 .../src/usagers/controllers/import/import.controller.ts       | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/packages/backend/src/usagers/controllers/import/import.controller.spec.ts b/packages/backend/src/usagers/controllers/import/import.controller.spec.ts
index e6f505b6aa..fdb77d2e7a 100644
--- a/packages/backend/src/usagers/controllers/import/import.controller.spec.ts
+++ b/packages/backend/src/usagers/controllers/import/import.controller.spec.ts
@@ -58,6 +58,10 @@ describe("Import Controller", () => {
     controller = context.module.get<ImportController>(ImportController);
   });
 
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
   afterAll(async () => {
     await AppTestHelper.tearDownTestApp(context);
   });
diff --git a/packages/backend/src/usagers/controllers/import/import.controller.ts b/packages/backend/src/usagers/controllers/import/import.controller.ts
index c60c298a7a..f431eb17dd 100644
--- a/packages/backend/src/usagers/controllers/import/import.controller.ts
+++ b/packages/backend/src/usagers/controllers/import/import.controller.ts
@@ -298,6 +298,8 @@ export class ImportController {
     await this.appLogsService.create<SuccessfulUsagerImportLogContext>({
       action: "IMPORT_USAGERS_SUCCESS",
       userId: user.id,
+      structureId: user.structureId,
+      role: user.role,
       context: {
         nombreActifs: extractUsagersNumber(usagersRows),
         nombreTotal: importPreviewRows.length,