magento-engcom/bulk-api#4 Support for Async operations in WebAPI

- Fixed integration tests

Author: vrann

app/code/Magento/WebapiAsync/Controller/Rest/Async/InputParamsResolver.php

@@ -89,18 +89,9 @@ public function resolve()
     {
         $this->requestValidator->validate();
         $webapiResolvedParams = [];
-        $inputData = $this->request->getRequestData();
 
-        //simple check if async request have single or bulk entities
-        if (array_key_exists(0, $inputData)) {
-            foreach ($inputData as $key => $singleEntityParams) {
-                if (is_integer($key)) {
-                    $webapiResolvedParams[$key] = $this->resolveBulkItemParams($singleEntityParams);
-                }
-            }
-        } else {//single item request
-            $webapiResolvedParams[] = $this->inputParamsResolver->resolve();
-        }
+        ///single item request
+        $webapiResolvedParams[] = $this->inputParamsResolver->resolve();
 
         return $webapiResolvedParams;
     }
@@ -112,26 +103,4 @@ public function getRoute()
     {
         return $this->inputParamsResolver->getRoute();
     }
-
-    /**
-     * Convert the input array from key-value format to a list of parameters
-     * suitable for the specified class / method.
-     *
-     * Instead of \Magento\Webapi\Controller\Rest\InputParamsResolver
-     * we don't need to merge body params with url params and use only body params
-     *
-     * @param array $inputData data to send to method in key-value format
-     * @return array list of parameters that can be used to call the service method
-     * @throws \Magento\Framework\Exception\InputException if no value is provided for required parameters
-     * @throws \Magento\Framework\Webapi\Exception
-     */
-    private function resolveBulkItemParams($inputData)
-    {
-        $route = $this->getRoute();
-        $serviceMethodName = $route->getServiceMethod();
-        $serviceClassName = $route->getServiceClass();
-        $inputParams = $this->serviceInputProcessor->process($serviceClassName, $serviceMethodName, $inputData);
-
-        return $inputParams;
-    }
 }

dev/tests/api-functional/testsuite/Magento/WebapiAsync/Model/BulkScheduleTest.php

@@ -107,25 +107,17 @@ protected function setUp()
     public function testAsyncScheduleBulk($product)
     {
         $this->_markTestAsRestOnly();
+        $this->skus[] = $product['product'][ProductInterface::SKU];
+        $this->clearProducts();
+
         $response = $this->saveProductAsync($product);
         $this->assertArrayHasKey(self::BULK_UUID_KEY, $response);
         $this->assertNotNull($response[self::BULK_UUID_KEY]);
 
-        if (count($product) <= 1) {
-            $this->skus[] = $product['product'][ProductInterface::SKU];
-            $this->assertCount(1, $response['request_items']);
-            $this->assertEquals('accepted', $response['request_items'][0]['status']);
-            $this->assertFalse($response['errors']);
-        } else {
-            $this->assertCount(count($product), $response['request_items']);
-            foreach ($product as $productItem) {
-                $this->skus[] = $productItem['product'][ProductInterface::SKU];
-            }
-            foreach ($response['request_items'] as $status) {
-                $this->assertEquals('accepted', $status['status']);
-            }
-            $this->assertFalse($response['errors']);
-        }
+        $this->assertCount(1, $response['request_items']);
+        $this->assertEquals('accepted', $response['request_items'][0]['status']);
+        $this->assertFalse($response['errors']);
+
         //assert one products is created
         try {
             $this->publisherConsumerController->waitForAsynchronousResult(
@@ -224,16 +216,6 @@ public function productCreationProvider()
             [['product' => $productBuilder([
                 ProductInterface::TYPE_ID => 'virtual',
                 ProductInterface::SKU => 'psku-test-2'])
-            ]],
-            [[
-                ['product' => $productBuilder([
-                    ProductInterface::TYPE_ID => 'simple',
-                    ProductInterface::SKU => 'psku-test-1'
-                ])],
-                ['product' => $productBuilder([
-                    ProductInterface::TYPE_ID => 'virtual',
-                    ProductInterface::SKU => 'psku-test-2'
-                ])]
             ]]
         ];
     }

dev/tests/integration/framework/Magento/TestFramework/MessageQueue/PublisherConsumerController.php

@@ -161,7 +161,7 @@ public function waitForAsynchronousResult(callable $condition, $params)
         do {
             sleep(1);
             $assertion = call_user_func_array($condition, $params);
-        } while (!$assertion && ($i++ < 20));
+        } while (!$assertion && ($i++ < 180));
 
         if (!$assertion) {
             throw new PreconditionFailedException("No asynchronous messages were processed.");