Add support for configurable user entity class in validators.

src/DependencyInjection/AnzuSystemsCommonExtension.php

@@ -81,7 +81,9 @@
 use AnzuSystems\CommonBundle\Serializer\Handler\Handlers\ValueObjectHandler;
 use AnzuSystems\CommonBundle\Serializer\Service\BsonConverter;
 use AnzuSystems\CommonBundle\Util\ResourceLocker;
+use AnzuSystems\CommonBundle\Validator\Constraints\EntityExistsValidator;
 use AnzuSystems\CommonBundle\Validator\Constraints\UniqueEntityDtoValidator;
+use AnzuSystems\CommonBundle\Validator\Constraints\UniqueEntityValidator;
 use AnzuSystems\CommonBundle\Validator\Validator;
 use AnzuSystems\SerializerBundle\Metadata\MetadataRegistry;
 use AnzuSystems\SerializerBundle\Serializer;
@@ -270,6 +272,14 @@ private function loadSettings(ContainerBuilder $container): void
             ->getDefinition(UniqueEntityDtoValidator::class)
             ->replaceArgument('$userEntityClass', $settings['user_entity_class']);
 
+        $container
+            ->getDefinition(UniqueEntityValidator::class)
+            ->replaceArgument('$userEntityClass', $settings['user_entity_class']);
+
+        $container
+            ->getDefinition(EntityExistsValidator::class)
+            ->replaceArgument('$userEntityClass', $settings['user_entity_class']);
+
         if ($settings['send_context_id_with_response']) {
             $container->register(ContextIdOnResponseListener::class)
                 ->addTag('kernel.event_listener', ['event' => KernelEvents::RESPONSE])

src/Resources/config/services.php

@@ -150,12 +150,14 @@
 
     $services->set(EntityExistsValidator::class)
         ->arg('$entityManager', service(EntityManagerInterface::class))
+        ->arg('$userEntityClass', null)
         ->tag('validator.constraint_validator')
     ;
 
     $services->set(UniqueEntityValidator::class)
         ->arg('$propertyAccessor', service(PropertyAccessorInterface::class))
         ->arg('$entityManager', service(EntityManagerInterface::class))
+        ->arg('$userEntityClass', null)
         ->tag('validator.constraint_validator')
     ;
 

src/Validator/Constraints/EntityExistsValidator.php

@@ -5,16 +5,24 @@
 namespace AnzuSystems\CommonBundle\Validator\Constraints;
 
 use AnzuSystems\CommonBundle\Repository\AnzuRepositoryInterface;
+use AnzuSystems\CommonBundle\Validator\Traits\EntityClassResolverTrait;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
 use Symfony\Component\Validator\Exception\UnexpectedTypeException;
 
 final class EntityExistsValidator extends ConstraintValidator
 {
+    use EntityClassResolverTrait;
+
+    /**
+     * @param class-string $userEntityClass
+     */
     public function __construct(
         private readonly EntityManagerInterface $entityManager,
+        string $userEntityClass,
     ) {
+        $this->userEntityClass = $userEntityClass;
     }
 
     /**
@@ -30,8 +38,10 @@ public function validate(mixed $value, Constraint $constraint): void
             throw new UnexpectedTypeException($value, 'string|integer');
         }
 
+        $entityClass = $this->resolveEntityClass($constraint->entity);
+
         /** @var AnzuRepositoryInterface $repo */
-        $repo = $this->entityManager->getRepository($constraint->entity);
+        $repo = $this->entityManager->getRepository($entityClass);
         if ($repo->exists(is_numeric($value) ? (int) $value : $value)) {
             return;
         }

src/Validator/Constraints/UniqueEntityDtoValidator.php

@@ -4,7 +4,7 @@
 
 namespace AnzuSystems\CommonBundle\Validator\Constraints;
 
-use AnzuSystems\Contracts\Entity\AnzuUser;
+use AnzuSystems\CommonBundle\Validator\Traits\EntityClassResolverTrait;
 use AnzuSystems\Contracts\Entity\Interfaces\BaseIdentifiableInterface;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\PropertyAccess\PropertyAccessorInterface;
@@ -14,11 +14,17 @@
 
 final class UniqueEntityDtoValidator extends ConstraintValidator
 {
+    use EntityClassResolverTrait;
+
+    /**
+     * @param class-string $userEntityClass
+     */
     public function __construct(
         private readonly PropertyAccessorInterface $propertyAccessor,
         private readonly EntityManagerInterface $entityManager,
-        private readonly string $userEntityClass,
+        string $userEntityClass,
     ) {
+        $this->userEntityClass = $userEntityClass;
     }
 
     /**
@@ -33,12 +39,7 @@ public function validate(mixed $value, Constraint $constraint): void
             throw new UnexpectedTypeException($constraint->entity, BaseIdentifiableInterface::class);
         }
 
-        /** @var class-string<BaseIdentifiableInterface> $entityClass */
-        $entityClass = $constraint->entity;
-        if ($entityClass === AnzuUser::class) {
-            /** @var class-string<BaseIdentifiableInterface> $entityClass */
-            $entityClass = $this->userEntityClass;
-        }
+        $entityClass = $this->resolveEntityClass($constraint->entity);
 
         $fieldsNames = $constraint->fields;
         $fields = [];

src/Validator/Constraints/UniqueEntityValidator.php

@@ -4,7 +4,9 @@
 
 namespace AnzuSystems\CommonBundle\Validator\Constraints;
 
+use AnzuSystems\CommonBundle\Validator\Traits\EntityClassResolverTrait;
 use AnzuSystems\Contracts\Entity\Interfaces\BaseIdentifiableInterface;
+use Doctrine\Common\Util\ClassUtils;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\PropertyAccess\PropertyAccessorInterface;
 use Symfony\Component\Validator\Constraint;
@@ -13,10 +15,17 @@
 
 final class UniqueEntityValidator extends ConstraintValidator
 {
+    use EntityClassResolverTrait;
+
+    /**
+     * @param class-string $userEntityClass
+     */
     public function __construct(
         private readonly PropertyAccessorInterface $propertyAccessor,
         private readonly EntityManagerInterface $entityManager,
+        string $userEntityClass,
     ) {
+        $this->userEntityClass = $userEntityClass;
     }
 
     /**
@@ -34,8 +43,10 @@ public function validate(mixed $value, Constraint $constraint): void
             $fields[$fieldName] = $this->propertyAccessor->getValue($value, $fieldName);
         }
 
+        $entityClass = $this->resolveEntityClass(ClassUtils::getRealClass($value::class));
+
         /** @var BaseIdentifiableInterface|null $existingEntity */
-        $existingEntity = $this->entityManager->getRepository($value::class)->findOneBy($fields);
+        $existingEntity = $this->entityManager->getRepository($entityClass)->findOneBy($fields);
         if (null === $existingEntity) {
             return;
         }

src/Validator/Traits/EntityClassResolverTrait.php

@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+namespace AnzuSystems\CommonBundle\Validator\Traits;
+
+use AnzuSystems\Contracts\Entity\AnzuUser;
+
+trait EntityClassResolverTrait
+{
+    /**
+     * @var class-string
+     */
+    private readonly string $userEntityClass;
+
+    /**
+     * @param class-string $entityClass
+     *
+     * @return class-string
+     */
+    private function resolveEntityClass(string $entityClass): string
+    {
+        if ($entityClass === AnzuUser::class) {
+            return $this->userEntityClass;
+        }
+
+        return $entityClass;
+    }
+}