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

* commit 'e0ea5c88':
  Added search and sorting for Archived list

api/viewsets/applications.py

@@ -217,6 +217,12 @@ class ApplicationViewSet(viewsets.ModelViewSet):
     def archived(self, request, pk=None):
         try:
             queryset = Application.objects.filter(deleted_at__isnull=False)
+            # table ordering
+            if 'sort_order' in request.query_params and 'sort_field' 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

@@ -199,6 +199,12 @@ class APIEndpointViewSet(viewsets.ModelViewSet):
     def archived(self, request, pk=None):
         try:
             queryset = APIEndpoint.objects.filter(deleted_at__isnull=False)
+            # table ordering
+            if 'sort_order' in request.query_params and 'sort_field' 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

@@ -201,6 +201,12 @@ class APIServiceViewSet(viewsets.ModelViewSet):
     def archived(self, request, pk=None):
         try:
             queryset = self.queryset.filter(deleted_at__isnull=False)
+
+            # table ordering
+            if 'sort_order' in request.query_params and 'sort_field' in request.query_params:
+                queryset = tbl_ordering(
+                                    queryset, **request.query_params
+                                )
             queryset = self.filter_queryset(queryset)
 
             if not queryset.exists():