ISSUE-345: tests folder restructure

Author: tatevikg1

config/services/validators.yml

@@ -4,7 +4,7 @@ services:
     autoconfigure: true
     public: false
 
-  PhpList\RestBundle\Identity\Validator\UniqueEmailValidator:
+  PhpList\RestBundle\Identity\Validator\Constraint\UniqueEmailValidator:
     autowire: true
     autoconfigure: true
     tags: [ 'validator.constraint_validator' ]
@@ -24,14 +24,6 @@ services:
     autoconfigure: true
     tags: [ 'validator.constraint_validator' ]
 
-  PhpList\Core\Domain\Service\Validator\TemplateLinkValidator:
-    autowire: true
-    autoconfigure: true
-
-  PhpList\Core\Domain\Service\Validator\TemplateImageValidator:
-    autowire: true
-    autoconfigure: true
-
   PhpList\RestBundle\Messaging\Validator\Constraint\ContainsPlaceholderValidator:
     tags: ['validator.constraint_validator']
 

src/Common/Validator/RequestValidator.php

@@ -38,6 +38,9 @@ public function validate(Request $request, string $dtoClass): RequestInterface
         if (isset($routeParams['listId'])) {
             $routeParams['listId'] = (int) $routeParams['listId'];
         }
+        if (isset($routeParams['administratorId'])) {
+            $routeParams['administratorId'] = (int) $routeParams['administratorId'];
+        }
 
         $data = array_merge($routeParams, $body ?? []);
 

src/Identity/Controller/AdministratorController.php

@@ -230,7 +230,7 @@ public function updateAdministrator(
         $updateRequest = $this->validator->validate($request, UpdateAdministratorRequest::class);
         $this->administratorManager->updateAdministrator($administrator, $updateRequest->getDto());
 
-        return $this->json(null, Response::HTTP_OK);
+        return $this->json($this->normalizer->normalize($administrator), Response::HTTP_OK);
     }
 
     #[Route('/{administratorId}', name: 'delete_administrator', methods: ['DELETE'])]

src/Identity/Validator/Constraint/UniqueEmailValidator.php

@@ -4,7 +4,7 @@
 
 namespace PhpList\RestBundle\Identity\Validator\Constraint;
 
-use Doctrine\ORM\EntityManagerInterface;
+use PhpList\Core\Domain\Identity\Repository\AdministratorRepository;
 use Symfony\Component\HttpKernel\Exception\ConflictHttpException;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
@@ -13,7 +13,7 @@
 
 class UniqueEmailValidator extends ConstraintValidator
 {
-    public function __construct(private readonly EntityManagerInterface $entityManager)
+    public function __construct(private readonly AdministratorRepository $repository)
     {
     }
 
@@ -31,9 +31,7 @@ public function validate($value, Constraint $constraint): void
             throw new UnexpectedValueException($value, 'string');
         }
 
-        $existingUser = $this->entityManager
-            ->getRepository($constraint->entityClass)
-            ->findOneBy(['email' => $value]);
+        $existingUser = $this->repository->findOneBy(['email' => $value]);
 
         $dto = $this->context->getObject();
         $updatingId = $dto->administratorId ?? null;

src/Subscription/Controller/SubscriberAttributeDefinitionController.php

@@ -20,7 +20,7 @@
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Attribute\Route;
 
-#[Route('/subscriber/attributes')]
+#[Route('/subscribers/attributes')]
 class SubscriberAttributeDefinitionController extends BaseController
 {
     private AttributeDefinitionManager $definitionManager;

src/Subscription/Controller/SubscriberAttributeController.php renamed to src/Subscription/Controller/SubscriberAttributeValueController.php

@@ -21,8 +21,8 @@
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Attribute\Route;
 
-#[Route('/subscriber/attribute-values')]
-class SubscriberAttributeController extends BaseController
+#[Route('/subscribers/attribute-values')]
+class SubscriberAttributeValueController extends BaseController
 {
     private SubscriberAttributeManager $attributeManager;
     private SubscriberAttributeValueNormalizer $normalizer;
@@ -114,7 +114,7 @@ public function createOrUpdate(
         $attributeDefinition = $this->attributeManager->createOrUpdate(
             subscriber:$subscriber,
             definition: $definition,
-            value: $request->get('value')
+            value: $request->toArray()['value'] ?? null
         );
         $json = $this->normalizer->normalize($attributeDefinition, 'json');
 

tests/Integration/Controller/AbstractTestController.php renamed to tests/Integration/Common/AbstractTestController.php

@@ -2,12 +2,12 @@
 
 declare(strict_types=1);
 
-namespace PhpList\RestBundle\Tests\Integration\Controller;
+namespace PhpList\RestBundle\Tests\Integration\Common;
 
 use Doctrine\ORM\Tools\SchemaTool;
 use PhpList\Core\TestingSupport\Traits\DatabaseTestTrait;
-use PhpList\RestBundle\Tests\Integration\Controller\Fixtures\Identity\AdministratorFixture;
-use PhpList\RestBundle\Tests\Integration\Controller\Fixtures\Identity\AdministratorTokenFixture;
+use PhpList\RestBundle\Tests\Integration\Identity\Fixtures\AdministratorFixture;
+use PhpList\RestBundle\Tests\Integration\Identity\Fixtures\AdministratorTokenFixture;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use Symfony\Component\DomCrawler\Crawler;
 use Symfony\Component\HttpFoundation\Response;

tests/Integration/EventListener/ExceptionListenerTest.php renamed to tests/Integration/Common/EventListener/ExceptionListenerTest.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace PhpList\RestBundle\Tests\Integration\EventListener;
+namespace PhpList\RestBundle\Tests\Integration\Common\EventListener;
 
 use PhpList\Core\Domain\Subscription\Exception\SubscriptionCreationException;
 use PhpList\RestBundle\Common\EventListener\ExceptionListener;

tests/Integration/EventListener/ResponseListenerTest.php renamed to tests/Integration/Common/EventListener/ResponseListenerTest.php

@@ -1,6 +1,8 @@
 <?php
 
-namespace PhpList\RestBundle\Tests\Integration\EventListener;
+declare(strict_types=1);
+
+namespace PhpList\RestBundle\Tests\Integration\Common\EventListener;
 
 use PhpList\RestBundle\Common\EventListener\ResponseListener;
 use PHPUnit\Framework\TestCase;

tests/Integration/Routing/RoutingTest.php renamed to tests/Integration/Common/Routing/RoutingTest.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace PhpList\RestBundle\Tests\Integration\Routing;
+namespace PhpList\RestBundle\Tests\Integration\Common\Routing;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;