add all fields to API query view

Author: juanpablosalas

DMOps/file_invalidation_server/fi_manager/views.py

@@ -108,8 +108,16 @@ def post(self, request, *args, **kwargs):
         response_message = raw_file_message + already_serviced_files
 
         return Response({"message": response_message,
-                         "redirect_url":f"https://file-invalidation.app.cern.ch/api/query/?request_id={request_id}",
-                         "redirect_description":"View request_id details"}, status=status.HTTP_201_CREATED)
+                         "actions": [
+                                {
+                                    "url": f"https://file-invalidation.app.cern.ch/api/query/?request_id={request_id}",
+                                    "description": "View request details."
+                                },
+                                {
+                                    "url": f"https://file-invalidation.app.cern.ch/api/approve/{request_id}",
+                                    "description": "Ask a data management operator to approve the invalidation request."
+                                }
+                            ]}, status=status.HTTP_201_CREATED)
 
 class FileQueryView(APIView):
     def get(self, request, *args, **kwargs):
@@ -159,8 +167,9 @@ def get(self, request, *args, **kwargs):
             return response
 
 
+        print(files[0].keys())
         return Response(
-            [{"request_id": f.request_id, "file_name": f.file_name, "status": f.status,"mode":f.mode,"dry_run":f.dry_run,"reason":f.reason,"job_id":f.job_id,"logs":f.logs,"request_user":f.request_user,"approve_user":f.approve_user} for f in files],
+            [{"request_id": f.request_id, "file_name": f.file_name, "status": f.status,"mode":f.mode,"dry_run":f.dry_run,"reason":f.reason,"job_id":f.job_id,"logs":f.logs,"rse":f.rse,"global_invalidate_last_replicas":f.global_invalidate_last_replicas,"request_user":f.request_user,"approve_user":f.approve_user} for f in files],
             status=status.HTTP_200_OK
         )
 
@@ -203,11 +212,7 @@ def post(self, request, request_id):
                              "actions": [
                                 {
                                     "url": f"https://file-invalidation.app.cern.ch/api/query/?request_id={request_id}",
-                                    "description": "View request details."
-                                },
-                                {
-                                    "url": f"https://file-invalidation.app.cern.ch/api/approve/{request_id}",
-                                    "description": "Ask a data management operator to approve the invalidation request."
+                                    "description": "View invalidation job details."
                                 }
                             ]}, status=status.HTTP_201_CREATED)