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

* commit 'cc981f5a':
  Modified sort condition

api/viewsets/applications.py

@@ -70,7 +70,7 @@ class ApplicationViewSet(viewsets.ModelViewSet):
             )
 
             # table ordering
-            if 'sort_field' and 'sort_order' in request.query_params:
+            if 'sort_order' in request.query_params and 'sort_field' in request.query_params:
                 queryset = tbl_ordering(
                                     queryset, **request.query_params
                                 )

api/viewsets/endpoints.py

@@ -64,7 +64,7 @@ class APIEndpointViewSet(viewsets.ModelViewSet):
             queryset = self.queryset.filter(deleted_at__exact=None)
 
             # table ordering
-            if 'sort_field' and 'sort_order' in request.query_params:
+            if 'sort_order' in request.query_params and 'sort_field' in request.query_params:
                 queryset = tbl_ordering(
                                     queryset, **request.query_params
                                 )

api/viewsets/services.py

@@ -65,7 +65,7 @@ class APIServiceViewSet(viewsets.ModelViewSet):
             queryset = self.queryset.filter(deleted_at__exact=None)
 
             # table ordering
-            if 'sort_field' and 'sort_order' in request.query_params:
+            if 'sort_order' in request.query_params and 'sort_field' in request.query_params:
                 queryset = tbl_ordering(
                                     queryset, **request.query_params
                                 )