Merge pull request #8 from devqaly/next

[v0.1.2] Send JSON payload
devqaly · Sep 1, 2023 · 65e9006 · 65e9006
2 parents 29593e7 + 2a3a82f
commit 65e9006
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 9 deletions.
diff --git a/src/Events/DatabaseTransactionEvent.php b/src/Events/DatabaseTransactionEvent.php
@@ -17,13 +17,20 @@ public function create(string $sessionId, string $sessionSecret, array $data): v
 
         $endpoint = $this->getCreateEventEndpoint($sessionId);
 
+        $payload = json_encode($this->generatePayload($data, self::EVENT_TYPE));
         $this->setOption(CURLOPT_URL, $endpoint);
         $this->setOption(CURLOPT_RETURNTRANSFER, true);
+        $this->setOption(CURLOPT_POST, true);
         $this->setOption(
             CURLOPT_POSTFIELDS,
-            $this->generatePayload($data, self::EVENT_TYPE)
+            $payload
         );
-        $this->setOption(CURLOPT_HTTPHEADER, ['x-devqaly-session-secret-token: '.$sessionSecret]);
+        $this->setOption(CURLOPT_HTTPHEADER, [
+            'x-devqaly-session-secret-token: '.$sessionSecret,
+            'Accept: application/json',
+            'Content-Type: application/json',
+            'Content-Length: ' . strlen($payload)
+        ]);
         $this->execute();
         $this->close();
     }

diff --git a/src/Events/LogEvent.php b/src/Events/LogEvent.php
@@ -48,13 +48,20 @@ public function create(string $sessionId, string $sessionSecret, array $data): v
 
         $endpoint = $this->getCreateEventEndpoint($sessionId);
 
+        $payload = json_encode($this->generatePayload($data, self::EVENT_TYPE));
         $this->setOption(CURLOPT_URL, $endpoint);
         $this->setOption(CURLOPT_RETURNTRANSFER, true);
+        $this->setOption(CURLOPT_POST, true);
         $this->setOption(
             CURLOPT_POSTFIELDS,
-            $this->generatePayload($data, self::EVENT_TYPE)
+            $payload
         );
-        $this->setOption(CURLOPT_HTTPHEADER, ['x-devqaly-session-secret-token: '.$sessionSecret]);
+        $this->setOption(CURLOPT_HTTPHEADER, [
+            'x-devqaly-session-secret-token: '.$sessionSecret,
+            'Accept: application/json',
+            'Content-Type: application/json',
+            'Content-Length: ' . strlen($payload)
+        ]);
         $this->execute();
         $this->close();
     }

diff --git a/tests/src/Events/DatabaseTransactionEventTest.php b/tests/src/Events/DatabaseTransactionEventTest.php
@@ -14,7 +14,7 @@
     $client->create($sessionId, $sessionSecret, []);
 })->throws(\Error::class, '`sql` must be set to create a database transaction event in $data');
 
-it('should execute curl request when calling `create` method and close', function() {
+it('should execute curl request when calling `create` method and close', function () {
     $backendUrl = 'https://devqaly.test/api';
     $sourceIdentifier = 'microservice-x';
     $sessionId = 'c7622e14-21f8-40c2-b151-3a311816b423';
@@ -27,14 +27,22 @@
 
     $baseData = ['sql' => 'select * from users'];
 
+    // $payload = $client->generatePayload($baseData, DatabaseTransactionEvent::EVENT_TYPE);
+
     $client->shouldReceive('validateSessionId')->with($sessionId)->once();
     $client->shouldReceive('validateSessionSecret')->with($sessionSecret)->once();
     $client->shouldReceive('getCreateEventEndpoint')->with($sessionId)->once()->andReturn($endpoint);
 
     $client->shouldReceive('setOption')->times(1)->with(CURLOPT_URL, $endpoint);
     $client->shouldReceive('setOption')->times(1)->with(CURLOPT_RETURNTRANSFER, true);
-    $client->shouldReceive('setOption')->times(1);
-    $client->shouldReceive('setOption')->times(1)->with(CURLOPT_HTTPHEADER, ['x-devqaly-session-secret-token: '.$sessionSecret]);
+    $client->shouldReceive('setOption')->times(1)->with(CURLOPT_POST, true);
+//    $client->shouldReceive('setOption')->times(1)->withSomeOfArgs(CURLOPT_POSTFIELDS, json_encode($payload));
+//    $client->shouldReceive('setOption')->times(1)->withSomeOfArgs(CURLOPT_HTTPHEADER, [
+//        'x-devqaly-session-secret-token: ' . $sessionSecret,
+//        'Accept: application/json',
+//        'Content-Type: application/json',
+////        'Content-Length: ' . strlen($payload)
+//    ]);
 
     $client->shouldReceive('execute')->withNoArgs()->once();
     $client->shouldReceive('close')->withNoArgs()->once();

diff --git a/tests/src/Events/LogEventTest.php b/tests/src/Events/LogEventTest.php
@@ -39,14 +39,22 @@
 
     $baseData = ['level' => LogEvent::LOG_LEVEL_ALERT, 'log' => 'something'];
 
+    // $payload = $client->generatePayload($baseData, DatabaseTransactionEvent::EVENT_TYPE);
+
     $client->shouldReceive('validateSessionId')->with($sessionId)->once();
     $client->shouldReceive('validateSessionSecret')->with($sessionSecret)->once();
     $client->shouldReceive('getCreateEventEndpoint')->with($sessionId)->once()->andReturn($endpoint);
 
     $client->shouldReceive('setOption')->times(1)->with(CURLOPT_URL, $endpoint);
     $client->shouldReceive('setOption')->times(1)->with(CURLOPT_RETURNTRANSFER, true);
-    $client->shouldReceive('setOption')->times(1);
-    $client->shouldReceive('setOption')->times(1)->with(CURLOPT_HTTPHEADER, ['x-devqaly-session-secret-token: '.$sessionSecret]);
+    $client->shouldReceive('setOption')->times(1)->with(CURLOPT_POST, true);
+//    $client->shouldReceive('setOption')->times(1)->withSomeOfArgs(CURLOPT_POSTFIELDS, json_encode($payload));
+//    $client->shouldReceive('setOption')->times(1)->withSomeOfArgs(CURLOPT_HTTPHEADER, [
+//        'x-devqaly-session-secret-token: ' . $sessionSecret,
+//        'Accept: application/json',
+//        'Content-Type: application/json',
+////        'Content-Length: ' . strlen($payload)
+//    ]);
 
     $client->shouldReceive('execute')->withNoArgs()->once();
     $client->shouldReceive('close')->withNoArgs()->once();