Small tweaks

- improve logging
- save heavy DB query
- prefer dataclasses over strings

Author: harminius

server/mergin/sync/public_api_controller.py

@@ -608,8 +608,9 @@ def get_paginated_projects(
         public,
         only_public,
     )
-    result = projects.paginate(page, per_page).items
-    total = projects.paginate().total
+    pagination = projects.paginate(page, per_page)
+    result = pagination.items
+    total = pagination.total
 
     # create user map id:username passed to project schema to minimize queries to db
     projects_ids = [p.id for p in result]

server/mergin/sync/public_api_v2_controller.py

@@ -428,12 +428,12 @@ def list_workspace_projects(workspace_id, page, per_page, order_params=None, q=N
     if not (ws and ws.is_active):
         abort(404, "Workspace not found")
 
-    if ws.user_has_permissions(current_user, "read"):
+    if ws.user_has_permissions(current_user, WorkspaceRole.READER.value):
         # regular members can list all projects
         projects = Project.query.filter_by(workspace_id=ws.id).filter(
             Project.removed_at.is_(None)
         )
-    elif ws.user_has_permissions(current_user, "guest"):
+    elif ws.user_has_permissions(current_user, WorkspaceRole.GUEST.value):
         # guest can list only explicitly shared projects
         projects = projects_query(
             ProjectPermissions.Read, as_admin=False, public=False

server/mergin/utils.py

@@ -60,7 +60,7 @@ def get_order_param(
         attr = None
     order_attr = cls.__table__.c.get(col, None)
     if not isinstance(order_attr, Column):
-        logging.warning("Ignoring invalid order parameter.")
+        logging.warning(f"Ignoring invalid order parameter: {order_param}.")
         return
     # sort by key in JSON field
     if attr: