From c07f0c33cbff66270063337e4a2c7a5ad018c01d Mon Sep 17 00:00:00 2001
From: imperosol <thgirod@hotmail.com>
Date: Wed, 11 Jun 2025 17:38:21 +0200
Subject: [PATCH] fix permanent notification callback

---
 com/models.py                   |  7 +++++--
 com/tests/test_notifications.py | 23 +++++++++++++++++++++++
 core/models.py                  | 20 +++++++++++---------
 3 files changed, 39 insertions(+), 11 deletions(-)
 create mode 100644 com/tests/test_notifications.py

diff --git a/com/models.py b/com/models.py
index c7e66515..b6253619 100644
--- a/com/models.py
+++ b/com/models.py
@@ -160,9 +160,12 @@ class News(models.Model):
         )
 
 
-def news_notification_callback(notif):
+def news_notification_callback(notif: Notification):
+    # the NewsDate linked to the News
+    # which creation triggered this callback may not exist yet,
+    # so it's important to filter by "not past date" rather than by "future date"
     count = News.objects.filter(
-        dates__start_date__gt=timezone.now(), is_published=False
+        ~Q(dates__start_date__gt=timezone.now()), is_published=False
     ).count()
     if count:
         notif.viewed = False
diff --git a/com/tests/test_notifications.py b/com/tests/test_notifications.py
new file mode 100644
index 00000000..fa541efb
--- /dev/null
+++ b/com/tests/test_notifications.py
@@ -0,0 +1,23 @@
+import pytest
+from django.conf import settings
+from model_bakery import baker
+
+from com.models import News
+from core.models import Group, Notification, User
+
+
+@pytest.mark.django_db
+def test_notification_created():
+    com_admin_group = Group.objects.get(pk=settings.SITH_GROUP_COM_ADMIN_ID)
+    com_admin_group.users.all().delete()
+    Notification.objects.all().delete()
+    com_admin = baker.make(User, groups=[com_admin_group])
+    for i in range(2):
+        # news notifications are permanent, so the notification created
+        # during the first iteration should be reused during the second one.
+        baker.make(News)
+        notifications = list(Notification.objects.all())
+        assert len(notifications) == 1
+        assert notifications[0].user == com_admin
+        assert notifications[0].type == "NEWS_MODERATION"
+        assert notifications[0].param == str(i + 1)
diff --git a/core/models.py b/core/models.py
index b71f5408..0a7a5e37 100644
--- a/core/models.py
+++ b/core/models.py
@@ -23,7 +23,6 @@
 #
 from __future__ import annotations
 
-import importlib
 import logging
 import os
 import string
@@ -51,6 +50,7 @@ from django.urls import reverse
 from django.utils import timezone
 from django.utils.functional import cached_property
 from django.utils.html import escape
+from django.utils.module_loading import import_string
 from django.utils.timezone import localdate, now
 from django.utils.translation import gettext_lazy as _
 from phonenumber_field.modelfields import PhoneNumberField
@@ -1452,22 +1452,24 @@ class Notification(models.Model):
         return self.get_type_display()
 
     def save(self, *args, **kwargs):
-        if not self.id and self.type in settings.SITH_PERMANENT_NOTIFICATIONS:
+        if self._state.adding and self.type in settings.SITH_PERMANENT_NOTIFICATIONS:
             old_notif = self.user.notifications.filter(type=self.type).last()
             if old_notif:
                 old_notif.callback()
                 old_notif.save()
                 return
+            # if this permanent notification is the first one,
+            # go into the callback nonetheless, because the logic
+            # to set Notification.param is here
+            # (please don't be mad at me, I'm not the one who cooked this spaghetti)
+            self.callback()
         super().save(*args, **kwargs)
 
     def callback(self):
-        # Get the callback defined in settings to update existing
-        # notifications
-        mod_name, func_name = settings.SITH_PERMANENT_NOTIFICATIONS[self.type].rsplit(
-            ".", 1
-        )
-        mod = importlib.import_module(mod_name)
-        getattr(mod, func_name)(self)
+        func_name = settings.SITH_PERMANENT_NOTIFICATIONS.get(self.type)
+        if not func_name:
+            return
+        import_string(func_name)(self)
 
 
 class Gift(models.Model):