wbcore 1.54.10__py2.py3-none-any.whl → 1.58.2__py2.py3-none-any.whl

wbcore/cache/decorators.py

@@ -15,9 +15,9 @@ def cache_table(
     periodic_caching_get_parameters: list[dict[str, str]] | Callable | None = None,
 ):
     def _decorator(pandas_view_class):
-        setattr(pandas_view_class, "CACHE_ENABLED", not settings.DEBUG)
-        setattr(pandas_view_class, "CACHE_TIMEOUT", timeout)
-        setattr(pandas_view_class, "CACHE_KEY_PREFIX", key_prefix)
+        pandas_view_class.CACHE_ENABLED = not settings.DEBUG
+        pandas_view_class.CACHE_TIMEOUT = timeout
+        pandas_view_class.CACHE_KEY_PREFIX = key_prefix
         add_extra_button.connect(add_clear_cache_button, sender=pandas_view_class, weak=False)
 
         if periodic_caching:

wbcore/cache/registry.py

@@ -61,8 +61,9 @@ class CachedClass:
         for kwargs in view_kwargs:
             for request in self._get_requests(**kwargs):
                 with suppress(RequiredFilterMissing):
-                    view = self.view_class(request=request, kwargs=kwargs)
-                    setattr(request, "parser_context", {"request": request, "view": view, "kwargs": kwargs})
+                    view = self.view_class()
+                    view.setup(request, **kwargs)
+                    request.parser_context = {"request": request, "view": view, "kwargs": kwargs}
                     cache_key = view._get_cache_key()
                     cache.delete(cache_key)
                     res.append(view._get_dataframe())

wbcore/configs/decorators.py

@@ -7,5 +7,5 @@ def register_config(func: Callable) -> Callable:
     of all configs. This function should only be used in a module called configs, otherwise the auto-discover
     functionality won't work.
     """
-    setattr(func, "_is_config", True)
+    func._is_config = True
     return func

wbcore/configurations/configurations/apps.py

@@ -39,13 +39,13 @@ class Apps:
         return getattr(self, "ADDITIONAL_APPS", []) + getattr(self, "WB_ENDPOINTS", [])
 
     @property
-    def INSTALLED_APPS(self):
+    def INSTALLED_APPS(self):  # noqa
         return self._BASE_APPS + self._get_additional_and_wb_apps()
 
 
 class DevApps(Apps):
     @property
-    def INSTALLED_APPS(self):
+    def INSTALLED_APPS(self):  # noqa
         apps = self._BASE_APPS
 
         if self.DEBUG:

wbcore/configurations/configurations/authentication.py

@@ -24,7 +24,7 @@ class Authentication:
     JWT_COOKIE_KEY = values.Value("JWT-access", environ_prefix=None)
 
     @property
-    def SIMPLE_JWT(self):
+    def SIMPLE_JWT(self):  # noqa
         return {
             "ACCESS_TOKEN_LIFETIME": timedelta(seconds=self.JWT_ACCESS_TOKEN_LIFETIME),
             "REFRESH_TOKEN_LIFETIME": timedelta(seconds=self.JWT_REFRESH_TOKEN_LIFETIME),

wbcore/configurations/configurations/base.py

@@ -9,7 +9,7 @@ class Base:
     SITE_ID = values.IntegerValue(1, environ_prefix=None)
 
     @property
-    def PROJECT_NAME(self):
+    def PROJECT_NAME(self):  # noqa
         if settings_module := os.environ.get("DJANGO_SETTINGS_MODULE", None):
             return settings_module.split(".")[0]
         return None

wbcore/configurations/configurations/cache.py

@@ -8,7 +8,7 @@ class Cache:
     )  # The default (10 days) timeout in seconds
 
     @property
-    def CACHES(self):
+    def CACHES(self):  # noqa
         if self.CACHE_REDIS_URL:
             return {
                 "default": {

wbcore/configurations/configurations/maintenance.py

@@ -6,7 +6,7 @@ class Maintenance:
     MAINTENANCE_MODE_STR: str | None = values.Value("False", environ_prefix=None)
 
     # We allow maintenance mode to be either True, False or None. In case of None, the specified Backend will take over.
-    def MAINTENANCE_MODE(self) -> bool | None:
+    def MAINTENANCE_MODE(self) -> bool | None:  # noqa
         if value := self.MAINTENANCE_MODE_STR:
             normalized_value = value.strip().lower()
             if normalized_value in values.BooleanValue.true_values:

wbcore/configurations/configurations/media.py

@@ -7,7 +7,7 @@ class Media:
 
 class LocalMedia(Media):
     @property
-    def MEDIA_ROOT(self):
+    def MEDIA_ROOT(self):  # noqa
         return self.BASE_DIR.joinpath("mediafiles")
 
 

wbcore/configurations/configurations/middleware.py

@@ -14,7 +14,7 @@ class Middleware:
 
 class DevMiddleware:
     @property
-    def MIDDLEWARE(self):
+    def MIDDLEWARE(self):  # noqa
         middleware = []
         middleware_list = Middleware.MIDDLEWARE.copy()
         if self.DEBUG:

wbcore/configurations/configurations/rest_framework.py

@@ -6,7 +6,7 @@ class Restframework:
     REST_FRAMEWORK_THROTTLE_PERIOD = values.Value("hour", environ_prefix=None)
     REST_FRAMEWORK_USER_THROTTLE_RATES = values.IntegerValue(5000, environ_prefix=None)
 
-    def REST_FRAMEWORK(self):
+    def REST_FRAMEWORK(self):  # noqa
         rest_framework = {
             "DEFAULT_PAGINATION_CLASS": "rest_framework.pagination.LimitOffsetPagination",
             "PAGE_SIZE": 25,

wbcore/configurations/configurations/static.py

@@ -13,7 +13,7 @@ class LocalStaticfiles(Staticfiles):
     }
 
     @property
-    def STATIC_ROOT(self):
+    def STATIC_ROOT(self):  # noqa
         return self.BASE_DIR.joinpath("staticfiles")
 
 

wbcore/configurations/configurations/wbcore.py

@@ -46,7 +46,7 @@ class WBCore:
     MESSAGE_STORAGE = "wbcore.messages.route_message_storage"
 
     @property
-    def FRONTEND_CONTEXT(self):
+    def FRONTEND_CONTEXT(self):  # noqa
         base_url = f"{self.CDN_BASE_ENDPOINT_URL}/{self.FRONTEND_VERSION}/"
         return {
             "TITLE": "Workbench",

wbcore/content_type/serializers.py

@@ -54,7 +54,7 @@ class ContentTypeRepresentationSerializer(serializers.RepresentationSerializer):
         fields = ("id", "app_label", "model", "model_title")
 
 
-class GenericModel(models.Model):
+class GenericModel(models.Model):  # noqa
     id = models.IntegerField(primary_key=True)
     label = models.CharField(max_length=256)
 

wbcore/content_type/utils.py

@@ -1,3 +1,5 @@
+from contextlib import suppress
+
 from django.contrib.contenttypes.models import ContentType
 
 
@@ -17,12 +19,10 @@ def get_ancestors_content_type(content_type):
     ]
     """
     for _class in content_type.model_class().__mro__:
-        try:
+        with suppress(Exception):
             ancestor_content_type = ContentType.objects.get_for_model(_class)
             if ancestor_content_type.model_class():
                 yield ancestor_content_type
-        except Exception:
-            pass
 
 
 def get_view_content_type_id(view):

wbcore/contrib/agenda/viewsets/calendar_items.py

@@ -38,13 +38,13 @@ class CalendarItemRepresentationViewSet(viewsets.RepresentationViewSet):
 
 
 class CalendarItemMetaClass(type(viewsets.ModelViewSet)):
-    def __new__(metacls, cls, bases, classdict, **kwds):
-        _class = super().__new__(metacls, cls, bases, classdict, **kwds)
+    def __new__(cls, *args, **kwargs):
+        _class = super().__new__(cls, *args, **kwargs)
         dependant_identifiers = []
         for subclass in get_inheriting_subclasses(_class):
             if identifier := getattr(subclass, "IDENTIFIER", None):
                 dependant_identifiers.append(identifier)
-        setattr(_class, "DEPENDANT_IDENTIFIERS", dependant_identifiers)
+        _class.DEPENDANT_IDENTIFIERS = dependant_identifiers
         return _class
 
 
@@ -68,7 +68,7 @@ class CalendarItemViewSet(viewsets.ModelViewSet, metaclass=CalendarItemMetaClass
         Property to store the unioned queryset of draggable calendar items. Each module inheriting from CalendarItem are expected to define the signal receiver
         """
         qs = CalendarItem.objects.none()
-        for tmp, union_qs in draggable_calendar_item_ids.send(CalendarItem, request=self.request):
+        for _, union_qs in draggable_calendar_item_ids.send(CalendarItem, request=self.request):
             qs = qs.union(union_qs)
         return qs
 
@@ -154,15 +154,15 @@ def get_ics(request):
         min_max_range = TimestamptzRange(minimum_date, maximum_date)
         gen = qs.filter(period__contained_by=min_max_range)
 
-        iCal = Calendar()
+        ical = Calendar()
         for occurence in gen:
             start = occurence.period.lower
             end = occurence.period.upper
             activity = occurence
             event = activity.to_ics(start, end)
             if event:
-                iCal.events.add(event)
-        data = StringIO(str(iCal))
+                ical.events.add(event)
+        data = StringIO(str(ical))
         response = HttpResponse(data, content_type="text/calendar")
         response["Content-Disposition"] = f'attachment; filename="{profile.computed_str}.ics"'
         return response

wbcore/contrib/ai/llm/config.py

@@ -7,12 +7,12 @@ from django.db.models.signals import ModelSignal
 from langchain_core.language_models import BaseChatModel
 from langchain_core.messages import BaseMessage
 from langchain_openai import ChatOpenAI
+from pydantic import BaseModel
 
 from ..exceptions import APIStatusErrors, BadRequestErrors
 from .utils import run_llm
 
 logger = logging.getLogger("llm")
-from pydantic import BaseModel
 
 
 @shared_task(

wbcore/contrib/authentication/admin.py

@@ -202,11 +202,11 @@ class UserAdmin(admin.ModelAdmin):
             form = self.change_password_form(user)
 
         fieldsets = [(None, {"fields": list(form.base_fields)})]
-        adminForm = admin.helpers.AdminForm(form, fieldsets, {})
+        admin_form = admin.helpers.AdminForm(form, fieldsets, {})
 
         context = {
             "title": _("Change password: %s") % escape(user.get_username()),
-            "adminForm": adminForm,
+            "adminForm": admin_form,
             "form_url": form_url,
             "form": form,
             "is_popup": (IS_POPUP_VAR in request.POST or IS_POPUP_VAR in request.GET),

wbcore/contrib/authentication/filters.py

@@ -6,7 +6,6 @@ from .models import UserActivity
 
 class UserActivityChartFilter(wb_filters.FilterSet):
     date = wb_filters.DateTimeRangeFilter(
-        method=wb_filters.DateRangeFilter.base_date_range_filter_method,
         label="Date Range",
         required=True,
         clearable=False,

wbcore/contrib/authentication/models/users.py

@@ -166,7 +166,7 @@ class User(AbstractBaseUser, PermissionsMixin):
         return self.profile.last_name
 
     @classmethod
-    def get_endpoint_basename(self):
+    def get_endpoint_basename(cls):
         return "wbcore:authentication:user"
 
     @classmethod
@@ -187,7 +187,7 @@ class Group(DjangoBaseGroup):
         proxy = True
 
     @classmethod
-    def get_endpoint_basename(self):
+    def get_endpoint_basename(cls):
         return "wbcore:authentication:group"
 
     @classmethod
@@ -208,7 +208,7 @@ class Permission(DjangoBasePermission):
         proxy = True
 
     @classmethod
-    def get_endpoint_basename(self):
+    def get_endpoint_basename(cls):
         return "wbcore:authentication:permission"
 
     @classmethod

wbcore/contrib/authentication/models/users_activities.py

@@ -59,7 +59,7 @@ class UserActivity(models.Model):
         return Subquery(qs.order_by("-latest_refresh").values("latest_refresh")[:1], output_field=DateTimeField())
 
     @classmethod
-    def get_endpoint_basename(self):
+    def get_endpoint_basename(cls):
         return "wbcore:authentication:useractivity"
 
     @classmethod

wbcore/contrib/authentication/serializers/users.py

@@ -60,7 +60,7 @@ class ChangePasswordSerializer(wb_serializers.Serializer):
                 validate_password(new_password)
                 return super().validate(data)
             except serializers.ValidationError as e:
-                raise serializers.ValidationError({"new_password": e, "confirm_password": e})
+                raise serializers.ValidationError({"new_password": e, "confirm_password": e}) from e
 
     class Meta:
         fields = ("current_password", "new_password", "confirm_password")
@@ -336,7 +336,7 @@ class MyTokenObtainPairSerializer(TokenObtainPairSerializer):
             raise exceptions.AuthenticationFailed(
                 self.error_messages["no_active_account"],
                 "no_active_account",
-            )
+            ) from None
         return data
 
 

wbcore/contrib/authentication/tests/test_tokens.py

@@ -9,7 +9,7 @@ from rest_framework import exceptions
 from rest_framework.test import APIRequestFactory
 
 from wbcore.contrib.authentication.authentication import inject_short_lived_token
-from wbcore.contrib.authentication.models import Token
+from wbcore.contrib.authentication.models import Token, User
 
 fake = Faker()
 now = datetime.now()
@@ -17,9 +17,9 @@ now = datetime.now()
 
 class TestTokenUnitTests:
     @pytest.fixture
-    def request_with_user(user):
+    def request_with_user(self: User):
         request = APIRequestFactory().get("/")
-        request.user = user
+        request.user = self
         return request
 
     def setup_method(self):

wbcore/contrib/authentication/tests/test_users.py

@@ -155,7 +155,6 @@ class TestRegistrationAndActivationViews:
         # Arrange
         mock_get_user = mocker.patch(
             "wbcore.contrib.authentication.models.users.UserManager.get",
-            side_effect=Exception if should_fail else None,
             return_value=None if should_fail else test_user,
         )
         mock_reset_password = mocker.patch.object(test_user, "reset_password")

wbcore/contrib/authentication/viewsets/user_activities.py

@@ -157,7 +157,8 @@ class UserActivityChart(viewsets.ChartViewSet):
                 cum_times = pd.Series(
                     dt
                     for group in [
-                        pd.date_range(start, end, freq="Min") for start, end in zip(dff.date, dff.latest_refresh)
+                        pd.date_range(start, end, freq="Min")
+                        for start, end in zip(dff.date, dff.latest_refresh, strict=False)
                     ]
                     for dt in group
                 ).value_counts()

wbcore/contrib/authentication/viewsets/users.py

@@ -1,4 +1,5 @@
 import logging
+from contextlib import suppress
 
 from django.conf import settings
 from django.contrib.auth.models import Group, Permission
@@ -66,11 +67,12 @@ logger = logging.getLogger()
 @permission_classes([AllowAny])
 @authentication_classes([])
 def reset_password_email(request):
-    try:
+    with suppress(User.DoesNotExist):
         user = User.objects.get(email=request.data["email"])
-        user.reset_password(request)
-    except Exception:
-        pass
+        try:
+            user.reset_password(request)
+        except Exception as e:
+            logger.error(f"While user {user} try to reset password, we encounter the error {e}")
     return Response(
         {
             "status": "ok",

wbcore/contrib/color/models.py

@@ -39,7 +39,8 @@ class ColorGradient(models.Model):
         if color:
             color_rgb = _hex2rgb(color)
             nearest_color = min(
-                self.colors, key=lambda subject: sum((s - q) ** 2 for s, q in zip(_hex2rgb(subject), color_rgb))
+                self.colors,
+                key=lambda subject: sum((s - q) ** 2 for s, q in zip(_hex2rgb(subject), color_rgb, strict=False)),
             )
 
             index = self.colors.index(nearest_color)

wbcore/contrib/currency/factories.py

@@ -6,7 +6,7 @@ import yaml
 from .models import Currency, CurrencyFXRates
 
 with open(pathlib.Path(__file__).parent.joinpath("fixtures").joinpath("currency.yaml"), "r") as yaml_file:
-    currency_dict = yaml.load(yaml_file, Loader=yaml.CLoader)
+    currency_dict = yaml.load(yaml_file, Loader=yaml.CLoader)  # noqa: S506
 
 
 class CurrencyFactory(factory.django.DjangoModelFactory):

wbcore/contrib/currency/import_export/backends/fixerio/currency_fx_rates.py

@@ -55,7 +55,9 @@ class DataBackend(AbstractDataBackend):
             params["symbols"] = ",".join(obj_external_ids)
         res = []
         for _date in pd.date_range(start, execution_date, freq="B"):
-            r = requests.get(f'{self.ENDPOINT}/{_date.strftime("%Y-%m-%d")}?', params=params, headers=self.HEADERS)
+            r = requests.get(
+                f'{self.ENDPOINT}/{_date.strftime("%Y-%m-%d")}?', params=params, headers=self.HEADERS, timeout=10
+            )
             if r.status_code == requests.codes.ok:
                 res_json = r.json()
                 if res_json and res_json["success"]:

wbcore/contrib/currency/models.py

@@ -4,7 +4,9 @@ from datetime import date as date_lib
 from decimal import Decimal
 
 from django.db import models
-from django.db.models import Expression, ExpressionWrapper, Subquery
+from django.db.models import Case, CharField, Expression, ExpressionWrapper, F, Q, Subquery, Value, When
+from django.db.models.functions import Concat
+from persisting_theory import QuerySet
 
 from wbcore.contrib.io.mixins import ImportMixin
 from wbcore.models import WBModel
@@ -13,6 +15,21 @@ from wbcore.utils.models import LabelKeyMixin
 from .import_export.handlers import CurrencyFXRatesImportHandler, CurrencyImportHandler
 
 
+class CurrencyDefaultManager(models.Manager):
+    def get_queryset(self) -> QuerySet:
+        return (
+            super()
+            .get_queryset()
+            .annotate(
+                name_repr=Case(
+                    When(Q(symbol="") | Q(symbol__isnull=True), then=F("title")),
+                    default=Concat(F("title"), Value(" ("), F("symbol"), Value(")")),
+                    output_field=CharField(),
+                )
+            )
+        )
+
+
 class Currency(ImportMixin, LabelKeyMixin, WBModel):
     import_export_handler_class = CurrencyImportHandler
 
@@ -21,18 +38,19 @@ class Currency(ImportMixin, LabelKeyMixin, WBModel):
         verbose_name_plural = "Currencies"
         ordering = ("title",)
 
-    def __str__(self):
-        symbol = f"({self.symbol})" if self.symbol else ""
-        return f"{self.key} {symbol}"
+    def __str__(self) -> str:
+        if self.symbol:
+            return f"{self.title} ({self.symbol})"
+        return self.title
 
-    def __repr__(self):
+    def __repr__(self) -> str:
         return self.key
 
     title = models.CharField(max_length=255)
     symbol = models.CharField(max_length=10, blank=True, null=True)
     key = models.CharField(max_length=3, unique=True)
 
-    objects = models.Manager()
+    objects = CurrencyDefaultManager()
 
     LABEL_KEY = "{{key}} ({{symbol}})"
 
@@ -65,7 +83,9 @@ class Currency(ImportMixin, LabelKeyMixin, WBModel):
                     raise CurrencyFXRates.DoesNotExist
             return (1 / base.value) * other.value
         except CurrencyFXRates.DoesNotExist:
-            return Decimal(1.0)
+            if exact_lookup:
+                return self.convert(valuation_date, other_currency, exact_lookup=False)
+            raise CurrencyFXRates.DoesNotExist from None
 
     @classmethod
     def get_endpoint_basename(cls) -> str:
@@ -81,7 +101,7 @@ class Currency(ImportMixin, LabelKeyMixin, WBModel):
 
     @classmethod
     def get_representation_label_key(cls) -> str:
-        return "{{key}} ({{symbol}})"
+        return "{{name_repr}}"
 
 
 class CurrencyFXRates(ImportMixin, models.Model):

wbcore/contrib/currency/serializers.py

@@ -8,11 +8,15 @@ from .models import Currency, CurrencyFXRates
 class CurrencyRepresentationSerializer(wb_serializers.RepresentationSerializer):
     """Representation Serializer for Currencies"""
 
+    name_repr = wb_serializers.SerializerMethodField(read_only=True)
     _detail = wb_serializers.HyperlinkField(reverse_name="wbcore:currency:currency-detail")
 
+    def get_name_repr(self, obj):
+        return str(obj)
+
     class Meta:
         model = Currency
-        fields = ("id", "title", "key", "symbol", "_detail")
+        fields = ("id", "name_repr", "key", "_detail")
 
 
 class CurrencyModelSerializer(wb_serializers.ModelSerializer):

wbcore/contrib/currency/tests/test_serializers.py

@@ -30,6 +30,10 @@ class TestSerializers:
         mocker.patch.object(currency_fx_rate, "currency_id", currency.id)
         return currency_fx_rate
 
+    @pytest.fixture
+    def expected_representation_data(self, currency):
+        return {"id": currency.id, "name_repr": f"{currency.title} ({currency.symbol})", "key": currency.key}
+
     @pytest.fixture
     def expected_data(self, currency):
         return {"id": currency.id, "title": currency.title, "key": currency.key, "symbol": currency.symbol}
@@ -43,12 +47,12 @@ class TestSerializers:
             "currency": currency_fx_rate.currency_id,
         }
 
-    def test_currency_representation_serializer(self, mocker: MockerFixture, currency, expected_data):
+    def test_currency_representation_serializer(self, mocker: MockerFixture, currency, expected_representation_data):
         detail = f"/wbcore/currency/currency/{currency.id}/"
         mocker.patch("wbcore.serializers.fields.fields.HyperlinkField", return_value=detail)
         serializer = CurrencyRepresentationSerializer(instance=currency)
-        expected_data["_detail"] = detail
-        assert serializer.data == expected_data
+        expected_representation_data["_detail"] = detail
+        assert serializer.data == expected_representation_data
 
     def test_currency_model_serializer(self, mocker: MockerFixture, currency, expected_data):
         mocker.patch(

wbcore/contrib/currency/tests/test_viewsets.py

@@ -50,7 +50,7 @@ class TestCurrencyRepresentationViewSets:
         assert response.status_code == status.HTTP_200_OK
         assert instance.get("id") == euro.id
         assert instance.get("key") == euro.key
-        assert instance.get("title") == euro.title
+        assert instance.get("name_repr") == f"{euro.title} ({euro.symbol})"
 
 
 @pytest.mark.viewset_tests

wbcore/contrib/currency/viewsets/currency.py

@@ -19,8 +19,8 @@ class CurrencyRepresentationViewSet(viewsets.RepresentationViewSet):
     serializer_class = CurrencyRepresentationSerializer
     filter_backends = (filters.OrderingFilter, filters.SearchFilter)
 
-    ordering = ordering_fields = ["-symbol"]
-    search_fields = ("symbol", "key")
+    ordering = ["name_repr"]
+    search_fields = ("name_repr", "key")
 
 
 class CurrencyModelViewSet(viewsets.ModelViewSet):

wbcore/contrib/dataloader/utils.py

@@ -12,9 +12,9 @@ def dictfetchall[T](cursor: "CursorWrapper", dict_type: type[T] = dict) -> Itera
     columns = get_columns(cursor)
     for row in cursor.fetchall():
         # The spec for TypedDict is not compliant with the sepc for dict
-        yield dict_type(zip(columns, row))  # type: ignore
+        yield dict_type(zip(columns, row, strict=False))  # type: ignore
 
 
 def dictfetchone(cursor: "CursorWrapper") -> dict:
     columns = get_columns(cursor)
-    return dict(zip(columns, cursor.fetchone() or []))
+    return dict(zip(columns, cursor.fetchone() or [], strict=False))

wbcore/contrib/directory/factories/__init__.py

@@ -18,7 +18,7 @@ from .entries import (
     EntryFactory,
     PersonFactory,
     PersonWithEmployerFactory,
-    Random_ClientFactory,
+    RandomClientFactory,
     SpecializationFactory,
     UnemployedPersonFactory,
     PersonSignatureFactory,

wbcore/contrib/directory/factories/entries.py

@@ -158,7 +158,7 @@ class ClientFactory(PersonFactory):
                 self.clients.add(person)
 
 
-class Random_ClientFactory(ClientFactory):
+class RandomClientFactory(ClientFactory):
     @factory.post_generation
     def clients(self, create, extracted, **kwargs):
         self.clients.add(PersonFactory())

wbcore/contrib/directory/models/contacts.py

@@ -40,7 +40,7 @@ class BankingContact(PrimaryMixin, WBModel):
         @classmethod
         def get_color_map(cls):
             colors = [WBColor.RED_LIGHT.value, WBColor.YELLOW_LIGHT.value, WBColor.GREEN_LIGHT.value]
-            return [choice for choice in zip(cls, colors)]
+            return [choice for choice in zip(cls, colors, strict=False)]
 
     status = FSMField(
         default=Status.DRAFT,
@@ -227,7 +227,7 @@ class BankingContact(PrimaryMixin, WBModel):
 
         notification_types = [
             create_notification_type(
-                code="directory.banking+contact.approval",
+                code="directory.banking_contact.approval",
                 title="Banking Contact Notification",
                 help_text="Sends out a notification when you want need to approve a change in bank details",
             )