wbcompliance 1.59.16__py2.py3-none-any.whl → 1.60.1__py2.py3-none-any.whl

wbcompliance/factories/risk_management/backends.py

@@ -1,13 +1,12 @@
 from typing import Generator
 
-from django.contrib.auth import get_user_model
 from django.contrib.contenttypes.models import ContentType
 from faker import Faker
 from wbcore import serializers as wb_serializers
+from wbcore.contrib.authentication.models.users import User
 
 from wbcompliance.models.risk_management import backend
 
-User = get_user_model()
 fake = Faker()
 
 

wbcompliance/factories/risk_management/checks.py

@@ -1,6 +1,6 @@
 import factory
-from django.contrib.auth import get_user_model
 from django.contrib.contenttypes.models import ContentType
+from wbcore.contrib.authentication.models.users import User
 
 from wbcompliance.models.risk_management.checks import RiskCheck
 
@@ -8,7 +8,7 @@ from wbcompliance.models.risk_management.checks import RiskCheck
 class RiskCheckFactory(factory.django.DjangoModelFactory):
     rule = factory.SubFactory("wbcompliance.factories.risk_management.rules.RiskRuleFactory")
     evaluation_date = factory.Faker("date_object")
-    checked_object_content_type = factory.LazyAttribute(lambda o: ContentType.objects.get_for_model(get_user_model()))
+    checked_object_content_type = factory.LazyAttribute(lambda o: ContentType.objects.get_for_model(User))
     checked_object_id = 1
 
     @factory.post_generation

wbcompliance/factories/risk_management/rules.py

@@ -3,13 +3,13 @@ import random
 from datetime import date
 
 import factory
-from django.contrib.auth import get_user_model
 from django.contrib.contenttypes.models import ContentType
 from django.core.serializers.json import DjangoJSONEncoder
 from faker import Faker
 from guardian.utils import get_anonymous_user
 from psycopg.types.range import NumericRange
 from wbcore.contrib.authentication.factories import UserFactory
+from wbcore.contrib.authentication.models.users import User
 
 from wbcompliance.models.risk_management.rules import (
     RiskRule,
@@ -95,7 +95,7 @@ class RuleThresholdFactory(factory.django.DjangoModelFactory):
 
 class RuleCheckedObjectRelationshipFactory(factory.django.DjangoModelFactory):
     rule = factory.SubFactory("wbcompliance.factories.risk_management.RiskRuleFactory")
-    checked_object_content_type = factory.LazyAttribute(lambda o: ContentType.objects.get_for_model(get_user_model()))
+    checked_object_content_type = factory.LazyAttribute(lambda o: ContentType.objects.get_for_model(User))
     checked_object_id = 1
 
     class Meta:

wbcompliance/filters/risk_management/checks.py

@@ -1,10 +1,11 @@
 from wbcore import filters as wb_filters
+from wbcore.contrib.content_type.filters import MultipleChoiceContentTypeFilter
 
 from wbcompliance.models.risk_management import RiskCheck
 
 
 class RiskCheckFilterSet(wb_filters.FilterSet):
-    checked_objects = wb_filters.MultipleChoiceContentTypeFilter(
+    checked_objects = MultipleChoiceContentTypeFilter(
         label="Triggerers",
         field_name="checked_objects",
         object_id_label="checked_object_id",
@@ -12,7 +13,7 @@ class RiskCheckFilterSet(wb_filters.FilterSet):
         distinct=True,
         hidden=True,
     )
-    activators = wb_filters.MultipleChoiceContentTypeFilter(
+    activators = MultipleChoiceContentTypeFilter(
         label="Activators",
         field_name="activators",
         object_id_label="activator_id",

wbcompliance/filters/risk_management/incidents.py

@@ -1,6 +1,7 @@
 from django.db.models import Q
 from django.utils.translation import gettext_lazy as _
 from wbcore import filters as wb_filters
+from wbcore.contrib.content_type.filters import MultipleChoiceContentTypeFilter
 
 from wbcompliance.models.risk_management import (
     CheckedObjectIncidentRelationship,
@@ -39,7 +40,7 @@ class RiskIncidentFilterSet(wb_filters.FilterSet):
         label_key=RiskIncidentType.get_representation_label_key(),
         initial=get_default_severity,
     )
-    checked_object_relationships = wb_filters.MultipleChoiceContentTypeFilter(
+    checked_object_relationships = MultipleChoiceContentTypeFilter(
         label="Checked Objects",
         field_name="checked_object_relationships",
         object_id_label="checked_object_relationships__rule_check__checked_object_id",
@@ -80,7 +81,7 @@ class CheckedObjectIncidentRelationshipFilterSet(wb_filters.FilterSet):
     checked_object = wb_filters.CharFilter(
         method="filter_checked_object", field_name="checked_object", lookup_expr="icontains"
     )
-    checked_object_relationships = wb_filters.MultipleChoiceContentTypeFilter(
+    checked_object_relationships = MultipleChoiceContentTypeFilter(
         label="Checked Objects",
         field_name="checked_object_relationships",
         object_id_label="rule_check__checked_object_id",

wbcompliance/filters/risk_management/rules.py

@@ -2,6 +2,7 @@ from django.db.models import Count, F, OuterRef, Q, Subquery
 from django.db.models.functions import Coalesce
 from django.utils.translation import gettext_lazy as _
 from wbcore import filters as wb_filters
+from wbcore.contrib.content_type.filters import MultipleChoiceContentTypeFilter
 from wbcore.contrib.directory.models import Person
 
 from wbcompliance.models.risk_management import RiskRule, RuleThreshold
@@ -11,7 +12,7 @@ from .utils import get_default_handler
 
 
 class RiskRuleFilterSet(wb_filters.FilterSet):
-    checked_object_relationships = wb_filters.MultipleChoiceContentTypeFilter(
+    checked_object_relationships = MultipleChoiceContentTypeFilter(
         label="Checked Objects",
         field_name="checked_object_relationships",
         distinct=True,

wbcompliance/filters/risk_management/tables.py

@@ -36,7 +36,7 @@ class RiskManagementIncidentFilter(wb_filters.FilterSet):
         required=True,
         method="filter_checked_object_content_type",
         queryset=ContentType.objects.all(),
-        endpoint="wbcore:contenttyperepresentation-list",
+        endpoint="wbcore:content_type:contenttyperepresentation-list",
         value_key="id",
         label_key="{{app_label}} | {{model}}",
         label=_("Checked Object Type"),