Move applyToCollection logic to private method and use in both cases

Sylius · Dec 20, 2023 · 31374d6 · 31374d6
1 parent b318041
commit 31374d6
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 20 deletions.
diff --git a/src/Sylius/Bundle/ApiBundle/Doctrine/QueryExtension/OrderExtension.php b/src/Sylius/Bundle/ApiBundle/Doctrine/QueryExtension/OrderExtension.php
@@ -17,10 +17,8 @@
 use ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\QueryItemExtensionInterface;
 use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryNameGeneratorInterface;
 use Doctrine\ORM\QueryBuilder;
-use Sylius\Bundle\ApiBundle\Context\UserContextInterface;
 use Sylius\Bundle\ApiBundle\SectionResolver\AdminApiSection;
 use Sylius\Bundle\CoreBundle\SectionResolver\SectionProviderInterface;
-use Sylius\Component\Core\Model\AdminUserInterface;
 use Sylius\Component\Core\Model\OrderInterface;
 
 /** @experimental */
@@ -45,28 +43,43 @@ public function applyToCollection(
         string $operationName = null,
         array $context = [],
     ): void {
-        if (!is_a($resourceClass, OrderInterface::class, true)) {
-            return;
-        }
-
-        if ($this->sectionProvider->getSection() instanceof AdminApiSection) {
-
-            $stateParameter = $queryNameGenerator->generateParameterName('state');
-            $rootAlias = $queryBuilder->getRootAliases()[0];
-
-            $queryBuilder
-                ->andWhere(sprintf('%s.state != :%s', $rootAlias, $stateParameter))
-                ->setParameter($stateParameter, $this->orderStatesToFilterOut)
-            ;
-        }
+        $this->filterOutOrders($queryBuilder, $queryNameGenerator, $resourceClass);
     }
 
     /**
      * @param array<mixed> $context
      * @param array<mixed> $identifiers
      */
-    public function applyToItem(QueryBuilder $queryBuilder, QueryNameGeneratorInterface $queryNameGenerator, string $resourceClass, array $identifiers, string $operationName = null, array $context = []): void
-    {
-        $this->applyToCollection($queryBuilder, $queryNameGenerator, $resourceClass, $operationName, $context);
+    public function applyToItem(
+        QueryBuilder $queryBuilder,
+        QueryNameGeneratorInterface $queryNameGenerator,
+        string $resourceClass,
+        array $identifiers,
+        string $operationName = null,
+        array $context = []
+    ): void {
+        $this->filterOutOrders($queryBuilder, $queryNameGenerator, $resourceClass);
+    }
+
+    private function filterOutOrders(
+        QueryBuilder $queryBuilder,
+        QueryNameGeneratorInterface $queryNameGenerator,
+        string $resourceClass,
+    ): void {
+        if (!is_a($resourceClass, OrderInterface::class, true)) {
+            return;
+        }
+
+        if (!$this->sectionProvider->getSection() instanceof AdminApiSection) {
+            return;
+        }
+
+        $stateParameter = $queryNameGenerator->generateParameterName('state');
+        $rootAlias = $queryBuilder->getRootAliases()[0];
+
+        $queryBuilder
+            ->andWhere(sprintf('%s.state != :%s', $rootAlias, $stateParameter))
+            ->setParameter($stateParameter, $this->orderStatesToFilterOut)
+        ;
     }
 }
diff --git a/src/Sylius/Bundle/ApiBundle/spec/Doctrine/QueryExtension/OrderExtensionSpec.php b/src/Sylius/Bundle/ApiBundle/spec/Doctrine/QueryExtension/OrderExtensionSpec.php
@@ -16,7 +16,6 @@
 use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryNameGeneratorInterface;
 use Doctrine\ORM\QueryBuilder;
 use PhpSpec\ObjectBehavior;
-use Sylius\Bundle\ApiBundle\Context\UserContextInterface;
 use Sylius\Bundle\ApiBundle\SectionResolver\AdminApiSection;
 use Sylius\Bundle\ApiBundle\SectionResolver\ShopApiSection;
 use Sylius\Bundle\CoreBundle\SectionResolver\SectionProviderInterface;