Merge pull request #1 from magento/2.3-develop

marge new change

Author: ravi-chandra3197

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

@@ -71,6 +71,11 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
      */
     const STORE_ID = 'store_id';
 
+    /**
+     * Product Url path.
+     */
+    const URL_PATH = 'url_path';
+
     /**
      * @var string
      */
@@ -923,8 +928,8 @@ public function beforeSave()
      *
      * If value specified, it will be set.
      *
-     * @param   bool $value
-     * @return  bool
+     * @param bool $value
+     * @return bool
      */
     public function canAffectOptions($value = null)
     {

app/code/Magento/Catalog/Model/Product/Attribute/Backend/TierPrice/UpdateHandler.php

@@ -92,7 +92,12 @@ public function execute($entity, $arguments = [])
             $productId = (int) $entity->getData($identifierField);
 
             // prepare original data to compare
-            $origPrices = $entity->getOrigData($attribute->getName());
+            $origPrices = [];
+            $originalId = $entity->getOrigData($identifierField);
+            if (empty($originalId) || $entity->getData($identifierField) == $originalId) {
+                $origPrices = $entity->getOrigData($attribute->getName());
+            }
+
             $old = $this->prepareOriginalDataToCompare($origPrices, $isGlobal);
             // prepare data for save
             $new = $this->prepareNewDataForSave($priceRows, $isGlobal);

app/code/Magento/Catalog/Model/Product/Copier.php

@@ -8,7 +8,11 @@
 namespace Magento\Catalog\Model\Product;
 
 use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Model\Product;
 
+/**
+ * The copier creates product duplicates.
+ */
 class Copier
 {
     /**
@@ -49,7 +53,7 @@ public function __construct(
      * @param \Magento\Catalog\Model\Product $product
      * @return \Magento\Catalog\Model\Product
      */
-    public function copy(\Magento\Catalog\Model\Product $product)
+    public function copy(Product $product)
     {
         $product->getWebsiteIds();
         $product->getCategoryIds();
@@ -79,6 +83,7 @@ public function copy(\Magento\Catalog\Model\Product $product)
                 ? $matches[1] . '-' . ($matches[2] + 1)
                 : $urlKey . '-1';
             $duplicate->setUrlKey($urlKey);
+            $duplicate->setData(Product::URL_PATH, null);
             try {
                 $duplicate->save();
                 $isDuplicateSaved = true;
@@ -94,6 +99,8 @@ public function copy(\Magento\Catalog\Model\Product $product)
     }
 
     /**
+     * Returns product option repository.
+     *
      * @return Option\Repository
      * @deprecated 101.0.0
      */
@@ -107,6 +114,8 @@ private function getOptionRepository()
     }
 
     /**
+     * Returns metadata pool.
+     *
      * @return \Magento\Framework\EntityManager\MetadataPool
      * @deprecated 101.0.0
      */

app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml

@@ -420,4 +420,17 @@
         <data key="status">1</data>
         <requiredEntity type="product_extension_attribute">EavStock100</requiredEntity>
     </entity>
+    <entity name="ApiSimpleSingleQty" type="product2">
+        <data key="sku" unique="suffix">api-simple-product</data>
+        <data key="type_id">simple</data>
+        <data key="attribute_set_id">4</data>
+        <data key="visibility">4</data>
+        <data key="name" unique="suffix">Api Simple Product</data>
+        <data key="price">123.00</data>
+        <data key="urlKey" unique="suffix">api-simple-product</data>
+        <data key="status">1</data>
+        <data key="quantity">1</data>
+        <requiredEntity type="product_extension_attribute">EavStock1</requiredEntity>
+        <requiredEntity type="custom_attribute">CustomAttributeProductAttribute</requiredEntity>
+    </entity>
 </entities>

app/code/Magento/Catalog/Test/Mftf/Data/ProductExtensionAttributeData.xml

@@ -17,4 +17,7 @@
     <entity name="EavStock10" type="product_extension_attribute">
         <requiredEntity type="stock_item">Qty_10</requiredEntity>
     </entity>
+    <entity name="EavStock1" type="product_extension_attribute">
+        <requiredEntity type="stock_item">Qty_1</requiredEntity>
+    </entity>
 </entities>

app/code/Magento/Catalog/Test/Mftf/Data/StockItemData.xml

@@ -28,4 +28,8 @@
         <data key="qty">101</data>
         <data key="is_in_stock">true</data>
     </entity>
+    <entity name="Qty_1" type="stock_item">
+        <data key="qty">1</data>
+        <data key="is_in_stock">true</data>
+    </entity>
 </entities>

app/code/Magento/Catalog/Test/Unit/Model/Attribute/Backend/TierPrice/UpdateHandlerTest.php

@@ -120,8 +120,13 @@ public function testExecute(): void
                 ['entity_id', $productId]
             ]
         );
-        $product->expects($this->atLeastOnce())->method('getOrigData')->with('tier_price')
-            ->willReturn($originalTierPrices);
+        $product->expects($this->atLeastOnce())->method('getOrigData')
+            ->willReturnMap(
+                [
+                    ['tier_price', $originalTierPrices],
+                    ['entity_id', $productId]
+                ]
+            );
         $product->expects($this->atLeastOnce())->method('getStoreId')->willReturn(0);
         $product->expects($this->atLeastOnce())->method('setData')->with('tier_price_changed', 1);
         $store = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class)

app/code/Magento/Catalog/Test/Unit/Model/Product/CopierTest.php

@@ -7,6 +7,7 @@
 
 use Magento\Catalog\Api\Data\ProductInterface;
 use \Magento\Catalog\Model\Product\Copier;
+use Magento\Catalog\Model\Product;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -54,7 +55,7 @@ protected function setUp()
             \Magento\Catalog\Model\Product\Option\Repository::class
         );
         $this->optionRepositoryMock;
-        $this->productMock = $this->createMock(\Magento\Catalog\Model\Product::class);
+        $this->productMock = $this->createMock(Product::class);
         $this->productMock->expects($this->any())->method('getEntityId')->willReturn(1);
 
         $this->metadata = $this->getMockBuilder(\Magento\Framework\EntityManager\EntityMetadata::class)
@@ -106,7 +107,7 @@ public function testCopy()
         $this->productMock->expects($this->once())->method('getResource')->will($this->returnValue($resourceMock));
 
         $duplicateMock = $this->createPartialMock(
-            \Magento\Catalog\Model\Product::class,
+            Product::class,
             [
                 '__wakeup',
                 'setData',
@@ -147,10 +148,10 @@ public function testCopy()
         )->with(
             \Magento\Store\Model\Store::DEFAULT_STORE_ID
         );
-        $duplicateMock->expects($this->once())->method('setData')->with($productData);
+        $duplicateMock->expects($this->atLeastOnce())->method('setData')->willReturn($duplicateMock);
         $this->copyConstructorMock->expects($this->once())->method('build')->with($this->productMock, $duplicateMock);
         $duplicateMock->expects($this->once())->method('getUrlKey')->willReturn('urk-key-1');
-        $duplicateMock->expects($this->once())->method('setUrlKey')->with('urk-key-2');
+        $duplicateMock->expects($this->once())->method('setUrlKey')->with('urk-key-2')->willReturn($duplicateMock);
         $duplicateMock->expects($this->once())->method('save');
 
         $this->metadata->expects($this->any())->method('getLinkField')->willReturn('linkField');

app/code/Magento/CatalogInventory/Model/Indexer/Stock/CacheCleaner.php

@@ -10,8 +10,10 @@
 
 use Magento\CatalogInventory\Api\StockConfigurationInterface;
 use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\Event\ManagerInterface;
+use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\Indexer\CacheContext;
 use Magento\CatalogInventory\Model\Stock;
 use Magento\Catalog\Model\Product;
@@ -46,25 +48,35 @@ class CacheCleaner
      */
     private $connection;
 
+    /**
+     * @var MetadataPool
+     */
+    private $metadataPool;
+
     /**
      * @param ResourceConnection $resource
      * @param StockConfigurationInterface $stockConfiguration
      * @param CacheContext $cacheContext
      * @param ManagerInterface $eventManager
+     * @param MetadataPool|null $metadataPool
      */
     public function __construct(
         ResourceConnection $resource,
         StockConfigurationInterface $stockConfiguration,
         CacheContext $cacheContext,
-        ManagerInterface $eventManager
+        ManagerInterface $eventManager,
+        MetadataPool $metadataPool = null
     ) {
         $this->resource = $resource;
         $this->stockConfiguration = $stockConfiguration;
         $this->cacheContext = $cacheContext;
         $this->eventManager = $eventManager;
+        $this->metadataPool = $metadataPool ?: ObjectManager::getInstance()->get(MetadataPool::class);
     }
 
     /**
+     * Clean cache by product ids.
+     *
      * @param array $productIds
      * @param callable $reindex
      * @return void
@@ -76,22 +88,37 @@ public function clean(array $productIds, callable $reindex)
         $productStatusesAfter = $this->getProductStockStatuses($productIds);
         $productIds = $this->getProductIdsForCacheClean($productStatusesBefore, $productStatusesAfter);
         if ($productIds) {
-            $this->cacheContext->registerEntities(Product::CACHE_TAG, $productIds);
+            $this->cacheContext->registerEntities(Product::CACHE_TAG, array_unique($productIds));
             $this->eventManager->dispatch('clean_cache_by_tags', ['object' => $this->cacheContext]);
         }
     }
 
     /**
+     * Get current stock statuses for product ids.
+     *
      * @param array $productIds
      * @return array
      */
     private function getProductStockStatuses(array $productIds)
     {
+        $linkField = $this->metadataPool->getMetadata(\Magento\Catalog\Api\Data\ProductInterface::class)
+            ->getLinkField();
         $select = $this->getConnection()->select()
             ->from(
-                $this->resource->getTableName('cataloginventory_stock_status'),
+                ['css' => $this->resource->getTableName('cataloginventory_stock_status')],
                 ['product_id', 'stock_status', 'qty']
-            )->where('product_id IN (?)', $productIds)
+            )
+            ->joinLeft(
+                ['cpr' => $this->resource->getTableName('catalog_product_relation')],
+                'css.product_id = cpr.child_id',
+                []
+            )
+            ->joinLeft(
+                ['cpe' => $this->resource->getTableName('catalog_product_entity')],
+                'cpr.parent_id = cpe.' . $linkField,
+                ['parent_id' => 'cpe.entity_id']
+            )
+            ->where('product_id IN (?)', $productIds)
             ->where('stock_id = ?', Stock::DEFAULT_STOCK_ID)
             ->where('website_id = ?', $this->stockConfiguration->getDefaultScopeId());
 
@@ -125,13 +152,18 @@ private function getProductIdsForCacheClean(array $productStatusesBefore, array
             if ($statusBefore['stock_status'] !== $statusAfter['stock_status']
                 || ($stockThresholdQty && $statusAfter['qty'] <= $stockThresholdQty)) {
                 $productIds[] = $productId;
+                if (isset($statusAfter['parent_id'])) {
+                    $productIds[] = $statusAfter['parent_id'];
+                }
             }
         }
 
         return $productIds;
     }
 
     /**
+     * Get database connection.
+     *
      * @return AdapterInterface
      */
     private function getConnection()