MAGETWO-87851: [Forwardport] #13551 Fix json encoded attribute backend type to not encode attribute value multiple times #13640

Author: Stanislav Idolov

app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php

@@ -202,8 +202,6 @@ public function execute()
                 }
             }
 
-            $data = $this->presentation->convertPresentationDataToInputType($data);
-
             if ($attributeId) {
                 if (!$model->getId()) {
                     $this->messageManager->addErrorMessage(__('This attribute no longer exists.'));
@@ -218,6 +216,7 @@ public function execute()
 
                 $data['attribute_code'] = $model->getAttributeCode();
                 $data['is_user_defined'] = $model->getIsUserDefined();
+                $data['frontend_input'] = $model->getFrontendInput();
             } else {
                 /**
                  * @todo add to helper and specify all relations for properties
@@ -230,6 +229,8 @@ public function execute()
                 );
             }
 
+            $data = $this->presentation->convertPresentationDataToInputType($data);
+
             $data += ['is_filterable' => 0, 'is_filterable_in_search' => 0];
 
             if ($model->getIsUserDefined() === null || $model->getIsUserDefined() != 0) {

app/code/Magento/Eav/Model/Entity/Attribute/Backend/JsonEncoded.php

@@ -41,7 +41,7 @@ public function beforeSave($object)
     {
         // parent::beforeSave() is not called intentionally
         $attrCode = $this->getAttribute()->getAttributeCode();
-        if ($object->hasData($attrCode)) {
+        if ($object->hasData($attrCode) && !$this->isJsonEncoded($object->getData($attrCode))) {
             $object->setData($attrCode, $this->jsonSerializer->serialize($object->getData($attrCode)));
         }
         return $this;
@@ -61,4 +61,24 @@ public function afterLoad($object)
         $object->setData($attrCode, $this->jsonSerializer->unserialize($object->getData($attrCode) ?: '{}'));
         return $this;
     }
+
+    /**
+     * Returns true if given value is a valid json value, and false otherwise.
+     *
+     * @param string|int|float|bool|array|null $value
+     * @return bool
+     */
+    private function isJsonEncoded($value): bool
+    {
+        $result = is_string($value);
+        if ($result) {
+            try {
+                $this->jsonSerializer->unserialize($value);
+            } catch (\InvalidArgumentException $e) {
+                $result = false;
+            }
+        }
+
+        return $result;
+    }
 }

app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Backend/JsonEncodedTest.php

@@ -82,6 +82,25 @@ public function testBeforeSave()
         $this->assertEquals(json_encode([1, 2, 3]), $product->getData('json_encoded'));
     }
 
+    /**
+     * Test before save handler with already encoded attribute value
+     */
+    public function testBeforeSaveWithAlreadyEncodedValue()
+    {
+        $product = new \Magento\Framework\DataObject(
+            [
+                'json_encoded' => [1, 2, 3]
+            ]
+        );
+
+        // save twice
+        $this->model->beforeSave($product);
+        $this->model->beforeSave($product);
+        
+        // check it is encoded only once
+        $this->assertEquals(json_encode([1, 2, 3]), $product->getData('json_encoded'));
+    }
+
     /**
      * Test after load handler
      */