From 0d498d45700ee04d57801dff56ac5f6115e0d225 Mon Sep 17 00:00:00 2001
From: Charles <ce.marguerite@sudalys.fr>
Date: Thu, 7 Aug 2025 14:17:49 +0200
Subject: [PATCH] Log action

---
 src/Controller/UserController.php | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/Controller/UserController.php b/src/Controller/UserController.php
index 02d29d7..05e0e35 100644
--- a/src/Controller/UserController.php
+++ b/src/Controller/UserController.php
@@ -137,12 +137,12 @@ class UserController extends AbstractController
                 //log the action
                 $user = $this->getUser() ?? throw $this->createNotFoundException(self::NOT_FOUND);
                 $user = $this->entityManager->getRepository(User::class)->findOneBy(['email' => $user->getUserIdentifier()]);
-                $this->actionService->createAction("Création d'une organisation", $user, $organization, "{$user->getIdentifier()} à ajouter l'utilisateur {$data->getUserIdentifier()} à l'organisation {$organization->getName()}");
+                $this->actionService->createAction("Création d'un utilisateur", $user, $organization, "{$user->getIdentifier()} à ajouter l'utilisateur {$data->getUserIdentifier()} à l'organisation {$organization->getName()}");
                 $this->entityManager->persist($uo);
             } else {
                 $user = $this->getUser() ?? throw $this->createNotFoundException(self::NOT_FOUND);
                 $user = $this->entityManager->getRepository(User::class)->findOneBy(['email' => $user->getUserIdentifier()]);
-                $this->actionService->createAction("Création d'une organisation", $user, null, "{$user->getIdentifier()} à ajouter l'utilisateur {$data->getUserIdentifier()} sans organisation");
+                $this->actionService->createAction("Création d'un utilisateur", $user, null, "{$user->getIdentifier()} à ajouter l'utilisateur {$data->getUserIdentifier()} sans organisation");
             }
             $this->entityManager->persist($data);
 
@@ -251,9 +251,9 @@ class UserController extends AbstractController
         $user->setIsDeleted(true);
         $entityManager->persist($user);
         // Log the action
-        $user = $this->getUser() ?? throw $this->createNotFoundException(self::NOT_FOUND);
-        $user = $this->entityManager->getRepository(User::class)->findOneBy(['email' => $user->getUserIdentifier()]);
-        $this->actionService->createAction("Création d'une organisation", $user, null, "{$user->getIdentifier()} a supprimé l'utilisateur {$user->getUserIdentifier()}");
+        $actingUser = $this->getUser() ?? throw $this->createNotFoundException(self::NOT_FOUND);
+        $actingUser = $this->entityManager->getRepository(User::class)->findOneBy(['email' => $actingUser->getUserIdentifier()]);
+        $this->actionService->createAction("Supression d'un utilisateur", $actingUser, null, "{$actingUser->getIdentifier()} a supprimé l'utilisateur {$user->getUserIdentifier()}");
         $entityManager->flush();
 
         return $this->redirectToRoute('user_index');
@@ -277,10 +277,10 @@ class UserController extends AbstractController
         // Handle user deletion logic
         $entityManager->remove($user);
         // Log the action
-        $action = new Actions();
-        $action->setActionType('Suppression définitive utilisateur');
-        $action->setUsers($this->getUser());
-        $entityManager->persist($action);
+
+        $actingUser = $this->getUser() ?? throw $this->createNotFoundException(self::NOT_FOUND);
+        $actingUser = $this->entityManager->getRepository(User::class)->findOneBy(['email' => $actingUser->getUserIdentifier()]);
+        $this->actionService->createAction("Suppression définitive d'un utilisateur", $actingUser, null, "{$actingUser->getIdentifier()} a supprimé l'utilisateur {$user->getUserIdentifier()}");
         $entityManager->flush();
 
         return $this->redirectToRoute('user_index');
@@ -304,9 +304,9 @@ class UserController extends AbstractController
             $user->setIsActive(false);
             $entityManager->persist($user);
             // Log the action
-            $user = $this->getUser() ?? throw $this->createNotFoundException(self::NOT_FOUND);
-            $user = $this->entityManager->getRepository(User::class)->findOneBy(['email' => $user->getUserIdentifier()]);
-            $this->actionService->createAction("Création d'une organisation", $user, null, "{$user->getIdentifier()} a désactivé l'utilisateur {$user->getUserIdentifier()}");
+            $actingUser = $this->getUser() ?? throw $this->createNotFoundException(self::NOT_FOUND);
+            $actingUser = $this->entityManager->getRepository(User::class)->findOneBy(['email' => $actingUser->getUserIdentifier()]);
+            $this->actionService->createAction("Désactivation d'un utilisateur", $actingUser, null, "{$actingUser->getIdentifier()} a désactivé l'utilisateur {$user->getUserIdentifier()}");
             $entityManager->flush();
             return $this->redirectToRoute('user_index');
         }
@@ -406,6 +406,9 @@ class UserController extends AbstractController
         $organization = $userOrganization->getOrganization() ?? throw $this->createNotFoundException(self::NOT_FOUND);
 
         $this->userOrganizationService->deactivateAllUserRoles($user, $organization);
+        $actingUser = $this->getUser() ?? throw $this->createNotFoundException(self::NOT_FOUND);
+        $actingUser = $this->entityManager->getRepository(User::class)->findOneBy(['email' => $actingUser->getUserIdentifier()]);
+        $this->actionService->createAction("Désactivation d'un utilisateur dans une organisation", $actingUser, $organization, "{$actingUser->getIdentifier()} a désactivé l'utilisateur {$user->getUserIdentifier()} dans l'organisation {$organization->getName()}");
 
         return $this->redirectToRoute('user_show', ['id' => $user->getId()]);
     }