wbcompliance 1.59.5rc0__tar.gz → 1.59.6rc0__tar.gz

{wbcompliance-1.59.5rc0 → wbcompliance-1.59.6rc0}/PKG-INFO

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

{wbcompliance-1.59.5rc0 → wbcompliance-1.59.6rc0}/wbcompliance/factories/compliance.py

@@ -29,6 +29,7 @@ class ComplianceFormTypeFactory(factory.django.DjangoModelFactory):
 class ComplianceFormFactory(factory.django.DjangoModelFactory):
     class Meta:
         model = ComplianceForm
+        skip_postgeneration_save = True
 
     form_type = factory.SubFactory(ComplianceFormTypeFactory)
     creator = factory.SubFactory("wbcore.contrib.authentication.factories.AuthenticatedPersonFactory")
@@ -103,6 +104,7 @@ class ComplianceFormSignatureRuleFactory(factory.django.DjangoModelFactory):
 class ComplianceTypeFactory(factory.django.DjangoModelFactory):
     class Meta:
         model = ComplianceType
+        skip_postgeneration_save = True
 
     name = factory.Faker("text", max_nb_chars=32)
     description = factory.Faker("text", max_nb_chars=255)
@@ -153,6 +155,7 @@ class ReviewComplianceTaskFactory(ParentReviewComplianceTaskFactory):
 class ComplianceTaskFactory(factory.django.DjangoModelFactory):
     class Meta:
         model = ComplianceTask
+        skip_postgeneration_save = True
 
     title = factory.Faker("text", max_nb_chars=32)
     description = factory.Faker("text", max_nb_chars=255)

{wbcompliance-1.59.5rc0 → wbcompliance-1.59.6rc0}/wbcompliance/factories/risk_management/checks.py

@@ -19,6 +19,8 @@ class RiskCheckFactory(factory.django.DjangoModelFactory):
             self.rule = extracted.rule
             self.checked_object_id = extracted.checked_object_id
             self.checked_object_content_type = extracted.checked_object_content_type
+        self.save()
 
     class Meta:
         model = RiskCheck
+        skip_postgeneration_save = True

{wbcompliance-1.59.5rc0 → wbcompliance-1.59.6rc0}/wbcompliance/factories/risk_management/rules.py

@@ -64,6 +64,7 @@ class RiskRuleFactory(factory.django.DjangoModelFactory):
 
     class Meta:
         model = RiskRule
+        skip_postgeneration_save = True
 
 
 class RuleThresholdFactory(factory.django.DjangoModelFactory):
@@ -89,6 +90,7 @@ class RuleThresholdFactory(factory.django.DjangoModelFactory):
 
     class Meta:
         model = RuleThreshold
+        skip_postgeneration_save = True
 
 
 class RuleCheckedObjectRelationshipFactory(factory.django.DjangoModelFactory):

{wbcompliance-1.59.5rc0 → wbcompliance-1.59.6rc0}/wbcompliance/viewsets/compliance_form.py

@@ -245,10 +245,12 @@ class ComplianceFormModelViewSet(RevisionMixin, viewsets.ModelViewSet):
                 total_compliance_form_signature=ComplianceForm.get_subquery_total_compliance_form_signature(),
                 total_signed=F("total_compliance_form_signature")
                 - ComplianceForm.get_subquery_total_compliance_form_signature(remaining_signed=True),
-                current_signed=ExpressionWrapper(
-                    Concat(
-                        Value(" ("), F("total_signed"), Value("/"), F("total_compliance_form_signature"), Value(")")
-                    ),
+                current_signed=Concat(
+                    Value(" ("),
+                    F("total_signed"),
+                    Value("/"),
+                    F("total_compliance_form_signature"),
+                    Value(")"),
                     output_field=CharField(),
                 ),
                 is_signed=Case(

{wbcompliance-1.59.5rc0 → wbcompliance-1.59.6rc0}/wbcompliance/viewsets/compliance_task.py

@@ -11,8 +11,8 @@ from rest_framework.response import Response
 from reversion.views import RevisionMixin
 from wbcore import viewsets
 from wbcore.contrib.authentication.authentication import JWTCookieAuthentication
-from wbcore.pandas import fields as pf
-from wbcore.pandas.views import PandasAPIViewSet
+from wbcore.contrib.pandas import fields as pf
+from wbcore.contrib.pandas.views import PandasAPIViewSet
 
 from wbcompliance.filters import (
     ComplianceActionFilter,

{wbcompliance-1.59.5rc0 → wbcompliance-1.59.6rc0}/wbcompliance/viewsets/risk_management/tables.py

@@ -3,8 +3,8 @@ from django.contrib.contenttypes.models import ContentType
 from django.db.models import Q
 from django.utils.functional import cached_property
 from django.utils.translation import gettext as _
-from wbcore.pandas import fields as pf
-from wbcore.pandas.views import PandasAPIViewSet
+from wbcore.contrib.pandas import fields as pf
+from wbcore.contrib.pandas.views import PandasAPIViewSet
 from wbcore.utils.models import get_object
 
 from wbcompliance.filters import RiskManagementIncidentFilter
@@ -41,7 +41,7 @@ class RiskManagementIncidentTableView(PandasAPIViewSet):
                 | Q(rule_backend__allowed_checked_object_content_type=self.checked_object_content_type)
             )
         )
-        return list(map(lambda x: (f'rule_{x["id"]}', x["name"]), rules.order_by("name").values("id", "name")))
+        return list(map(lambda x: (f"rule_{x['id']}", x["name"]), rules.order_by("name").values("id", "name")))
 
     def get_ordering_fields(self):
         return ["checked_object_repr", *[x[0] for x in self.get_rule_map]]