Merge pull request #106 from naitsirch/fix_request_filter

Use query parameters in GET requests for filtering
5pm-HDH · Sep 12, 2022 · 907cb5b · 907cb5b
2 parents 114d4db + 1f3014c
commit 907cb5b
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -24,6 +24,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - [Status-Code handling and Exception-handling](https://github.com/5pm-HDH/churchtools-api/pull/99)
 - [Refactor delete person](https://github.com/5pm-HDH/churchtools-api/pull/100)
 - [Refactor FillWithData](https://github.com/5pm-HDH/churchtools-api/pull/101)
+- [Refactor: Use Query-Parameters for Where-Clause](https://github.com/5pm-HDH/churchtools-api/pull/106)
 
 ### Fixed
 

diff --git a/src/Requests/PersonRequestBuilder.php b/src/Requests/PersonRequestBuilder.php
@@ -21,7 +21,7 @@ public function whoami(): Person
     public function get(): array
     {
         $options = [
-            "json" => []
+            "query" => []
         ];
 
         //Where-Clauses

diff --git a/src/Requests/Traits/Pagination.php b/src/Requests/Traits/Pagination.php
@@ -13,14 +13,14 @@ protected function collectDataFromPages(string $url, array $options = []): array
         $client = CTClient::getClient();
         $collectedData = [];
 
-        if (isset($options["json"]["page"])) {
+        if (isset($options["query"]["page"])) {
             $manualPagination = true;
         } else {
             // Add Page Information to Options
-            if (!array_key_exists("json", $options)) {
-                $options["json"] = [];
+            if (!array_key_exists("query", $options)) {
+                $options["query"] = [];
             }
-            $options["json"]["page"] = 1;
+            $options["query"]["page"] = 1;
 
             $manualPagination = false;
         }
@@ -37,7 +37,7 @@ protected function collectDataFromPages(string $url, array $options = []): array
 
             // Collect Date from Second till Last page
             for ($i = 2; $i <= $lastPage; $i++) {
-                $options["json"]["page"] = $i;
+                $options["query"]["page"] = $i;
 
                 $response = $client->get($url, $options);
 

diff --git a/src/Requests/Traits/WhereCondition.php b/src/Requests/Traits/WhereCondition.php
@@ -21,12 +21,12 @@ public function where(string $key, $value): self
 
     protected function addWhereConditionsToOption(&$options): void
     {
-        if (!array_key_exists("json", $options)) {
-            $options["json"] = [];
+        if (!array_key_exists("query", $options)) {
+            $options["query"] = [];
         }
 
         foreach ($this->whereCriteria as $whereKey => $whereValue) {
-            $options["json"][$whereKey] = $whereValue;
+            $options["query"][$whereKey] = $whereValue;
         }
     }
 }
diff --git a/tests/unit/HttpMock/HttpMockDataResolver.php b/tests/unit/HttpMock/HttpMockDataResolver.php
@@ -39,7 +39,7 @@ private static function convertEndpointToFileName(string $endpoint, array $optio
         // convert string to lowercase
         $endpoint = strtolower($endpoint);
 
-        $pageNr = CTUtil::arrayPathGet($options, "json.page");
+        $pageNr = CTUtil::arrayPathGet($options, "query.page");
         if (!is_null($pageNr) && $pageNr > 1) {
             $endpoint .= "_page_" . $pageNr;
             CTLog::getLog()->debug("Append Page-Number to Endpoint-Filename: " . $endpoint);