MAGETWO-90729: Imported products are incorrectly in stock if 'allow_backorders' enabled

Author: DianaRusin

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

@@ -2869,14 +2869,12 @@ private function formatStockDataForRow(array $rowData): array
 
         if ($this->stockConfiguration->isQty($this->skuProcessor->getNewSku($sku)['type_id'])) {
             $stockItemDo->setData($row);
-            $row['is_in_stock'] = $stockItemDo->getBackorders() && isset($row['is_in_stock'])
+            $row['is_in_stock'] = isset($row['is_in_stock']) && $stockItemDo->getBackorders()
                 ? $row['is_in_stock']
                 : $this->stockStateProvider->verifyStock($stockItemDo);
             if ($this->stockStateProvider->verifyNotification($stockItemDo)) {
-                $row['low_stock_date'] = $this->dateTime->gmDate(
-                    'Y-m-d H:i:s',
-                    (new \DateTime())->getTimestamp()
-                );
+                $row['low_stock_date'] =
+                gmdate(\Magento\Framework\Stdlib\DateTime::DATETIME_PHP_FORMAT, (new \DateTime())->getTimestamp());
             }
             $row['stock_status_changed_auto'] = (int)!$this->stockStateProvider->verifyStock($stockItemDo);
         } else {

dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_out_of_stock.php

@@ -18,8 +18,7 @@
 $product = $objectManager->create(\Magento\Catalog\Model\Product::class);
 $product->isObjectNew(true);
 $product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
-    ->setId(1)
-    ->setAttributeSetId(4)
+    ->setAttributeSetId($product->getDefaultAttributeSetId())
     ->setWebsiteIds([1])
     ->setName('Simple Product')
     ->setSku('simple-out-of-stock')
@@ -40,7 +39,8 @@
             'is_qty_decimal'            => 0,
             'is_in_stock'               => 0,
         ]
-    )->setCanSaveCustomOptions(true)
+    )
+    ->setCanSaveCustomOptions(true)
     ->setHasOptions(true);
 
 /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepositoryFactory */

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

@@ -2185,7 +2185,7 @@ public function testProductsWithMultipleStoresWhenMediaIsDisabled(): void
     /**
      * Test that imported product stock status with backorders functionality enabled can be set to 'out of stock'.
      *
-     * @magentoDataIsolation enabled
+     * @magentoDbIsolation enabled
      * @magentoAppIsolation enabled
      *
      * @return void
@@ -2220,7 +2220,9 @@ private function importFile(string $fileName): void
                 'entity' => 'catalog_product',
                 \Magento\ImportExport\Model\Import::FIELDS_ENCLOSURE => 1,
             ]
-        )->setSource($source)->validateData();
+        )
+        ->setSource($source)
+        ->validateData();
 
         $this->assertTrue($errors->getErrorsCount() == 0);