Merge branch '2.4-develop' into ECP-98

Author: akaplya

app/code/Magento/Catalog/Model/Product/ProductFrontendAction/Synchronizer.php

@@ -125,9 +125,16 @@ private function filterNewestActions(array $productsData, $typeId)
         $lifetime = $this->getLifeTimeByNamespace($typeId);
         $actionsNumber = $lifetime * self::TIME_TO_DO_ONE_ACTION;
 
-        uasort($productsData, function (array $firstProduct, array $secondProduct) {
-            return $firstProduct['added_at'] > $secondProduct['added_at'];
-        });
+        uasort(
+            $productsData,
+            function (array $firstProduct, array $secondProduct) {
+                if (isset($firstProduct['added_at'], $secondProduct['added_at'])) {
+                    return $firstProduct['added_at'] > $secondProduct['added_at'];
+                }
+
+                return false;
+            }
+        );
 
         return array_slice($productsData, 0, $actionsNumber, true);
     }
@@ -185,15 +192,17 @@ public function syncActions(array $productsData, $typeId)
 
             foreach ($productsData as $productId => $productData) {
                 /** @var ProductFrontendActionInterface $action */
-                $action = $this->productFrontendActionFactory->create([
-                    'data' => [
-                        'visitor_id' => $customerId ? null : $visitorId,
-                        'customer_id' => $this->session->getCustomerId(),
-                        'added_at' => $productData['added_at'],
-                        'product_id' => $productId,
-                        'type_id' => $typeId
+                $action = $this->productFrontendActionFactory->create(
+                    [
+                        'data' => [
+                            'visitor_id' => $customerId ? null : $visitorId,
+                            'customer_id' => $this->session->getCustomerId(),
+                            'added_at' => $productData['added_at'],
+                            'product_id' => $productId,
+                            'type_id' => $typeId
+                        ]
                     ]
-                ]);
+                );
 
                 $this->entityManager->save($action);
             }

app/code/Magento/Catalog/Setup/Patch/Data/UpdateDefaultAttributeValue.php

@@ -3,19 +3,18 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Catalog\Setup\Patch\Data;
 
 use Magento\Catalog\Setup\CategorySetup;
 use Magento\Catalog\Setup\CategorySetupFactory;
-use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
 use Magento\Framework\Setup\Patch\DataPatchInterface;
 use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
- * Class UpdateDefaultAttributeValue
- * @package Magento\Catalog\Setup\Patch
+ * Updates 'is_anchor' attribute default value.
  */
 class UpdateDefaultAttributeValue implements DataPatchInterface, PatchVersionInterface
 {
@@ -30,7 +29,6 @@ class UpdateDefaultAttributeValue implements DataPatchInterface, PatchVersionInt
     private $categorySetupFactory;
 
     /**
-     * PatchInitial constructor.
      * @param ModuleDataSetupInterface $moduleDataSetup
      * @param CategorySetupFactory $categorySetupFactory
      */
@@ -43,17 +41,24 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function apply()
     {
         /** @var CategorySetup $categorySetup */
         $categorySetup = $this->categorySetupFactory->create(['setup' => $this->moduleDataSetup]);
-        $categorySetup->updateAttribute(3, 54, 'default_value', 1);
+        $categorySetup->updateAttribute(
+            CategorySetup::CATEGORY_ENTITY_TYPE_ID,
+            'is_anchor',
+            'default_value',
+            1
+        );
+
+        return $this;
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public static function getDependencies()
     {
@@ -63,15 +68,15 @@ public static function getDependencies()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public static function getVersion()
     {
         return '2.0.3';
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getAliases()
     {

app/code/Magento/Catalog/view/frontend/layout/default.xml

@@ -26,6 +26,9 @@
                             <item name="updateRequestConfig" xsi:type="array">
                                 <item name="url" xsi:type="serviceUrl" path="/products-render-info"/>
                             </item>
+                            <item name="requestConfig" xsi:type="array">
+                                <item name="syncUrl" xsi:type="url" path="catalog/product/frontend_action_synchronize"/>
+                            </item>
                         </item>
                     </argument>
                 </arguments>

app/code/Magento/CatalogGraphQl/DataProvider/Product/SearchCriteriaBuilder.php

@@ -129,7 +129,7 @@ private function addVisibilityFilter(SearchCriteriaInterface $searchCriteria, bo
             ? $this->visibility->getVisibleInSearchIds()
             : $this->visibility->getVisibleInCatalogIds();
 
-        $this->addFilter($searchCriteria, 'visibility', $visibilityIds);
+        $this->addFilter($searchCriteria, 'visibility', $visibilityIds, 'in');
     }
 
     /**
@@ -155,13 +155,20 @@ private function preparePriceAggregation(SearchCriteriaInterface $searchCriteria
      * @param SearchCriteriaInterface $searchCriteria
      * @param string $field
      * @param mixed $value
+     * @param string|null $condition
      */
-    private function addFilter(SearchCriteriaInterface $searchCriteria, string $field, $value): void
-    {
+    private function addFilter(
+        SearchCriteriaInterface $searchCriteria,
+        string $field,
+        $value,
+        ?string $condition = null
+    ): void {
         $filter = $this->filterBuilder
             ->setField($field)
             ->setValue($value)
+            ->setConditionType($condition)
             ->create();
+
         $this->filterGroupBuilder->addFilter($filter);
         $filterGroups = $searchCriteria->getFilterGroups();
         $filterGroups[] = $this->filterGroupBuilder->create();

app/code/Magento/CatalogGraphQl/Model/Resolver/Category/Products.php

@@ -7,41 +7,20 @@
 
 namespace Magento\CatalogGraphQl\Model\Resolver\Category;
 
-use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\CatalogGraphQl\DataProvider\Product\SearchCriteriaBuilder;
-use Magento\CatalogGraphQl\Model\Resolver\Products\Query\Search;
-use Magento\Framework\App\ObjectManager;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-use Magento\Framework\GraphQl\Query\Resolver\Argument\SearchCriteria\Builder;
-use Magento\CatalogGraphQl\Model\Resolver\Products\Query\Filter;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\CatalogGraphQl\Model\Resolver\Products\Query\ProductQueryInterface;
 
 /**
  * Category products resolver, used by GraphQL endpoints to retrieve products assigned to a category
  */
 class Products implements ResolverInterface
 {
     /**
-     * @var \Magento\Catalog\Api\ProductRepositoryInterface
-     */
-    private $productRepository;
-
-    /**
-     * @var Builder
-     * @deprecated
-     */
-    private $searchCriteriaBuilder;
-
-    /**
-     * @var Filter
-     * @deprecated
-     */
-    private $filterQuery;
-
-    /**
-     * @var Search
+     * @var ProductQueryInterface
      */
     private $searchQuery;
 
@@ -51,25 +30,15 @@ class Products implements ResolverInterface
     private $searchApiCriteriaBuilder;
 
     /**
-     * @param ProductRepositoryInterface $productRepository
-     * @param Builder $searchCriteriaBuilder
-     * @param Filter $filterQuery
-     * @param Search $searchQuery
+     * @param ProductQueryInterface $searchQuery
      * @param SearchCriteriaBuilder $searchApiCriteriaBuilder
      */
     public function __construct(
-        ProductRepositoryInterface $productRepository,
-        Builder $searchCriteriaBuilder,
-        Filter $filterQuery,
-        Search $searchQuery = null,
-        SearchCriteriaBuilder $searchApiCriteriaBuilder = null
+        ProductQueryInterface $searchQuery,
+        SearchCriteriaBuilder $searchApiCriteriaBuilder
     ) {
-        $this->productRepository = $productRepository;
-        $this->searchCriteriaBuilder = $searchCriteriaBuilder;
-        $this->filterQuery = $filterQuery;
-        $this->searchQuery = $searchQuery ?? ObjectManager::getInstance()->get(Search::class);
-        $this->searchApiCriteriaBuilder = $searchApiCriteriaBuilder ??
-            ObjectManager::getInstance()->get(SearchCriteriaBuilder::class);
+        $this->searchQuery = $searchQuery;
+        $this->searchApiCriteriaBuilder = $searchApiCriteriaBuilder;
     }
 
     /**
@@ -94,18 +63,17 @@ public function resolve(
                 'eq' => $value['id']
             ]
         ];
-        $searchCriteria = $this->searchApiCriteriaBuilder->build($args, false);
-        $searchResult = $this->searchQuery->getResult($searchCriteria, $info);
+        $searchResult = $this->searchQuery->getResult($args, $info);
 
         //possible division by 0
-        if ($searchCriteria->getPageSize()) {
-            $maxPages = ceil($searchResult->getTotalCount() / $searchCriteria->getPageSize());
+        if ($searchResult->getPageSize()) {
+            $maxPages = ceil($searchResult->getTotalCount() / $searchResult->getPageSize());
         } else {
             $maxPages = 0;
         }
 
-        $currentPage = $searchCriteria->getCurrentPage();
-        if ($searchCriteria->getCurrentPage() > $maxPages && $searchResult->getTotalCount() > 0) {
+        $currentPage = $searchResult->getCurrentPage();
+        if ($searchResult->getCurrentPage() > $maxPages && $searchResult->getTotalCount() > 0) {
             $currentPage = new GraphQlInputException(
                 __(
                     'currentPage value %1 specified is greater than the number of pages available.',
@@ -118,7 +86,7 @@ public function resolve(
             'total_count' => $searchResult->getTotalCount(),
             'items'       => $searchResult->getProductsSearchResult(),
             'page_info'   => [
-                'page_size'    => $searchCriteria->getPageSize(),
+                'page_size'    => $searchResult->getPageSize(),
                 'current_page' => $currentPage,
                 'total_pages' => $maxPages
             ]

app/code/Magento/CatalogGraphQl/Model/Resolver/Product/PriceRange.php

@@ -86,7 +86,7 @@ private function getMinimumProductPrice(SaleableInterface $product, StoreInterfa
         $priceProvider = $this->priceProviderPool->getProviderByProductType($product->getTypeId());
         $regularPrice = $priceProvider->getMinimalRegularPrice($product)->getValue();
         $finalPrice = $priceProvider->getMinimalFinalPrice($product)->getValue();
-        $minPriceArray = $this->formatPrice($regularPrice, $finalPrice, $store);
+        $minPriceArray = $this->formatPrice((float) $regularPrice, (float) $finalPrice, $store);
         $minPriceArray['model'] = $product;
         return $minPriceArray;
     }
@@ -103,7 +103,7 @@ private function getMaximumProductPrice(SaleableInterface $product, StoreInterfa
         $priceProvider = $this->priceProviderPool->getProviderByProductType($product->getTypeId());
         $regularPrice = $priceProvider->getMaximalRegularPrice($product)->getValue();
         $finalPrice = $priceProvider->getMaximalFinalPrice($product)->getValue();
-        $maxPriceArray = $this->formatPrice($regularPrice, $finalPrice, $store);
+        $maxPriceArray = $this->formatPrice((float) $regularPrice, (float) $finalPrice, $store);
         $maxPriceArray['model'] = $product;
         return $maxPriceArray;
     }

app/code/Magento/CatalogGraphQl/Model/Resolver/Products.php

@@ -7,6 +7,7 @@
 
 namespace Magento\CatalogGraphQl\Model\Resolver;
 
+use Magento\CatalogGraphQl\Model\Resolver\Products\Query\ProductQueryInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\CatalogGraphQl\Model\Resolver\Products\Query\Filter;
 use Magento\CatalogGraphQl\Model\Resolver\Products\Query\Search;
@@ -24,51 +25,24 @@
 class Products implements ResolverInterface
 {
     /**
-     * @var Builder
-     * @deprecated
-     */
-    private $searchCriteriaBuilder;
-
-    /**
-     * @var Search
+     * @var ProductQueryInterface
      */
     private $searchQuery;
 
-    /**
-     * @var Filter
-     * @deprecated
-     */
-    private $filterQuery;
-
-    /**
-     * @var SearchFilter
-     * @deprecated
-     */
-    private $searchFilter;
-
     /**
      * @var SearchCriteriaBuilder
      */
     private $searchApiCriteriaBuilder;
 
     /**
-     * @param Builder $searchCriteriaBuilder
-     * @param Search $searchQuery
-     * @param Filter $filterQuery
-     * @param SearchFilter $searchFilter
+     * @param ProductQueryInterface $searchQuery
      * @param SearchCriteriaBuilder|null $searchApiCriteriaBuilder
      */
     public function __construct(
-        Builder $searchCriteriaBuilder,
-        Search $searchQuery,
-        Filter $filterQuery,
-        SearchFilter $searchFilter,
+        ProductQueryInterface $searchQuery,
         SearchCriteriaBuilder $searchApiCriteriaBuilder = null
     ) {
-        $this->searchCriteriaBuilder = $searchCriteriaBuilder;
         $this->searchQuery = $searchQuery;
-        $this->filterQuery = $filterQuery;
-        $this->searchFilter = $searchFilter;
         $this->searchApiCriteriaBuilder = $searchApiCriteriaBuilder ??
             \Magento\Framework\App\ObjectManager::getInstance()->get(SearchCriteriaBuilder::class);
     }
@@ -95,11 +69,7 @@ public function resolve(
             );
         }
 
-        //get product children fields queried
-        $productFields = (array)$info->getFieldSelection(1);
-        $includeAggregations = isset($productFields['filters']) || isset($productFields['aggregations']);
-        $searchCriteria = $this->searchApiCriteriaBuilder->build($args, $includeAggregations);
-        $searchResult = $this->searchQuery->getResult($searchCriteria, $info, $args);
+        $searchResult = $this->searchQuery->getResult($args, $info);
 
         if ($searchResult->getCurrentPage() > $searchResult->getTotalPages() && $searchResult->getTotalCount() > 0) {
             throw new GraphQlInputException(