[API][Product] fixes to taxon filter

Sylius · Apr 16, 2021 · 886d9d2 · 886d9d2
1 parent 889f37d
commit 886d9d2
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 34 deletions.
diff --git a/src/Sylius/Behat/Context/Api/Shop/ProductContext.php b/src/Sylius/Behat/Context/Api/Shop/ProductContext.php
@@ -65,7 +65,7 @@ public function iOpenProductPage(ProductInterface $product): void
     public function iBrowseProductsFromTaxon(TaxonInterface $taxon): void
     {
         $this->client->index();
-        $this->client->addFilter('productTaxons', $this->iriConverter->getIriFromItem($taxon));
+        $this->client->addFilter('taxon', $this->iriConverter->getIriFromItem($taxon));
         $this->client->filter();
     }
 

diff --git a/src/Sylius/Behat/Service/Context/ChannelContext.php b/src/Sylius/Behat/Service/Context/ChannelContext.php
diff --git a/src/Sylius/Bundle/ApiBundle/Filter/TaxonFilter.php b/src/Sylius/Bundle/ApiBundle/Filter/TaxonFilter.php
@@ -37,7 +37,7 @@ public function __construct(ManagerRegistry $managerRegistry, IriConverterInterf
 
     public function filterProperty(string $property, $value, QueryBuilder $queryBuilder, QueryNameGeneratorInterface $queryNameGenerator, string $resourceClass, string $operationName = null)
     {
-        if ($property !== 'productTaxons') {
+        if ($property !== 'taxon') {
             return;
         }
 
@@ -59,18 +59,16 @@ public function filterProperty(string $property, $value, QueryBuilder $queryBuil
 
     public function getDescription(string $resourceClass): array
     {
-        $description = [];
-        $description["productTaxons"] =
-            [
-            'type' => 'string',
-            'required' => false,
-            'property' => null,
-            'swagger' => [
-                'name' =>'Product taxon filter',
-                'description' => 'Get a collection of product with chosen taxon'
-            ]
+        return [
+            'taxon' => [
+                'type' => 'string',
+                'required' => false,
+                'property' => null,
+                'swagger' => [
+                    'name' =>'Product taxon filter',
+                    'description' => 'Get a collection of product with chosen taxon',
+                ],
+            ],
         ];
-
-        return $description;
     }
 }
diff --git a/src/Sylius/Bundle/ApiBundle/spec/Filter/TaxonFilterSpec.php b/src/Sylius/Bundle/ApiBundle/spec/Filter/TaxonFilterSpec.php
@@ -92,7 +92,7 @@ function it_adds_taxon_filter_if_property_is_product_taxon(
         ;
 
         $this->filterProperty(
-            'productTaxons',
+            'taxon',
             'api/taxon',
             $queryBuilder,
             $queryNameGenerator,