Refactor error handling and improve sorting methods in REST handlers

Author: dkmstr

server/src/uds/REST/dispatcher.py

@@ -37,10 +37,8 @@
 import traceback
 
 from django import http
-import django
-import django.db
-import django.db.models
 from django.utils.decorators import method_decorator
+from django.core.exceptions import ObjectDoesNotExist
 from django.views.decorators.csrf import csrf_exempt
 from django.views.generic.base import View
 
@@ -209,9 +207,9 @@ def dispatch(self, request: 'http.request.HttpRequest', path: str) -> 'http.Http
         except exceptions.services.generics.Error as e:
             log.log_operation(handler, 503, types.log.LogLevel.ERROR)
             return http.HttpResponseServerError(
-                f'{{"error": "{e}"}}'.encode(), content_type="application/json", code=503
+                f'{{"error": "{e}"}}'.encode(), content_type="application/json", status=503
             )
-        except django.db.models.Model.DoesNotExist as e:  # All DoesNotExist exceptions are not found
+        except ObjectDoesNotExist as e:  # All DoesNotExist exceptions are not found
             log.log_operation(handler, 404, types.log.LogLevel.ERROR)
             return http.HttpResponseNotFound(f'{{"error": "{e}"}}'.encode(), content_type="application/json")
         except Exception as e:

server/src/uds/REST/methods/config.py

@@ -51,7 +51,7 @@ class Config(Handler):
     ROLE = consts.UserRole.ADMIN
 
     def get(self) -> typing.Any:
-        return self.filter_odata_data(CfgConfig.get_config_values(self.is_admin()))
+        return CfgConfig.get_config_values(self.is_admin())
 
     def put(self) -> typing.Any:
         for section, section_dict in typing.cast(dict[str, dict[str, dict[str, str]]], self._params).items():

server/src/uds/REST/methods/providers.py

@@ -36,7 +36,7 @@
 import typing
 
 from django.utils.translation import gettext, gettext_lazy as _
-from django.db.models import Model
+from django.db.models import Model, Count
 
 import uds.core.types.permissions
 from uds.core import exceptions, services, types
@@ -51,6 +51,9 @@
 
 logger = logging.getLogger(__name__)
 
+if typing.TYPE_CHECKING:
+    from django.db.models.query import QuerySet
+
 
 # Helper class for Provider offers
 @dataclasses.dataclass
@@ -96,13 +99,23 @@ class Providers(ModelHandler[ProviderItem]):
         .numeric_column(name='user_services_count', title=_('User Services'))
         .text_column(name='tags', title=_('Tags'), visible=False)
         .row_style(prefix='row-maintenance-', field='maintenance_mode')
+        .with_field_mappings(type_name='data_type')
+        .with_filter_fields('name', 'data_type', 'comments', 'maintenance_mode')
     ).build()
 
     # Rest api related information to complete the auto-generated API
     REST_API_INFO = types.rest.api.RestApiInfo(
         typed=types.rest.api.RestApiInfoGuiType.MULTIPLE_TYPES,
     )
 
+    def apply_sort(self, qs: 'QuerySet[typing.Any]') -> 'list[typing.Any] | QuerySet[typing.Any]':
+        if field_info := self.get_sort_field_info('services_count'):
+            field_name, is_descending = field_info
+            order_by_field = f"-{field_name}" if is_descending else field_name
+            return qs.annotate(services_count=Count('services')).order_by(order_by_field)
+
+        return super().apply_sort(qs)
+
     def get_item(self, item: 'Model') -> ProviderItem:
         item = ensure.is_instance(item, Provider)
         type_ = item.get_type()

server/src/uds/REST/methods/users_groups.py

@@ -53,6 +53,8 @@
 
 from .user_services import AssignedUserService, UserServiceItem
 
+if typing.TYPE_CHECKING:
+    from django.db.models.query import QuerySet
 
 logger = logging.getLogger(__name__)
 
@@ -116,6 +118,13 @@ def as_user_item(user: 'User') -> UserItem:
             groups=[i.uuid for i in user.get_groups()],
             role=user.get_role().as_str(),
         )
+        
+    def apply_sort(self, qs: 'QuerySet[typing.Any]') -> 'list[typing.Any] | QuerySet[typing.Any]':
+        if field_info := self.get_sort_field_info('role'):
+            descending = '-' if field_info[1] else ''
+            return qs.order_by(f'{descending}is_admin', f'{descending}staff_member')
+
+        return super().apply_sort(qs)
 
     def get_item_position(self, parent: 'Model', item_uuid: str) -> int:
         parent = ensure.is_instance(parent, Authenticator)