[UPD] add pagination to GET API response

Signed-off-by: Red <[email protected]>

Author: reichie020212

spp_api/__manifest__.py

@@ -7,7 +7,7 @@
     "images": [
         "images/icon.png",
     ],
-    "version": "17.0.1.3.1",
+    "version": "17.0.1.4.1",
     "application": False,
     "author": "OpenSPP.org",
     "development_status": "Production/Stable",

spp_api/controllers/api.py

@@ -207,19 +207,29 @@ def read_multi__GET(self, namespace, version, model, **kw):
         path = kw.get("path")
         del kw["path"]
 
+        page = kw.get("page", 1)
+
         kw = path.search_treatment_kwargs(kw)
+        limit = kw.get("limit")
+
         records = self.get_records(path.model, kw)
         records_data = records.search_read(**kw)
         records_all = records.search_count(kw.get("domain"))
         records_data = path._get_response_treatment(records_data)
+
+        pagination = {
+            "page": page,
+            "limit": limit,
+            "total_records": records_all,
+            "total_pages": (records_all + limit - 1) // limit,
+        }
+
         response_data = {
             "results": records_data,
-            "count": records_all,
-            "offset": kw.get("offset", 0),
-            "limit": kw.get("limit", 0),
             "version": version,
             "timestamp": datetime_format(datetime.datetime.now()),
             "reply_id": self.get_reply_id(),
+            "pagination": pagination,
         }
 
         return successful_response(200, response_data)

spp_api/models/spp_api_path.py

@@ -89,7 +89,7 @@ class SPPAPIPath(models.Model):
     # Read
     filter_domain = fields.Char(default="[]")
     field_ids = fields.Many2many("ir.model.fields", domain="[('model_id', '=', model_id)]", string="Fields")
-    limit = fields.Integer(string="Limit of results", default=500)
+    limit = fields.Integer(string="Limit of results", default=80, help="Limit of results per page")
     # Create / Update
     warning_required = fields.Boolean(compute="_compute_warning_required", compute_sudo=True)
     api_field_ids = fields.One2many("spp_api.field", "path_id", string="API Fields", copy=True)
@@ -663,15 +663,24 @@ def search_treatment_kwargs(self, kwargs):
         """
         self.ensure_one()
 
-        # Limit
-        limit = kwargs.get("limit", 0)
-        max_limit = self.limit if self.limit else MAX_LIMIT
-        kwargs["limit"] = limit if (limit and limit <= max_limit) else max_limit
+        # Page
+        page = 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
+        limit = kwargs.get("limit", self.limit if self.limit else MAX_LIMIT)
+
+        # Validate limit
+        try:
+            limit = int(limit)
+        except (ValueError, TypeError):
+            limit = self.limit if self.limit else MAX_LIMIT
+
+        kwargs["limit"] = limit
 
         # Offset
-        kwargs["offset"] = kwargs.get("start_from", 0)
-        if "start_from" in kwargs:
-            del kwargs["start_from"]
+        offset = (page - 1) * limit if page > 1 else kwargs.get("offset", 0)
+        kwargs["offset"] = offset
 
         # Domain
         kwargs["domain"] = self.get_domain(kwargs)