Simplified data query.

laurentmuller · Dec 28, 2024 · 5e94ebf · 5e94ebf
1 parent 71c433f
commit 5e94ebf
Show file tree

Hide file tree

Showing 29 changed files with 418 additions and 218 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/resources/diagrams/abstract_property.mmd b/resources/diagrams/abstract_property.mmd
@@ -11,15 +11,18 @@ classDiagram
         +getName() string
         +setName(string)
         +getValue() string|null
-        +setValue(string|null)
-        +getBoolean() bool
-        +setBoolean(bool)
+        +setValue(mixed)
         +getArray() array|null
         +setArray(array|null)
+        +getBoolean() bool
+        +setBoolean(bool)
         +getDate() DateTimeInterface|null
         +setDate(DateTimeInterface|null)
+        +getFloat() float
+        +setFloat(float)
         +getInteger() int
         +setInteger(int)
+        +setString(string|null)
     }
 
     class EntityInterface {

diff --git a/src/Generator/AbstractEntityGenerator.php b/src/Generator/AbstractEntityGenerator.php
@@ -37,8 +37,10 @@ abstract class AbstractEntityGenerator implements GeneratorInterface, ServiceSub
 
     private readonly Generator $generator;
 
-    public function __construct(private readonly EntityManagerInterface $manager, FakerService $fakerService)
-    {
+    public function __construct(
+        private readonly EntityManagerInterface $manager,
+        FakerService $fakerService
+    ) {
         $this->generator = $fakerService->getGenerator();
     }
 

diff --git a/src/Generator/CalculationGenerator.php b/src/Generator/CalculationGenerator.php
@@ -30,8 +30,11 @@
  */
 class CalculationGenerator extends AbstractEntityGenerator
 {
-    public function __construct(EntityManagerInterface $manager, FakerService $fakerService, private readonly CalculationService $service)
-    {
+    public function __construct(
+        EntityManagerInterface $manager,
+        FakerService $fakerService,
+        private readonly CalculationService $service
+    ) {
         parent::__construct($manager, $fakerService);
     }
 

diff --git a/src/Resolver/DataQueryValueResolver.php b/src/Resolver/DataQueryValueResolver.php
@@ -17,19 +17,22 @@
 use App\Interfaces\SortModeInterface;
 use App\Interfaces\TableInterface;
 use App\Service\UrlGeneratorService;
+use App\Table\AbstractCategoryItemTable;
+use App\Table\CalculationTable;
+use App\Table\CategoryTable;
 use App\Table\DataQuery;
+use App\Table\LogTable;
+use App\Table\SearchTable;
 use App\Traits\CookieTrait;
 use Symfony\Component\HttpFoundation\Exception\BadRequestException;
 use Symfony\Component\HttpFoundation\InputBag;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Controller\ValueResolverInterface;
 use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadata;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
-use Symfony\Component\PropertyAccess\PropertyAccessorInterface;
 use Symfony\Component\Validator\ConstraintViolationListInterface;
 use Symfony\Component\Validator\Exception\ValidationFailedException;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
 
 /**
  * Value resolver for {@link DataQuery}.
@@ -38,11 +41,8 @@
 {
     use CookieTrait;
 
-    public function __construct(
-        private PropertyAccessorInterface $accessor,
-        private ValidatorInterface $validator,
-        private TranslatorInterface $translator,
-    ) {
+    public function __construct(private ValidatorInterface $validator)
+    {
     }
 
     /**
@@ -137,22 +137,54 @@ private function updateParameters(DataQuery $query, Request $request): void
 
     /**
      * @psalm-param InputBag<string> $inputBag
+     *
+     * @psalm-suppress PropertyTypeCoercion
      */
     private function updateQuery(DataQuery $query, InputBag $inputBag): void
     {
-        /** @psalm-var mixed $value */
-        foreach ($inputBag as $key => $value) { // @phpstan-ignore varTag.type
-            if (UrlGeneratorService::PARAM_CALLER === $key) {
-                continue;
-            }
-            if (!$this->accessor->isWritable($query, $key)) {
-                $message = $this->formatError($key, $this->translator->trans('schema.fields.error'));
-                throw new BadRequestHttpException($message);
-            }
-            if (TableInterface::PARAM_VIEW === $key) {
-                $value = TableView::tryFrom((string) $value) ?? $query->view; // @phpstan-ignore property.nonObject
+        /** @psalm-var string[] $keys */
+        $keys = $inputBag->keys();
+        foreach ($keys as $key) {
+            switch ($key) {
+                case UrlGeneratorService::PARAM_CALLER:
+                    // skipped
+                    break;
+                case TableInterface::PARAM_ID:
+                    $query->id = $inputBag->getInt($key);
+                    break;
+                case TableInterface::PARAM_SEARCH:
+                    $query->search = $inputBag->getString($key);
+                    break;
+                case TableInterface::PARAM_SORT:
+                    $query->sort = $inputBag->getString($key);
+                    break;
+                case TableInterface::PARAM_ORDER:
+                    // @phpstan-ignore assign.propertyType
+                    $query->order = $inputBag->getString($key);
+                    break;
+                case TableInterface::PARAM_OFFSET:
+                    $query->offset = $inputBag->getInt($key);
+                    break;
+                case TableInterface::PARAM_LIMIT:
+                    $query->limit = $inputBag->getInt($key);
+                    break;
+                case TableInterface::PARAM_VIEW:
+                    $query->view = $inputBag->getEnum($key, TableView::class, $query->view);
+                    break;
+                case CategoryTable::PARAM_GROUP:
+                case CalculationTable::PARAM_STATE:
+                case CalculationTable::PARAM_EDITABLE:
+                case AbstractCategoryItemTable::PARAM_CATEGORY:
+                    $query->addParameter($key, $inputBag->getInt($key));
+                    break;
+                case LogTable::PARAM_LEVEL:
+                case LogTable::PARAM_CHANNEL:
+                case SearchTable::PARAM_ENTITY:
+                    $query->addParameter($key, $inputBag->getString($key));
+                    break;
+                default:
+                    throw new BadRequestHttpException(\sprintf('Invalid parameter "%s".', $key));
             }
-            $this->accessor->setValue($query, $key, $value);
         }
     }
 

diff --git a/src/Service/CalculationService.php b/src/Service/CalculationService.php
@@ -20,9 +20,7 @@
 use App\Repository\GroupMarginRepository;
 use App\Repository\GroupRepository;
 use App\Traits\MathTrait;
-use App\Traits\TranslatorAwareTrait;
-use Symfony\Contracts\Service\ServiceMethodsSubscriberTrait;
-use Symfony\Contracts\Service\ServiceSubscriberInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 /**
  * Service to update calculation totals.
@@ -44,11 +42,9 @@
  *     user_margin: float,
  *     groups: ServiceGroupType[]}
  */
-class CalculationService implements ServiceSubscriberInterface
+class CalculationService
 {
     use MathTrait;
-    use ServiceMethodsSubscriberTrait;
-    use TranslatorAwareTrait;
 
     /**
      * Empty row identifier.
@@ -89,7 +85,8 @@ public function __construct(
         private readonly GlobalMarginRepository $globalRepository,
         private readonly GroupMarginRepository $marginRepository,
         private readonly GroupRepository $groupRepository,
-        private readonly ApplicationService $service
+        private readonly ApplicationService $service,
+        private readonly TranslatorInterface $translator,
     ) {
     }
 
@@ -548,4 +545,9 @@ private function reduceGroup(array $group): float
             0.0
         );
     }
+
+    private function trans(string $id): string
+    {
+        return $this->translator->trans($id);
+    }
 }
diff --git a/src/Table/AbstractCategoryItemTable.php b/src/Table/AbstractCategoryItemTable.php
@@ -54,7 +54,7 @@ protected function addSearch(DataQuery $query, QueryBuilder $builder, string $al
     {
         $repository = $this->getRepository();
         $result = parent::addSearch($query, $builder, $alias);
-        $categoryId = $query->categoryId;
+        $categoryId = $query->getIntParameter(self::PARAM_CATEGORY);
         if (0 !== $categoryId) {
             /** @psalm-var string $field */
             $field = $repository->getSearchFields('category.id', $alias);
@@ -63,7 +63,7 @@ protected function addSearch(DataQuery $query, QueryBuilder $builder, string $al
 
             return true;
         }
-        $groupId = $query->groupId;
+        $groupId = $query->getIntParameter(CategoryTable::PARAM_GROUP);
         if (0 !== $groupId) {
             /** @psalm-var string $field */
             $field = $repository->getSearchFields('group.id', $alias);
@@ -87,10 +87,10 @@ protected function updateResults(DataQuery $query, DataResults &$results): void
     {
         parent::updateResults($query, $results);
         if (!$query->callback) {
-            $categoryId = $query->categoryId;
+            $categoryId = $query->getIntParameter(self::PARAM_CATEGORY);
             $results->addParameter(self::PARAM_CATEGORY, $categoryId);
 
-            $groupId = $query->groupId;
+            $groupId = $query->getIntParameter(CategoryTable::PARAM_GROUP);
             $results->addParameter(CategoryTable::PARAM_GROUP, $groupId);
 
             $results->addCustomData('dropdown', $this->getDropDownValues());

diff --git a/src/Table/AbstractTable.php b/src/Table/AbstractTable.php
@@ -199,7 +199,7 @@ protected function updateResults(DataQuery $query, DataResults &$results): void
     {
         $results->pageList = $this->getAllowedPageList($results->totalNotFiltered);
         $query->limit = [] !== $results->pageList ? \min($query->limit, \max($results->pageList)) : $query->limit;
-        $results->params = \array_merge($query->parameters(), $results->params);
+        $results->params = \array_merge($query->params(), $results->params);
         if ($query->callback) {
             return;
         }

diff --git a/src/Table/CalculationTable.php b/src/Table/CalculationTable.php
@@ -72,7 +72,7 @@ protected function addSearch(DataQuery $query, QueryBuilder $builder, string $al
     {
         $repository = $this->getRepository();
         $result = parent::addSearch($query, $builder, $alias);
-        $stateId = $query->stateId;
+        $stateId = $query->getIntParameter(self::PARAM_STATE);
         if (0 !== $stateId) {
             /** @psalm-var string $field */
             $field = $repository->getSearchFields('state.id', $alias);
@@ -82,7 +82,7 @@ protected function addSearch(DataQuery $query, QueryBuilder $builder, string $al
             return true;
         }
 
-        $stateEditable = $query->stateEditable;
+        $stateEditable = $query->getIntParameter(self::PARAM_EDITABLE);
         if (0 !== $stateEditable) {
             /** @psalm-var string $field */
             $field = $repository->getSearchFields('state.editable', $alias);
@@ -123,10 +123,10 @@ protected function updateResults(DataQuery $query, DataResults &$results): void
         parent::updateResults($query, $results);
         if (!$query->callback) {
             $results->addAttribute('row-style', 'styleTextMuted');
-            $stateId = $query->stateId;
+            $stateId = $query->getIntParameter(self::PARAM_STATE);
             $results->addParameter(self::PARAM_STATE, $stateId);
 
-            $stateEditable = $query->stateEditable;
+            $stateEditable = $query->getIntParameter(self::PARAM_EDITABLE);
             $results->addParameter(self::PARAM_EDITABLE, $stateEditable);
 
             $results->addCustomData('dropdown', $this->getDropDownValues());

diff --git a/src/Table/CategoryTable.php b/src/Table/CategoryTable.php
@@ -100,7 +100,7 @@ public function formatTasks(int $value, array $entity): string
     protected function addSearch(DataQuery $query, QueryBuilder $builder, string $alias): bool
     {
         $result = parent::addSearch($query, $builder, $alias);
-        $groupId = $query->groupId;
+        $groupId = $query->getIntParameter(self::PARAM_GROUP);
         if (0 === $groupId) {
             return $result;
         }
@@ -131,7 +131,7 @@ protected function updateResults(DataQuery $query, DataResults &$results): void
     {
         parent::updateResults($query, $results);
         if (!$query->callback) {
-            $groupId = $query->groupId;
+            $groupId = $query->getIntParameter(self::PARAM_GROUP);
             $results->addParameter(self::PARAM_GROUP, $groupId);
             $results->addCustomData('group', $this->getGroup($groupId));
             $results->addCustomData('dropdown', $this->getDropDownValues());