MQE-369: Implement non web api data persistence.

Author: jilu1

src/Magento/FunctionalTestingFramework/DataGenerator/Persist/CurlHandler.php

@@ -51,6 +51,13 @@ class CurlHandler
      */
     private $dependentEntities = [];
 
+    /**
+     * Persisted data array.
+     *
+     * @var array
+     */
+    private $persistedDataArray;
+
     /**
      * The array of entity name and number of objects being created,
      * we don't need to track objects in update and delete operations.
@@ -79,25 +86,11 @@ class CurlHandler
         ];
 
     /**
-     * Persisted entity.
-     *
-     * @var EntityDataObject
-     */
-    private $persistedEntity;
-
-    /**
-     * Persisted dependent entities.
-     *
-     * @var array
-     */
-    private $persistedDependentEntities = [];
-
-    /**
-     * If it's a REST request.
+     * If it's a web api request.
      *
      * @var bool
      */
-    private $isRestRequest;
+    private $isWebApiRequest;
 
     /**
      * ApiSubObject constructor.
@@ -111,7 +104,7 @@ public function __construct($operation, $entityObject, $dependentEntities = null
         $this->operation = $operation;
         $this->entityObject = $entityObject;
         $this->storeCode = $storeCode;
-        $this->isRestRequest = true;
+        $this->isWebApiRequest = true;
         if ($dependentEntities != null) {
             foreach ($dependentEntities as $entity) {
                 $this->dependentEntities[$entity->getName()] = $entity;
@@ -150,23 +143,33 @@ public function executeRequest()
         $successRegex = null;
         $returnRegex = null;
         $headers = $this->dataDefinition->getHeaders();
-        $params = $this->convertDataArray($this->entityObject, $this->dataDefinition->getMetaData());
+        $this->persistedDataArray = $this->convertDataArray($this->entityObject, $this->dataDefinition->getMetaData());
 
         $authorization = $this->dataDefinition->getAuth();
         switch ($authorization) {
             case 'adminOauth':
                 $executor = new WebapiExecutor($this->storeCode);
-                $executor->write($apiUrl, $params, self::$curlMethodMapping[$this->operation], $headers);
+                $executor->write(
+                    $apiUrl,
+                    $this->persistedDataArray,
+                    self::$curlMethodMapping[$this->operation],
+                    $headers
+                );
                 break;
             case 'adminFormkey':
-                $this->isRestRequest = false;
+                $this->isWebApiRequest = false;
                 $executor = new AdminExecutor();
-                $executor->write($apiUrl, $params, self::$curlMethodMapping[$this->operation], $headers);
+                $executor->write(
+                    $apiUrl,
+                    $this->persistedDataArray,
+                    self::$curlMethodMapping[$this->operation],
+                    $headers
+                );
                 $successRegex = $this->dataDefinition->getSuccessRegex();
                 $returnRegex = $this->dataDefinition->getReturnRegex();
                 break;
             case 'customFromkey':
-                $this->isRestRequest = false;
+                $this->isWebApiRequest = false;
                 // TODO: add frontend request executor.
                 break;
         }
@@ -176,13 +179,23 @@ public function executeRequest()
     }
 
     /**
-     * If the request is a Rest.
+     * If it's a web api request.
      *
      * @return bool
      */
-    public function isRestRequest()
+    public function isWebApiRequest()
+    {
+        return $this->isWebApiRequest;
+    }
+
+    /**
+     * Get persisted data array.
+     *
+     * @return array
+     */
+    public function getPersistedDataArray()
     {
-        return $this->isRestRequest;
+        return $this->persistedDataArray;
     }
 
     /**

src/Magento/FunctionalTestingFramework/DataGenerator/Persist/DataPersistHandler.php

@@ -41,7 +41,8 @@ class DataPersistHandler
     private $storeCode;
 
     /**
-     * ApiPersistenceHandler constructor.
+     * DataPersistHandler constructor.
+     *
      * @param EntityDataObject $entityObject
      * @param array $dependentObjects
      */
@@ -66,23 +67,20 @@ public function createEntity($storeCode = null)
         $curlHandler = new CurlHandler('create', $this->entityObject, $this->dependentObjects, $this->storeCode);
         $result = $curlHandler->executeRequest();
 
-        if ($curlHandler->isRestRequest()) {
-            $this->createdObject = new EntityDataObject(
-                $this->entityObject->getName(),
-                $this->entityObject->getType(),
-                json_decode($result, true),
-                null,
-                null // No uniqueness data is needed to be further processed.
-            );
+        $persistedDataArray = $curlHandler->getPersistedDataArray();
+        if ($curlHandler->isWebApiRequest()) {
+            $persistedDataArray = array_merge($persistedDataArray, json_decode($result, true));
         } else {
-            $this->createdObject = new EntityDataObject(
-                $this->entityObject->getName(),
-                $this->entityObject->getType(),
-                null,
-                null,
-                null
-            );
+            $persistedDataArray = array_merge($persistedDataArray, ['return' => $result]);
         }
+
+        $this->createdObject = new EntityDataObject(
+            $this->entityObject->getName(),
+            $this->entityObject->getType(),
+            $persistedDataArray,
+            null,
+            null
+        );
     }
 
     /**
@@ -93,10 +91,10 @@ public function createEntity($storeCode = null)
      */
     public function deleteEntity($storeCode = null)
     {
-        if (!$storeCode) {
-            $storeCode = $this->storeCode;
+        if (isset($storeCode)) {
+            $this->storeCode = $storeCode;
         }
-        $curlHandler = new CurlHandler('delete', $this->createdObject, null, $storeCode);
+        $curlHandler = new CurlHandler('delete', $this->createdObject, null, $this->storeCode);
         $result = $curlHandler->executeRequest();
 
         return $result;
@@ -118,11 +116,7 @@ public function getCreatedObject()
      */
     public function getCreatedDataByName($dataName)
     {
-        $data = $this->createdObject->getDataByName($dataName, EntityDataObject::NO_UNIQUE_PROCESS);
-        if (empty($data)) {
-            $data = $this->entityObject->getDataByName($dataName, EntityDataObject::CEST_UNIQUE_VALUE);
-        }
-        return $data;
+        return $this->createdObject->getDataByName($dataName, EntityDataObject::NO_UNIQUE_PROCESS);
     }
 
     // TODO add update function