wbcore 1.61.4__py2.py3-none-any.whl → 1.61.6__py2.py3-none-any.whl

wbcore/contrib/authentication/admin.py

@@ -78,7 +78,13 @@ class UserAdmin(admin.ModelAdmin):
         (_("Synchronization"), {"fields": ("metadata",)}),
         (
             _("Permissions"),
-            {"fields": ("is_active", "is_register", "is_staff", "is_superuser", "groups", "user_permissions")},
+            {
+                "fields": (
+                    ("is_active", "is_register", "is_staff", "is_superuser", "is_internal"),
+                    ("groups",),
+                    ("user_permissions",),
+                )
+            },
         ),
     )
     raw_id_fields = ("profile",)

wbcore/contrib/notifications/admin.py

@@ -2,7 +2,7 @@ from datetime import date, timedelta
 
 from django.contrib import admin
 
-from wbcore.contrib.notifications.tasks import send_notification_task
+from wbcore.contrib.notifications.models.notifications import send_notification_as_task
 
 from .models import (
     Notification,
@@ -16,19 +16,12 @@ from .models import (
 class NotificationModelAdmin(admin.ModelAdmin):
     search_fields = ["title", "body"]
 
-    list_display = [
-        "title",
-        "user",
-        "notification_type",
-        "endpoint",
-        "sent",
-        "read",
-    ]
+    list_display = ["title", "user", "notification_type", "endpoint", "sent", "read", "created"]
 
     @admin.action(description="Send Notification")
     def send_notification(self, request, queryset):
         for notification in queryset:
-            send_notification_task.delay(notification.id)
+            send_notification_as_task.delay(notification.id)
 
     actions = [send_notification]
 

wbcore/contrib/notifications/backends/firebase/backends.py

@@ -11,9 +11,6 @@ from wbcore.contrib.notifications.backends.abstract_backend import (
     AbstractNotificationBackend,
 )
 from wbcore.contrib.notifications.models import Notification, NotificationUserToken
-from wbcore.contrib.notifications.models.notification_types import (
-    NotificationTypeSetting,
-)
 
 
 class NotificationBackend(AbstractNotificationBackend):
@@ -34,11 +31,8 @@ class NotificationBackend(AbstractNotificationBackend):
     @classmethod
     def send_notification(cls, notification: Notification):
         app = cls.get_firebase_app(cls.get_firebase_credentials())
-        notification_user_settings = NotificationTypeSetting.objects.get(
-            notification_type=notification.notification_type,
-            user=notification.user,
-        )
-        tokens = NotificationUserToken.objects.filter_for_user_settings(notification_user_settings)
+        notification_user_setting = notification.notification_type.get_setting_for_user(notification.user)
+        tokens = NotificationUserToken.objects.filter_for_user_settings(notification_user_setting)
         endpoint_data = {}  # Firebase can't accept non-string value
         if full_endpoint := notification.get_full_endpoint():
             endpoint_data["endpoint"] = full_endpoint

wbcore/contrib/notifications/dispatch.py

@@ -4,7 +4,6 @@ from celery import shared_task
 from django.conf import settings
 from django.db import transaction
 from django.dispatch import receiver
-from django.utils import timezone
 from django.utils.module_loading import import_string
 from django.utils.translation import gettext
 from rest_framework.reverse import reverse
@@ -13,15 +12,24 @@ from wbcore.contrib.authentication.models.users import User
 from wbcore.shares.signals import handle_widget_sharing
 
 from ...workers import Queue
-from .models import Notification, NotificationType, NotificationTypeSetting
-from .tasks import send_notification_task
+from .models import NotificationType
+from .models.notifications import Notification, send_notification_as_task
 
 
+def get_user(u: User | int) -> User:
+    if isinstance(u, User):
+        return u
+    elif isinstance(u, int):
+        return User.objects.get(id=u)
+    raise ValueError("Invalid user type")
+
+
+@shared_task(queue=Queue.HIGH_PRIORITY.value)
 def send_notification(
     code: str,
     title: str,
     body: str,
-    user: User | Iterable[User],
+    user: User | Iterable[User | int] | int,
     reverse_name: str | None = None,
     reverse_args=None,
     reverse_kwargs=None,
@@ -39,15 +47,16 @@ def send_notification(
         reverse_kwargs: The keyword arguments passed to the `reverse` function
         endpoint: The endpoint of resource. If provided, reverse_name + args + kwargs are disregarded
     """
-    users = user
-    if isinstance(users, User):
-        users = [users]
+    users = []
+    if isinstance(user, list):
+        for u in user:
+            users.append(get_user(u))
+    else:
+        users.append(get_user(user))
+
     for user in users:
         notification_type = NotificationType.objects.get(code=code)
-        if (
-            user.is_active
-            and NotificationTypeSetting.objects.filter(notification_type=notification_type, user=user).exists()
-        ):
+        if user.is_active:
             if not endpoint:
                 endpoint = reverse(reverse_name, reverse_args, reverse_kwargs) if reverse_name else None
             notification = Notification.objects.create(
@@ -56,21 +65,12 @@ def send_notification(
                 user=user,
                 notification_type=notification_type,
                 endpoint=endpoint,
-                sent=timezone.now(),
             )
             transaction.on_commit(
-                lambda notification_pk=notification.pk: send_notification_task.delay(notification_pk)
+                lambda notification_pk=notification.pk: send_notification_as_task.delay(notification_pk)
             )
 
 
-@shared_task(queue=Queue.HIGH_PRIORITY.value)
-def send_notification_as_task(code, title, body, user_id, **kwargs):
-    if not isinstance(user_id, list):
-        user_id = [user_id]
-    user = User.objects.filter(id__in=user_id)
-    send_notification(code, title, body, user, **kwargs)
-
-
 @receiver(handle_widget_sharing)
 def share_notification(
     request, widget_relative_endpoint, share=False, share_message=None, share_recipients=None, **kwargs

wbcore/contrib/notifications/factories/notifications.py

@@ -6,7 +6,7 @@ from wbcore.contrib.notifications.factories.notification_types import (
 from wbcore.contrib.notifications.models import Notification
 
 
-class NotificationModelFactory(factory.django.DjangoModelFactory):
+class NotificationFactory(factory.django.DjangoModelFactory):
     title = factory.Faker("pystr")
     body = factory.Faker("pystr")
     notification_type = factory.SubFactory(NotificationTypeModelFactory)

wbcore/contrib/notifications/migrations/0010_notification_checksum_notification_checksum_unique.py

@@ -0,0 +1,50 @@
+# Generated by Django 5.2.9 on 2026-02-02 11:27
+import hashlib
+
+from django.conf import settings
+from django.db import migrations, models
+from tqdm import tqdm
+
+from wbcore.contrib.notifications.utils import get_checksum
+
+
+def migrate_checksum(apps, schema_editor):
+    Notification = apps.get_model('notifications', 'Notification')
+    qs = Notification.objects.all()
+    objs = []
+    for notification in tqdm(qs, total=qs.count()):
+        notification.checksum = get_checksum(notification.title, notification.body, notification.endpoint)
+        objs.append(notification)
+    Notification.objects.bulk_update(objs, ["checksum"], batch_size=1000)
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('notifications', '0009_alter_notificationtypesetting_options_and_more'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='notification',
+            name='checksum',
+            field=models.CharField(null=True, blank=True, max_length=64),
+            preserve_default=False,
+        ),
+        migrations.RunPython(migrate_checksum),
+        migrations.AlterField(
+            model_name='notification',
+            name='body',
+            field=models.TextField(default=''),
+        ),
+        migrations.AlterField(
+            model_name='notification',
+            name='checksum',
+            field=models.CharField(default=None, max_length=64),
+            preserve_default=False,
+        ),
+        migrations.AddIndex(
+            model_name='notification',
+            index=models.Index(fields=['user', 'notification_type', 'checksum'], name='notificatio_user_id_b90c58_idx'),
+        ),
+    ]

wbcore/contrib/notifications/models/notification_types.py

@@ -10,54 +10,6 @@ from wbcore.contrib.authentication.models.users import User
 from wbcore.models import WBModel
 
 
-class NotificationType(WBModel):
-    code = models.CharField(max_length=128, unique=True)
-    title = models.CharField(max_length=128, default="")
-    help_text = models.CharField(max_length=512, default="")
-
-    stale = models.BooleanField(default=False)
-    contenttype = models.ForeignKey(
-        to="contenttypes.ContentType", related_name="+", null=True, blank=True, on_delete=models.SET_NULL
-    )
-    resource_button_label = models.CharField(max_length=128)
-
-    default_enable_web = models.BooleanField(default=False)
-    default_enable_mobile = models.BooleanField(default=False)
-    default_enable_email = models.BooleanField(default=False)
-    is_lock = models.BooleanField(default=False)
-
-    def __str__(self) -> str:
-        return f"{self.title}"
-
-    def save(self, *args, **kwargs):
-        if not self.resource_button_label:
-            if self.contenttype:
-                self.resource_button_label = f"Open {self.contenttype.name}"
-            else:
-                self.resource_button_label = "Open Resource"
-        super().save(*args, **kwargs)
-
-    class Meta:
-        verbose_name = "Notification Type"
-        verbose_name_plural = "Notification Types"
-
-    @classmethod
-    def get_endpoint_basename(cls):
-        return "wbcore:notifications:notification_type"
-
-    @classmethod
-    def get_representation_endpoint(cls):
-        return "wbcore:notifications:notification_type_representation-list"
-
-    @classmethod
-    def get_representation_value_key(cls):
-        return "id"
-
-    @classmethod
-    def get_representation_label_key(cls):
-        return "{{title}}"
-
-
 class NotificationTypeSetting(WBModel):
     notification_type = models.ForeignKey(
         to="notifications.NotificationType", related_name="user_settings", on_delete=models.CASCADE
@@ -106,31 +58,81 @@ class NotificationTypeSetting(WBModel):
         return "{{notification_type}}"
 
 
+class NotificationType(WBModel):
+    code = models.CharField(max_length=128, unique=True)
+    title = models.CharField(max_length=128, default="")
+    help_text = models.CharField(max_length=512, default="")
+
+    stale = models.BooleanField(default=False)
+    contenttype = models.ForeignKey(
+        to="contenttypes.ContentType", related_name="+", null=True, blank=True, on_delete=models.SET_NULL
+    )
+    resource_button_label = models.CharField(max_length=128)
+
+    default_enable_web = models.BooleanField(default=False)
+    default_enable_mobile = models.BooleanField(default=False)
+    default_enable_email = models.BooleanField(default=False)
+    is_lock = models.BooleanField(default=False)
+
+    def __str__(self) -> str:
+        return f"{self.title}"
+
+    def save(self, *args, **kwargs):
+        if not self.resource_button_label:
+            if self.contenttype:
+                self.resource_button_label = f"Open {self.contenttype.name}"
+            else:
+                self.resource_button_label = "Open Resource"
+        super().save(*args, **kwargs)
+
+    class Meta:
+        verbose_name = "Notification Type"
+        verbose_name_plural = "Notification Types"
+
+    def get_setting_for_user(self, user: User, bulk: bool = False) -> NotificationTypeSetting:
+        try:
+            setting = NotificationTypeSetting.objects.get(user=user, notification_type=self)
+            setting.enable_web = setting.enable_web if not self.is_lock else self.default_enable_web
+            setting.enable_mobile = setting.enable_mobile if not self.is_lock else self.default_enable_mobile
+            setting.enable_email = setting.enable_email if not self.is_lock else self.default_enable_email
+            return setting
+        except NotificationTypeSetting.DoesNotExist:
+            setting = NotificationTypeSetting(
+                user=user,
+                notification_type=self,
+                enable_web=self.default_enable_web,
+                enable_mobile=self.default_enable_mobile,
+                enable_email=self.default_enable_email,
+            )
+            if not bulk:
+                setting.save()
+            return setting
+
+    @classmethod
+    def get_endpoint_basename(cls):
+        return "wbcore:notifications:notification_type"
+
+    @classmethod
+    def get_representation_endpoint(cls):
+        return "wbcore:notifications:notification_type_representation-list"
+
+    @classmethod
+    def get_representation_value_key(cls):
+        return "id"
+
+    @classmethod
+    def get_representation_label_key(cls):
+        return "{{title}}"
+
+
 @receiver(post_save, sender="notifications.NotificationType")
 def post_save_notification_type(instance, **kwargs):
     anonymous_user = get_anonymous_user()
 
     objs = []
     for user in User.objects.filter(~models.Q(pk=anonymous_user.pk)):
-        try:
-            existing_setting = NotificationTypeSetting.objects.get(user=user, notification_type=instance)
-            enable_web = existing_setting.enable_web if not instance.is_lock else instance.default_enable_web
-            enable_mobile = existing_setting.enable_mobile if not instance.is_lock else instance.default_enable_mobile
-            enable_email = existing_setting.enable_email if not instance.is_lock else instance.default_enable_email
-        except NotificationTypeSetting.DoesNotExist:
-            enable_web = instance.default_enable_web
-            enable_mobile = instance.default_enable_mobile
-            enable_email = instance.default_enable_email
-
-        objs.append(
-            NotificationTypeSetting(
-                notification_type=instance,
-                user=user,
-                enable_web=enable_web,
-                enable_mobile=enable_mobile,
-                enable_email=enable_email,
-            )
-        )
+        setting = instance.get_setting_for_user(user, bulk=True)
+        objs.append(setting)
     if objs:
         NotificationTypeSetting.objects.bulk_create(
             objs,
@@ -150,14 +152,7 @@ def post_save_user(sender, instance, created, raw, **kwargs):
 
         objs = []
         for notification_type in NotificationType.objects.all():
-            objs.append(
-                NotificationTypeSetting(
-                    notification_type=notification_type,
-                    user=instance,
-                    enable_web=notification_type.default_enable_web,
-                    enable_mobile=notification_type.default_enable_mobile,
-                    enable_email=notification_type.default_enable_email,
-                )
-            )
+            setting = notification_type.get_setting_for_user(instance, bulk=True)
+            objs.append(setting)
         if objs:
             NotificationTypeSetting.objects.bulk_create(objs, unique_fields=["notification_type", "user"])

wbcore/contrib/notifications/models/notifications.py

@@ -1,28 +1,38 @@
 import urllib
 from contextlib import suppress
+from datetime import timedelta
 
+from celery import shared_task
+from django.conf import settings
+from django.core.mail import EmailMultiAlternatives
 from django.core.validators import URLValidator, ValidationError
 from django.db import models
+from django.template.loader import get_template
 from django.urls import Resolver404, resolve
+from django.utils import timezone
 from django.utils.functional import cached_property
+from django.utils.html import strip_tags
+from django.utils.module_loading import import_string
 
 from wbcore.contrib.authentication.models.users import User
-from wbcore.contrib.notifications.utils import base_domain, create_notification_type
+from wbcore.contrib.notifications.utils import base_domain, create_notification_type, get_checksum
+from wbcore.workers import Queue
 
 
 class Notification(models.Model):
     title = models.CharField(max_length=255)
-    body = models.TextField(null=True, blank=True)
+    body = models.TextField(default="")
+    endpoint = models.CharField(max_length=2048, null=True, blank=True)
 
     user = models.ForeignKey(to=User, related_name="notifications_notifications", on_delete=models.CASCADE)
     notification_type = models.ForeignKey(
         to="notifications.NotificationType", related_name="notifications", on_delete=models.CASCADE
     )
-    endpoint = models.CharField(max_length=2048, null=True, blank=True)
 
     created = models.DateTimeField(auto_now_add=True)
     sent = models.DateTimeField(null=True, blank=True)
     read = models.DateTimeField(null=True, blank=True)
+    checksum = models.CharField(max_length=64)
 
     def __str__(self) -> str:
         return f"{self.user} {self.title}"
@@ -41,6 +51,12 @@ class Notification(models.Model):
                 False,
             ),
         ]
+        indexes = [
+            models.Index(fields=["user", "notification_type", "checksum"]),
+        ]
+        # constraints = [
+        #     models.UniqueConstraint(fields=["user", "checksum"], name="checksum_unique"),
+        # ]
 
     @cached_property
     def is_endpoint_internal(self) -> bool:
@@ -60,6 +76,61 @@ class Notification(models.Model):
         except ValidationError:
             return False
 
+    def _send_as_mail(self):
+        """Sends out a notification to the user specified inside the notification"""
+
+        context = {
+            "title": self.title,
+            "message": self.body or "",
+            "notification_share_url": self.get_full_endpoint(as_shareable_internal_link=True),
+            "notification_endpoint": self.get_full_endpoint(),
+        }
+        rendered_template = get_template("notifications/notification_template.html").render(context)
+        msg = EmailMultiAlternatives(
+            subject=self.title,
+            body=strip_tags(rendered_template),
+            from_email=getattr(settings, "WBCORE_NOTIFICATION_EMAIL_FROM", "no_reply@stainly.com"),
+            to=[self.user.email],  # type: ignore
+        )
+        msg.attach_alternative(rendered_template, "text/html")
+        msg.send()
+
+    def save(self, *args, **kwargs):
+        if not self.checksum:
+            self.checksum = self.get_checksum()
+        super().save(*args, **kwargs)
+
+    def has_duplicated(self, interval: int = 60 * 4) -> bool:
+        return (
+            Notification.objects.exclude(id=self.id)
+            .filter(
+                user=self.user,
+                notification_type=self.notification_type,
+                checksum=self.checksum,
+                sent__isnull=False,
+                created__gt=self.created - timedelta(minutes=interval),
+                created__lt=self.created + timedelta(minutes=interval),
+            )
+            .exists()
+        )
+
+    def send(self):
+        notification_user_setting = self.notification_type.get_setting_for_user(self.user)
+
+        # we do not sent notification through email if we detect similar already sent notification
+        if notification_user_setting.enable_email and not self.has_duplicated():
+            self._send_as_mail()
+        if notification_user_setting.enable_web or notification_user_setting.enable_mobile:
+            backend = import_string(settings.NOTIFICATION_BACKEND)
+            backend.send_notification(self)
+
+        # mark this notification as sent
+        self.sent = timezone.now()
+        self.save()
+
+    def get_checksum(self) -> str:
+        return get_checksum(self.title, self.body, self.endpoint)
+
     def get_full_endpoint(self, as_shareable_internal_link: bool = False) -> str | None:
         if self.is_endpoint_internal:
             if as_shareable_internal_link:
@@ -80,3 +151,15 @@ class Notification(models.Model):
     @classmethod
     def get_representation_label_key(cls) -> str:
         return "{{title}}"
+
+
+@shared_task(queue=Queue.HIGH_PRIORITY.value)
+def send_notification_as_task(notification_pk: int):
+    """A celery task to send out a notification via email, web or mobile
+
+    Args:
+        notification_pk: The primary key of the notification that is going to be send out
+    """
+
+    notification = Notification.objects.get(pk=notification_pk)
+    notification.send()

wbcore/contrib/notifications/tests/conftest.py

@@ -8,7 +8,7 @@ from wbcore.contrib.notifications.factories.notification_types import (
     NotificationTypeSettingModelFactory,
 )
 from wbcore.contrib.notifications.factories.notifications import (
-    NotificationModelFactory,
+    NotificationFactory,
 )
 from wbcore.contrib.notifications.factories.tokens import (
     NotificationUserTokenModelFactory,
@@ -19,7 +19,7 @@ register(UserFactory)
 register(PersonFactory)
 register(NotificationTypeModelFactory, name="notification_type")
 register(NotificationTypeSettingModelFactory, name="notification_type_setting")
-register(NotificationModelFactory, name="notification")
+register(NotificationFactory)
 register(NotificationUserTokenModelFactory, name="notification_user_token")
 
 

wbcore/contrib/notifications/tests/test_models/test_notifications.py

@@ -1,9 +1,38 @@
+from datetime import timedelta
+from unittest.mock import patch
+
 import pytest
+from bs4 import BeautifulSoup
+from django.core import mail
+from django.test.utils import override_settings
 
 from wbcore.contrib.notifications.models import Notification
 from wbcore.contrib.notifications.utils import base_domain
 
 
+@pytest.fixture
+def patched_import_string(mocker):
+    return mocker.patch("wbcore.contrib.notifications.models.notifications.import_string")
+
+
+@pytest.fixture
+def mock_backend():
+    from wbcore.contrib.notifications.backends.abstract_backend import (
+        AbstractNotificationBackend,
+    )
+
+    class MockedBackend(AbstractNotificationBackend):
+        @classmethod
+        def send_notification(cls, notification):
+            pass
+
+        @classmethod
+        def get_configuration(cls) -> dict:
+            return {}
+
+    return MockedBackend
+
+
 @pytest.mark.django_db
 class TestNotification:
     def test_factory(self, notification: Notification):
@@ -22,6 +51,23 @@ class TestNotification:
     def test_representation_label_key(self):
         assert Notification.get_representation_label_key() == "{{title}}"
 
+    def test_has_duplicated(self, notification_factory):
+        notification = notification_factory.create()
+        assert notification.has_duplicated() is False
+        duplicated_notification = notification_factory.create(
+            user=notification.user,
+            title=notification.title,
+            body=notification.body,
+            endpoint=notification.endpoint,
+            notification_type=notification.notification_type,
+            created=notification.created + timedelta(minutes=60),
+        )
+        assert notification.has_duplicated(interval=61) is False
+        assert notification.has_duplicated(interval=59) is False
+        duplicated_notification.sent = duplicated_notification.created
+        duplicated_notification.save()
+        assert notification.has_duplicated(interval=59) is True
+
     @pytest.mark.parametrize("notification__endpoint", ["/wbcore/notifications/"])
     def test_full_valid_internal_endpoint(self, notification):
         assert notification.get_full_endpoint() == f"{base_domain()}{notification.endpoint}"
@@ -44,3 +90,68 @@ class TestNotification:
     @pytest.mark.parametrize("notification__endpoint", ["https.www.google.com"])
     def test_full_invalid_external_endpoint(self, notification):
         assert notification.get_full_endpoint() is None
+
+    @patch.object(Notification, "_send_as_mail")
+    @patch.object(Notification, "has_duplicated")
+    def test_send_exclude_mail_with_duplicate(self, mock_has_duplicated, mock_send_as_mail, notification):
+        mock_has_duplicated.return_value = False
+        setting = notification.notification_type.get_setting_for_user(notification.user)
+        setting.enable_email = True
+        setting.save()
+
+        assert mock_send_as_mail.call_count == 0
+        notification.send()
+        assert mock_send_as_mail.call_count == 1
+
+        mock_has_duplicated.return_value = True
+        notification.send()
+        assert mock_send_as_mail.call_count == 1
+
+    @patch.object(Notification, "_send_as_mail")
+    def test_send_notification_task(
+        self, patched_send_notification_email, notification, mock_backend, mocker, patched_import_string
+    ):
+        spy = mocker.spy(mock_backend, "send_notification")
+        patched_import_string.return_value = mock_backend
+
+        setting = notification.notification_type.get_setting_for_user(notification.user)
+        setting.enable_email = False
+        setting.save()
+
+        notification.send()
+        patched_send_notification_email.assert_not_called()
+
+        setting.enable_email = True
+        setting.save()
+        notification.send()
+        patched_send_notification_email.assert_called_once_with()
+
+        setting.enable_web = True
+        setting.save()
+        notification.send()
+        patched_import_string.assert_called_once()
+        spy.assert_called_once_with(notification)
+
+    @patch.object(Notification, "_send_as_mail")
+    def test_send_notification_task_without_mail(
+        self, patched_send_notification_email, notification, mock_backend, patched_import_string
+    ):
+        notification.user.wbnotification_user_settings.update(enable_email=False)
+        patched_import_string.return_value = mock_backend
+
+        notification.send()
+
+        assert not patched_send_notification_email.called
+
+    @override_settings(EMAIL_BACKEND="django.core.mail.backends.locmem.EmailBackend")
+    @pytest.mark.parametrize("notification__endpoint", ["/wbcore/notifications/"])
+    def test_send_notification_email(self, notification):
+        setting = notification.notification_type.get_setting_for_user(notification.user)
+        setting.enable_email = True
+        setting.save()
+
+        assert len(mail.outbox) == 0
+        notification.send()
+        assert len(mail.outbox) == 1
+        soup = BeautifulSoup(mail.outbox[0].alternatives[0][0], "html.parser")
+        assert soup.find("a", href=notification.get_full_endpoint(as_shareable_internal_link=True))

wbcore/contrib/notifications/tests/test_viewsets/test_notifications.py

@@ -4,7 +4,7 @@ from rest_framework.reverse import reverse
 
 from wbcore.contrib.authentication.factories import UserFactory
 from wbcore.contrib.notifications.factories.notifications import (
-    NotificationModelFactory,
+    NotificationFactory,
 )
 from wbcore.contrib.notifications.models.notifications import Notification
 
@@ -109,7 +109,7 @@ class TestNotificationModelViewSet:
 
     @pytest.mark.parametrize("user__user_permissions", [(["notifications.change_notification"])])
     def test_read_all_action_other_notification(self, notification, client, user):
-        notification2 = NotificationModelFactory()
+        notification2 = NotificationFactory()
         assert notification.read is None
         assert notification2.read is None  # type: ignore
         client.force_authenticate(user)
@@ -121,7 +121,7 @@ class TestNotificationModelViewSet:
 
     @pytest.mark.parametrize("user__user_permissions", [(["notifications.change_notification"])])
     def test_delete_all_action(self, notification, client, user):
-        NotificationModelFactory(user=user, read=timezone.now())
+        NotificationFactory(user=user, read=timezone.now())
         assert Notification.objects.filter(user=user).count() == 2
 
         client.force_authenticate(user)
@@ -132,7 +132,7 @@ class TestNotificationModelViewSet:
     @pytest.mark.parametrize("user__user_permissions", [(["notifications.change_notification"])])
     def test_delete_all_action_other_notification(self, notification, client, user):
         user2 = UserFactory()
-        NotificationModelFactory(user=user2, read=timezone.now())
+        NotificationFactory(user=user2, read=timezone.now())
         notification.read = timezone.now()
         notification.save()
         assert Notification.objects.all().count() == 2

wbcore/contrib/notifications/utils.py

@@ -1,7 +1,18 @@
+import hashlib
+
 from django.conf import settings
 from django.contrib.sites.models import Site
 
 
+def get_checksum(title: str, body: str | None, endpoint: str | None) -> str:
+    content = title
+    if body:
+        content += ":" + body
+    if endpoint:
+        content += ":" + endpoint
+    return hashlib.sha256(content.encode()).hexdigest()
+
+
 def base_domain() -> str:
     """A utility method that assembles the current domain. Utilizes the site app from django
 

wbcore/contrib/permission/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 5.0.8 on 2024-09-10 10:44
+# Generated by Django 5.2.9 on 2026-01-28 14:41
 
 import django.db.models.deletion
 from django.conf import settings
@@ -6,98 +6,49 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
+
     initial = True
 
     dependencies = [
-        ("auth", "0012_alter_user_first_name_max_length"),
-        ("contenttypes", "0002_remove_content_type_name"),
+        ('auth', '0012_alter_user_first_name_max_length'),
+        ('contenttypes', '0002_remove_content_type_name'),
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
     ]
 
     operations = [
-        migrations.SeparateDatabaseAndState(
-            database_operations=[],
-            state_operations=[
-                migrations.CreateModel(
-                    name="GroupObjectPermission",
-                    fields=[
-                        ("object_pk", models.CharField(max_length=255, verbose_name="object ID")),
-                        ("id", models.BigAutoField(editable=False, primary_key=True, serialize=False, unique=True)),
-                        ("editable", models.BooleanField(default=True)),
-                        (
-                            "content_type",
-                            models.ForeignKey(
-                                on_delete=django.db.models.deletion.CASCADE, to="contenttypes.contenttype"
-                            ),
-                        ),
-                        ("group", models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to="auth.group")),
-                        (
-                            "permission",
-                            models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to="auth.permission"),
-                        ),
-                    ],
-                    options={
-                        "db_table": "bridger_biggroupobjectpermission",
-                        "abstract": False,
-                        "default_related_name": "groupobjectpermissions",
-                        "unique_together": {("group", "permission", "object_pk")},
-                    },
-                ),
-                migrations.CreateModel(
-                    name="UserObjectPermission",
-                    fields=[
-                        ("object_pk", models.CharField(max_length=255, verbose_name="object ID")),
-                        ("id", models.BigAutoField(editable=False, primary_key=True, serialize=False, unique=True)),
-                        ("editable", models.BooleanField(default=True)),
-                        ("system", models.BooleanField(default=False)),
-                        (
-                            "content_type",
-                            models.ForeignKey(
-                                on_delete=django.db.models.deletion.CASCADE, to="contenttypes.contenttype"
-                            ),
-                        ),
-                        (
-                            "permission",
-                            models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to="auth.permission"),
-                        ),
-                        (
-                            "user",
-                            models.ForeignKey(
-                                on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL
-                            ),
-                        ),
-                    ],
-                    options={
-                        "db_table": "bridger_biguserobjectpermission",
-                        "abstract": False,
-                        "default_related_name": "userobjectpermissions",
-                        "unique_together": {("user", "permission", "object_pk")},
-                    },
-                ),
+        migrations.CreateModel(
+            name='GroupObjectPermission',
+            fields=[
+                ('object_pk', models.CharField(max_length=255, verbose_name='object ID')),
+                ('id', models.BigAutoField(editable=False, primary_key=True, serialize=False, unique=True)),
+                ('editable', models.BooleanField(default=True)),
+                ('content_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='contenttypes.contenttype')),
+                ('group', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='auth.group')),
+                ('permission', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='auth.permission')),
             ],
+            options={
+                'abstract': False,
+                'default_related_name': 'groupobjectpermissions',
+                'indexes': [models.Index(fields=['content_type', 'object_pk'], name='wbcore_perm_content_7e5298_idx'), models.Index(fields=['content_type', 'object_pk', 'group'], name='wbcore_perm_content_e0e7e3_idx')],
+                'unique_together': {('group', 'permission', 'object_pk')},
+            },
         ),
-        migrations.AlterModelTable(
-            name="groupobjectpermission",
-            table=None,
-        ),
-        migrations.AlterModelTable(
-            name="userobjectpermission",
-            table=None,
-        ),
-        migrations.AddIndex(
-            model_name="groupobjectpermission",
-            index=models.Index(fields=["content_type", "object_pk"], name="wbcore_guar_content_4afd41_idx"),
-        ),
-        migrations.AddIndex(
-            model_name="groupobjectpermission",
-            index=models.Index(fields=["content_type", "object_pk", "group"], name="wbcore_guar_content_83dcd4_idx"),
-        ),
-        migrations.AddIndex(
-            model_name="userobjectpermission",
-            index=models.Index(fields=["content_type", "object_pk"], name="wbcore_guar_content_138d49_idx"),
-        ),
-        migrations.AddIndex(
-            model_name="userobjectpermission",
-            index=models.Index(fields=["content_type", "object_pk", "user"], name="wbcore_guar_content_98fc0f_idx"),
+        migrations.CreateModel(
+            name='UserObjectPermission',
+            fields=[
+                ('object_pk', models.CharField(max_length=255, verbose_name='object ID')),
+                ('id', models.BigAutoField(editable=False, primary_key=True, serialize=False, unique=True)),
+                ('editable', models.BooleanField(default=True)),
+                ('system', models.BooleanField(default=False)),
+                ('content_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='contenttypes.contenttype')),
+                ('permission', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='auth.permission')),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+                'abstract': False,
+                'default_related_name': 'userobjectpermissions',
+                'indexes': [models.Index(fields=['content_type', 'object_pk'], name='wbcore_perm_content_753f13_idx'), models.Index(fields=['content_type', 'object_pk', 'user'], name='wbcore_perm_content_9efa9b_idx')],
+                'unique_together': {('user', 'permission', 'object_pk')},
+            },
         ),
     ]

wbcore/contrib/permission/tasks.py

@@ -1,4 +1,5 @@
 from celery import shared_task
+from tqdm import tqdm
 
 from wbcore.contrib.permission.models.mixins import PermissionObjectModelMixin
 from wbcore.utils.itertools import get_inheriting_subclasses
@@ -6,7 +7,12 @@ from wbcore.workers import Queue
 
 
 @shared_task(queue=Queue.EXTENDED_BACKGROUND.value)
-def reload_permissions_as_task(prune_existing: bool | None = True, force_pruning: bool | None = False):
+def reload_permissions_as_task(
+    prune_existing: bool | None = True, force_pruning: bool | None = False, debug: bool = False
+):
     for subclass in get_inheriting_subclasses(PermissionObjectModelMixin):
-        for instance in subclass.objects.iterator():
+        gen = subclass.objects.iterator()
+        if debug:
+            gen = tqdm(gen, total=subclass.objects.count())
+        for instance in gen:
             instance.reload_permissions(prune_existing=prune_existing, force_pruning=force_pruning)

wbcore/serializers/fields/number.py

@@ -77,27 +77,43 @@ class DecimalField(NumberFieldMixin, WBCoreSerializerFieldMixin, serializers.Dec
 
         return field_name, representation
 
+    def _is_inf(self, data) -> bool:
+        return isinstance(data, str) and data.lower().replace("-", "") == "infinity"
+
+    def validate_empty_values(self, data):
+        if self._is_inf(data):
+            data = None
+        return super().validate_empty_values(data)
+
+    def to_internal_value(self, data):
+        if self._is_inf(data):
+            return None
+        return super().to_internal_value(data)
+
 
 class FloatField(NumberFieldMixin, WBCoreSerializerFieldMixin, serializers.FloatField):
     field_type = WBCoreType.NUMBER.value
 
 
-class DecimalRangeField(RangeMixin, WBCoreSerializerFieldMixin, serializers.DecimalField):
+class DecimalRangeField(RangeMixin, DecimalField):
     field_type = WBCoreType.NUMBERRANGE.value
     internal_field = NumericRange
 
     def to_representation(self, instance):
         res = list(super().to_representation(instance))
         # ensure empty value shows as None
-        if res[0] is None:
+        if not res[0]:
             res[0] = "-Infinity"
-        if res[1] is None:
+        if not res[1]:
             res[1] = "Infinity"
         return tuple(res)
 
     def __init__(self, max_digits=None, decimal_places=None, **kwargs):
         if not max_digits:
-            max_digits = 3
+            max_digits = 12
         if not decimal_places:
-            decimal_places = 2
+            decimal_places = 1
+        if "coerce_to_string" not in kwargs:
+            kwargs["coerce_to_string"] = True
+        kwargs["allow_null"] = True
         super().__init__(max_digits, decimal_places, **kwargs)

{wbcore-1.61.4.dist-info → wbcore-1.61.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wbcore
-Version: 1.61.4
+Version: 1.61.6
 Author-email: Christopher Wittlinger <c.wittlinger@stainly.com>
 Requires-Dist: celery[redis]==5.*
 Requires-Dist: croniter==2.*

{wbcore-1.61.4.dist-info → wbcore-1.61.6.dist-info}/RECORD

@@ -116,7 +116,7 @@ wbcore/contrib/ai/llm/decorators.py,sha256=u3AWbQjbCCeIp-X1aezhqeZJd8chbI1OhGnm8
 wbcore/contrib/ai/llm/mixins.py,sha256=qbuRLaRCmLjdMC7r877RKYsMpE6AurYEGEzSPYYE9y4,1037
 wbcore/contrib/ai/llm/utils.py,sha256=B6iNt54x9ehN084wj-UvLUVEYrTPANSaITtl0AT3WJc,2503
 wbcore/contrib/authentication/__init__.py,sha256=eQ3KJSYPoO4xc867RdcdayxaxZ8TLGLHMA3kY5H6UMg,313
-wbcore/contrib/authentication/admin.py,sha256=-lhV1R36bYFYPMMuYncSwVs4Xl-qk8_Jd6WCdrLrhnk,9570
+wbcore/contrib/authentication/admin.py,sha256=NxUcMx4JPeCCQH-MBe_lIYXC4V3BHy5v_IW9YpulS9c,9702
 wbcore/contrib/authentication/apps.py,sha256=5ak0rx5M2P7r4Mq1XnP4-arEHIUq6CAYoBjzOU7lPs4,411
 wbcore/contrib/authentication/authentication.py,sha256=EMa-y7803EaH23voSREjMcfFXJr1tkAcbuwR5KCbL00,4295
 wbcore/contrib/authentication/configs.py,sha256=Z3M2X6xzWhwJEEvHym6d9khriSdgyTmimbkxi7KAGuk,358
@@ -706,24 +706,23 @@ wbcore/contrib/io/tests/test_imports.py,sha256=0n99vPnItSeXMlwubr9g1k8UODR73eYQS
 wbcore/contrib/io/tests/test_models.py,sha256=QJGHTs7pa1gqNcPyqqp2EIN7SwBbGp-kbIcL6lFmgBk,14232
 wbcore/contrib/io/tests/test_viewsets.py,sha256=Fzd1G5gOc03gxpPwCX8juHgeazlSadZPq56k4ZvgoSY,9178
 wbcore/contrib/notifications/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-wbcore/contrib/notifications/admin.py,sha256=aeLRLXw-5-fRXrrRAyFBtoFo8rzu8XSozM1_q-yWdV8,1672
+wbcore/contrib/notifications/admin.py,sha256=zHsqFg6-rRpYQ7J2Bc13iYpBTL3gVS-ynukAaCqZ89I,1649
 wbcore/contrib/notifications/apps.py,sha256=O5rwHeCn3FBTE1rjJgNDahJcGXQqezvIEX7T1RtBsZ8,1883
 wbcore/contrib/notifications/configs.py,sha256=Brt_79I8teg-sLzy6KBVsb0eXg-KFmgv_t-bNdznX5k,538
 wbcore/contrib/notifications/configurations.py,sha256=ZoNd8cdbw8Y-rQIQtS2VgieUO8FQ-kdgZdzNMwqL484,327
-wbcore/contrib/notifications/dispatch.py,sha256=6ioFv00hf_5wl7G_4-yWAhZ6P2HLcfvA8cpmzwijPHs,3308
-wbcore/contrib/notifications/tasks.py,sha256=rdOFPLPiRKEuP9YqAdhnQD-93GvR4C0JykwCD9ziF7w,2117
+wbcore/contrib/notifications/dispatch.py,sha256=QT506c6rJWnuWdPqhJAqAf_ABhY21kJQ9RDcimqqJ5g,3143
 wbcore/contrib/notifications/urls.py,sha256=C764DdlQcJaPjzRKqKrLxKMhpZITZe-YLZaAQOFtzys,872
-wbcore/contrib/notifications/utils.py,sha256=Ou8JwrsDfJ_OHaz4qJuNrR5nhgKXAatRyFyWwAYrCaY,929
+wbcore/contrib/notifications/utils.py,sha256=lk-afWTS-8LMYWFmGwx0mvbRCgFiY9DNF9i1uOq91YQ,1194
 wbcore/contrib/notifications/views.py,sha256=kr7UNwSdQpiwc0-N2KB6zsqNXcodsAcu2wpPblHZoO0,2601
 wbcore/contrib/notifications/backends/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wbcore/contrib/notifications/backends/abstract_backend.py,sha256=gdCQn3YRoTGOy19N3TNfsBOmNbqDWZgeBRSmAEhCM2c,304
 wbcore/contrib/notifications/backends/console/__init__.py,sha256=vgrN2iIcVZfFSRJ2A5ltDQYOCK0DCAkt79JU4ZSfwTQ,42
 wbcore/contrib/notifications/backends/console/backends.py,sha256=3oCasfFwlSvW6KMFWgI6mTTwTS8e60Xi8Kb831hp4tk,765
 wbcore/contrib/notifications/backends/firebase/__init__.py,sha256=vgrN2iIcVZfFSRJ2A5ltDQYOCK0DCAkt79JU4ZSfwTQ,42
-wbcore/contrib/notifications/backends/firebase/backends.py,sha256=cPV_V0ikgMP30JtRTB7ZYf1Bv__3KZcOqOrqhyRfinc,4398
+wbcore/contrib/notifications/backends/firebase/backends.py,sha256=1uq3Gh9810CfaUBAhuWEBZEn1ISEdMa1FbabqoJlayw,4222
 wbcore/contrib/notifications/factories/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wbcore/contrib/notifications/factories/notification_types.py,sha256=s2R4M6FSeIt36E8Zc6Zg9KFUS3Kg1r6G5uEzy2IbhMM,706
-wbcore/contrib/notifications/factories/notifications.py,sha256=QOO0Wp0x2Ij3YZQS6LlWMawbWtiy8yfUBk8vK6NWGok,547
+wbcore/contrib/notifications/factories/notifications.py,sha256=QSZr6zoKrlic69gqdBikwbnuz5ypgwm2j1pBL29aqJ4,542
 wbcore/contrib/notifications/factories/tokens.py,sha256=_L82yARrWkTEManCJzu3HLmUprXcsYLA471Om1FRcpo,458
 wbcore/contrib/notifications/locale/de/LC_MESSAGES/django.po,sha256=d5gqNmW90TvbN78pxgUJI9Ep3adTAffgVA3SWOfX8N8,2102
 wbcore/contrib/notifications/locale/de/LC_MESSAGES/django.po.translated,sha256=U_ybUKrzfqWsy6bEb1SwFImXRT7w2GMVE9bvhIdGqKY,2088
@@ -738,10 +737,11 @@ wbcore/contrib/notifications/migrations/0006_notification_created.py,sha256=2trD
 wbcore/contrib/notifications/migrations/0007_notificationtype_resource_button_label.py,sha256=oSVy8y9uQMrw2BGCNKy6WhaeMali69yuHGgfX1HXyyw,480
 wbcore/contrib/notifications/migrations/0008_notificationtype_is_lock.py,sha256=7uMgkxo7AcLQrvTR2oiYyrCpAcY7NZnp9vcd1rmi7sc,425
 wbcore/contrib/notifications/migrations/0009_alter_notificationtypesetting_options_and_more.py,sha256=yjkAbfbZMHjJ_DLBHXg792AYzeOlLKyp-sAuVt-IpNI,1311
+wbcore/contrib/notifications/migrations/0010_notification_checksum_notification_checksum_unique.py,sha256=lLZml8heSjFossj-fzaJ9yUMHdLyDReOj3P-A8Xq4-w,1724
 wbcore/contrib/notifications/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wbcore/contrib/notifications/models/__init__.py,sha256=l7E4YjFreG6YeBCjcYJrK1Zn2vfPiBpF6bbfIb_5VM4,156
-wbcore/contrib/notifications/models/notification_types.py,sha256=nlL7vTKmflrOr1Cp_Wf9-sN-UyoalzSQd-1tyjyC5rI,6007
-wbcore/contrib/notifications/models/notifications.py,sha256=DP76m7Z4Zcqb4NGc1k7D13m-gB63R0x9ktrZhLvwLWw,2697
+wbcore/contrib/notifications/models/notification_types.py,sha256=vujSAprxaZDGhTqLXmKRPXGuIrLg50Fs1w5iBVQxJjE,5819
+wbcore/contrib/notifications/models/notifications.py,sha256=yGR82Br-EFUzaD5umyV6UAI-Szl0qIld56Osi-7cmeA,5942
 wbcore/contrib/notifications/models/tokens.py,sha256=agFhkmCwBNmK9TM1ylMSonXRd1h782sJqoms58z5ucg,1545
 wbcore/contrib/notifications/release_notes/1_0_0.md,sha256=pyuuGK8zEp7sbPchnpXyPngwJ9-qvrm0dJh3P2DJGIg,168
 wbcore/contrib/notifications/release_notes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -751,22 +751,21 @@ wbcore/contrib/notifications/serializers/notifications.py,sha256=tNMIIYzSJYwmxF2
 wbcore/contrib/notifications/static/notifications/service-worker.js,sha256=4_yl6qd0ituPK5KxFIyYXs6zXOIc_Y4wtzXKzWkSnqw,4926
 wbcore/contrib/notifications/templates/notifications/notification_template.html,sha256=k-o9ieU6z6c0SKAw43_iLEleJTIZK43Y8jrRCwbKPCc,1441
 wbcore/contrib/notifications/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-wbcore/contrib/notifications/tests/conftest.py,sha256=QthEmk6WnvMsvo9Rdva7RGGT8grNlGvSLdD9Ggj4480,1486
+wbcore/contrib/notifications/tests/conftest.py,sha256=H1by5FovsOOTE-a4TsovtJsUrv57KLTM6WHOTqq5frs,1455
 wbcore/contrib/notifications/tests/test_configs.py,sha256=2V3m8EurnV7FlnVpexawfgR5fsOUSSe9RDZMzWqWowk,283
-wbcore/contrib/notifications/tests/test_tasks.py,sha256=d8EtXHNPZFU_JwTiVDqpdjBsxbZuRZ-NruEuaqt306M,2338
 wbcore/contrib/notifications/tests/test_utils.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wbcore/contrib/notifications/tests/test_backends/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wbcore/contrib/notifications/tests/test_backends/test_firebase.py,sha256=RoC9fbj5OWhW_jn2_ZHVMG-t2aYYl3IKH98fCHXFZW8,3804
 wbcore/contrib/notifications/tests/test_models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wbcore/contrib/notifications/tests/test_models/test_notification_types.py,sha256=t4Cozw2hgDoGc9uC5elX7q2kK5UWY-l4bMU4Fo6L2fs,3428
-wbcore/contrib/notifications/tests/test_models/test_notifications.py,sha256=N98NHI-9LvZi2YA1ruawc6NEfS06iO4fQrlux1PS50I,2056
+wbcore/contrib/notifications/tests/test_models/test_notifications.py,sha256=bF4PhEw4olAo_OiLqoupbVYBE2bd-LJVcOgoavB1DDg,6250
 wbcore/contrib/notifications/tests/test_models/test_tokens.py,sha256=8U9WBmHBLMZcNig_doDdByIFYH2V4ccYwnPsgpw9bIc,1301
 wbcore/contrib/notifications/tests/test_serializers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wbcore/contrib/notifications/tests/test_serializers/test_notification_types.py,sha256=TIiMdwaXWXRSzeFNKenMAR7VT0fX_HNdxnO9nsTRr6w,2536
 wbcore/contrib/notifications/tests/test_serializers/test_notifications.py,sha256=kW4uTL8Vr_gwo-zAZv4q_v3BBTAmyUDvUv0SzODB2YI,940
 wbcore/contrib/notifications/tests/test_viewsets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wbcore/contrib/notifications/tests/test_viewsets/test_notification_types.py,sha256=GSmHRc1tUn5Z6M872ZTzaKvgzh7ManfLdYv2BkjN7oc,5851
-wbcore/contrib/notifications/tests/test_viewsets/test_notifications.py,sha256=cuY6k_LJfA4AHLLXzm9bYhjvuCqS-4VKOByUVUjlDTw,6448
+wbcore/contrib/notifications/tests/test_viewsets/test_notifications.py,sha256=YNSUUcGgCq_LSRqboGL3o-8Vd4ZqxKzinyYeuo6GmIY,6428
 wbcore/contrib/notifications/viewsets/__init__.py,sha256=LvuSAnXRTv5tixtnLaLnx1OFomQaKumL5fo_1EtfBzw,172
 wbcore/contrib/notifications/viewsets/menus.py,sha256=NvhqCjGwpq21DRhvNJKCcv2MAvHIyxq38JLrsV3zR8s,534
 wbcore/contrib/notifications/viewsets/notification_types.py,sha256=FrOxSiQzuO6zC6vQl-C4UZBjvf6J-xyZkCGzueKA_hk,1900
@@ -792,14 +791,14 @@ wbcore/contrib/permission/apps.py,sha256=ukDa4Mox01a0gtS5t-FmdPOeXTj_dF-lsXe0Gbj
 wbcore/contrib/permission/configurations.py,sha256=bqg-soAJKU70vVuAuwhnV5Dzfa1XkJ1TyuZaXhMfAr4,187
 wbcore/contrib/permission/filters.py,sha256=Jt9HuDpCPITGJQ0aWyG3HxmNM8MVsqV-FfRy_-g5ebs,1069
 wbcore/contrib/permission/permissions.py,sha256=1fHUA9o0u02Zhzk2zmFvtBqJgtlVe-R7AkIA0hUgbfk,1777
-wbcore/contrib/permission/tasks.py,sha256=ds2rGvx9qoZkWZi5J3CPCW21EXGgADqXepGmiAkoSXU,591
+wbcore/contrib/permission/tasks.py,sha256=WUiy4Fn1kwWeNoM7c6Bfz7_TOPmmx7xU8Zuz8kdeHRM,736
 wbcore/contrib/permission/urls.py,sha256=rzkEtFSJNluVgM-r3KCxnqtSYzCAy0OGKMXFpcLg74I,415
 wbcore/contrib/permission/utils.py,sha256=d64UjkcMfqT5YLiTjhTUFRWpDTu6sVat-1nx6XcNaRg,6110
 wbcore/contrib/permission/internal/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wbcore/contrib/permission/internal/backend.py,sha256=pLK_Hpk_2O4pMXEnUkw_dDYG2Jagm4vK0ER9eZt80MY,1368
 wbcore/contrib/permission/internal/registry.py,sha256=e6CrXNP5Wx-sDUerotM1sMAH2_lzhDqsfrW72w0XQZM,1571
 wbcore/contrib/permission/management/__init__.py,sha256=AdparB3Q-UQ_wYKXXXuKK6PozIg9x3CowQIkmY0qSHE,164
-wbcore/contrib/permission/migrations/0001_initial.py,sha256=IB4_ls922OVdC3r_9FhIFR_xom0wic2NOwYG9gRo8S8,4609
+wbcore/contrib/permission/migrations/0001_initial.py,sha256=8i15T3jYDsSFqISwCQF0IaUsoFRghfvRkhmVolcp2Nk,2875
 wbcore/contrib/permission/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wbcore/contrib/permission/models/__init__.py,sha256=63_HSsJbwNgPPt67vyZKHm5dqB8X-YIAF6tRlK9YgQk,64
 wbcore/contrib/permission/models/mixins.py,sha256=0VTVYQT3mOeGt0HYDtyTVEH5TBCoB-lNwcHKewjboos,7422
@@ -1113,7 +1112,7 @@ wbcore/serializers/fields/fsm.py,sha256=xUYxDj166PDnmDLggI4fShXdSunJVzbc8quFQioM
 wbcore/serializers/fields/json.py,sha256=8SmEOW2hXnTTfuCztaxA8AA3qtTxhCZtft7BJm1yO6o,2225
 wbcore/serializers/fields/list.py,sha256=cYmMBg9M10Qb_5z98CeP3SjE2bV-u7Z0xkzXr-C3xoA,4178
 wbcore/serializers/fields/mixins.py,sha256=sP1mEiD5tMZ4yCr-X0IkIY3RZwJcT0JokvontvRsDKw,7613
-wbcore/serializers/fields/number.py,sha256=qdPxELB6Up_BfA_cl_ouqmCKZha8JE0RNMn0b3w19Ls,3761
+wbcore/serializers/fields/number.py,sha256=4L8Hjf_BWzX3M-ZWKW-D7XzAedy5fXr1gJnPcZ4gVno,4256
 wbcore/serializers/fields/other.py,sha256=3r_70JH_A_daS99LuwQWwa0LNtyosKW7QKJzZgQA-zo,1131
 wbcore/serializers/fields/primary_key.py,sha256=yTbs5B2QlUX-XKEtop3JpwIPeP-FhM8u-2qDXM5q6u0,676
 wbcore/serializers/fields/related.py,sha256=mq7QhcjSG273G400ZueYJnNVNDlGgnUHLoAHaKRjW_Q,6355
@@ -1237,6 +1236,6 @@ wbcore/viewsets/generics.py,sha256=lKDq9UY_Tyc56u1bqaIEvHGgoaXwXxpZ1c3fLVteptI,1
 wbcore/viewsets/mixins.py,sha256=KJxbd2arSplZg2dMD37VgDhCDQa69PyxtOxiCir0eXg,12059
 wbcore/viewsets/utils.py,sha256=4520Ij3ASM8lOa8QZkCqbBfOexVRiZu688eW-PGqMOA,882
 wbcore/viewsets/viewsets.py,sha256=G6BVJ3NzieT0TaeC1T3v8oKIT-nm61INLXnTus_6LUQ,6588
-wbcore-1.61.4.dist-info/METADATA,sha256=s2T4-5Y3sM0YdrUDsioaIpPCfBcE-9QJ19i08QSSo4w,2316
-wbcore-1.61.4.dist-info/WHEEL,sha256=aha0VrrYvgDJ3Xxl3db_g_MDIW-ZexDdrc_m-Hk8YY4,105
-wbcore-1.61.4.dist-info/RECORD,,
+wbcore-1.61.6.dist-info/METADATA,sha256=xFMBS18bxKaJxpbOOEZTpJu5b96DpUTjj3wuyYjZyp0,2316
+wbcore-1.61.6.dist-info/WHEEL,sha256=aha0VrrYvgDJ3Xxl3db_g_MDIW-ZexDdrc_m-Hk8YY4,105
+wbcore-1.61.6.dist-info/RECORD,,

wbcore/contrib/notifications/tasks.py

@@ -1,57 +0,0 @@
-from celery import shared_task
-from django.conf import settings
-from django.core.mail.message import EmailMultiAlternatives
-from django.template.loader import get_template
-from django.utils.html import strip_tags
-from django.utils.module_loading import import_string
-
-from wbcore.contrib.notifications.models.notification_types import (
-    NotificationTypeSetting,
-)
-from wbcore.contrib.notifications.models.notifications import Notification
-from wbcore.workers import Queue
-
-
-def send_notification_email(notification: Notification):
-    """Sends out a notification to the user specified inside the notification
-
-    Args:
-        notification: The notification that is going to be send
-    """
-
-    context = {
-        "title": notification.title,
-        "message": notification.body or "",
-        "notification_share_url": notification.get_full_endpoint(as_shareable_internal_link=True),
-        "notification_endpoint": notification.get_full_endpoint(),
-    }
-    rendered_template = get_template("notifications/notification_template.html").render(context)
-    msg = EmailMultiAlternatives(
-        subject=notification.title,
-        body=strip_tags(rendered_template),
-        from_email=getattr(settings, "WBCORE_NOTIFICATION_EMAIL_FROM", "no_reply@stainly.com"),
-        to=[notification.user.email],  # type: ignore
-    )
-    msg.attach_alternative(rendered_template, "text/html")
-    msg.send()
-
-
-@shared_task(queue=Queue.HIGH_PRIORITY.value)
-def send_notification_task(notification_pk: int):
-    """A celery task to send out a notification via email, web or mobile
-
-    Args:
-        notification_pk: The primary key of the notification that is going to be send out
-    """
-
-    notification = Notification.objects.get(pk=notification_pk)
-
-    notification_user_settings = NotificationTypeSetting.objects.get(
-        notification_type=notification.notification_type,
-        user=notification.user,
-    )
-    if notification_user_settings.enable_email:
-        send_notification_email(notification)
-
-    backend = import_string(settings.NOTIFICATION_BACKEND)
-    backend.send_notification(notification)

wbcore/contrib/notifications/tests/test_tasks.py

@@ -1,72 +0,0 @@
-import pytest
-from bs4 import BeautifulSoup
-from django.core import mail
-from django.test.utils import override_settings
-
-from wbcore.contrib.notifications import tasks
-
-
-@pytest.fixture
-def patched_send_notification_email(mocker):
-    return mocker.patch("wbcore.contrib.notifications.tasks.send_notification_email")
-
-
-@pytest.fixture
-def patched_import_string(mocker):
-    return mocker.patch("wbcore.contrib.notifications.tasks.import_string")
-
-
-@pytest.fixture
-def mock_backend():
-    from wbcore.contrib.notifications.backends.abstract_backend import (
-        AbstractNotificationBackend,
-    )
-
-    class MockedBackend(AbstractNotificationBackend):
-        @classmethod
-        def send_notification(cls, notification):
-            pass
-
-        @classmethod
-        def get_configuration(cls) -> dict:
-            return {}
-
-    return MockedBackend
-
-
-@pytest.mark.django_db
-def test_send_notification_task(
-    notification, mock_backend, mocker, patched_send_notification_email, patched_import_string
-):
-    notification.user.wbnotification_user_settings.update(enable_email=True)
-    spy = mocker.spy(mock_backend, "send_notification")
-    patched_import_string.return_value = mock_backend
-
-    tasks.send_notification_task(notification.pk)
-
-    patched_send_notification_email.assert_called_once_with(notification)
-    patched_import_string.assert_called_once()
-    spy.assert_called_once_with(notification)
-
-
-@pytest.mark.django_db
-def test_send_notification_task_without_mail(
-    notification, mock_backend, patched_send_notification_email, patched_import_string
-):
-    notification.user.wbnotification_user_settings.update(enable_email=False)
-    patched_import_string.return_value = mock_backend
-
-    tasks.send_notification_task(notification.pk)
-
-    assert not patched_send_notification_email.called
-
-
-@pytest.mark.django_db
-@override_settings(EMAIL_BACKEND="django.core.mail.backends.locmem.EmailBackend")
-@pytest.mark.parametrize("notification__endpoint", ["/wbcore/notifications/"])
-def test_send_notification_email(notification):
-    assert len(mail.outbox) == 0
-    tasks.send_notification_email(notification)
-    assert len(mail.outbox) == 1
-    soup = BeautifulSoup(mail.outbox[0].alternatives[0][0], "html.parser")
-    assert soup.find("a", href=notification.get_full_endpoint(as_shareable_internal_link=True))