Merge pull request #95 from danielh-official/pr/88-add-tests

NotionException: Use status from http response #88 additions

Author: johguentner

src/Exceptions/NotionException.php

@@ -16,7 +16,17 @@ class NotionException extends LaravelNotionAPIException
      */
     public static function instance(string $message, array $payload = []): NotionException
     {
-        $e = new NotionException($message);
+        $code = 0;
+
+        $responseDataExists = array_key_exists('responseData', $payload);
+
+        if ($responseDataExists) {
+            $responseData = $payload['responseData'];
+
+            $code = array_key_exists('status', $responseData) ? $responseData['status'] : 0;
+        }
+
+        $e = new NotionException($message, $code);
         $e->payload = $payload;
 
         return $e;
@@ -46,7 +56,7 @@ public static function fromResponse(Response $response): NotionException
 
         return new NotionException(
             $message,
-            0,
+            $response->status(),
             $response->toException()
         );
     }

tests/EndpointBlocksTest.php

@@ -45,6 +45,7 @@ public function it_throws_a_notion_exception_bad_request()
 
         $this->expectException(NotionException::class);
         $this->expectExceptionMessage('Bad Request');
+        $this->expectExceptionCode(400);
 
         Notion::block('b55c9c91-384d-452b-81db-d1ef79372b76')->children();
     }
@@ -216,6 +217,7 @@ public function it_throws_a_notion_exception_not_found()
 
         $this->expectException(NotionException::class);
         $this->expectExceptionMessage('Not found');
+        $this->expectExceptionCode(404);
 
         Notion::block('b55c9c91-384d-452b-81db-d1ef79372b11')->children();
     }

tests/EndpointDatabaseTest.php

@@ -127,7 +127,7 @@
 
     $this->expectException(NotionException::class);
     $this->expectExceptionMessage('Bad Request');
-
+    $this->expectExceptionCode(400);
     Notion::database('8284f3ff77e24d4a939d19459e4d6bdc')->query();
 });
 

tests/EndpointPagesTest.php

@@ -46,6 +46,7 @@ public function it_throws_a_notion_exception_bad_request()
 
         $this->expectException(NotionException::class);
         $this->expectExceptionMessage('Bad Request');
+        $this->expectExceptionCode(400);
 
         Notion::pages()->find('afd5f6fb-1cbd-41d1-a108-a22ae0d9bac8');
     }
@@ -97,6 +98,7 @@ public function it_throws_a_notion_exception_not_found()
 
         $this->expectException(NotionException::class);
         $this->expectExceptionMessage('Not found');
+        $this->expectExceptionCode(404);
 
         Notion::pages()->find('b55c9c91-384d-452b-81db-d1ef79372b79');
     }

tests/EndpointSearchTest.php

@@ -32,6 +32,7 @@ public function it_throws_a_notion_exception_bad_request()
 
         $this->expectException(NotionException::class);
         $this->expectExceptionMessage('Bad Request');
+        $this->expectExceptionCode(400);
 
         Notion::search()->query();
     }

tests/EndpointUsersTest.php

@@ -31,6 +31,7 @@ public function it_throws_a_notion_exception_bad_request()
 
         $this->expectException(NotionException::class);
         $this->expectExceptionMessage('Bad Request');
+        $this->expectExceptionCode(400);
 
         Notion::users()->all();
     }
@@ -96,6 +97,7 @@ public function it_throws_a_notion_exception_not_found()
 
         $this->expectException(NotionException::class);
         $this->expectExceptionMessage('Not found');
+        $this->expectExceptionCode(404);
 
         Notion::users()->find('d40e767c-d7af-4b18-a86d-55c61f1e39a1');
     }

tests/NotionExceptionTest.php

@@ -23,6 +23,7 @@ public function it_throws_a_notion_exception_with_detailed_message_from_response
 
         $this->expectException(NotionException::class);
         $this->expectExceptionMessage('Bad Request: (validation_error) (path failed validation: path.id should be a valid uuid, instead was');
+        $this->expectExceptionCode(400);
 
         \Notion::block('d092140ce4e549bf9915fb8ad43d1699d')->children()->asCollection();
     }