Merge pull request #11 from exonet/validate-patch

Validate response for PATCH and DELETE requests
exonet · Jan 20, 2021 · 84f862d · 84f862d
2 parents b9cf609 + b917e26
commit 84f862d
Show file tree

Hide file tree

Showing 3 changed files with 73 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,7 +5,12 @@ All notable changes to `exonet-api-php` will be documented in this file.
 Updates should follow the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
 
 ## Unreleased
-[Compare v2.3.0 - Unreleased](https://github.com/exonet/exonet-api-php/compare/v2.3.0...master)
+[Compare v2.4.0 - Unreleased](https://github.com/exonet/exonet-api-php/compare/v2.4.0...master)
+
+## [v2.4.0](https://github.com/exonet/exonet-api-php/releases/tag/v2.4.0) - 2021-01-20
+[Compare v2.3.0 - v2.4.0](https://github.com/exonet/exonet-api-php/compare/v2.3.0...v2.4.0)
+### Changed
+- On `PATCH` and `DELETE` requests the response will be parsed to trigger a possible `ValidationException`.
 
 ## [v2.3.0](https://github.com/exonet/exonet-api-php/releases/tag/v2.3.0) - 2020-08-07
 [Compare v2.2.0 - v2.3.0](https://github.com/exonet/exonet-api-php/compare/v2.2.0...v2.3.0)

diff --git a/src/Connector.php b/src/Connector.php
@@ -126,7 +126,9 @@ public function patch(string $urlPath, array $data): bool
             json_encode($data)
         );
 
-        self::httpClient()->send($request);
+        $response = self::httpClient()->send($request);
+
+        $this->parseResponse($response);
 
         return true;
     }
@@ -151,7 +153,9 @@ public function delete(string $urlPath, array $data = []): bool
             json_encode($data)
         );
 
-        self::httpClient()->send($request);
+        $response = self::httpClient()->send($request);
+
+        $this->parseResponse($response);
 
         return true;
     }

diff --git a/tests/ConnectorTest.php b/tests/ConnectorTest.php
@@ -4,6 +4,7 @@
 
 use Exonet\Api\Auth\PersonalAccessToken;
 use Exonet\Api\Exceptions\AuthenticationException;
+use Exonet\Api\Exceptions\ValidationException;
 use Exonet\Api\Structures\ApiResource;
 use Exonet\Api\Structures\ApiResourceSet;
 use GuzzleHttp\Handler\MockHandler;
@@ -210,4 +211,64 @@ public function testDelete()
         $this->assertSame('exonet-api-php/'.Client::CLIENT_VERSION, $request->getHeader('User-Agent')[0]);
         $this->assertSame('application/json', $request->getHeader('Content-Type')[0]);
     }
+
+    public function testInvalidPatch()
+    {
+        $apiCalls = [];
+        $mock = new MockHandler([
+            new Response(
+                422,
+                [],
+                '{"errors":[{"status":422,"code":"102.10001","title":"validation.generic","detail":"Validation did not pass.","variables":[]}]}'
+            ),
+        ]);
+
+        $history = Middleware::history($apiCalls);
+        $handler = HandlerStack::create($mock);
+        $handler->push($history);
+
+        new Client(new PersonalAccessToken('test-token'));
+        $connectorClass = new Connector($handler);
+
+        $payload = ['test' => 'demo'];
+
+        try {
+            $connectorClass->patch('url', $payload);
+        } catch (ValidationException $exception) {
+            $validationTested = true;
+            $this->assertSame($exception->getMessage(), 'There is 1 validation error.');
+            $this->assertCount(1, $exception->getFailedValidations());
+            $this->assertSame('Validation did not pass.', $exception->getFailedValidations()['generic'][0]);
+        }
+    }
+
+    public function testInvalidDelete()
+    {
+        $apiCalls = [];
+        $mock = new MockHandler([
+            new Response(
+                422,
+                [],
+                '{"errors":[{"status":422,"code":"102.10001","title":"validation.generic","detail":"Validation did not pass.","variables":[]}]}'
+            ),
+        ]);
+
+        $history = Middleware::history($apiCalls);
+        $handler = HandlerStack::create($mock);
+        $handler->push($history);
+
+        new Client(new PersonalAccessToken('test-token'));
+        $connectorClass = new Connector($handler);
+
+        $payload = ['test' => 'demo'];
+
+        try {
+            $connectorClass->patch('url', $payload);
+        } catch (ValidationException $exception) {
+            $validationTested = true;
+            $this->assertSame($exception->getMessage(), 'There is 1 validation error.');
+            $this->assertCount(1, $exception->getFailedValidations());
+            $this->assertSame('Validation did not pass.', $exception->getFailedValidations()['generic'][0]);
+        }
+    }
 }