Merge branch 'main' into develop

Author: alice-telescoop

recoco/apps/conversations/migrations/0007_auto_20251230_1707.py

@@ -1,7 +1,7 @@
 # Generated by Django 5.1.15 on 2025-12-30 16:07
 
 from django.db import migrations
-from notifications.signals import notify
+from django.utils import timezone
 from tqdm import tqdm
 
 from recoco import verbs
@@ -13,6 +13,8 @@ def convert_public_note_notifications(apps, schema_editor):
     Notification = apps.get_model("notifications", "Notification")
     ContentType = apps.get_model("contenttypes", "ContentType")
     Note = apps.get_model("projects", "Note")
+    User = apps.get_model("auth", "User")
+    Project = apps.get_model("projects", "Project")
     public_note_verb = "a envoyé un message dans l'espace conversation"
     content_type = ContentType.objects.get_for_model(Note)
     for notif in tqdm(
@@ -37,20 +39,36 @@ def convert_public_note_notifications(apps, schema_editor):
         try:
             # get corresponding message to create its own notification
             message = Message.objects.get(
-                created=note.created_on, modified=note.updated_on, project=note.project
+                created=note.created_on,
+                modified=note.updated_on,
+                project_id=note.project.pk,
             )
-            notification = {
-                "sender": notif.actor,
-                "verb": verbs.Conversation.POST_MESSAGE,
-                "action_object": message,
-                "target": notif.target,
-                "annotations": gather_annotations_for_message_notification(message),
-                "emailed": notif.emailed,
-            }
 
-            notify.send(recipient=notif.recipient, site=notif.site, **notification)
+            Notification(
+                recipient=notif.recipient,
+                actor_content_type=ContentType.objects.get_for_model(User),
+                actor_object_id=notif.actor_object_id,
+                target_object_id=notif.target_object_id,
+                target_content_type=ContentType.objects.get_for_model(Project),
+                action_object_object_id=message.id,
+                action_object_content_type=ContentType.objects.get_for_model(Message),
+                verb=verbs.Conversation.POST_MESSAGE,
+                public=True,
+                description=None,
+                data={
+                    "annotations": gather_annotations_for_message_notification(message)
+                },
+                emailed=notif.emailed,
+                timestamp=timezone.now(),
+                level="info",
+                site_id=notif.site_id,
+            )
+
+            # notify.send(recipient=notif.recipient, site_id=notif.site.id, **notification)
         except Message.DoesNotExist:
             print(f"no message found for {note}. skipped")
+        except User.DoesNotExist:
+            print(f"sender not found for {note}. skipped")
 
 
 class Migration(migrations.Migration):

recoco/apps/tasks/tests/test_tasks.py

@@ -59,7 +59,7 @@ def test_task_recommendation_list_available_for_staff(client):
 @pytest.mark.django_db
 def test_task_recommendation_list(client, current_site):
     tr = baker.make(models.TaskRecommendation, site=current_site)
-    tr.condition_tags_taggit.add("test")
+    tr.condition_tags.add("test")
 
     url = reverse("projects-task-recommendation-list")
     with login(client, groups=["example_com_staff"]):