Clean database criteria

findologic · Apr 29, 2024 · a42a56e · a42a56e
1 parent f3ff43e
commit a42a56e
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/src/Traits/SearchResultHelper.php b/src/Traits/SearchResultHelper.php
@@ -55,13 +55,12 @@ protected function fetchProducts(
         SalesChannelContext $salesChannelContext,
         ?string $query = null
     ): EntitySearchResult {
-        $productCriteria = clone $criteria;
+        $productCriteria = $this->cleanDatabaseCriteria($criteria);
+
         if ($query !== null && count($productCriteria->getIds()) === 1) {
             $this->modifyCriteriaFromQuery($query, $productCriteria, $salesChannelContext);
         }
 
-        $productCriteria->resetAggregations();
-
         $result = $this->salesChannelProductRepository->search($productCriteria, $salesChannelContext);
 
         return $this->fixResultOrder($result, $productCriteria);
@@ -147,4 +146,16 @@ private function modifyCriteriaFromQuery(
             $criteria->setIds([$product->getId()]);
         }
     }
+
+    private function cleanDatabaseCriteria(Criteria $criteria): Criteria
+    {
+        $productCriteria = clone $criteria;
+        $productCriteria->setOffset(0);
+        $productCriteria->resetQueries();
+        $productCriteria->resetFilters();
+        $productCriteria->resetSorting();
+        $productCriteria->resetAggregations();
+
+        return $productCriteria;
+    }
 }