Merge pull request #554 from akeneo/hotfix/PGTO-203

hotfix/PGTO-203 into master
akeneo · Mar 17, 2022 · b74a40c · b74a40c
2 parents 5937315 + c1d5e43
commit b74a40c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 23 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -322,3 +322,6 @@
 ### Version 102.5.0 :
 * Add product status mode "Attribute mapping" in order to map a Yes/No attribute to the status attribute (https://help.akeneo.com/magento2-connector/articles/05-configure-products.html#attribute-mapping-for-status)
 * Use "is_root" Akeneo API parameter for category endpoint in order to generate options for the category import configuration in the admin page
+
+### Version 102.5.1 :
+* Fix every family being fetched while using IN family search with advanced filter mode
diff --git a/Helper/ProductFilters.php b/Helper/ProductFilters.php
@@ -123,8 +123,6 @@ public function getFilters($jobExecutor, $productFamily = null, $isProductModel
         $filters = [];
         /** @var mixed[] $search */
         $search = [];
-        /** @var  $productFilterAdded */
-        $productFilterAdded = false;
         /** @var string $mode */
         $mode = $this->configHelper->getFilterMode();
         if ($mode == Mode::ADVANCED) {
@@ -133,25 +131,11 @@ public function getFilters($jobExecutor, $productFamily = null, $isProductModel
             // If product import gave a family, add it to the filter
             if ($productFamily) {
                 if (isset($advancedFilters['search']['family'])) {
-                    /**
-                     * @var int      $key
-                     * @var string[] $familyFilter
-                     */
-                    foreach ($advancedFilters['search']['family'] as $key => $familyFilter) {
-                        if (isset($familyFilter['operator']) && $familyFilter['operator'] == 'IN') {
-                            $advancedFilters['search']['family'][$key]['value'][] = $productFamily;
-                            $productFilterAdded                                   = true;
-
-                            break;
-                        }
-                    }
-                }
-
-                if (!$productFilterAdded) {
-                    /** @var string[] $familyFilter */
-                    $familyFilter                          = ['operator' => 'IN', 'value' => [$productFamily]];
-                    $advancedFilters['search']['family'][] = $familyFilter;
+                    unset($advancedFilters['search']['family']);
                 }
+                /** @var string[] $familyFilter */
+                $familyFilter                          = ['operator' => 'IN', 'value' => [$productFamily]];
+                $advancedFilters['search']['family'][] = $familyFilter;
             }
 
             return [$advancedFilters];
@@ -171,6 +155,9 @@ public function getFilters($jobExecutor, $productFamily = null, $isProductModel
             $search['family'][] = $familyFilter;
         }
 
+        /** @var string[] $akeneoLocales */
+        $akeneoLocales = $this->localesHelper->getAkeneoLocales();
+
         /** @var string $channel */
         foreach ($mappedChannels as $channel) {
             /** @var string[] $filter */
@@ -197,8 +184,6 @@ public function getFilters($jobExecutor, $productFamily = null, $isProductModel
             /** @var string[] $locales */
             $locales = $this->storeHelper->getChannelStoreLangs($channel);
             if (!empty($locales)) {
-                /** @var string $locales */
-                $akeneoLocales = $this->localesHelper->getAkeneoLocales();
                 if (!empty($akeneoLocales)) {
                     $locales = array_intersect($locales, $akeneoLocales);
                 }

diff --git a/composer.json b/composer.json
@@ -12,7 +12,7 @@
     "http-interop/http-factory-guzzle": "^1.0"
   },
   "type": "magento2-module",
-  "version": "102.5.0",
+  "version": "102.5.1",
   "license": [
     "OSL-3.0",
     "AFL-3.0"