ACP2E-3660: REST endpoint Product Import Json not validate the mandatory fields

Author: aplapana

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

@@ -8,9 +8,24 @@
 namespace Magento\CatalogImportExport\Model\Import\Product\Validator;
 
 use Magento\CatalogImportExport\Model\Import\Product\RowValidatorInterface;
+use Magento\CatalogImportExport\Model\Import\Product\SkuStorage;
+use Magento\CatalogImportExport\Model\Import\Product;
 
 class Name extends AbstractImportValidator implements RowValidatorInterface
 {
+    /**
+     * @var SkuStorage
+     */
+    private SkuStorage $skuStorage;
+
+    /**
+     * @param SkuStorage $skuStorage
+     */
+    public function __construct(SkuStorage $skuStorage)
+    {
+        $this->skuStorage = $skuStorage;
+    }
+
     /**
      * @inheritDoc
      */
@@ -19,7 +34,8 @@ public function isValid($value)
         $this->_clearMessages();
         if (!$this->hasNameValue($value) &&
             !$this->hasCustomOptions($value) &&
-            (!isset($value['store_view_code']) || $value['store_view_code'] != 'default')
+            (!isset($value['store_view_code']) || $value['store_view_code'] != 'default') &&
+            !$this->skuStorage->has($value[Product::COL_SKU])
         ) {
             $this->_addMessages(
                 [
@@ -43,9 +59,9 @@ public function isValid($value)
      */
     private function hasNameValue(array $rowData): bool
     {
-        return array_key_exists('name', $rowData) &&
-            !empty($rowData['name']) &&
-            $rowData['name'] !== $this->context->getEmptyAttributeValueConstant();
+        return array_key_exists(Product::COL_NAME, $rowData) &&
+            !empty($rowData[Product::COL_NAME]) &&
+            $rowData[Product::COL_NAME] !== $this->context->getEmptyAttributeValueConstant();
     }
 
     /**

app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Validator/NameTest.php

@@ -8,12 +8,28 @@
 namespace Magento\CatalogImportExport\Test\Unit\Model\Import\Product\Validator;
 
 use Magento\CatalogImportExport\Model\Import\Product;
+use Magento\CatalogImportExport\Model\Import\Product\SkuStorage;
 use Magento\CatalogImportExport\Model\Import\Product\Validator\Name;
 use PHPUnit\Framework\MockObject\Exception;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
 class NameTest extends TestCase
 {
+    /**
+     * @var SkuStorage|MockObject
+     */
+    private SkuStorage $skuStorage;
+
+    /**
+     * @return void
+     */
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->skuStorage = $this->createMock(SkuStorage::class);
+    }
+
     /**
      * @param $expected
      * @param $value
@@ -23,7 +39,8 @@ class NameTest extends TestCase
      */
     public function testIsValid($expected, $value): void
     {
-        $nameValidator = new Name();
+        $this->skuStorage->expects($this->any())->method('has')->willReturn(false);
+        $nameValidator = new Name($this->skuStorage);
         $context = $this->createMock(Product::class);
         $context->expects($this->any())->method('getEmptyAttributeValueConstant')->willReturn('|');
         $context->expects($this->any())->method('retrieveMessageTemplate')->willReturn('%s error %s');
@@ -39,11 +56,11 @@ public static function getRowData(): array
         return [
             [
                 false,
-                ['name' => null, 'store_view_code' => 'en']
+                ['name' => null, 'store_view_code' => 'en', 'sku' => 'sku']
             ],
             [
                 true,
-                ['name' => 'anything goes here', 'store_view_code' => 'en']
+                ['name' => 'anything goes here', 'store_view_code' => 'en', 'sku' => 'sku']
             ]
         ];
     }