Log actions
This commit is contained in:
parent
3894d72439
commit
b81b168ec3
|
|
@ -9,6 +9,7 @@ use App\Entity\Roles;
|
||||||
use App\Entity\User;
|
use App\Entity\User;
|
||||||
use App\Form\UserForm;
|
use App\Form\UserForm;
|
||||||
use App\Entity\UsersOrganizations;
|
use App\Entity\UsersOrganizations;
|
||||||
|
use App\Service\ActionService;
|
||||||
use App\Service\UserOrganizationService;
|
use App\Service\UserOrganizationService;
|
||||||
use App\Service\UserService;
|
use App\Service\UserService;
|
||||||
use Doctrine\ORM\EntityManagerInterface;
|
use Doctrine\ORM\EntityManagerInterface;
|
||||||
|
|
@ -27,7 +28,7 @@ class UserController extends AbstractController
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private readonly UserOrganizationService $userOrganizationService,
|
private readonly UserOrganizationService $userOrganizationService,
|
||||||
private readonly EntityManagerInterface $entityManager,
|
private readonly EntityManagerInterface $entityManager,
|
||||||
private readonly UserService $userService)
|
private readonly UserService $userService, private readonly ActionService $actionService)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -39,7 +40,6 @@ class UserController extends AbstractController
|
||||||
{
|
{
|
||||||
if ($this->isGranted('ROLE_SUPER_ADMIN')) {
|
if ($this->isGranted('ROLE_SUPER_ADMIN')) {
|
||||||
$usersByOrganization = $this->userOrganizationService->getActiveUsersGroupedByOrganization();
|
$usersByOrganization = $this->userOrganizationService->getActiveUsersGroupedByOrganization();
|
||||||
// dd($usersByOrganization);
|
|
||||||
} else {
|
} else {
|
||||||
$user = $this->getUser();
|
$user = $this->getUser();
|
||||||
if (!$user) {
|
if (!$user) {
|
||||||
|
|
@ -119,18 +119,16 @@ class UserController extends AbstractController
|
||||||
$uo->setUsers($data);
|
$uo->setUsers($data);
|
||||||
|
|
||||||
//log the action
|
//log the action
|
||||||
$action = new Actions();
|
$user = $this->getUser() ?? throw $this->createNotFoundException(self::NOT_FOUND);
|
||||||
$action->setActionType('Création utilisateur');
|
$user = $this->entityManager->getRepository(User::class)->findOneBy(['email' => $user->getUserIdentifier()]);
|
||||||
$action->setUsers($this->getUser());
|
$this->actionService->createAction("Création d'une organisation", $user, $organization, "{$user->getIdentifier()} à ajouter l'utilisateur {$data->getUserIdentifier()} à l'organisation {$organization->getName()}");
|
||||||
$action->setOrganization($organization);
|
|
||||||
$this->entityManager->persist($uo);
|
$this->entityManager->persist($uo);
|
||||||
} else {
|
} else {
|
||||||
$action = new Actions();
|
$user = $this->getUser() ?? throw $this->createNotFoundException(self::NOT_FOUND);
|
||||||
$action->setActionType('Création utilisateur');
|
$user = $this->entityManager->getRepository(User::class)->findOneBy(['email' => $user->getUserIdentifier()]);
|
||||||
$action->setUsers($this->getUser());
|
$this->actionService->createAction("Création d'une organisation",$user, null, "{$user->getIdentifier()} à ajouter l'utilisateur {$data->getUserIdentifier()} sans organisation");
|
||||||
}
|
}
|
||||||
$this->entityManager->persist($data);
|
$this->entityManager->persist($data);
|
||||||
$this->entityManager->persist($action);
|
|
||||||
|
|
||||||
|
|
||||||
$this->entityManager->flush();
|
$this->entityManager->flush();
|
||||||
|
|
@ -171,10 +169,10 @@ class UserController extends AbstractController
|
||||||
//Persist changes to the user entity
|
//Persist changes to the user entity
|
||||||
$entityManager->persist($user);
|
$entityManager->persist($user);
|
||||||
//Log the action
|
//Log the action
|
||||||
$action = new Actions();
|
|
||||||
$action->setActionType('Modification utilisateur');
|
$user = $this->getUser() ?? throw $this->createNotFoundException(self::NOT_FOUND);
|
||||||
$action->setUsers($this->getUser());
|
$user = $this->entityManager->getRepository(User::class)->findOneBy(['email' => $user->getUserIdentifier()]);
|
||||||
$entityManager->persist($action);
|
$this->actionService->createAction("Création d'une organisation",$user, null, "{$user->getIdentifier()} a modifié l'utilisateur {$user->getUserIdentifier()}");
|
||||||
$entityManager->flush();
|
$entityManager->flush();
|
||||||
|
|
||||||
//Redirect to user profile after successful edit
|
//Redirect to user profile after successful edit
|
||||||
|
|
@ -210,10 +208,9 @@ class UserController extends AbstractController
|
||||||
$user->setIsDeleted(true);
|
$user->setIsDeleted(true);
|
||||||
$entityManager->persist($user);
|
$entityManager->persist($user);
|
||||||
// Log the action
|
// Log the action
|
||||||
$action = new Actions();
|
$user = $this->getUser() ?? throw $this->createNotFoundException(self::NOT_FOUND);
|
||||||
$action->setActionType('Suppression utilisateur');
|
$user = $this->entityManager->getRepository(User::class)->findOneBy(['email' => $user->getUserIdentifier()]);
|
||||||
$action->setUsers($this->getUser());
|
$this->actionService->createAction("Création d'une organisation",$user, null, "{$user->getIdentifier()} a supprimé l'utilisateur {$user->getUserIdentifier()}");
|
||||||
$entityManager->persist($action);
|
|
||||||
$entityManager->flush();
|
$entityManager->flush();
|
||||||
|
|
||||||
return $this->redirectToRoute('user_index');
|
return $this->redirectToRoute('user_index');
|
||||||
|
|
@ -264,10 +261,9 @@ class UserController extends AbstractController
|
||||||
$user->setIsActive(false);
|
$user->setIsActive(false);
|
||||||
$entityManager->persist($user);
|
$entityManager->persist($user);
|
||||||
// Log the action
|
// Log the action
|
||||||
$action = new Actions();
|
$user = $this->getUser() ?? throw $this->createNotFoundException(self::NOT_FOUND);
|
||||||
$action->setActionType('Désactivation utilisateur');
|
$user = $this->entityManager->getRepository(User::class)->findOneBy(['email' => $user->getUserIdentifier()]);
|
||||||
$action->setUsers($this->getUser());
|
$this->actionService->createAction("Création d'une organisation",$user, null, "{$user->getIdentifier()} a désactivé l'utilisateur {$user->getUserIdentifier()}");
|
||||||
$entityManager->persist($action);
|
|
||||||
$entityManager->flush();
|
$entityManager->flush();
|
||||||
return $this->redirectToRoute('user_index');
|
return $this->redirectToRoute('user_index');
|
||||||
}
|
}
|
||||||
|
|
@ -302,7 +298,6 @@ class UserController extends AbstractController
|
||||||
$this->userOrganizationService->setUserOrganizations($user, $organization, $selectedRoles);
|
$this->userOrganizationService->setUserOrganizations($user, $organization, $selectedRoles);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// Redirect to the user profile after successful update
|
// Redirect to the user profile after successful update
|
||||||
return $this->redirectToRoute('user_show', ['id' => $user->getId()]);
|
return $this->redirectToRoute('user_show', ['id' => $user->getId()]);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue