Merge branch 'fix-notification-update' into 'main'

Fix remote notification disappearing after refetch

See merge request reportcreator/reportcreator!1076

Author: MWedl

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## Upcoming
+* Fix remote notification disappearing after refetch
+
+
 ## v2025.83 - 2025-09-26
 * Suggest previously used tags in filters, projects, designs and templates
 * Plugin `scanimport`: Prevent errors on incompatible finding field types

api/src/sysreptor/notifications/serializers.py

@@ -38,7 +38,7 @@ def create(self, validated_data):
             .update(active_until=(timezone.now() - timedelta(days=1)).date())
         UserNotification.objects \
             .filter(remotenotificationspec__isnull=False) \
-            .exclude(id__in=[n.id for n in notifications]) \
+            .exclude(remotenotificationspec_id__in=[n.id for n in notifications]) \
             .update(visible_until=timezone.now())
 
         # Create new notifications

api/src/sysreptor/tests/test_notifications.py

@@ -119,20 +119,33 @@ def test_create(self):
 
     def test_refetch(self):
         async_to_sync(fetch_notifications)(None)
-        before = RemoteNotificationSpec.objects.get()
+        rn_before = RemoteNotificationSpec.objects.get()
+        un_before = self.user_notification.notifications.get()
         async_to_sync(fetch_notifications)(None)
-        after = RemoteNotificationSpec.objects.get()
-        assertKeysEqual(before, after, ['id', 'created', 'updated', 'active_until'])
+        rn_after = RemoteNotificationSpec.objects.get()
+        assertKeysEqual(rn_before, rn_after, ['id', 'created', 'updated', 'active_until'])
+        un_after = self.user_notification.notifications.get()
+        assertKeysEqual(un_before, un_after, ['id', 'created', 'user', 'type', 'remotenotificationspec_id', 'visible_until', 'read', 'additional_content'])
 
     def test_delete(self):
         async_to_sync(fetch_notifications)(None)
         self.notification_import_data = []
         async_to_sync(fetch_notifications)(None)
+
+        # RemoteNotificationSpec is set to inactive
         after = RemoteNotificationSpec.objects.get()
         notification = self.user_notification.notifications.get(remotenotificationspec=after)
         assert after.active_until < timezone.now().date()
         assert notification.visible_until < timezone.now()
 
+        # User notifications are set to invisible
+        un1 = self.user_notification.notifications.get(remotenotificationspec=after)
+        assert un1.visible_until < timezone.now()
+
+        # No new notifications are created
+        u = create_user()
+        assert u.notifications.all().count() == 0
+
 
 @pytest.mark.django_db()
 class TestNotificationTriggers: