Merge pull request #161 from magento-api/MAGETWO-35266-Update-fails-t…

…rying-to-recreate-tables [API] MAGETWO-35266: Update fails trying to recreate tables
magento · Mar 18, 2015 · fc05202 · fc05202
2 parents b456cd1 + 28cf7e4
commit fc05202
Show file tree

Hide file tree

Showing 8 changed files with 225 additions and 140 deletions.
diff --git a/app/code/Magento/Eav/Model/EavCustomAttributeTypeLocator.php b/app/code/Magento/Eav/Model/EavCustomAttributeTypeLocator.php
@@ -10,6 +10,9 @@
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Webapi\CustomAttributeTypeLocatorInterface;
 
+/**
+ * Class to locate types for Eav custom attributes
+ */
 class EavCustomAttributeTypeLocator implements CustomAttributeTypeLocatorInterface
 {
     /**
@@ -32,7 +35,22 @@ class EavCustomAttributeTypeLocator implements CustomAttributeTypeLocatorInterfa
      *
      * @param AttributeRepositoryInterface $attributeRepository
      * @param array $serviceEntityTypeMap
+     * <pre>
+     * [
+     *      'ServiceInterfaceA' => 'EavEntityType1',
+     *      'ServiceInterfaceB' => 'EavEntityType2'
+     * ]
+     * </pre>
      * @param array $serviceBackendModelDataInterfaceMap
+     * <pre>
+     * [
+     *      'ServiceInterfaceA' => ['BackendType1' => 'ServiceDataInterface1'],
+     *      'ServiceInterfaceB' => [
+     *                              'BackendType2' => 'ServiceDataInterface2',
+     *                              'BackendType3' => 'ServiceDataInterface3'
+     *                             ]
+     * ]
+     * </pre>
      */
     public function __construct(
         AttributeRepositoryInterface $attributeRepository,
@@ -69,4 +87,22 @@ public function getType($attributeCode, $serviceClass)
 
         return $dataInterface;
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAllServiceDataInterfaces()
+    {
+        $dataInterfaceArray = [];
+        if (!$this->serviceBackendModelDataInterfaceMap) {
+            return [];
+        } else {
+            foreach ($this->serviceBackendModelDataInterfaceMap as $serviceArray) {
+                foreach ($serviceArray as $dataInterface) {
+                    $dataInterfaceArray[] = $dataInterface;
+                }
+            }
+        }
+        return $dataInterfaceArray;
+    }
 }
diff --git a/app/code/Magento/Eav/Test/Unit/Model/EavCustomAttributeTypeLocatorTest.php b/app/code/Magento/Eav/Test/Unit/Model/EavCustomAttributeTypeLocatorTest.php
@@ -147,4 +147,26 @@ public function getTypeDataProvider()
             ]
         ];
     }
+
+    public function testGetAllServiceDataInterfaceEmpty()
+    {
+        $this->eavCustomAttributeTypeLocator = new EavCustomAttributeTypeLocator($this->attributeRepository);
+        $this->assertEmpty($this->eavCustomAttributeTypeLocator->getAllServiceDataInterfaces());
+    }
+
+    public function testGetAllServiceDataInterface()
+    {
+        $serviceBackendModelDataInterfaceMapData = [
+            'ServiceA' => ['BackendA' => 'ServiceDataInterfaceA'],
+            'ServiceB' => ['BackendB' => 'ServiceDataInterfaceB', 'BackendC' => 'ServiceDataInterfaceC'],
+            'ServiceC' => ['BackendD' => 'ServiceDataInterfaceD']
+        ];
+        $this->eavCustomAttributeTypeLocator = new EavCustomAttributeTypeLocator(
+            $this->attributeRepository, [], $serviceBackendModelDataInterfaceMapData
+        );
+        $this->assertEquals(
+            ['ServiceDataInterfaceA', 'ServiceDataInterfaceB', 'ServiceDataInterfaceC', 'ServiceDataInterfaceD'],
+            $this->eavCustomAttributeTypeLocator->getAllServiceDataInterfaces()
+        );
+    }
 }
diff --git a/app/code/Magento/Webapi/Model/Soap/Wsdl/Generator.php b/app/code/Magento/Webapi/Model/Soap/Wsdl/Generator.php
@@ -50,9 +50,9 @@ class Generator
     protected $storeManager;
 
     /**
-     * @var array
+     * @var \Magento\Framework\Webapi\CustomAttributeTypeLocatorInterface
      */
-    protected $customAttributeMapArray = null;
+    protected $customAttributeTypeLocator = null;
 
     /**
      * Initialize dependencies.
@@ -62,22 +62,22 @@ class Generator
      * @param \Magento\Framework\App\Cache\Type\Webapi $cache
      * @param \Magento\Framework\Reflection\TypeProcessor $typeProcessor
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param \Magento\Framework\Object $customAttributeMap
+     * @param \Magento\Framework\Webapi\CustomAttributeTypeLocatorInterface $customAttributeTypeLocator
      */
     public function __construct(
         \Magento\Webapi\Model\Soap\Config $apiConfig,
         WsdlFactory $wsdlFactory,
         \Magento\Framework\App\Cache\Type\Webapi $cache,
         \Magento\Framework\Reflection\TypeProcessor $typeProcessor,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Framework\Object $customAttributeMap
+        \Magento\Framework\Webapi\CustomAttributeTypeLocatorInterface $customAttributeTypeLocator
     ) {
         $this->_apiConfig = $apiConfig;
         $this->_wsdlFactory = $wsdlFactory;
         $this->_cache = $cache;
         $this->_typeProcessor = $typeProcessor;
         $this->storeManager = $storeManager;
-        $this->customAttributeMapArray = array_values($customAttributeMap->getData());
+        $this->customAttributeTypeLocator = $customAttributeTypeLocator;
     }
 
     /**
@@ -178,7 +178,7 @@ protected function _generate($requestedServices, $endPointUrl)
      */
     protected function addCustomAttributeTypes($wsdl)
     {
-        foreach ($this->customAttributeMapArray as $customAttributeClass) {
+        foreach ($this->customAttributeTypeLocator->getAllServiceDataInterfaces() as $customAttributeClass) {
             $typeName = $this->_typeProcessor->register($customAttributeClass);
             $wsdl->addComplexType($typeName);
         }

diff --git a/app/code/Magento/Webapi/Test/Unit/Model/Soap/Wsdl/GeneratorTest.php b/app/code/Magento/Webapi/Test/Unit/Model/Soap/Wsdl/GeneratorTest.php
@@ -12,8 +12,10 @@ class GeneratorTest extends \PHPUnit_Framework_TestCase
     /**  @var \Magento\Webapi\Model\Soap\Wsdl\Generator */
     protected $_wsdlGenerator;
 
-    /**  @var \Magento\Framework\Object */
-    protected $customAttributeMap;
+    /**
+     * @var \Magento\Framework\Webapi\CustomAttributeTypeLocatorInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $customAttributeTypeLocator = null;
 
     /**  @var \Magento\Webapi\Model\Soap\Config|\PHPUnit_Framework_MockObject_MockObject */
     protected $_soapConfigMock;
@@ -93,7 +95,9 @@ protected function setUp()
 
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
 
-        $this->customAttributeMap = $objectManager->getObject('Magento\Framework\Object');
+        $this->customAttributeTypeLocator = $objectManager
+            ->getObject('Magento\Eav\Model\EavCustomAttributeTypeLocator');
+
         $this->_wsdlGenerator = $objectManager->getObject(
             'Magento\Webapi\Model\Soap\Wsdl\Generator',
             [
@@ -102,7 +106,7 @@ protected function setUp()
                 'cache' => $this->_cacheMock,
                 'typeProcessor' => $this->_typeProcessor,
                 'storeManagerMock' => $this->storeManagerMock,
-                'customAttributeMap' => $this->customAttributeMap
+                'customAttributeTypeLocator' => $this->customAttributeTypeLocator
             ]
         );
 
@@ -196,7 +200,7 @@ public function testHandleWithException()
                 $this->_cacheMock,
                 $this->_typeProcessor,
                 $this->storeManagerMock,
-                $this->customAttributeMap
+                $this->customAttributeTypeLocator
             ]
         )->getMock();
 

diff --git a/app/code/Magento/Webapi/etc/di.xml b/app/code/Magento/Webapi/etc/di.xml
@@ -27,11 +27,6 @@
             <argument name="cache" xsi:type="object">Magento\Framework\App\Cache\Type\Webapi</argument>
         </arguments>
     </type>
-    <type name="Magento\Webapi\Model\Soap\Wsdl\Generator">
-        <arguments>
-            <argument name="customAttributeMap" xsi:type="object">CustomAttributeMap</argument>
-        </arguments>
-    </type>
     <type name="Magento\Integration\Model\ConfigBasedIntegrationManager">
         <plugin name="webapiSetup" type="Magento\Webapi\Model\Plugin\Manager" />
     </type>

diff --git a/dev/tests/api-functional/_files/Magento/TestModuleMSC/etc/di.xml b/dev/tests/api-functional/_files/Magento/TestModuleMSC/etc/di.xml
@@ -30,12 +30,25 @@
             <argument name="resource" xsi:type="object">Magento\TestModuleMSC\Model\Resource\Item</argument>
         </arguments>
     </type>
-    <virtualType name="CustomAttributeMap" type="Magento\Framework\Object">
+        <virtualType name="CustomAttributeMap" type="Magento\Framework\Object">
         <arguments>
             <argument name="data" xsi:type="array">
                 <item name="customAttributeDataObjectInterface" xsi:type="string">Magento\TestModuleMSC\Api\Data\CustomAttributeDataObjectInterface</item>
                 <item name="customAttributeNestedDataObjectInterface" xsi:type="string">Magento\TestModuleMSC\Api\Data\CustomAttributeNestedDataObjectInterface</item>
             </argument>
         </arguments>
     </virtualType>
+    <type name="Magento\Eav\Model\EavCustomAttributeTypeLocator">
+        <arguments>
+            <argument name="serviceEntityTypeMap" xsi:type="array">
+                <item name="Magento\TestModuleMSC\Api\AllSoapAndRestInterface" xsi:type="string">1</item>
+            </argument>
+            <argument name="serviceBackendModelDataInterfaceMap" xsi:type="array">
+                <item name="Magento\TestModuleMSC\Api\AllSoapAndRestInterface" xsi:type="array">
+                    <item name="Magento\Sample\BackendType1" xsi:type="string">Magento\TestModuleMSC\Api\Data\CustomAttributeDataObjectInterface</item>
+                    <item name="Magento\Sample\BackendType2" xsi:type="string">Magento\TestModuleMSC\Api\Data\CustomAttributeNestedDataObjectInterface</item>
+                </item>
+            </argument>
+        </arguments>
+    </type>
 </config>
diff --git a/lib/internal/Magento/Framework/Webapi/CustomAttributeTypeLocatorInterface.php b/lib/internal/Magento/Framework/Webapi/CustomAttributeTypeLocatorInterface.php
@@ -19,4 +19,11 @@ interface CustomAttributeTypeLocatorInterface
      * @return string|null
      */
     public function getType($attributeCode, $serviceClass);
+
+    /**
+     * Get list of all Data Interface corresponding to complex custom attribute types
+     *
+     * @return string[] array of Data Interface class names
+     */
+    public function getAllServiceDataInterfaces();
 }