Merge remote-tracking branch 'origin/ACP2E-4142' into PR_2025_09_08_muntianu

Author: katmoon

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

@@ -3404,6 +3404,7 @@ private function formatStockDataForRow(array $rowData): array
 
         $stockItemDo = $this->stockRegistry->getStockItem($row['product_id'], $row['website_id']);
         $existStockData = $stockItemDo->getData();
+        $isInStockOld = (bool) ($existStockData['is_in_stock'] ?? $this->defaultStockData['is_in_stock']);
 
         $row = array_merge(
             $this->defaultStockData,
@@ -3414,14 +3415,35 @@ private function formatStockDataForRow(array $rowData): array
 
         if ($this->stockConfiguration->isQty($this->skuProcessor->getNewSku($sku)['type_id'])) {
             $stockItemDo->setData($row);
-            $row['is_in_stock'] = $this->stockStateProvider->verifyStock($stockItemDo)
-                ? (int) $row['is_in_stock']
-                : 0;
+            $isInStock = $this->stockStateProvider->verifyStock($stockItemDo);
+            /**
+             * This following logic originates from
+             * @see \Magento\CatalogInventory\Model\Stock\StockItemRepository::updateStockStatus
+             * It is important to keep it for consistency
+             */
+            if ($stockItemDo->getManageStock()) {
+                if (!$isInStock) {
+                    if ($stockItemDo->getIsInStock() === true) {
+                        $stockItemDo->setIsInStock(false);
+                        $stockItemDo->setStockStatusChangedAuto(1);
+                    }
+                } else {
+                    if ($stockItemDo->getIsInStock() !== $isInStockOld) {
+                        $stockItemDo->setStockStatusChangedAuto(0);
+                    }
+                    if ($stockItemDo->getIsInStock() === false && $stockItemDo->getStockStatusChangedAuto()) {
+                        $stockItemDo->setIsInStock(true);
+                    }
+                }
+            } else {
+                $stockItemDo->setStockStatusChangedAuto(0);
+            }
+            $row['is_in_stock'] = (int) $stockItemDo->getIsInStock();
+            $row['stock_status_changed_auto'] = (int) $stockItemDo->getStockStatusChangedAuto();
             if ($this->stockStateProvider->verifyNotification($stockItemDo)) {
                 $date = $this->dateTimeFactory->create('now', new \DateTimeZone('UTC'));
                 $row['low_stock_date'] = $date->format(DateTime::DATETIME_PHP_FORMAT);
             }
-            $row['stock_status_changed_auto'] = (int)!$this->stockStateProvider->verifyStock($stockItemDo);
         } else {
             $row['qty'] = 0;
         }

dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest/ProductStockTest.php

@@ -1,17 +1,21 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
 namespace Magento\CatalogImportExport\Model\Import\ProductTest;
 
+use Magento\Catalog\Test\Fixture\Product as ProductFixture;
 use Magento\CatalogImportExport\Model\Import\ProductTestBase;
 use Magento\CatalogInventory\Model\Stock;
 use Magento\CatalogInventory\Model\StockRegistry;
 use Magento\CatalogInventory\Model\StockRegistryStorage;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\ImportExport\Test\Fixture\CsvFile as CsvFileFixture;
+use Magento\TestFramework\Fixture\DataFixture;
+use Magento\TestFramework\Fixture\DataFixtureStorageManager;
 
 /**
  * Integration test for \Magento\CatalogImportExport\Model\Import\Product class.
@@ -43,6 +47,50 @@ protected function setUp(): void
         $this->stockRegistry = $this->objectManager->get(StockRegistry::class);
     }
 
+    #[
+        DataFixture(
+            ProductFixture::class,
+            [
+                'extension_attributes' => [
+                    'stock_item' => [
+                        'use_config_manage_stock' => true,
+                        'qty' => 100,
+                        'is_qty_decimal' => false,
+                        'is_in_stock' => true,
+                        'min_qty' => 200
+                    ]
+                ],
+            ],
+            'product'
+        ),
+        DataFixture(
+            CsvFileFixture::class,
+            [
+                'rows' => [
+                    ['sku', 'store_view_code', 'out_of_stock_qty'],
+                    ['$product.sku$', '', '1'],
+                ]
+            ],
+            'file'
+        ),
+    ]
+
+    public function testImportProductAutoStockStatusAdjustment(): void
+    {
+        $fixtures = DataFixtureStorageManager::getStorage();
+        $id = $fixtures->get('product')->getId();
+        $pathToFile = $fixtures->get('file')->getAbsolutePath();
+        $stockItem = $this->stockRegistry->getStockItem($id, 1);
+        $this->assertFalse($stockItem->getIsInStock());
+
+        $import = $this->createImportModel($pathToFile);
+        $this->assertErrorsCount(0, $import->validateData());
+        $import->importData();
+
+        $stockItem = $this->stockRegistry->getStockItem($id, 1);
+        $this->assertTrue($stockItem->getIsInStock());
+    }
+
     /**
      * Test if stock item quantity properly saved after import
      *