[REF] refactor code

Author: reichie020212

spp_api/controllers/api.py

@@ -218,6 +218,7 @@ def read_multi__GET(self, namespace, version, model, **kw):
         except (ValueError, TypeError):
             page = 1
         page = max(1, page)
+        kw["page"] = page
 
         kw = path.search_treatment_kwargs(kw)
         limit = kw.get("limit")
@@ -243,7 +244,7 @@ def read_multi__GET(self, namespace, version, model, **kw):
                 "page": page,
                 "limit": limit,
                 "total_records": records_all,
-                "total_pages": (records_all + limit - 1) // limit if limit > 0 else 1,
+                "total_pages": max(1, (records_all + limit - 1) // limit if limit > 0 else 1),
             }
 
         return successful_response(200, response_data)

spp_api/models/spp_api_path.py

@@ -676,11 +676,7 @@ def search_treatment_kwargs(self, kwargs):
                 del kwargs["start_from"]
         else:
             # Page
-            try:
-                page = int(kwargs.get("page", 1))
-            except (ValueError, TypeError):
-                page = 1
-            page = max(1, page)
+            page = int(kwargs.get("page", 1))
 
             # Get defined limit first in spp_api.path
             # if limit is defined in kwargs (query parameter), use it; else use self.limit or MAX_LIMIT