MAGETWO-63159: Fix Sales Rule Data Model convertor to support extension attributes

Author: slavvka

app/code/Magento/SalesRule/Model/Converter/ToDataModel.php

@@ -5,6 +5,8 @@
  */
 namespace Magento\SalesRule\Model\Converter;
 
+use Magento\SalesRule\Api\Data\RuleExtensionFactory;
+use Magento\SalesRule\Api\Data\RuleExtensionInterface;
 use Magento\SalesRule\Model\Data\Condition;
 use Magento\SalesRule\Api\Data\RuleInterface;
 use Magento\SalesRule\Model\Data\Rule as RuleDataModel;
@@ -43,38 +45,52 @@ class ToDataModel
      */
     private $serializer;
 
+    /**
+     * @var RuleExtensionFactory
+     */
+    private $extensionFactory;
+
     /**
      * @param \Magento\SalesRule\Model\RuleFactory $ruleFactory
      * @param \Magento\SalesRule\Api\Data\RuleInterfaceFactory $ruleDataFactory
      * @param \Magento\SalesRule\Api\Data\ConditionInterfaceFactory $conditionDataFactory
      * @param \Magento\SalesRule\Api\Data\RuleLabelInterfaceFactory $ruleLabelFactory
      * @param \Magento\Framework\Reflection\DataObjectProcessor $dataObjectProcessor
      * @param Json $serializer Optional parameter for backward compatibility
+     * @param RuleExtensionFactory|null $extensionFactory
      */
     public function __construct(
         \Magento\SalesRule\Model\RuleFactory $ruleFactory,
         \Magento\SalesRule\Api\Data\RuleInterfaceFactory $ruleDataFactory,
         \Magento\SalesRule\Api\Data\ConditionInterfaceFactory $conditionDataFactory,
         \Magento\SalesRule\Api\Data\RuleLabelInterfaceFactory $ruleLabelFactory,
         \Magento\Framework\Reflection\DataObjectProcessor $dataObjectProcessor,
-        Json $serializer = null
+        Json $serializer = null,
+        RuleExtensionFactory $extensionFactory = null
     ) {
         $this->ruleFactory = $ruleFactory;
         $this->ruleDataFactory = $ruleDataFactory;
         $this->conditionDataFactory = $conditionDataFactory;
         $this->ruleLabelFactory = $ruleLabelFactory;
         $this->dataObjectProcessor = $dataObjectProcessor;
         $this->serializer = $serializer ?: \Magento\Framework\App\ObjectManager::getInstance()->get(Json::class);
+        $this->extensionFactory = $extensionFactory ?:
+            \Magento\Framework\App\ObjectManager::getInstance()->get(RuleExtensionFactory::class);
     }
 
     /**
+     * Converts Sale Rule model to Sale Rule DTO
+     *
      * @param Rule $ruleModel
      * @return RuleDataModel
      */
     public function toDataModel(\Magento\SalesRule\Model\Rule $ruleModel)
     {
+        $modelData = $ruleModel->getData();
+        $modelData = $this->convertExtensionAttributesToObject($modelData);
+
         /** @var \Magento\SalesRule\Model\Data\Rule $dataModel */
-        $dataModel = $this->ruleDataFactory->create(['data' => $ruleModel->getData()]);
+        $dataModel = $this->ruleDataFactory->create(['data' => $modelData]);
 
         $this->mapFields($dataModel, $ruleModel);
 
@@ -162,6 +178,21 @@ protected function mapCouponType(RuleDataModel $dataModel)
         return $this;
     }
 
+    /**
+     * Convert extension attributes of model to object if it is an array
+     *
+     * @param array $data
+     * @return array
+     */
+    private function convertExtensionAttributesToObject(array $data) : array
+    {
+        if (isset($data['extension_attributes']) && is_array($data['extension_attributes'])) {
+            /** @var RuleExtensionInterface $attributes */
+            $data['extension_attributes'] = $this->extensionFactory->create(['data' => $data['extension_attributes']]);
+        }
+        return $data;
+    }
+
     /**
      * @param RuleDataModel $dataModel
      * @param \Magento\SalesRule\Model\Rule $ruleModel

app/code/Magento/SalesRule/Test/Unit/Model/Converter/ToDataModelTest.php

@@ -4,6 +4,8 @@
  * See COPYING.txt for license details.
  */
 namespace Magento\SalesRule\Test\Unit\Model\Converter;
+use Magento\SalesRule\Api\Data\RuleExtensionFactory;
+use Magento\SalesRule\Api\Data\RuleExtensionInterface;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -50,6 +52,11 @@ class ToDataModelTest extends \PHPUnit_Framework_TestCase
      */
     protected $serializer;
 
+    /**
+     * @var RuleExtensionFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $extensionFactoryMock;
+
     protected function setUp()
     {
         $this->ruleFactory = $this->getMockBuilder(\Magento\SalesRule\Model\RuleFactory::class)
@@ -87,6 +94,11 @@ protected function setUp()
             ->setMethods(null)
             ->getMock();
 
+        $this->extensionFactoryMock = $this->getMockBuilder(RuleExtensionFactory::class)
+            ->setMethods(['create'])
+            ->disableOriginalConstructor()
+            ->getMock();
+
         $helper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $this->model = $helper->getObject(
             \Magento\SalesRule\Model\Converter\ToDataModel::class,
@@ -97,6 +109,7 @@ protected function setUp()
                 'ruleLabelFactory' => $this->ruleLabelFactory,
                 'dataObjectProcessor' => $this->dataObjectProcessor,
                 'serializer' => $this->serializer,
+                'extensionFactory' => $this->extensionFactoryMock,
             ]
         );
     }
@@ -147,12 +160,28 @@ private function getArrayData()
                 0 => 'TestRule',
                 1 => 'TestRuleForDefaultStore',
             ],
+            'extension_attributes' => [
+                'some_extension_attributes' => 123,
+            ],
         ];
     }
 
     public function testToDataModel()
     {
         $array = $this->getArrayData();
+        $arrayAttributes = $array;
+
+        /** @var RuleExtensionInterface|\PHPUnit_Framework_MockObject_MockObject $attributesMock */
+        $attributesMock = $this->getMockBuilder(RuleExtensionInterface::class)
+            ->getMock();
+        $arrayAttributes['extension_attributes'] = $attributesMock;
+
+
+        $this->extensionFactoryMock->expects($this->any())
+            ->method('create')
+            ->with(['data' => $array['extension_attributes']])
+            ->willReturn($attributesMock);
+
         $dataModel = $this->getMockBuilder(\Magento\SalesRule\Model\Data\Rule::class)
             ->disableOriginalConstructor()
             ->setMethods(['create', 'getStoreLabels', 'setStoreLabels', 'getCouponType', 'setCouponType'])
@@ -181,6 +210,7 @@ public function testToDataModel()
         $this->ruleDataFactory
             ->expects($this->any())
             ->method('create')
+            ->with(['data' => $arrayAttributes])
             ->willReturn($dataModel);
 
         $this->salesRule