wbcompliance 1.58.1__tar.gz → 1.58.3__tar.gz

{wbcompliance-1.58.1 → wbcompliance-1.58.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wbcompliance
-Version: 1.58.1
+Version: 1.58.3
 Summary: A workbench module for managing compliance.
 Author-email: Christopher Wittlinger <c.wittlinger@stainly.com>
 Requires-Dist: wbcore

{wbcompliance-1.58.1 → wbcompliance-1.58.3}/wbcompliance/models/risk_management/checks.py

@@ -99,9 +99,12 @@ class RiskCheck(ComplexToStringMixin, WBModel):
     @property
     def needs_incident(self) -> bool:
         # if the there is a similar checked object relationship, we needs to create a general incident if the check evaluates to a breach
-        return self.rule.checked_object_relationships.filter(
-            checked_object_content_type=self.checked_object_content_type, checked_object_id=self.checked_object_id
-        ).exists()
+        return (
+            self.rule.checked_object_relationships.filter(
+                checked_object_content_type=self.checked_object_content_type, checked_object_id=self.checked_object_id
+            ).exists()
+            or self.activator_id is not None
+        )
 
     @property
     def previous_check(self) -> Self | None:

{wbcompliance-1.58.1 → wbcompliance-1.58.3}/wbcompliance/serializers/risk_management/checks.py

@@ -17,7 +17,7 @@ class RiskCheckModelSerializer(wb_serializers.ModelSerializer):
     _rule = RiskRuleRepresentationSerializer(source="rule")
     _checked_object_content_type = ContentTypeRepresentationSerializer(source="checked_object_content_type")
 
-    incident_reports = wb_serializers.TextField()
+    incident_reports = wb_serializers.TextField(read_only=True)
     status_icon = IconSelectField(read_only=True)
 
     @wb_serializers.register_resource()

{wbcompliance-1.58.1 → wbcompliance-1.58.3}/wbcompliance/viewsets/risk_management/checks.py

@@ -1,10 +1,12 @@
 from django.contrib.auth import get_user_model
 from django.contrib.postgres.aggregates import StringAgg
 from django.db import models
-from django.db.models import F
+from django.db.models import F, OuterRef, Subquery, Value
+from django.db.models.functions import Concat
 from wbcore import viewsets
 
 from wbcompliance.filters.risk_management.checks import RiskCheckFilterSet
+from wbcompliance.models import CheckedObjectIncidentRelationship
 from wbcompliance.models.risk_management import RiskCheck
 from wbcompliance.serializers import (
     RiskCheckModelSerializer,
@@ -35,6 +37,15 @@ class RiskCheckModelViewSet(viewsets.ModelViewSet):
     filterset_class = RiskCheckFilterSet
 
     def get_queryset(self):
+        rel = (
+            CheckedObjectIncidentRelationship.objects.filter(rule_check=OuterRef("id"))
+            .annotate(
+                title=Concat(F("incident__breached_object_repr"), Value(" ( "), F("breached_value"), Value(" ) "))
+            )
+            .values("rule_check")
+            .annotate(incident_reports=StringAgg("title", delimiter="<br>"))
+            .values("incident_reports")
+        )
         return (
             RiskCheck.all_objects.annotate(
                 status_icon=models.Case(
@@ -44,7 +55,7 @@ class RiskCheckModelViewSet(viewsets.ModelViewSet):
                     ],
                     default=models.Value("none"),
                 ),
-                incident_reports=StringAgg(F("incidents__incident__breached_object_repr"), delimiter="<br>"),
+                incident_reports=Subquery(rel),
             )
             .select_related(
                 "rule",