Merge pull request #7072 from magento-l3/L3-PR-20210908

L3 pr 20210908

Author: dhorytskyi

app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaOnCustomerLoginTest.xml

@@ -24,6 +24,7 @@
             <magentoCLI command="config:set {{StorefrontCaptchaOnCustomerLoginConfigData.path}} {{StorefrontCaptchaOnCustomerLoginConfigData.value}}" stepKey="enableCaptchaOnCustomerLogin"/>
             <magentoCLI command="config:set {{StorefrontCustomerCaptchaLength3ConfigData.path}} {{StorefrontCustomerCaptchaLength3ConfigData.value}}" stepKey="setCaptchaLength" />
             <magentoCLI command="config:set {{StorefrontCustomerCaptchaSymbols1ConfigData.path}} {{StorefrontCustomerCaptchaSymbols1ConfigData.value}}" stepKey="setCaptchaSymbols" />
+            <magentoCLI command="config:set customer/captcha/failed_attempts_login 3" stepKey="setLoginAttempt"/>
             <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanInvalidatedCaches">
                 <argument name="tags" value="config full_page"/>
             </actionGroup>

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

@@ -23,6 +23,8 @@
  */
 class PriceRange implements ResolverInterface
 {
+    private const STORE_FILTER_CACHE_KEY = '_cache_instance_store_filter';
+
     /**
      * @var Discount
      */
@@ -62,6 +64,8 @@ public function resolve(
         /** @var Product $product */
         $product = $value['model'];
         $product->unsetData('minimal_price');
+        // add store filter for the product
+        $product->setData(self::STORE_FILTER_CACHE_KEY, $store);
 
         if ($context) {
             $customerGroupId = $context->getExtensionAttributes()->getCustomerGroupId();

app/code/Magento/CatalogImportExport/Model/Import/Product.php

@@ -821,6 +821,7 @@ class Product extends AbstractEntity
      * @throws \Magento\Framework\Exception\FileSystemException
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function __construct(
         \Magento\Framework\Json\Helper\Data $jsonHelper,
@@ -1344,6 +1345,40 @@ protected function _saveProductAttributes(array $attributesData)
         return $this;
     }
 
+    /**
+     * Get data for updating product-category relations
+     *
+     * @param array $categoriesData
+     * @param string $tableName
+     * @return array
+     */
+    private function getProductCategoriesDataSave(array $categoriesData, string $tableName): array
+    {
+        $delProductId = [];
+        $categoriesIn = [];
+        $minCategoryPosition = [];
+        foreach ($categoriesData as $delSku => $categories) {
+            $productId = $this->skuProcessor->getNewSku($delSku)['entity_id'];
+            $delProductId[] = $productId;
+
+            foreach (array_keys($categories) as $categoryId) {
+                //position new products before existing ones
+                if (!isset($minCategoryPosition[$categoryId])) {
+                    $select = $this->_connection->select()
+                        ->from($tableName, ['position' => new \Zend_Db_Expr('MIN(position)')])
+                        ->where('category_id = ?', $categoryId);
+                    $minCategoryPosition[$categoryId] = (int)$this->_connection->fetchOne($select);
+                }
+                $categoriesIn[] = [
+                    'product_id' => $productId,
+                    'category_id' => $categoryId,
+                    'position' => --$minCategoryPosition[$categoryId]
+                ];
+            }
+        }
+        return [$delProductId, $categoriesIn];
+    }
+
     /**
      * Save product categories.
      *
@@ -1358,17 +1393,8 @@ protected function _saveProductCategories(array $categoriesData)
             $tableName = $this->_resourceFactory->create()->getProductCategoryTable();
         }
         if ($categoriesData) {
-            $categoriesIn = [];
-            $delProductId = [];
-
-            foreach ($categoriesData as $delSku => $categories) {
-                $productId = $this->skuProcessor->getNewSku($delSku)['entity_id'];
-                $delProductId[] = $productId;
+            list($delProductId, $categoriesIn) = $this->getProductCategoriesDataSave($categoriesData, $tableName);
 
-                foreach (array_keys($categories) as $categoryId) {
-                    $categoriesIn[] = ['product_id' => $productId, 'category_id' => $categoryId, 'position' => 0];
-                }
-            }
             if (Import::BEHAVIOR_APPEND != $this->getBehavior()) {
                 $this->_connection->delete(
                     $tableName,
@@ -3268,7 +3294,7 @@ private function findImageByHash(array $images, string $hash): string
      */
     private function getProductMediaPath(): string
     {
-        return $this->joinFilePaths($this->getMediaBasePath(), 'catalog','product');
+        return $this->joinFilePaths($this->getMediaBasePath(), 'catalog', 'product');
     }
 
     /**
@@ -3289,7 +3315,7 @@ private function getMediaBasePath(): string
     /**
      * Joins two paths and remove redundant directory separator
      *
-     * @param string ...$paths
+     * @param array $paths
      * @return string
      */
     private function joinFilePaths(...$paths): string