Merge pull request #43 in RMS/api-main-service from risty-develop to dev

* commit 'e1885fdd':
  Modified table sorting

api/utils.py

@@ -184,8 +184,8 @@ def status_message_response(code, status, message, results):
 # Table ordering
 def tbl_ordering(queryset, **kwargs):
 
-    sort_field = kwargs.get('sort-field', None)[0]
-    sort_order = kwargs.get('sort-order', None)[0]
+    sort_field = kwargs.get('sort_field', None)[0]
+    sort_order = kwargs.get('sort_order', None)[0]
 
     if sort_order.lower() == 'asc':
         queryset = queryset.order_by(

api/viewsets/applications.py

@@ -65,16 +65,16 @@ class ApplicationViewSet(viewsets.ModelViewSet):
         try:
             # queryset = Application.objects.filter(deleted_at__exact=None)
             queryset = self.queryset.filter(deleted_at__exact=None)
-            queryset = self.filter_queryset(queryset)
             ids = self.request.query_params.get(
                 'ids', None
             )
 
             # table ordering
-            if 'sort-field' and 'sort-order' in request.query_params:
+            if 'sort_field' and 'sort_order' in request.query_params:
                 queryset = tbl_ordering(
                                     queryset, **request.query_params
                                 )
+            queryset = self.filter_queryset(queryset)
 
             if not queryset.exists():
                 message = status_message_response(

api/viewsets/endpoints.py

@@ -62,12 +62,13 @@ class APIEndpointViewSet(viewsets.ModelViewSet):
     def list(self, request, *args, **kwargs):
         try:
             queryset = self.queryset.filter(deleted_at__exact=None)
-            queryset = self.filter_queryset(queryset)
+
             # table ordering
-            if 'sort-field' and 'sort-order' in request.query_params:
+            if 'sort_field' and 'sort_order' in request.query_params:
                 queryset = tbl_ordering(
                                     queryset, **request.query_params
                                 )
+            queryset = self.filter_queryset(queryset)
 
             if not queryset.exists():
                 message = status_message_response(

api/viewsets/services.py

@@ -63,13 +63,13 @@ class APIServiceViewSet(viewsets.ModelViewSet):
 
         try:
             queryset = self.queryset.filter(deleted_at__exact=None)
-            queryset = self.filter_queryset(queryset)
 
             # table ordering
-            if 'sort-field' and 'sort-order' in request.query_params:
+            if 'sort_field' and 'sort_order' in request.query_params:
                 queryset = tbl_ordering(
                                     queryset, **request.query_params
                                 )
+            queryset = self.filter_queryset(queryset)
 
             if not queryset.exists():
                 message = status_message_response(