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

Author: aplapana

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

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\CatalogImportExport\Model\Import\Product\Type;
 
@@ -27,6 +27,8 @@
  */
 abstract class AbstractType
 {
+    private const NON_REQUIRED_ATTRIBUTES_EXISTING_PRODUCTS = [Product::COL_NAME];
+
     /**
      * @var array
      */
@@ -581,7 +583,9 @@ public function isRowValid(array $rowData, $rowNum, $isNewProduct = true)
                     // For the default scope - if this is a new product or
                     // for an old product, if the imported doc has the column present for the attrCode
                     if (Product::SCOPE_DEFAULT == $rowScope &&
-                        ($isNewProduct || array_key_exists($attrCode, $rowData))) {
+                        ($isNewProduct || !in_array($attrCode,self::NON_REQUIRED_ATTRIBUTES_EXISTING_PRODUCTS)) &&
+                        array_key_exists($attrCode, $rowData)
+                    ) {
                         $this->_entityModel->addRowError(
                             RowValidatorInterface::ERROR_VALUE_IS_REQUIRED,
                             $rowNum,

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

@@ -381,31 +381,36 @@ public function getInvalidAttribute()
     /**
      * Is valid attributes
      *
-     * @return bool
+     * @return array
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
      */
-    protected function isValidAttributes()
+    protected function isValidAttributes(): array
     {
         $this->_clearMessages();
         $this->setInvalidAttribute(null);
+        $attributeValidationResult['result'] = true;
+
         if (!isset($this->_rowData['product_type'])) {
-            return false;
+            $attributeValidationResult['result'] = false;
+            return $attributeValidationResult;
         }
         $entityTypeModel = $this->context->retrieveProductTypeByName($this->_rowData['product_type']);
         if ($entityTypeModel) {
+            $result = true;
             foreach ($this->_rowData as $attrCode => $attrValue) {
                 $attrParams = $entityTypeModel->retrieveAttributeFromCache($attrCode);
                 if ($attrCode === Product::COL_CATEGORY && $attrValue) {
-                    $this->isCategoriesValid($attrValue);
+                    $result = $this->isCategoriesValid($attrValue);
                 } elseif ($attrParams) {
-                    $this->isAttributeValid($attrCode, $attrParams, $this->_rowData);
+                    $result = $this->isAttributeValid($attrCode, $attrParams, $this->_rowData);
                 }
+                $attributeValidationResult['attributes'][$attrCode] = $result;
             }
             if ($this->getMessages()) {
-                return false;
+                $attributeValidationResult['result'] = false;
             }
         }
-        return true;
+        return $attributeValidationResult;
     }
 
     /**
@@ -415,14 +420,28 @@ public function isValid($value)
     {
         $this->_rowData = $value;
         $this->_clearMessages();
-        $returnValue = $this->isValidAttributes();
+        $validatedAttributes = $this->isValidAttributes();
+        /** @var Product\Validator\AbstractImportValidator $validator */
         foreach ($this->validators as $validator) {
             if (!$validator->isValid($value)) {
-                $returnValue = false;
                 $this->_addMessages($validator->getMessages());
+            } else {
+                //prioritize specialized validation
+                if ($validator->getFieldName() &&
+                    $validatedAttributes['attributes'][$validator->getFieldName()] === false
+                ) {
+                    $validatedAttributes['attributes'][$validator->getFieldName()] = true;
+                    foreach ($this->_messages as $key => $message) {
+                        if (str_contains($message, $validator->getFieldName())) {
+                            unset($this->_messages[$key]);
+                        }
+                    }
+                    $this->_messages = array_values($this->_messages);
+                }
             }
         }
-        return $returnValue;
+
+        return !in_array(false, array_values($validatedAttributes['attributes']));
     }
 
     /**
@@ -439,6 +458,16 @@ public function getRowScope(array $rowData)
         return Product::SCOPE_STORE;
     }
 
+    private function getValidatorFields(): array
+    {
+        $validatorFields = [];
+        /** @var Product\Validator\AbstractImportValidator $validator */
+        foreach($this->validators as $validator) {
+            $validatorFields[] = $validator->getFieldName();
+        }
+        return $validatorFields;
+    }
+
     /**
      * Validate category names
      *

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

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\CatalogImportExport\Model\Import\Product\Validator;
 
@@ -10,6 +10,11 @@
 
 abstract class AbstractImportValidator extends AbstractValidator implements RowValidatorInterface
 {
+    /**
+     * @var string|null
+     */
+    protected ?string $fieldName = null;
+
     /**
      * @var \Magento\CatalogImportExport\Model\Import\Product
      */
@@ -24,4 +29,12 @@ public function init($context)
         $this->context = $context;
         return $this;
     }
+
+    /**
+     * @return string|null
+     */
+    public function getFieldName(): ?string
+    {
+        return $this->fieldName;
+    }
 }

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

@@ -24,6 +24,7 @@ class Name extends AbstractImportValidator implements RowValidatorInterface
     public function __construct(SkuStorage $skuStorage)
     {
         $this->skuStorage = $skuStorage;
+        $this->fieldName = Product::COL_NAME;
     }
 
     /**
@@ -41,7 +42,7 @@ public function isValid($value)
                 [
                     sprintf(
                         $this->context->retrieveMessageTemplate(self::ERROR_INVALID_ATTRIBUTE_TYPE),
-                        'name',
+                        $this->fieldName,
                         'not empty'
                     )
                 ]
@@ -59,9 +60,9 @@ public function isValid($value)
      */
     private function hasNameValue(array $rowData): bool
     {
-        return array_key_exists(Product::COL_NAME, $rowData) &&
-            !empty($rowData[Product::COL_NAME]) &&
-            $rowData[Product::COL_NAME] !== $this->context->getEmptyAttributeValueConstant();
+        return array_key_exists($this->fieldName, $rowData) &&
+            !empty($rowData[$this->fieldName]) &&
+            $rowData[$this->fieldName] !== $this->context->getEmptyAttributeValueConstant();
     }
 
     /**