Merge remote-tracking branch 'local/ACP2E-982' into PR_21_SEP_2022

Author: o-dubovyk

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

@@ -16,6 +16,7 @@
 use Magento\CatalogImportExport\Model\Import\Product\StatusProcessor;
 use Magento\CatalogImportExport\Model\Import\Product\StockProcessor;
 use Magento\CatalogImportExport\Model\StockItemImporterInterface;
+use Magento\CatalogImportExport\Model\StockItemProcessorInterface;
 use Magento\CatalogInventory\Api\Data\StockItemInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\App\ObjectManager;
@@ -229,7 +230,6 @@ class Product extends AbstractEntity
      * @deprecated 101.1.0 use DI for LinkProcessor class if you want to add additional types
      *
      * @see Magento_CatalogImportExport::etc/di.xml
-     *
      * @var array
      */
     protected $_linkNameToId = [
@@ -615,8 +615,8 @@ class Product extends AbstractEntity
     /**
      * @var array
      * @deprecated 100.0.3
-     * @since 100.0.3
      *
+     * @since 100.0.3
      * @see we don't recommend this approach anymore
      */
     protected $productUrlKeys = [];
@@ -756,6 +756,11 @@ class Product extends AbstractEntity
      */
     private $linkProcessor;
 
+    /**
+     * @var StockItemProcessorInterface
+     */
+    private $stockItemProcessor;
+
     /**
      * @param \Magento\Framework\Json\Helper\Data $jsonHelper
      * @param \Magento\ImportExport\Helper\Data $importExportData
@@ -805,6 +810,7 @@ class Product extends AbstractEntity
      * @param StockProcessor|null $stockProcessor
      * @param LinkProcessor|null $linkProcessor
      * @param File|null $fileDriver
+     * @param StockItemProcessorInterface|null $stockItemProcessor
      * @throws LocalizedException
      * @throws \Magento\Framework\Exception\FileSystemException
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
@@ -859,7 +865,8 @@ public function __construct(
         StatusProcessor $statusProcessor = null,
         StockProcessor $stockProcessor = null,
         LinkProcessor $linkProcessor = null,
-        ?File $fileDriver = null
+        ?File $fileDriver = null,
+        ?StockItemProcessorInterface $stockItemProcessor = null
     ) {
         $this->_eventManager = $eventManager;
         $this->stockRegistry = $stockRegistry;
@@ -923,6 +930,8 @@ public function __construct(
         $this->dateTimeFactory = $dateTimeFactory ?? ObjectManager::getInstance()->get(DateTimeFactory::class);
         $this->productRepository = $productRepository ?? ObjectManager::getInstance()
                 ->get(ProductRepositoryInterface::class);
+        $this->stockItemProcessor = $stockItemProcessor ?? ObjectManager::getInstance()
+            ->get(StockItemProcessorInterface::class);
     }
 
     /**
@@ -1286,6 +1295,7 @@ protected function _prepareRowForDb(array $rowData)
      *
      * @deprecated 101.1.0 use linkProcessor Directly
      * @see linkProcessor
+     *
      * @return $this
      */
     protected function _saveLinks()
@@ -2328,6 +2338,7 @@ protected function _saveStockItem()
     {
         while ($bunch = $this->_dataSourceModel->getNextBunch()) {
             $stockData = [];
+            $importedData = [];
             $productIdsToReindex = [];
             $stockChangedProductIds = [];
             // Format bunch to stock data rows
@@ -2353,12 +2364,13 @@ protected function _saveStockItem()
 
                 if (!isset($stockData[$sku])) {
                     $stockData[$sku] = $row;
+                    $importedData[$sku] = $rowData;
                 }
             }
 
             // Insert rows
             if (!empty($stockData)) {
-                $this->stockItemImporter->import($stockData);
+                $this->stockItemProcessor->process($stockData, $importedData);
             }
 
             $this->reindexStockStatus($stockChangedProductIds);
@@ -2512,6 +2524,7 @@ public function getRowScope(array $rowData)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     * @throws \Zend_Validate_Exception
      */
     public function validateRow(array $rowData, $rowNum)
     {

app/code/Magento/CatalogImportExport/Model/StockItemProcessor.php

@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogImportExport\Model;
+
+class StockItemProcessor implements StockItemProcessorInterface
+{
+    /**
+     * @var StockItemImporterInterface
+     */
+    private $stockItemImporter;
+
+    /**
+     * @param StockItemImporterInterface $stockItemImporter
+     */
+    public function __construct(
+        StockItemImporterInterface $stockItemImporter
+    ) {
+        $this->stockItemImporter = $stockItemImporter;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function process(array $stockData, array $importedData): void
+    {
+        $this->stockItemImporter->import($stockData);
+    }
+}

app/code/Magento/CatalogImportExport/Model/StockItemProcessorInterface.php

@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogImportExport\Model;
+
+use Magento\Framework\Exception\CouldNotSaveException;
+use Magento\Framework\Exception\InputException;
+use Magento\Framework\Validation\ValidationException;
+
+interface StockItemProcessorInterface
+{
+    /**
+     * Handle Import of Stock Item Data
+     *
+     * @param array $stockData
+     * @param array $importedData
+     * @return void
+     * @throws CouldNotSaveException
+     * @throws InputException
+     * @throws ValidationException
+     */
+    public function process(array $stockData, array $importedData): void;
+}

app/code/Magento/CatalogImportExport/etc/di.xml

@@ -8,6 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
     <preference for="Magento\CatalogImportExport\Model\Export\RowCustomizerInterface" type="Magento\CatalogImportExport\Model\Export\RowCustomizer\Composite" />
     <preference for="Magento\CatalogImportExport\Model\StockItemImporterInterface" type="Magento\CatalogImportExport\Model\StockItemImporter" />
+    <preference for="Magento\CatalogImportExport\Model\StockItemProcessorInterface" type="Magento\CatalogImportExport\Model\StockItemProcessor" />
     <preference for="Magento\CatalogImportExport\Model\Export\ProductFilterInterface" type="Magento\CatalogImportExport\Model\Export\ProductFilters" />
     <type name="Magento\ImportExport\Model\Import">
         <plugin name="catalogProductFlatIndexerImport" type="Magento\CatalogImportExport\Model\Indexer\Product\Flat\Plugin\Import" />