wbcompliance 1.61.3__py2.py3-none-any.whl → 1.61.4__py2.py3-none-any.whl

wbcompliance/models/compliance_form.py

@@ -29,7 +29,6 @@ from wbcore.enums import RequestType
 from wbcore.markdown.utils import custom_url_fetcher
 from wbcore.metadata.configs.buttons import ActionButton, ButtonDefaultColor
 from wbcore.models import WBModel
-from wbcore.permissions.shortcuts import get_internal_users
 from weasyprint import HTML
 
 from .compliance_type import ComplianceDocumentMixin, ComplianceType, can_active_request
@@ -263,10 +262,9 @@ class ComplianceForm(ComplianceDocumentMixin, WBModel):
             self.notify(title, msg, recipients, admin_compliance=True)
 
     def get_signing_users(self) -> QuerySet["User"]:
+        users = User.objects.filter(is_active=True)
         if self.only_internal:
-            users = get_internal_users()
-        else:
-            users = User.objects.filter(is_active=True)
+            users = users.filter_internal()
         if self.assigned_to.exists():
             users = users.filter(groups__in=self.assigned_to.all())
         return users.distinct()

wbcompliance/models/risk_management/rules.py

@@ -24,8 +24,8 @@ from pandas.tseries.offsets import BDay
 from rest_framework.reverse import reverse
 from wbcore.contrib.authentication.models.users import User
 from wbcore.contrib.directory.models import Person
-from wbcore.contrib.guardian.models.mixins import PermissionObjectModelMixin
 from wbcore.contrib.notifications.dispatch import send_notification
+from wbcore.contrib.permission.models.mixins import PermissionObjectModelMixin
 from wbcore.models import WBModel
 from wbcore.utils.models import ComplexToStringMixin
 from wbcore.utils.rrules import convert_rrulestr_to_dict

wbcompliance/permissions.py

@@ -1,6 +1,5 @@
 from guardian.core import ObjectPermissionChecker
 from rest_framework.permissions import IsAuthenticated
-from wbcore.permissions.shortcuts import is_internal_user
 
 from wbcompliance.models.risk_management import RiskRule
 
@@ -26,8 +25,8 @@ class RulePermission(IsAuthenticated):
 
 
 def is_admin_compliance(request):
-    return is_internal_user(request.user) and request.user.has_perm("wbcompliance.administrate_compliance")
+    return request.user.is_internal and request.user.has_perm("wbcompliance.administrate_compliance")
 
 
 def is_internal_employee_compliance(request):
-    return is_internal_user(request.user) and not is_admin_compliance(request)
+    return request.user.is_internal and not is_admin_compliance(request)

wbcompliance/serializers/compliance_form.py

@@ -7,7 +7,7 @@ from wbcore import serializers as wb_serializers
 from wbcore.contrib.authentication.serializers import GroupRepresentationSerializer
 from wbcore.contrib.directory.models import Person
 from wbcore.contrib.directory.serializers import PersonRepresentationSerializer
-from wbcore.permissions.shortcuts import get_internal_groups
+from wbcore.contrib.permission.internal.registry import get_internal_groups
 
 from wbcompliance.models import (
     ComplianceForm,

wbcompliance/tests/risk_management/models/test_rules.py

@@ -9,7 +9,7 @@ from django.core.exceptions import ValidationError
 from faker import Faker
 from guardian.utils import get_anonymous_user
 from psycopg.types.range import NumericRange
-from wbcore.permissions.utils import perm_to_permission
+from wbcore.contrib.permission.utils import perm_to_permission
 
 from wbcompliance.models import (
     RiskIncident,

wbcompliance/tests/test_models.py

@@ -1,6 +1,6 @@
 import pytest
 from wbcore.contrib.authentication.factories import UserFactory
-from wbcore.permissions.shortcuts import get_internal_users
+from wbcore.contrib.authentication.models import User
 
 from wbcompliance.models import ComplianceForm, ComplianceFormSignature
 
@@ -44,7 +44,7 @@ class TestSpecificModels(UserTestMixin):
         compliance_form1.active()
         assert (
             ComplianceFormSignature.objects.filter(compliance_form=compliance_form1).count()
-            == get_internal_users().count()
+            == User.objects.filter_internal().count()
         )
 
     # def test_only_internal(self, compliance_form_factory):

wbcompliance/viewsets/menu/risk_management.py

@@ -2,7 +2,6 @@ from contextlib import suppress
 
 from django.utils.translation import gettext as _
 from wbcore.menus import ItemPermission, Menu, MenuItem
-from wbcore.permissions.shortcuts import is_internal_user
 
 from wbcompliance.models.risk_management.rules import RuleGroup
 
@@ -10,13 +9,13 @@ RULE_MENUITEM = MenuItem(
     label=_("Rules"),
     endpoint="wbcompliance:riskrule-list",
     permission=ItemPermission(
-        method=lambda request: is_internal_user(request.user), permissions=["wbcompliance.view_riskrule"]
+        method=lambda request: request.user.is_internal, permissions=["wbcompliance.view_riskrule"]
     ),
     add=MenuItem(
         label=_("Add Rule"),
         endpoint="wbcompliance:riskrule-list",
         permission=ItemPermission(
-            method=lambda request: is_internal_user(request.user), permissions=["wbcompliance.add_riskrule"]
+            method=lambda request: request.user.is_internal, permissions=["wbcompliance.add_riskrule"]
         ),
     ),
 )
@@ -31,7 +30,7 @@ def _get_incident_menu():
                     label=rule_group.name,
                     endpoint="wbcompliance:riskincident-list",
                     permission=ItemPermission(
-                        method=lambda request: is_internal_user(request.user),
+                        method=lambda request: request.user.is_internal,
                         permissions=["wbcompliance.view_riskincident"],
                     ),
                     endpoint_get_parameters={"rule_group": rule_group.id},
@@ -43,7 +42,7 @@ def _get_incident_menu():
         label=_("Incidents"),
         endpoint="wbcompliance:riskincident-list",
         permission=ItemPermission(
-            method=lambda request: is_internal_user(request.user), permissions=["wbcompliance.view_riskincident"]
+            method=lambda request: request.user.is_internal, permissions=["wbcompliance.view_riskincident"]
         ),
     )
 

wbcompliance/viewsets/risk_management/incidents.py

@@ -21,8 +21,8 @@ from django.utils.functional import cached_property
 from rest_framework import status
 from rest_framework.decorators import action
 from wbcore import viewsets
-from wbcore.contrib.guardian.models import UserObjectPermission
 from wbcore.contrib.icons import WBIcon
+from wbcore.contrib.permission.models import UserObjectPermission
 
 from wbcompliance.filters import (
     CheckedObjectIncidentRelationshipFilterSet,

wbcompliance/viewsets/risk_management/rules.py

@@ -7,7 +7,7 @@ from rest_framework import status
 from rest_framework.decorators import action
 from wbcore import serializers as wb_serializers
 from wbcore import viewsets
-from wbcore.contrib.guardian.viewsets.mixins import GuardianFilterMixin
+from wbcore.contrib.permission.viewsets.mixins import ObjectPermissionFilterMixin
 from wbcore.utils.date import get_date_interval_from_request
 
 from wbcompliance.filters import RiskRuleFilterSet
@@ -66,7 +66,7 @@ class RuleThresholdRepresentationViewSet(viewsets.RepresentationViewSet):
     serializer_class = RuleThresholdRepresentationSerializer
 
 
-class RiskRuleRepresentationViewSet(GuardianFilterMixin, viewsets.RepresentationViewSet):
+class RiskRuleRepresentationViewSet(ObjectPermissionFilterMixin, viewsets.RepresentationViewSet):
     queryset = RiskRule.objects.all()
     serializer_class = RiskRuleRepresentationSerializer
     search_fields = (
@@ -105,7 +105,7 @@ class RuleCheckedObjectRelationshipRiskRuleModelViewSet(viewsets.ModelViewSet):
         return super().get_queryset().filter(rule_id=self.kwargs["rule_id"])
 
 
-class RiskRuleModelViewSet(GuardianFilterMixin, viewsets.ModelViewSet):
+class RiskRuleModelViewSet(ObjectPermissionFilterMixin, viewsets.ModelViewSet):
     display_config_class = RiskRuleDisplayConfig
     endpoint_config_class = RiskRuleEndpointConfig
     button_config_class = RiskRuleButtonConfig

{wbcompliance-1.61.3.dist-info → wbcompliance-1.61.4.dist-info}/METADATA

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

{wbcompliance-1.61.3.dist-info → wbcompliance-1.61.4.dist-info}/RECORD

@@ -1,6 +1,6 @@
 wbcompliance/__init__.py,sha256=J-j-u0itpEFT6irdmWmixQqYMadNl1X91TxUmoiLHMI,22
 wbcompliance/apps.py,sha256=YtNYwXg6t_XiLQf0TxCiXYRs1tvUYtGrENay-8tztyI,415
-wbcompliance/permissions.py,sha256=rb63hJ4pQHZ4QZjTIDCnqFh1LI2m_evXC7loG3B53lE,1391
+wbcompliance/permissions.py,sha256=f9ySGD59rNFhGmqNeBxVykprZy6TDuTa3eKcQM2izuw,1321
 wbcompliance/tasks.py,sha256=1yF2C1gxB-phXbYbsKqMkhYUa_Jlc1awnlcXMOFxnVA,5840
 wbcompliance/urls.py,sha256=-190MsA5_DDPeZujun0BGCrqWOJop6EjO3NYXcv3y_o,8659
 wbcompliance/admin/__init__.py,sha256=JiVPFKVgMQArksYuol4WMkl6BcfOBv75zJWpLmLyqV0,458
@@ -51,7 +51,7 @@ wbcompliance/migrations/0022_riskincident_precheck.py,sha256=H2l9REAsogn7EsUMWcE
 wbcompliance/migrations/0023_alter_checkedobjectincidentrelationship_unique_together_and_more.py,sha256=dSgzBAWvIs1tsegPgpr0GtBXEVKsHgtX5djuihQg93w,1486
 wbcompliance/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wbcompliance/models/__init__.py,sha256=gk3D0yZ3ZpJh1Nl-Kyc1PWm67t0Gj7t47Jl2xm9Lisk,534
-wbcompliance/models/compliance_form.py,sha256=uyU8DhMuEp1uXcMyE1fdPZ0mxHO0H0Ecc0I7XDPR2Dc,24867
+wbcompliance/models/compliance_form.py,sha256=k2NvwOJm_rFKPy5SRfMBNrdbLyueL-DjIYDReyVwOA4,24792
 wbcompliance/models/compliance_task.py,sha256=cwX7KA681yneK5xw2I8YFYjK8ODnoalo0AAudBYjkYQ,30794
 wbcompliance/models/compliance_type.py,sha256=_v5HDbzDN8b1bRGpTBI2ppAL0PjXjKeSC3PVI2Q-eZw,4733
 wbcompliance/models/enums.py,sha256=id1m8trG7b6Sw3Sa9VrLgD104GC2nG9A8ngJzaRqIIQ,424
@@ -61,9 +61,9 @@ wbcompliance/models/risk_management/checks.py,sha256=drBNhT7kj7TA1EclKX9jpPp-Iyc
 wbcompliance/models/risk_management/dispatch.py,sha256=cLi63vSGbk9xhCoVgr4UmVk2kfYmGiyohKINSvCodb0,1423
 wbcompliance/models/risk_management/incidents.py,sha256=bDSW34HJMKy1flbYxHI7XEjkJY9rc3FqKoK-9RYagEQ,24312
 wbcompliance/models/risk_management/mixins.py,sha256=vitLClx1QwmhooXselB_MqNoLbxMRp-uNQKsvHDooj8,4449
-wbcompliance/models/risk_management/rules.py,sha256=fDjHoI7A6CudRHP_8j3Wr0UgZFuhHk2dkKIKyGvY9nc,25918
+wbcompliance/models/risk_management/rules.py,sha256=uuEjamSVURlgXX4pzLumGdY3Fl5Yh58bdJSR3R3-8EA,25920
 wbcompliance/serializers/__init__.py,sha256=OhRIuUrexqQePCISpu-BKry9dfioYGfpO8RwlcwhHtI,1122
-wbcompliance/serializers/compliance_form.py,sha256=OxPILlup_CP4Qwvu864oMqz7QUZsk2QOkOGFifWP3gM,11615
+wbcompliance/serializers/compliance_form.py,sha256=hDQMZZEExFNNMTzVj7brepYm_2nL1328C29LNCeCAeQ,11630
 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
@@ -80,7 +80,7 @@ wbcompliance/tests/disable_signals.py,sha256=N3nosCNpUDdauokoWTOLOpqXgZo7BD52OCE
 wbcompliance/tests/mixins.py,sha256=mfCd0Ul_YsRx_SQCv-ybqkXWQGT7QTU341cdKv-wDzc,396
 wbcompliance/tests/signals.py,sha256=nCQBFcZNrkTuMxmVyY_fFrbj3C7b94i0s_MYlr-KKoU,4010
 wbcompliance/tests/test_filters.py,sha256=LV9lma5c_16TWjyKohR-1Qs7Z9Fd_p6lhnswceVQuI8,1017
-wbcompliance/tests/test_models.py,sha256=zoEK44J8ZfcKYm65ZZYj_wRWhMEGqdURnuDSYOSedFs,2604
+wbcompliance/tests/test_models.py,sha256=sNh2yA-LKdMHliVaNKUVPuiT3LGkcgbIujJPm8cKObc,2608
 wbcompliance/tests/test_serializers.py,sha256=JxlLGAxnOHu2etULUN4uy1Q3AFD8K4ZPTLcU1rBMZww,1881
 wbcompliance/tests/test_tasks.py,sha256=ynsspQCJoB6wnRDn1vWdRKMmNtToF1L5EIyEP4Ndxpo,1246
 wbcompliance/tests/test_views.py,sha256=nZIpfttDP-BedwYA-Y6Wkeh43lAJBNEb9tnhfdByrzw,16839
@@ -90,7 +90,7 @@ wbcompliance/tests/risk_management/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-
 wbcompliance/tests/risk_management/models/test_backends.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wbcompliance/tests/risk_management/models/test_checks.py,sha256=F4Pbn7q4PBmWx5fjvkwEclioG1mEt2M53maegSI9hYU,2467
 wbcompliance/tests/risk_management/models/test_incidents.py,sha256=kBDZ1LqaUY592g1_nexV5ye9Wz7AoKppAJhGv_qj00s,15035
-wbcompliance/tests/risk_management/models/test_rules.py,sha256=j3g2gK6SV0F9a7U2eh2bEzPLI2wtZZoueQpzH6NTxpw,11177
+wbcompliance/tests/risk_management/models/test_rules.py,sha256=JVTUzBAnMkemAiaGWI3Q0ZwPM99xMIkwhTUvf3rZ3ag,11184
 wbcompliance/viewsets/__init__.py,sha256=JVv3mT5i-9dSYIC_lrvJqcFCPI92KQp9AZ21lR-eqEg,1498
 wbcompliance/viewsets/compliance_form.py,sha256=_oAG5zkPHQ4g_IVy_MSQamk_gk1XBlgX6CDU8YHhHFE,17298
 wbcompliance/viewsets/compliance_task.py,sha256=gz071EDL3kctR_pv38m_vaNplw-6Rdvuq5W6CYLV_4Y,19213
@@ -124,12 +124,12 @@ wbcompliance/viewsets/menu/__init__.py,sha256=TpXH4kxAhJDy6SVpelL9LCxFoRUD-WpbcV
 wbcompliance/viewsets/menu/compliance_form.py,sha256=FJk6k1y-K-fMkwneDJgEwb7Qbq6kibynaK9-Vg9w8G4,1852
 wbcompliance/viewsets/menu/compliance_task.py,sha256=SsB9wrP13VBdxFBYYOT2Dh0isRk8uSYbcdnn7qXe81k,4510
 wbcompliance/viewsets/menu/compliance_type.py,sha256=8jvu9dFhTeYqJy0lhx4BD_rOeVi4iz073BPKYbnkuFY,684
-wbcompliance/viewsets/menu/risk_management.py,sha256=3rxNrWw9sET7BqulxXWjAehg5NRIKmNoyTrBLOHx4g8,1969
+wbcompliance/viewsets/menu/risk_management.py,sha256=YYlAd5ST8iuIOXT3kHlbs-zQ5CcY-6Z8w5ZzMjOSPbQ,1887
 wbcompliance/viewsets/risk_management/__init__.py,sha256=Gu2vavnClUg9RKpGMhwqo_DOv-FLAGlBf7BbYNyEkJM,821
 wbcompliance/viewsets/risk_management/checks.py,sha256=kCitq6tlqW_z_oGGiRqRKft3XDlLq0gEGDRIuT4wYlI,2377
-wbcompliance/viewsets/risk_management/incidents.py,sha256=XLxcmcbIvUEPwIm2R2T5Z_XErFbWEWNjEihHF6p2Gv0,8184
+wbcompliance/viewsets/risk_management/incidents.py,sha256=NzD9BSDoRD0p_yNoM9B1_Cus5d31KWrBZqssYBxg2S4,8186
 wbcompliance/viewsets/risk_management/mixins.py,sha256=g8gF7Glzc36bKfKng9jlb9CCXAqsVZsGfHc6SjDHGlY,1559
-wbcompliance/viewsets/risk_management/rules.py,sha256=IDb4YSfcSLeMugkIh-7m4q2B-FKKTtF92LXX_RtNRIE,6888
+wbcompliance/viewsets/risk_management/rules.py,sha256=t95x0OefTReUY592fVovU4wQ1r-XajRAjTu3Hzhw28k,6914
 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
@@ -140,6 +140,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.61.3.dist-info/METADATA,sha256=RgobuJzc9_kr3gxn12LjW29lhcN7aSq3PMoPZQF3-Ng,196
-wbcompliance-1.61.3.dist-info/WHEEL,sha256=aha0VrrYvgDJ3Xxl3db_g_MDIW-ZexDdrc_m-Hk8YY4,105
-wbcompliance-1.61.3.dist-info/RECORD,,
+wbcompliance-1.61.4.dist-info/METADATA,sha256=OVwH7D0J1eQ-LLabEXaPHOxGfm8YoynSpZDgEVbF9og,196
+wbcompliance-1.61.4.dist-info/WHEEL,sha256=aha0VrrYvgDJ3Xxl3db_g_MDIW-ZexDdrc_m-Hk8YY4,105
+wbcompliance-1.61.4.dist-info/RECORD,,