wbcompliance 1.61.3__tar.gz → 1.61.4__tar.gz

{wbcompliance-1.61.3 → wbcompliance-1.61.4}/PKG-INFO

@@ -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 → wbcompliance-1.61.4}/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-1.61.3 → wbcompliance-1.61.4}/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-1.61.3 → wbcompliance-1.61.4}/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-1.61.3 → wbcompliance-1.61.4}/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-1.61.3 → wbcompliance-1.61.4}/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-1.61.3 → wbcompliance-1.61.4}/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-1.61.3 → wbcompliance-1.61.4}/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-1.61.3 → wbcompliance-1.61.4}/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-1.61.3 → wbcompliance-1.61.4}/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