Merge pull request #13 from maltehuebner/fix-missing-paramconverter

Big bunch of changes for missing param converter.

Author: maltehuebner

src/Attribute/QueryAttribute/RequiredQueryParameter.php

@@ -7,13 +7,30 @@
 #[\Attribute]
 class RequiredQueryParameter extends AbstractAttribute implements QueryAttributeInterface
 {
-    public function __construct(private readonly string $parameterName)
+    public function __construct(
+        private readonly string $parameterName,
+        private readonly ?string $repository = null,
+        private readonly ?string $repositoryMethod = null,
+        private readonly ?string $accessor = null,
+    ) {}
+
+    public function getParameterName(): string
+    {
+        return $this->parameterName;
+    }
+
+    public function getRepository(): ?string
     {
+        return $this->repository;
+    }
 
+    public function getRepositoryMethod(): ?string
+    {
+        return $this->repositoryMethod;
     }
 
-    public function getParameterName(): string
+    public function getAccessor(): ?string
     {
-        return $this->parameterName;
+        return $this->accessor;
     }
 }

src/Factory/QueryFactory/QueryFactory.php

@@ -14,7 +14,6 @@
 use MalteHuebner\DataQueryBundle\Query\QueryInterface;
 use MalteHuebner\DataQueryBundle\RequestParameterList\RequestParameterList;
 use App\Criticalmass\Util\ClassUtil;
-use Doctrine\Persistence\ManagerRegistry;
 use Symfony\Component\Validator\ConstraintViolationListInterface;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
 

src/Factory/ValueAssigner/ValueAssigner.php

@@ -8,14 +8,12 @@
 use MalteHuebner\DataQueryBundle\Parameter\ParameterInterface;
 use MalteHuebner\DataQueryBundle\Query\QueryInterface;
 use MalteHuebner\DataQueryBundle\RequestParameterList\RequestParameterList;
-use App\Criticalmass\Util\ClassUtil;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 class ValueAssigner implements ValueAssignerInterface
 {
-    public function __construct(private readonly ManagerRegistry $managerRegistry)
+    public function __construct(
+        private readonly ManagerRegistry $managerRegistry
+    )
     {
 
     }
@@ -94,26 +92,42 @@ protected function assignEntityValueFromRepository(RequestParameterList $request
     {
         $parameterName = $queryField->getParameterName();
         $entityClass = $queryField->getType();
-        $methodName = $queryField->getMethodName();
 
         if (!$requestParameterList->has($parameterName)) {
             return $query;
         }
 
-        $id = $requestParameterList->get($parameterName);
-        $entityManager = $this->managerRegistry->getManagerForClass($entityClass);
+        $queryParameterValue = $requestParameterList->get($parameterName);
+
+        if ($queryField->getRepository()) {
+            $repository = $this->managerRegistry->getRepository($queryField->getRepository());
+        } else {
+            $repository = $this->managerRegistry->getRepository($entityClass);
+        }
+
+        if (!$repository) {
+            throw new \RuntimeException(sprintf('No repository found for class %s', $entityClass));
+        }
 
-        if (!$entityManager) {
-            throw new \RuntimeException(sprintf('No entity manager found for class %s', $entityClass));
+        if ($queryField->getRepositoryMethod()) {
+            $methodName = $queryField->getRepositoryMethod();
+        } else {
+            $methodName = 'find';
         }
 
-        $entity = $entityManager->getRepository($entityClass)->find($id);
+        $entity = $repository->$methodName($queryParameterValue);
+
+        if ($queryField->getAccessor()) {
+            $accessMethodName = $queryField->getAccessor();
+            $entity = $entity->$accessMethodName();
+        }
 
         if (null === $entity) {
             return $query;
         }
 
-        $query->$methodName($entity);
+        $setMethodName = $queryField->getMethodName();
+        $query->$setMethodName($entity);
 
         return $query;
     }
@@ -126,5 +140,4 @@ protected function convertToInt(string $stringValue, string $parameterName): int
 
         return (int)$stringValue;
     }
-
 }

src/Factory/ValueAssigner/ValueAssignerInterface.php

@@ -13,4 +13,4 @@ interface ValueAssignerInterface
     public function assignQueryPropertyValueFromRequest(RequestParameterList $requestParameterList, QueryInterface $query, QueryField $queryField): QueryInterface;
 
     public function assignParameterPropertyValueFromRequest(RequestParameterList $requestParameterList, ParameterInterface $parameter, ParameterField $parameterField): ParameterInterface;
-}
+}

src/FieldList/QueryFieldList/QueryField.php

@@ -7,16 +7,55 @@
 class QueryField extends AbstractField
 {
     protected ?string $parameterName = null;
+    protected ?string $repository = null;
+    protected ?string $repositoryMethod = null;
+    protected ?string $accessor = null;
 
     public function getParameterName(): ?string
     {
         return $this->parameterName;
     }
 
-    public function setParameterName(string $parameterName): QueryField
+    public function setParameterName(string $parameterName): self
     {
         $this->parameterName = $parameterName;
 
         return $this;
     }
+
+    public function getRepository(): ?string
+    {
+        return $this->repository;
+    }
+
+    public function setRepository(?string $repository): self
+    {
+        $this->repository = $repository;
+
+        return $this;
+    }
+
+    public function getRepositoryMethod(): ?string
+    {
+        return $this->repositoryMethod;
+    }
+
+    public function setRepositoryMethod(?string $repositoryMethod): self
+    {
+        $this->repositoryMethod = $repositoryMethod;
+
+        return $this;
+    }
+
+    public function getAccessor(): ?string
+    {
+        return $this->accessor;
+    }
+
+    public function setAccessor(?string $accessor): self
+    {
+        $this->accessor = $accessor;
+
+        return $this;
+    }
 }

src/FieldList/QueryFieldList/QueryFieldListFactory.php

@@ -35,10 +35,14 @@ protected function addQueryPropertiesToList(): void
                 $queryField = new QueryField();
                 $queryField
                     ->setPropertyName($reflectionProperty->getName())
-                    ->setParameterName($instance->getParameterName());
+                    ->setParameterName($instance->getParameterName())
+                    ->setRepository($instance->getRepository())
+                    ->setRepositoryMethod($instance->getRepositoryMethod())
+                    ->setAccessor($instance->getAccessor())
+                ;
 
-                // Optional: Typ holen (ab PHP 7.4+ möglich)
                 $type = $reflectionProperty->getType();
+
                 if ($type) {
                     $queryField->setType($type->getName());
                 }
@@ -71,7 +75,11 @@ protected function addQueryMethodsToList(): void
                 $queryField
                     ->setMethodName($reflectionMethod->getName())
                     ->setParameterName($instance->getParameterName())
-                    ->setType($reflectionType->getName());
+                    ->setType($reflectionType->getName())
+                    ->setRepository($instance->getRepository())
+                    ->setRepositoryMethod($instance->getRepositoryMethod())
+                    ->setAccessor($instance->getAccessor())
+                ;
 
                 $this->queryFieldList->addField($reflectionMethod->getName(), $queryField);
             }