wbcompliance 1.58.0__py2.py3-none-any.whl → 1.58.2__py2.py3-none-any.whl

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/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/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",

{wbcompliance-1.58.0.dist-info → wbcompliance-1.58.2.dist-info}/METADATA

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

{wbcompliance-1.58.0.dist-info → wbcompliance-1.58.2.dist-info}/RECORD

@@ -55,7 +55,7 @@ wbcompliance/models/compliance_type.py,sha256=Euevn9BRt7_R7lv49kTDlkMoL1uTQuUKWn
 wbcompliance/models/enums.py,sha256=id1m8trG7b6Sw3Sa9VrLgD104GC2nG9A8ngJzaRqIIQ,424
 wbcompliance/models/risk_management/__init__.py,sha256=DJXoHheA5REDpPYP0uyRmFWyNKP-ir_z5YB61CN6N-E,247
 wbcompliance/models/risk_management/backend.py,sha256=pbszChXMxA36JjK0nIkrz0k7w9ImKUTGMVlokgA1R-w,4736
-wbcompliance/models/risk_management/checks.py,sha256=Rt11-GUH96ARi1nI_wUcLLS7T656_usDRJ46e2_79eE,8524
+wbcompliance/models/risk_management/checks.py,sha256=S9MkG3kmMzixx9bi2P2SEREj9b25dstiPeThGx6jeHI,8601
 wbcompliance/models/risk_management/dispatch.py,sha256=cLi63vSGbk9xhCoVgr4UmVk2kfYmGiyohKINSvCodb0,1423
 wbcompliance/models/risk_management/incidents.py,sha256=RNYjsFK87JLUByF4hcWk5W8eYL6sdlojfPuLdXCgYcE,23803
 wbcompliance/models/risk_management/mixins.py,sha256=KsdjpM1Cl235z8h57USVcYSBKtO2VRH1S0FCuJOEMH0,3762
@@ -65,7 +65,7 @@ wbcompliance/serializers/compliance_form.py,sha256=OxPILlup_CP4Qwvu864oMqz7QUZsk
 wbcompliance/serializers/compliance_task.py,sha256=euTQya2LdexoRblew9zMkv40kU7wkW9nU2uLTI-lwow,17035
 wbcompliance/serializers/compliance_type.py,sha256=kxQTLS9JfGStJ1dJYmU_TlZh7Jqn3_9h_ZMAjiL61lA,1048
 wbcompliance/serializers/risk_management/__init__.py,sha256=_95Z1L6f7muQ0UvbEY1P3ROK3nqwkjhgYf3onRhWmv0,733
-wbcompliance/serializers/risk_management/checks.py,sha256=J-AhFvT7IvYNztAKfUgpedi622uwLyQcTzTWz-uRcPQ,1742
+wbcompliance/serializers/risk_management/checks.py,sha256=ARnpvZWfn-6wfrYt1dRasofyiZcQOmMjRGyrClmy_Vc,1756
 wbcompliance/serializers/risk_management/incidents.py,sha256=WHxeBn0VnLTrMJVULgCeCs-upKqEj-4rN4h8lYvcIQA,8475
 wbcompliance/serializers/risk_management/rules.py,sha256=-g7_zzJKDPYs01wdlSrFwwcd-yVMosuR6yHad7gYpGA,5527
 wbcompliance/templates/compliance/compliance_form.html,sha256=IR71gVnKlUZNalS63D4v18uwNg2GtbOWtqX4bCAON08,11943
@@ -123,7 +123,7 @@ wbcompliance/viewsets/menu/compliance_task.py,sha256=SsB9wrP13VBdxFBYYOT2Dh0isRk
 wbcompliance/viewsets/menu/compliance_type.py,sha256=8jvu9dFhTeYqJy0lhx4BD_rOeVi4iz073BPKYbnkuFY,684
 wbcompliance/viewsets/menu/risk_management.py,sha256=3rxNrWw9sET7BqulxXWjAehg5NRIKmNoyTrBLOHx4g8,1969
 wbcompliance/viewsets/risk_management/__init__.py,sha256=Gu2vavnClUg9RKpGMhwqo_DOv-FLAGlBf7BbYNyEkJM,821
-wbcompliance/viewsets/risk_management/checks.py,sha256=xxOJE51X_oXa_E-w3wdlF_mNSGpiFF9USHm_yD2YczU,1955
+wbcompliance/viewsets/risk_management/checks.py,sha256=LPePqnrJ1alhSgGyMPfh_-13AE_-KLicZN-OEXx6qgg,2449
 wbcompliance/viewsets/risk_management/incidents.py,sha256=WauVZq2QVB07rTxC-Bz4SUbNbQIJxe2r3jKs_ubrdPI,8230
 wbcompliance/viewsets/risk_management/mixins.py,sha256=g8gF7Glzc36bKfKng9jlb9CCXAqsVZsGfHc6SjDHGlY,1559
 wbcompliance/viewsets/risk_management/rules.py,sha256=2YYST-uULbJt1Y6IwK2GPmVTetXQCTt64Zrj4UEnHzo,6960
@@ -137,6 +137,6 @@ wbcompliance/viewsets/titles/risk_managment/checks.py,sha256=47DEQpj8HBSa-_TImW-
 wbcompliance/viewsets/titles/risk_managment/incidents.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wbcompliance/viewsets/titles/risk_managment/rules.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wbcompliance/viewsets/titles/risk_managment/tables.py,sha256=x_9mr6JWZ9GVNAEvfdNCeFZtGGYSG0-sXrR9pwTyocU,256
-wbcompliance-1.58.0.dist-info/METADATA,sha256=oAkFTSlQZ70THKqq4PyzLikrhE7nQ_XtXPiSJUSK1GQ,196
-wbcompliance-1.58.0.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
-wbcompliance-1.58.0.dist-info/RECORD,,
+wbcompliance-1.58.2.dist-info/METADATA,sha256=b-g_BhIQAfpT6lk1a-MJHC7yC7pqsodloBECs988X-o,196
+wbcompliance-1.58.2.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
+wbcompliance-1.58.2.dist-info/RECORD,,