Fix for order/limit/pagination

hotosm · Jun 5, 2024 · 224fc2a · 224fc2a
1 parent 149c783
commit 224fc2a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/python/dbapi/api/raw.py b/python/dbapi/api/raw.py
@@ -137,7 +137,7 @@ def listFeaturesQuery(
                     order=params.orderBy.value,
                     limit=RESULTS_PER_PAGE_LIST,
                     offset=params.page * RESULTS_PER_PAGE_LIST
-                ) if params.page else ""
+                ) if params.page is not None else " LIMIT {limit} OFFSET {offset}"
             ).replace("WHERE AND", "WHERE")
         if asJson:
             return listQueryToJSON(query, params)

diff --git a/python/dbapi/api/rawValidation.py b/python/dbapi/api/rawValidation.py
@@ -179,12 +179,12 @@ def listFeaturesQuery(
             ) if params.area else "",
         tags=" AND (" + tagsQueryFilter(params.tags, table.value) + ")" if params.tags else "",
         status=" AND status = '{status}'".format(status=params.status.value) if (params.status) else "",
-        order=" ORDER BY {order} DESC LIMIT {limit} OFFSET {offset}"
+        order=" AND {order} IS NOT NULL ORDER BY {order} DESC LIMIT {limit} OFFSET {offset}"
             .format(
                 order=orderBy.value,
                 limit=RESULTS_PER_PAGE_LIST,
                 offset=params.page * RESULTS_PER_PAGE_LIST
-            )
+            ) if params.page is not None else " LIMIT {limit} OFFSET {offset}"
         ).replace("WHERE AND", "WHERE")
     if asJson:
         return listQueryToJSON(query, params)