Merge pull request #11 from maltehuebner/improve-value-assigner

Improve value assigner

Author: maltehuebner

src/Factory/ParamConverterFactory/ParamConverterFactory.php

@@ -2,7 +2,7 @@
 
 namespace MalteHuebner\DataQueryBundle\Factory\ValueAssigner;
 
-use MalteHuebner\DataQueryBundle\Factory\ParamConverterFactory\ParamConverterFactoryInterface;
+use Doctrine\Persistence\ManagerRegistry;
 use MalteHuebner\DataQueryBundle\FieldList\ParameterFieldList\ParameterField;
 use MalteHuebner\DataQueryBundle\FieldList\QueryFieldList\QueryField;
 use MalteHuebner\DataQueryBundle\Parameter\ParameterInterface;
@@ -15,7 +15,7 @@
 
 class ValueAssigner implements ValueAssignerInterface
 {
-    public function __construct(private readonly ParamConverterFactoryInterface $paramConverterFactory)
+    public function __construct(private readonly ManagerRegistry $managerRegistry)
     {
 
     }
@@ -32,25 +32,25 @@ public function assignQueryPropertyValueFromRequest(RequestParameterList $reques
         $type = $queryField->getType();
 
         switch ($type) {
-            case 'float':
+            case ValueType::FLOAT:
                 $query->$methodName((float)$value);
                 break;
 
-            case 'int':
+            case ValueType::INT:
                 $value = $this->convertToInt($value, $queryField->getParameterName());
                 $query->$methodName($value);
                 break;
 
-            case 'string':
+            case ValueType::STRING:
                 $query->$methodName((string)$value);
                 break;
 
-            case 'mixed':
+            case ValueType::MIXED:
                 $query->$methodName($value);
                 break;
 
             default:
-                $query = $this->assignEntityValueFromParamConverter($requestParameterList, $query, $queryField);
+                $query = $this->assignEntityValueFromRepository($requestParameterList, $query, $queryField);
                 break;
         }
 
@@ -69,56 +69,62 @@ public function assignParameterPropertyValueFromRequest(RequestParameterList $re
         $type = $parameterField->getType();
 
         switch ($type) {
-            case 'float':
+            case ValueType::FLOAT:
                 $parameter->$methodName((float)$value);
                 break;
 
-            case 'int':
+            case ValueType::INT:
                 $value = $this->convertToInt($value, $parameterField->getParameterName());
                 $parameter->$methodName($value);
                 break;
 
-            case 'string':
+            case ValueType::STRING:
                 $parameter->$methodName((string)$value);
                 break;
 
-            case 'mixed':
+            case ValueType::MIXED:
                 $parameter->$methodName($value);
                 break;
         }
 
         return $parameter;
     }
 
-    protected function assignEntityValueFromParamConverter(RequestParameterList $requestParameterList, QueryInterface $query, QueryField $queryField): QueryInterface
+    protected function assignEntityValueFromRepository(RequestParameterList $requestParameterList, QueryInterface $query, QueryField $queryField): QueryInterface
     {
-        if ($converter = $this->paramConverterFactory->createParamConverter($queryField->getType())) {
-            $methodName = $queryField->getMethodName();
-            $newParameterName = ClassUtil::getLowercaseShortnameFromFqcn($queryField->getType());
+        $parameterName = $queryField->getParameterName();
+        $entityClass = $queryField->getType();
+        $methodName = $queryField->getMethodName();
 
-            $paramConverterConfiguration = new ParamConverter(['name' => $newParameterName]);
+        if (!$requestParameterList->has($parameterName)) {
+            return $query;
+        }
 
-            $request = new Request($requestParameterList->getList());
+        $id = $requestParameterList->get($parameterName);
+        $entityManager = $this->managerRegistry->getManagerForClass($entityClass);
+
+        if (!$entityManager) {
+            throw new \RuntimeException(sprintf('No entity manager found for class %s', $entityClass));
+        }
 
-            try {
-                $converter->apply($request, $paramConverterConfiguration);
-            } catch (NotFoundHttpException) {
-                return $query;
-            }
+        $entity = $entityManager->getRepository($entityClass)->find($id);
 
-            $query->$methodName($request->get($newParameterName));
+        if (null === $entity) {
+            return $query;
         }
 
+        $query->$methodName($entity);
+
         return $query;
     }
 
-    protected function convertToInt(string $stringValue, string $parameterValue): int
+    protected function convertToInt(string $stringValue, string $parameterName): int
     {
-        // ^-?(\d+|\d{1,3}(?:\,\d{3})+)?(\.\d+)?$
-//        if (!ctype_digit($stringValue)) {
-        //          throw new ParameterConverterException('int', $stringValue, $parameterValue);
-        //    }
+        if (!preg_match('/^-?\d+$/', $stringValue)) {
+            throw new \InvalidArgumentException(sprintf('Parameter "%s" is not a valid integer: "%s"', $parameterName, $stringValue));
+        }
 
         return (int)$stringValue;
     }
+
 }

src/Factory/ParamConverterFactory/ParamConverterFactoryInterface.php

@@ -0,0 +1,20 @@
+<?php declare(strict_types=1);
+
+namespace MalteHuebner\DataQueryBundle\Factory\ValueAssigner;
+
+class ValueType
+{
+    public const STRING = 'string';
+    public const INT = 'int';
+    public const FLOAT = 'float';
+    public const BOOLEAN = 'boolean';
+    public const ARRAY = 'array';
+    public const OBJECT = 'object';
+    public const NULL = 'null';
+    public const MIXED = 'mixed';
+
+    private function __construct()
+    {
+
+    }
+}