Fix: Unique Validators by adding UpdatingId to requests

Author: tatevikg1

src/Common/Validator/RequestValidator.php

@@ -33,9 +33,6 @@ public function validate(Request $request, string $dtoClass, ?callable $beforeVa
         if (isset($routeParams['listId'])) {
             $routeParams['listId'] = (int) $routeParams['listId'];
         }
-        if (isset($routeParams['templateId'])) {
-            $routeParams['templateId'] = (int) $routeParams['templateId'];
-        }
 
         $data = array_merge($routeParams, $request->query->all(), $body ?? []);
 

src/Identity/Controller/AdminAttributeDefinitionController.php

@@ -24,22 +24,15 @@
 #[Route('/administrators/attributes', name: 'admin_attribute_definition_')]
 class AdminAttributeDefinitionController extends BaseController
 {
-    private AdminAttributeDefinitionManager $definitionManager;
-    private AdminAttributeDefinitionNormalizer $normalizer;
-    private PaginatedDataProvider $paginatedDataProvider;
-
     public function __construct(
         Authentication $authentication,
         RequestValidator $validator,
-        AdminAttributeDefinitionManager $definitionManager,
-        AdminAttributeDefinitionNormalizer $normalizer,
-        PaginatedDataProvider $paginatedDataProvider,
+        private readonly AdminAttributeDefinitionManager $definitionManager,
+        private readonly AdminAttributeDefinitionNormalizer $normalizer,
+        private readonly PaginatedDataProvider $paginatedDataProvider,
         private readonly EntityManagerInterface $entityManager,
     ) {
         parent::__construct($authentication, $validator);
-        $this->definitionManager = $definitionManager;
-        $this->normalizer = $normalizer;
-        $this->paginatedDataProvider = $paginatedDataProvider;
     }
 
     #[Route('', name: 'create', methods: ['POST'])]

src/Identity/Controller/AdminAttributeValueController.php

@@ -25,24 +25,15 @@
 #[Route('/administrators', name: 'admin_attribute_value_')]
 class AdminAttributeValueController extends BaseController
 {
-    private AdminAttributeManager $attributeManager;
-    private AdminAttributeValueNormalizer $normalizer;
-    private PaginatedDataProvider $paginatedDataProvider;
-    private EntityManagerInterface $entityManager;
-
     public function __construct(
         Authentication $authentication,
         RequestValidator $validator,
-        AdminAttributeManager $attributeManager,
-        AdminAttributeValueNormalizer $normalizer,
-        PaginatedDataProvider $paginatedDataProvider,
-        EntityManagerInterface $entityManager,
+        private readonly AdminAttributeManager $attributeManager,
+        private readonly AdminAttributeValueNormalizer $normalizer,
+        private readonly PaginatedDataProvider $paginatedDataProvider,
+        private readonly EntityManagerInterface $entityManager,
     ) {
         parent::__construct($authentication, $validator);
-        $this->attributeManager = $attributeManager;
-        $this->normalizer = $normalizer;
-        $this->paginatedDataProvider = $paginatedDataProvider;
-        $this->entityManager = $entityManager;
     }
 
     #[Route(
@@ -280,13 +271,13 @@ public function getPaginated(
         $filter = (new AdminAttributeValueFilter())->setAdminId($admin->getId());
 
         return $this->json(
-            $this->paginatedDataProvider->getPaginatedList(
+            data: $this->paginatedDataProvider->getPaginatedList(
                 request: $request,
                 normalizer:$this->normalizer,
                 className: AdminAttributeValue::class,
                 filter: $filter
             ),
-            Response::HTTP_OK
+            status: Response::HTTP_OK
         );
     }
 

src/Identity/Controller/AdministratorController.php

@@ -28,22 +28,15 @@
 #[Route('/administrators', name: 'admin_')]
 class AdministratorController extends BaseController
 {
-    private AdministratorManager $administratorManager;
-    private AdministratorNormalizer $normalizer;
-    private PaginatedDataProvider $paginatedProvider;
-
     public function __construct(
         Authentication $authentication,
         RequestValidator $validator,
-        AdministratorManager $administratorManager,
-        AdministratorNormalizer $normalizer,
-        PaginatedDataProvider $paginatedProvider,
+        private readonly AdministratorManager $administratorManager,
+        private readonly AdministratorNormalizer $normalizer,
+        private readonly PaginatedDataProvider $paginatedProvider,
         private readonly EntityManagerInterface $entityManager,
     ) {
         parent::__construct($authentication, $validator);
-        $this->administratorManager = $administratorManager;
-        $this->normalizer = $normalizer;
-        $this->paginatedProvider = $paginatedProvider;
     }
 
     #[Route('', name: 'get_list', methods: ['GET'])]
@@ -262,7 +255,13 @@ public function updateAdministrator(
             throw $this->createNotFoundException('Administrator not found.');
         }
         /** @var UpdateAdministratorRequest $updateRequest */
-        $updateRequest = $this->validator->validate($request, UpdateAdministratorRequest::class);
+        $updateRequest = $this->validator->validate(
+            request: $request,
+            dtoClass:UpdateAdministratorRequest::class,
+            beforeValidation: static function (UpdateAdministratorRequest $dto) use ($administrator): void {
+                $dto->setUpdatingId($administrator->getId());
+            }
+        );
         $this->administratorManager->updateAdministrator($administrator, $updateRequest->getDto());
         $this->entityManager->flush();
 

src/Identity/Controller/PasswordResetController.php

@@ -24,17 +24,13 @@
 #[Route('/password-reset', name: 'password_reset_')]
 class PasswordResetController extends BaseController
 {
-    private PasswordManager $passwordManager;
-
     public function __construct(
         Authentication $authentication,
         RequestValidator $validator,
-        PasswordManager $passwordManager,
+        private readonly PasswordManager $passwordManager,
         private readonly EntityManagerInterface $entityManager,
     ) {
         parent::__construct($authentication, $validator);
-
-        $this->passwordManager = $passwordManager;
     }
 
     #[Route('/request', name: 'request', methods: ['POST'])]
@@ -170,8 +166,8 @@ public function resetPassword(Request $request): JsonResponse
         $resetRequest = $this->validator->validate($request, ResetPasswordRequest::class);
 
         $success = $this->passwordManager->updatePasswordWithToken(
-            $resetRequest->token,
-            $resetRequest->newPassword
+            token: $resetRequest->token,
+            newPassword: $resetRequest->newPassword
         );
         $this->entityManager->flush();
 

src/Identity/Controller/SessionController.php

@@ -30,18 +30,14 @@
 #[Route('/sessions', name: 'session_')]
 class SessionController extends BaseController
 {
-    private SessionManager $sessionManager;
-
     public function __construct(
         Authentication $authentication,
         RequestValidator $validator,
-        SessionManager $sessionManager,
+        private readonly SessionManager $sessionManager,
         private readonly EntityManagerInterface $entityManager,
         private readonly AdministratorNormalizer $normalizer,
     ) {
         parent::__construct($authentication, $validator);
-
-        $this->sessionManager = $sessionManager;
     }
 
     #[Route('', name: 'create', methods: ['POST'])]

src/Identity/Request/UpdateAdministratorRequest.php

@@ -58,6 +58,8 @@
 )]
 class UpdateAdministratorRequest implements RequestInterface
 {
+    public ?int $updatingId = null;
+
     #[Assert\Length(min: 3, max: 255)]
     #[UniqueLoginName]
     public ?string $loginName = null;
@@ -94,4 +96,9 @@ public function getDto(): UpdateAdministratorDto
             privileges: $this->privileges
         );
     }
+
+    public function setUpdatingId(?int $updatingId): void
+    {
+        $this->updatingId = $updatingId;
+    }
 }

src/Identity/Validator/Constraint/UniqueLoginNameValidator.php

@@ -37,7 +37,7 @@ public function validate($value, Constraint $constraint): void
         $existingUser = $this->administratorRepository->findOneBy(['loginName' => $value]);
 
         $dto = $this->context->getObject();
-        $updatingId = $dto->administratorId ?? null;
+        $updatingId = $dto->updatingId ?? null;
 
         if ($existingUser && $existingUser->getId() !== $updatingId) {
             throw new ConflictHttpException('Login already exists.');

src/Messaging/Controller/TemplateController.php

@@ -379,7 +379,13 @@ public function updateTemplates(
         }
 
         /** @var UpdateTemplateRequest $templateRequest */
-        $templateRequest = $this->validator->validate($request, UpdateTemplateRequest::class);
+        $templateRequest = $this->validator->validate(
+            request: $request,
+            dtoClass: UpdateTemplateRequest::class,
+            beforeValidation: static function (UpdateTemplateRequest $dto) use ($template): void {
+                $dto->setUpdatingId($template->getId());
+            }
+        );
         $template = $this->templateManager->update(template: $template, updateTemplateDto: $templateRequest->getDto());
         $this->entityManager->flush();
 

src/Messaging/Request/UpdateTemplateRequest.php

@@ -55,7 +55,7 @@
 )]
 class UpdateTemplateRequest implements RequestInterface
 {
-    public ?int $templateId = null;
+    public ?int $updatingId = null;
 
     #[Assert\NotBlank(normalizer: 'trim')]
     #[Assert\NotNull]
@@ -88,4 +88,9 @@ public function getDto(): UpdateTemplateDto
             listOrder: $this->listOrder ?? 0,
         );
     }
+
+    public function setUpdatingId(int $id): void
+    {
+        $this->updatingId = $id;
+    }
 }