Added support for Magento 2.4.1 (#74)

* Added support for Magento 2.4.1 * Removed hard-coded version
scandipwa · Nov 5, 2020 · b577eba · b577eba
1 parent c11f4fe
commit b577eba
Show file tree

Hide file tree

Showing 11 changed files with 212 additions and 375 deletions.
diff --git a/composer.json b/composer.json
@@ -14,8 +14,8 @@
         "magento/module-rule": "*",
         "magento/module-graph-ql": "*",
         "magento/module-store": "*",
-        "magento/module-elasticsearch": "^101",
-        "magento/module-catalog-graph-ql": "^100.4",
+        "magento/module-elasticsearch": "*",
+        "magento/module-catalog-graph-ql": "^100.4.1",
         "magento/module-configurable-product-graph-ql": "^100.3",
         "magento/module-bundle-graph-ql": "^100.3",
         "magento/module-swatches": "*",

diff --git a/src/Model/Resolver/CategoryTree.php b/src/Model/Resolver/CategoryTree.php
diff --git a/src/Model/Resolver/GroupedItems.php b/src/Model/Resolver/GroupedItems.php
@@ -10,23 +10,27 @@
 
 namespace ScandiPWA\CatalogGraphQl\Model\Resolver;
 
+use Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Deferred\Product;
 use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\GroupedProduct\Model\Product\Type\Grouped as GroupedAlias;
+use Magento\GroupedProduct\Model\ResourceModel\Product\Link;
 use ScandiPWA\Performance\Model\Resolver\ResolveInfoFieldsTrait;
-use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\GroupedProduct\Model\Product\Initialization\Helper\ProductLinks\Plugin\Grouped;
 use Magento\Catalog\Api\Data\ProductLinkInterface;
 use ScandiPWA\Performance\Model\Resolver\Products\DataPostProcessor;
 use ScandiPWA\CatalogGraphQl\Model\Resolver\Products\DataProvider\Product as ProductDataProvider;
 
+use Magento\GroupedProductGraphQl\Model\Resolver\GroupedItems as MagentoGroupedItems;
+
 /**
  * Class ConfigurableVariant
  *
  * @package ScandiPWA\CatalogGraphQl\Model\Resolver
  */
-class GroupedItems implements ResolverInterface
+class GroupedItems extends MagentoGroupedItems
 {
     use ResolveInfoFieldsTrait;
 
@@ -45,14 +49,26 @@ class GroupedItems implements ResolverInterface
      */
     protected $productDataProvider;
 
+    /**
+     * @var GroupedAlias
+     */
+    protected $grouped;
+
     public function __construct(
         SearchCriteriaBuilder $searchCriteriaBuilder,
         DataPostProcessor $postProcessor,
-        ProductDataProvider $productDataProvider
+        ProductDataProvider $productDataProvider,
+        Product $productResolver,
+        GroupedAlias $grouped
     ) {
+        parent::__construct(
+            $productResolver
+        );
+
         $this->searchCriteriaBuilder = $searchCriteriaBuilder;
         $this->postProcessor = $postProcessor;
         $this->productDataProvider = $productDataProvider;
+        $this->grouped = $grouped;
     }
 
     /**
@@ -72,6 +88,9 @@ public function resolve(
         $itemData = [];
         $productSKUs = [];
         $productModel = $value['model'];
+
+        // This fix allows to request min / max price and grouped items
+        $this->grouped->flushAssociatedProductsCache($productModel);
         $links = $productModel->getProductLinks();
 
         foreach ($links as $link) {