Fix analysis to return AnalysesList

OasisLMF · Jul 11, 2024 · 81f866b · 81f866b
1 parent 68767d8
commit 81f866b
Showing 1 changed file with 15 additions and 15 deletions.
diff --git a/src/server/oasisapi/analyses/v2_api/viewsets.py b/src/server/oasisapi/analyses/v2_api/viewsets.py
@@ -253,7 +253,7 @@ class AnalysisViewSet(VerifyGroupAccessModelViewSet):
                          'cancel_analysis_run']
 
     # queryset = Analysis.objects.all().select_related(*file_action_types).prefetch_related('complex_model_data_files')
-    serializer_class = AnalysisSerializer
+    serializer_class = AnalysisListSerializer
     filterset_class = AnalysisFilter
 
     group_access_model = Analysis
@@ -267,9 +267,9 @@ def get_queryset(self):
 
     def get_serializer_class(self):
         if self.action in ['create', 'options', 'update', 'partial_update']:
-            return super().get_serializer_class()
+            return AnalysisSerializer
         elif self.action in ['list', 'retrieve']:
-            return AnalysisListSerializer
+            return super().get_serializer_class()
         elif self.action == 'copy':
             return AnalysisCopySerializer
         elif self.action == 'data_files':
@@ -292,7 +292,7 @@ def parser_classes(self):
         else:
             return api_settings.DEFAULT_PARSER_CLASSES
 
-    @swagger_auto_schema(responses={200: AnalysisSerializer}, manual_parameters=[RUN_MODE_PARAM])
+    @swagger_auto_schema(responses={200: AnalysisListSerializer}, manual_parameters=[RUN_MODE_PARAM])
     @action(methods=['post'], detail=True)
     def run(self, request, pk=None, version=None):
         """
@@ -304,9 +304,9 @@ def run(self, request, pk=None, version=None):
         run_mode_override = request.GET.get('run_mode_override', None)
         verify_user_is_in_obj_groups(request.user, obj.model, 'You are not allowed to run this model')
         obj.run(request.user, run_mode_override=run_mode_override)
-        return Response(AnalysisSerializer(instance=obj, context=self.get_serializer_context()).data)
+        return Response(AnalysisListSerializer(instance=obj, context=self.get_serializer_context()).data)
 
-    @swagger_auto_schema(responses={200: AnalysisSerializer})
+    @swagger_auto_schema(responses={200: AnalysisListSerializer})
     @action(methods=['post'], detail=True)
     def generate_and_run(self, request, pk=None, version=None):
         """
@@ -317,9 +317,9 @@ def generate_and_run(self, request, pk=None, version=None):
         obj = self.get_object()
         verify_user_is_in_obj_groups(request.user, obj.model, 'You are not allowed to run this model')
         obj.generate_and_run(request.user)
-        return Response(AnalysisSerializer(instance=obj, context=self.get_serializer_context()).data)
+        return Response(AnalysisListSerializer(instance=obj, context=self.get_serializer_context()).data)
 
-    @swagger_auto_schema(responses={200: AnalysisSerializer})
+    @swagger_auto_schema(responses={200: AnalysisListSerializer})
     @action(methods=['post'], detail=True)
     def cancel(self, request, pk=None, version=None):
         """
@@ -330,9 +330,9 @@ def cancel(self, request, pk=None, version=None):
         verify_user_is_in_obj_groups(request.user, obj.model, 'You are not allowed to cancel this model')
         obj.cancel_subtasks()
         obj.cancel_any()
-        return Response(AnalysisSerializer(instance=obj, context=self.get_serializer_context()).data)
+        return Response(AnalysisListSerializer(instance=obj, context=self.get_serializer_context()).data)
 
-    @swagger_auto_schema(responses={200: AnalysisSerializer})
+    @swagger_auto_schema(responses={200: AnalysisListSerializer})
     @action(methods=['post'], detail=True)
     def cancel_analysis_run(self, request, pk=None, version=None):
         """
@@ -342,9 +342,9 @@ def cancel_analysis_run(self, request, pk=None, version=None):
         verify_user_is_in_obj_groups(request.user, obj.model, 'You are not allowed to cancel this model')
         obj.cancel_subtasks()
         obj.cancel_analysis()
-        return Response(AnalysisSerializer(instance=obj, context=self.get_serializer_context()).data)
+        return Response(AnalysisListSerializer(instance=obj, context=self.get_serializer_context()).data)
 
-    @swagger_auto_schema(responses={200: AnalysisSerializer}, manual_parameters=[RUN_MODE_PARAM])
+    @swagger_auto_schema(responses={200: AnalysisListSerializer}, manual_parameters=[RUN_MODE_PARAM])
     @action(methods=['post'], detail=True)
     def generate_inputs(self, request, pk=None, version=None):
         """
@@ -355,9 +355,9 @@ def generate_inputs(self, request, pk=None, version=None):
         run_mode_override = request.GET.get('run_mode_override', None)
         verify_user_is_in_obj_groups(request.user, obj.model, 'You are not allowed to run this model')
         obj.generate_inputs(request.user, run_mode_override=run_mode_override)
-        return Response(AnalysisSerializer(instance=obj, context=self.get_serializer_context()).data)
+        return Response(AnalysisListSerializer(instance=obj, context=self.get_serializer_context()).data)
 
-    @swagger_auto_schema(responses={200: AnalysisSerializer})
+    @swagger_auto_schema(responses={200: AnalysisListSerializer})
     @action(methods=['post'], detail=True)
     def cancel_generate_inputs(self, request, pk=None, version=None):
         """
@@ -367,7 +367,7 @@ def cancel_generate_inputs(self, request, pk=None, version=None):
         verify_user_is_in_obj_groups(request.user, obj.model, 'You are not allowed to cancel this model')
         obj.cancel_subtasks()
         obj.cancel_generate_inputs()
-        return Response(AnalysisSerializer(instance=obj, context=self.get_serializer_context()).data)
+        return Response(AnalysisListSerializer(instance=obj, context=self.get_serializer_context()).data)
 
     @action(methods=['post'], detail=True)
     def copy(self, request, pk=None, version=None):