Fix compliance assessment donut chart values computation

intuitem · May 7, 2024 · 608d647 · 608d647
1 parent 83836fb
commit 608d647
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/backend/core/models.py b/backend/core/models.py
@@ -1357,15 +1357,24 @@ def donut_render(self) -> dict:
                 .filter(compliance_assessment=self)
                 .filter(requirement__assessable=True)
             )
+            queries = dict()
+            union = RequirementAssessment.objects.none()
             if (
                 self.selected_implementation_groups
                 and len(self.selected_implementation_groups) > 0
             ):
                 for ig in self.selected_implementation_groups:
-                    _requirement_assessments = _requirement_assessments.filter(
+                    queries[ig] = _requirement_assessments.filter(
                         requirement__implementation_groups__icontains=ig
                     )
-            count = _requirement_assessments.count()
+                for query in queries:
+                    if union is None:
+                        union = queries[query]
+                    else:
+                        union = union | queries[query]
+            else:
+                union = _requirement_assessments
+            count = union.distinct().count()
             v = {
                 "name": st,
                 "localName": camel_case(st.value),