wbcompliance 1.59.5rc0__py2.py3-none-any.whl → 1.59.6rc0__py2.py3-none-any.whl

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/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/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/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/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/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]]

{wbcompliance-1.59.5rc0.dist-info → wbcompliance-1.59.6rc0.dist-info}/METADATA

@@ -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.dist-info → wbcompliance-1.59.6rc0.dist-info}/RECORD

@@ -13,12 +13,12 @@ wbcompliance/admin/risk_management/checks.py,sha256=fT2V77ycvRteqDjNWxUSVxVC5vVn
 wbcompliance/admin/risk_management/incidents.py,sha256=F4O2UnSPix6m1NCv451MZLSiCRxt4ksV1rllWDbBHSI,1342
 wbcompliance/admin/risk_management/rules.py,sha256=CKWD3QvMGvD8AlDBxIeB9yH_l61T18iD80KcI55U2aY,1627
 wbcompliance/factories/__init__.py,sha256=gpxfoKBAzYuawPSthg_z8BWh10UpS7beqB8SgjWZOM4,685
-wbcompliance/factories/compliance.py,sha256=Dy0VzefKO-k67hfQuDPVfNsP0vH3m82e5oW_T-DrMVw,8704
+wbcompliance/factories/compliance.py,sha256=7saot-dJ4NvzVKdZCc9G007fsPPoMUa1QtlFnXW98hQ,8824
 wbcompliance/factories/risk_management/__init__.py,sha256=A47UKvowLB_aZ-A21yxkuFJWvtTzBothPcOLX-p1q7A,300
 wbcompliance/factories/risk_management/backends.py,sha256=2PKs1hrjKqeebr4LG7hY6IFxMrK7nSjwwNmHoKY54GI,1554
-wbcompliance/factories/risk_management/checks.py,sha256=fvGeBYELaY6SoIdEjcr5Nhc4BFmEsiRBCsr7EwTA-Ws,941
+wbcompliance/factories/risk_management/checks.py,sha256=2imxsW_bbsx4dMUyv9WtifqkXXU-MS5B2F5tR2rEUwo,1001
 wbcompliance/factories/risk_management/incidents.py,sha256=5B44w5iPdXm_dv_R0biO55Pt1hXGlmzSIu9hGMAgrZg,2961
-wbcompliance/factories/risk_management/rules.py,sha256=95A6u1OrtrFZK1RuQoCzzTg-7kyk5KgRmKL_blQDbC4,3367
+wbcompliance/factories/risk_management/rules.py,sha256=kUfgL6k2yiZq_nOGi1zmh_SO-JCxKjbcBjJQO4qDm_E,3447
 wbcompliance/filters/__init__.py,sha256=CBh2V4uX97KCmXX9P3M5BkBqBgIjVe74w05MNJ7NRQg,58
 wbcompliance/filters/compliances.py,sha256=dKJcoPqW5aWlyPriBHLwsZnYY94GiIswK-E9pI2TYbA,6238
 wbcompliance/filters/risk_management/__init__.py,sha256=2GbEGT87eA3_zP3zZ8OKZ11nbmf3rMfPVTg3dxxb1Zk,175
@@ -90,8 +90,8 @@ wbcompliance/tests/risk_management/models/test_checks.py,sha256=F4Pbn7q4PBmWx5fj
 wbcompliance/tests/risk_management/models/test_incidents.py,sha256=BYhBbD6M83poo5VrLzULG9xXpbtOlw9ObhzLwm31KAE,15107
 wbcompliance/tests/risk_management/models/test_rules.py,sha256=j3g2gK6SV0F9a7U2eh2bEzPLI2wtZZoueQpzH6NTxpw,11177
 wbcompliance/viewsets/__init__.py,sha256=JVv3mT5i-9dSYIC_lrvJqcFCPI92KQp9AZ21lR-eqEg,1498
-wbcompliance/viewsets/compliance_form.py,sha256=2DKB72gzHQ9W3P3n7Al50awVLhMKBfkEEUZeMHASfGw,17295
-wbcompliance/viewsets/compliance_task.py,sha256=Qqd_hgaeLIcwMOalzNWTkyOPOIXl_lk-a7HN9cdCNTY,19197
+wbcompliance/viewsets/compliance_form.py,sha256=0Rknp9bq3CM4oeskauJckQerF3EKQndkeG3DPFte-vY,17310
+wbcompliance/viewsets/compliance_task.py,sha256=gz071EDL3kctR_pv38m_vaNplw-6Rdvuq5W6CYLV_4Y,19213
 wbcompliance/viewsets/compliance_type.py,sha256=XtPyVe6szzzpXEWA_F9JRSaI8YSxe--eydouCx1oTKM,1294
 wbcompliance/viewsets/buttons/__init__.py,sha256=rL54B0c3GQiqowqEzc0d9BOneeQ39XblPssRZ-vwiwA,239
 wbcompliance/viewsets/buttons/compliance_form.py,sha256=4bCCush7o7nqSAYHuuixullNrbg4Vu9k-wWXd9gtDtg,3491
@@ -128,7 +128,7 @@ wbcompliance/viewsets/risk_management/checks.py,sha256=LPePqnrJ1alhSgGyMPfh_-13A
 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
-wbcompliance/viewsets/risk_management/tables.py,sha256=oC5kf-Qy2hu2Bnedt9foQYR6oXn9bSbJKUPaAxJ-IM8,3880
+wbcompliance/viewsets/risk_management/tables.py,sha256=Yj_oJXjh-9trPmRs2pFRAVAe15TnA9542fdXkX8xeq4,3896
 wbcompliance/viewsets/titles/__init__.py,sha256=bzKjQrFzqTUSH8OxBAeI7Cc6HHGAIae0gBp8fzzgpfw,589
 wbcompliance/viewsets/titles/compliance_form.py,sha256=9LdQf54U6cAJwdjNxuaxFKEXkLXA8EloeR9baziqLkA,4256
 wbcompliance/viewsets/titles/compliance_task.py,sha256=rEVswGKAqIR59vXr9G6MP5EoDH4yG-NolUtOGwxbwyo,1756
@@ -138,6 +138,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.59.5rc0.dist-info/METADATA,sha256=64iYqFg-GBjnxXjhliTQv5H-iXGd7Y0m9_NZWXJxXnA,199
-wbcompliance-1.59.5rc0.dist-info/WHEEL,sha256=aha0VrrYvgDJ3Xxl3db_g_MDIW-ZexDdrc_m-Hk8YY4,105
-wbcompliance-1.59.5rc0.dist-info/RECORD,,
+wbcompliance-1.59.6rc0.dist-info/METADATA,sha256=32deQfVf3B_eFUb6Jhfd7c4Pp-jXpwyQcfSPsNhXfXk,199
+wbcompliance-1.59.6rc0.dist-info/WHEEL,sha256=aha0VrrYvgDJ3Xxl3db_g_MDIW-ZexDdrc_m-Hk8YY4,105
+wbcompliance-1.59.6rc0.dist-info/RECORD,,