Merge remote-tracking branch 'magento-l3/ACP2E-1384' into PR-L3-21-02-2023

Author: mirceaRosmeteniuc

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

@@ -2034,10 +2034,7 @@ private function saveProductAttributesPhase(
             }
             if (self::SCOPE_STORE == $rowScope) {
                 if (self::SCOPE_WEBSITE == $attribute->getIsGlobal()) {
-                    // check website defaults already set
-                    if (!isset($attributes[$attrTable][$rowSku][$attrId][$rowStore])) {
-                        $storeIds = $this->storeResolver->getStoreIdToWebsiteStoreIds($rowStore);
-                    }
+                    $storeIds = $this->storeResolver->getStoreIdToWebsiteStoreIds($rowStore);
                 } elseif (self::SCOPE_STORE == $attribute->getIsGlobal()) {
                     $storeIds = [$rowStore];
                 }

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

@@ -7,8 +7,10 @@
 
 namespace Magento\CatalogImportExport\Model\Import\ProductTest;
 
+use Magento\Catalog\Helper\Data as CatalogConfig;
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\ResourceModel\Product as ProductResource;
+use Magento\Catalog\Test\Fixture\Product as ProductFixture;
 use Magento\CatalogImportExport\Model\Import\ProductTestBase;
 use Magento\CatalogInventory\Model\StockRegistry;
 use Magento\Framework\Api\SearchCriteria;
@@ -17,6 +19,12 @@
 use Magento\ImportExport\Helper\Data;
 use Magento\ImportExport\Model\Import;
 use Magento\ImportExport\Model\Import\Source\Csv;
+use Magento\ImportExport\Test\Fixture\CsvFile as CsvFileFixture;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Store\Model\Store;
+use Magento\TestFramework\Fixture\Config;
+use Magento\TestFramework\Fixture\DataFixture;
+use Magento\TestFramework\Fixture\DataFixtureStorageManager;
 use Magento\UrlRewrite\Model\ResourceModel\UrlRewriteCollection;
 
 /**
@@ -725,4 +733,33 @@ public function testImportProductWithTaxClassNone(): void
         $simpleProduct = $this->getProductBySku('simple2');
         $this->assertSame('0', (string) $simpleProduct->getTaxClassId());
     }
+
+    #[
+        Config(CatalogConfig::XML_PATH_PRICE_SCOPE, CatalogConfig::PRICE_SCOPE_WEBSITE, ScopeInterface::SCOPE_STORE),
+        DataFixture(ProductFixture::class, ['price' => 10], 'product'),
+        DataFixture(
+            CsvFileFixture::class,
+            [
+                'rows' => [
+                    ['sku', 'store_view_code', 'price'],
+                    ['$product.sku$', 'default', '9'],
+                    ['$product.sku$', 'default', '8'],
+                ]
+            ],
+            'file'
+        ),
+    ]
+    public function testImportPriceInStoreViewShouldNotOverrideDefaultScopePrice(): void
+    {
+        $fixtures = DataFixtureStorageManager::getStorage();
+        $sku = $fixtures->get('product')->getSku();
+        $pathToFile = $fixtures->get('file')->getAbsolutePath();
+        $importModel = $this->createImportModel($pathToFile);
+        $this->assertErrorsCount(0, $importModel->validateData());
+        $importModel->importData();
+        $product = $this->productRepository->get($sku, storeId: Store::DEFAULT_STORE_ID, forceReload: true);
+        $this->assertEquals(10, $product->getPrice());
+        $product = $this->productRepository->get($sku, storeId: Store::DISTRO_STORE_ID, forceReload: true);
+        $this->assertEquals(9, $product->getPrice());
+    }
 }