Server: #152 - unify pagination

riotkit-org · Apr 23, 2021 · b405287 · b405287
1 parent f9b03c3
commit b405287
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 11 deletions.
diff --git a/frontend/src/models/pagination.model.ts b/frontend/src/models/pagination.model.ts
@@ -24,8 +24,8 @@ export default class Pagination {
 
         return new Pagination(
             pagination['page'],
-            pagination['maxPages'],
-            pagination['perPageLimit']
+            pagination['max_pages'],
+            pagination['per_page_limit']
         )
     }
 }
diff --git a/frontend/src/services/auth.backend.service.ts b/frontend/src/services/auth.backend.service.ts
@@ -51,7 +51,7 @@ export default class AuthBackend extends BackupRepositoryBackend {
 
             return new UserListingResponse(
                 response.data.data.map(function (userData) { return User.fromDict(userData) }),
-                new Pagination(page, response.data.context.pagination.maxPages, limit)
+                new Pagination(page, response.data.context.pagination.max_pages, limit)
             )
         })
     }

diff --git a/server/src/Domain/Backup/Entity/Authentication/User.php b/server/src/Domain/Backup/Entity/Authentication/User.php
@@ -9,7 +9,7 @@ class User extends TokenFromCommon implements \JsonSerializable
 {
     protected Email $email;
 
-    public function jsonSerialize()
+    public function jsonSerialize(): array
     {
         return [
             'id'           => $this->getId(),

diff --git a/server/src/Domain/Backup/Response/Collection/ListingResponse.php b/server/src/Domain/Backup/Response/Collection/ListingResponse.php
@@ -30,16 +30,13 @@ public static function createFromResults(array $elements, int $maxPages, int $cu
 
     public function jsonSerialize(): array
     {
-        $data = parent::jsonSerialize();
-        $data = array_merge($data, [
+        return array_merge(parent::jsonSerialize(), [
             'elements'   => $this->elements,
             'pagination' => [
-                'page'         => $this->currentPage,
-                'maxPages'     => $this->maxPages,
-                'perPageLimit' => $this->perPage
+                'page'           => $this->currentPage,
+                'max_pages'      => $this->maxPages,
+                'per_page_limit' => $this->perPage
             ]
         ]);
-
-        return $data;
     }
 }