Merge pull request #3194 from SEED-platform/fix/no-analyses-crash

Fix/no analyses crash
SEED-platform · Mar 31, 2022 · 8a57b54 · 8a57b54
2 parents 8b36fa6 + 5eaf096
commit 8a57b54
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/seed/views/v3/analyses.py b/seed/views/v3/analyses.py
@@ -125,21 +125,24 @@ def list(self, request):
             serialized_analysis.update({'highlights': analysis.get_highlights(property_id)})
             analyses.append(serialized_analysis)
 
-        views_queryset = AnalysisPropertyView.objects.filter(analysis__organization_id=organization_id).order_by('-id')
         serialized_views = []
-        property_views_by_apv_id = AnalysisPropertyView.get_property_views(views_queryset)
-        for view in views_queryset:
-            serialized_view = AnalysisPropertyViewSerializer(view).data
-            serialized_views.append(serialized_view)
+        original_views = {}
+        if analyses:
+            views_queryset = AnalysisPropertyView.objects.filter(analysis__organization_id=organization_id).order_by('-id')
+            property_views_by_apv_id = AnalysisPropertyView.get_property_views(views_queryset)
+            for view in views_queryset:
+                serialized_view = AnalysisPropertyViewSerializer(view).data
+                serialized_views.append(serialized_view)
+            original_views = {
+                apv_id: property_view.id if property_view is not None else None
+                for apv_id, property_view in property_views_by_apv_id.items()
+            }
 
         return JsonResponse({
             'status': 'success',
             'analyses': analyses,
             'views': serialized_views,
-            'original_views': {
-                apv_id: property_view.id if property_view is not None else None
-                for apv_id, property_view in property_views_by_apv_id.items()
-            }
+            'original_views': original_views
         })
 
     @swagger_auto_schema(manual_parameters=[AutoSchemaHelper.query_org_id_field(True)])