ISSUE-345: refactor

Author: tatevikg1

config/services.yml

@@ -10,10 +10,6 @@ services:
         autowire: true
         tags: ['controller.service_arguments']
 
-    #    Symfony\Component\Serializer\SerializerInterface:
-    #      autowire: true
-    #      autoconfigure: true
-
     my.secure_handler:
         class: PhpList\RestBundle\ViewHandler\SecuredViewHandler
 
@@ -29,7 +25,3 @@ services:
     PhpList\Core\Domain\Repository\Messaging\SubscriberListRepository:
         autowire: true
         autoconfigure: true
-
-    PhpList\RestBundle\Validator\RequestValidator:
-        autowire: true
-        autoconfigure: true

config/services/validators.yml

@@ -0,0 +1,9 @@
+services:
+  PhpList\RestBundle\Validator\RequestValidator:
+    autowire: true
+    autoconfigure: true
+
+  PhpList\RestBundle\Validator\UniqueEmailValidator:
+    autowire: true
+    autoconfigure: true
+    tags: [ 'validator.constraint_validator' ]

src/Controller/SubscriberController.php

@@ -4,19 +4,19 @@
 
 namespace PhpList\RestBundle\Controller;
 
+use OpenApi\Attributes as OA;
+use PhpList\Core\Domain\Repository\Subscription\SubscriberRepository;
+use PhpList\Core\Security\Authentication;
+use PhpList\RestBundle\Controller\Traits\AuthenticationTrait;
 use PhpList\RestBundle\Entity\SubscriberRequest;
 use PhpList\RestBundle\Service\Manager\SubscriberManager;
 use PhpList\RestBundle\Validator\RequestValidator;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use PhpList\Core\Domain\Repository\Subscription\SubscriberRepository;
-use PhpList\Core\Security\Authentication;
-use PhpList\RestBundle\Controller\Traits\AuthenticationTrait;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Attribute\Route;
 use Symfony\Component\Serializer\SerializerInterface;
-use OpenApi\Attributes as OA;
 
 /**
  * This controller provides REST API access to subscribers.

src/Entity/RequestInterface.php

@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpList\RestBundle\Entity;
+
+interface RequestInterface
+{
+
+}

src/Entity/SubscriberRequest.php

@@ -4,14 +4,14 @@
 
 namespace PhpList\RestBundle\Entity;
 
+use PhpList\RestBundle\Validator as CustomAssert;
 use Symfony\Component\Validator\Constraints as Assert;
-use PhpList\RestBundle\Validator\UniqueEmail;
 
-class SubscriberRequest
+class SubscriberRequest implements RequestInterface
 {
     #[Assert\NotBlank]
     #[Assert\Email]
-    #[UniqueEmail]
+    #[CustomAssert\UniqueEmail]
     public string $email;
 
     #[Assert\Type(type: 'bool')]

src/Validator/RequestValidator.php

@@ -4,6 +4,7 @@
 
 namespace PhpList\RestBundle\Validator;
 
+use PhpList\RestBundle\Entity\RequestInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Serializer\SerializerInterface;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
@@ -16,7 +17,7 @@ public function __construct(
         private readonly ValidatorInterface $validator
     ) {}
 
-    public function validate(Request $request, string $dtoClass): object
+    public function validate(Request $request, string $dtoClass): RequestInterface
     {
         $dto = $this->serializer->deserialize($request->getContent(), $dtoClass, 'json');
 

src/Validator/UniqueEmail.php

@@ -6,8 +6,17 @@
 
 use Symfony\Component\Validator\Constraint;
 
-#[\Attribute(\Attribute::TARGET_PROPERTY | \Attribute::IS_REPEATABLE)]
+#[\Attribute(\Attribute::TARGET_PROPERTY | \Attribute::TARGET_METHOD | \Attribute::IS_REPEATABLE)]
 class UniqueEmail extends Constraint
 {
-    public string $message = 'The email "{{ value }}" is already in use.';
+    public string $message = 'The email "{{ value }}" is already taken.';
+    public string $mode = 'strict';
+
+    public function __construct(?string $mode = null, ?string $message = null, ?array $groups = null, $payload = null)
+    {
+        parent::__construct([], $groups, $payload);
+
+        $this->mode = $mode ?? $this->mode;
+        $this->message = $message ?? $this->message;
+    }
 }

src/Validator/UniqueEmailValidator.php

@@ -7,6 +7,8 @@
 use PhpList\Core\Domain\Repository\Subscription\SubscriberRepository;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
+use Symfony\Component\Validator\Exception\UnexpectedTypeException;
+use Symfony\Component\Validator\Exception\UnexpectedValueException;
 
 class UniqueEmailValidator extends ConstraintValidator
 {
@@ -17,19 +19,26 @@ public function __construct(SubscriberRepository $subscriberRepository)
         $this->subscriberRepository = $subscriberRepository;
     }
 
-    public function validate($value, Constraint $constraint)
+    public function validate($value, Constraint $constraint): void
     {
-        /* @var $constraint UniqueEmail */
+        if (!$constraint instanceof UniqueEmail) {
+            throw new UnexpectedTypeException($constraint, UniqueEmail::class);
+        }
 
         if (null === $value || '' === $value) {
             return;
         }
 
-        if ($this->subscriberRepository->findOneByEmail($value)) {
+        if (!is_string($value)) {
+            throw new UnexpectedValueException($value, 'string');
+        }
+
+        $existingUser = $this->subscriberRepository->findOneBy(['email' => $value]);
+
+        if ($existingUser) {
             $this->context->buildViolation($constraint->message)
                 ->setParameter('{{ value }}', $value)
                 ->addViolation();
         }
     }
 }
-