Merge pull request #683 from favicode/fix/logging_condition

Fix for real time logging (create new response condition) issue #682

Author: vvuksan

Controller/Adminhtml/FastlyCdn/Logging/CreateEndpoint.php

@@ -35,7 +35,7 @@
 class CreateEndpoint extends Action
 {
     const ADMIN_RESOURCE = 'Magento_Config::config';
-    
+
     /**
      * @var Http
      */
@@ -110,16 +110,16 @@ public function execute()
                 $clone,
                 $this->getRequest()->getParam('condition_name'),
                 $this->getRequest()->getParam('apply_if'),
-                $this->getRequest()->getParam('condition_priority'),
-                $this->getRequest()->getParam('response_condition')
+                $this->getRequest()->getParam('condition_priority')
             );
 
             $params = array_merge(
                 $this->getRequest()->getParam('log_endpoint'),
                 ['response_condition' => $condition]
             );
+            $params = array_filter($params);
 
-            $endpoint = $this->api->createLogEndpoint($clone->number, $endpointType, array_filter($params));
+            $endpoint = $this->api->createLogEndpoint($clone->number, $endpointType, $params);
 
             if (!$endpoint) {
                 return $result->setData([
@@ -156,23 +156,21 @@ public function execute()
      * @param $conditionName
      * @param $applyIf
      * @param $conditionPriority
-     * @param $selCondition
-     * @return mixed
+     * @return string|null
      * @throws \Magento\Framework\Exception\LocalizedException
      */
-    private function createCondition($clone, $conditionName, $applyIf, $conditionPriority, $selCondition)
+    private function createCondition($clone, $conditionName, $applyIf, $conditionPriority)
     {
-        if ($conditionName == $selCondition && !empty($selCondition) &&
-            !$this->api->getCondition($clone->number, $conditionName)) {
-            $condition = [
-                'name'      => $conditionName,
-                'statement' => $applyIf,
-                'type'      => 'RESPONSE',
-                'priority'  => $conditionPriority
-            ];
-            $createCondition = $this->api->createCondition($clone->number, $condition);
-            return $createCondition->name;
+        if (!$conditionName || !$applyIf || !$conditionPriority) {
+            return null;
         }
-        return $selCondition;
+        $condition = [
+            'name'      => $conditionName,
+            'statement' => $applyIf,
+            'type'      => 'RESPONSE',
+            'priority'  => $conditionPriority
+        ];
+        $createCondition = $this->api->createCondition($clone->number, $condition);
+        return $createCondition->name;
     }
 }

Controller/Adminhtml/FastlyCdn/Logging/UpdateEndpoint.php

@@ -111,8 +111,7 @@ public function execute()
                 $clone,
                 $this->getRequest()->getParam('condition_name'),
                 $this->getRequest()->getParam('apply_if'),
-                $this->getRequest()->getParam('condition_priority'),
-                $this->getRequest()->getParam('response_condition')
+                $this->getRequest()->getParam('condition_priority')
             );
 
             $params = array_merge(
@@ -162,23 +161,21 @@ public function execute()
      * @param $conditionName
      * @param $applyIf
      * @param $conditionPriority
-     * @param $selCondition
-     * @return mixed
+     * @return string|null
      * @throws \Magento\Framework\Exception\LocalizedException
      */
-    private function createCondition($clone, $conditionName, $applyIf, $conditionPriority, $selCondition)
+    private function createCondition($clone, $conditionName, $applyIf, $conditionPriority)
     {
-        if ($conditionName == $selCondition && !empty($selCondition) &&
-            !$this->api->getCondition($clone->number, $conditionName)) {
-            $condition = [
-                'name'      => $conditionName,
-                'statement' => $applyIf,
-                'type'      => 'RESPONSE',
-                'priority'  => $conditionPriority
-            ];
-            $createCondition = $this->api->createCondition($clone->number, $condition);
-            return $createCondition->name;
+        if (!$conditionName || !$applyIf || !$conditionPriority) {
+            return null;
         }
-        return $selCondition;
+        $condition = [
+            'name'      => $conditionName,
+            'statement' => $applyIf,
+            'type'      => 'RESPONSE',
+            'priority'  => $conditionPriority
+        ];
+        $createCondition = $this->api->createCondition($clone->number, $condition);
+        return $createCondition->name;
     }
 }