Cleanup, fix tests, add celery schedule

shn-liqd · shn-liqd · commit 85bac1476e5a · 2025-11-24T09:16:37.000+01:00
diff --git a/adhocracy-plus/config/settings/production.py b/adhocracy-plus/config/settings/production.py
@@ -1,3 +1,5 @@
+from celery.schedules import crontab
+
 from .base import *
 
 DEBUG = False
@@ -31,3 +33,18 @@
     CKEDITOR_CONFIGS["video-editor"]["embed_provider"] = CKEDITOR_URL
 except NameError:
     pass
+
+CELERY_BEAT_SCHEDULE = {
+    "send-recently-started-project-notifications": {
+        "task": "send_recently_started_project_notifications",
+        "schedule": crontab.from_string("0 0 */3 * *"),
+    },
+    "send-recently-completed-project-notifications": {
+        "task": "send_recently_completed_project_notifications",
+        "schedule": crontab.from_string("0 0 */3 * *"),
+    },
+    "send_upcoming-event-notifications": {
+        "task": "send_upcoming_event_notifications",
+        "schedule": crontab.from_string("0 0 */3 * *"),
+    },
+}
diff --git a/adhocracy-plus/templates/includes/header_notification_button.html b/adhocracy-plus/templates/includes/header_notification_button.html
@@ -6,8 +6,7 @@
    aria-label="Notifications"
    hx-get="{% url 'notification-count-partial' %}"
    hx-trigger="updateNotificationCount from:body, every 15s"
-   hx-target=".notification-badge-container"
-   hx-swap="innerHTML">
+   hx-target=".notification-badge-container">
    
     <i class="fas fa-bell"></i>
     <span class="notification-badge-container">
diff --git a/apps/ideas/views.py b/apps/ideas/views.py
@@ -18,8 +18,6 @@
 from apps.contrib.widgets import FreeTextFilterWidget
 from apps.moderatorfeedback.forms import ModeratorFeedbackForm
 from apps.moderatorfeedback.models import ModeratorFeedback
-
-# from apps.notifications.emails import NotifyCreatorOnModeratorFeedback
 from apps.organisations.mixins import UserFormViewMixin
 
 from . import forms
@@ -197,7 +195,6 @@ def forms_save(self, forms, commit=True):
             feedback_text.save()
             moderateable.moderator_feedback_text = feedback_text
             moderateable.save()
-            # NotifyCreatorOnModeratorFeedback.send(self.object)
         return objects
 
     def get_instance(self, name):
diff --git a/apps/notifications/apps.py b/apps/notifications/apps.py
@@ -6,4 +6,4 @@ class Config(AppConfig):
     label = "a4_candy_notifications"
 
     def ready(self):
-        from . import signals
+        from . import signals  # noqa:F401
diff --git a/apps/notifications/migrations/0001_initial.py b/apps/notifications/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 5.1.11 on 2025-10-22 07:52
+# Generated by Django 5.1.11 on 2025-11-23 15:59
 
 import apps.notifications.models
 import django.db.models.deletion
@@ -36,7 +36,6 @@ def remove_notification_settings(apps, schema_editor):
 class Migration(migrations.Migration):
 
     dependencies = [
-        ("a4actions", "0010_alter_action_verb"),
         ("a4phases", "0007_order_phases_also_by_id"),
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
     ]
@@ -203,16 +202,6 @@ class Migration(migrations.Migration):
                     "target_url",
                     models.URLField(blank=True, null=True, verbose_name="Target URL"),
                 ),
-                (
-                    "action",
-                    models.ForeignKey(
-                        blank=True,
-                        null=True,
-                        on_delete=django.db.models.deletion.CASCADE,
-                        related_name="+",
-                        to="a4actions.action",
-                    ),
-                ),
                 (
                     "recipient",
                     models.ForeignKey(
diff --git a/apps/notifications/models.py b/apps/notifications/models.py
@@ -276,14 +276,6 @@ class Notification(models.Model):
         User, on_delete=models.CASCADE, related_name="notifications"
     )
 
-    # TODO: Remove when email notifications updated
-    action = models.ForeignKey(
-        "a4actions.Action",
-        on_delete=models.CASCADE,
-        related_name="+",
-        null=True,
-        blank=True,
-    )
     notification_type = models.CharField(
         max_length=30,
         choices=NotificationType.choices,
diff --git a/apps/notifications/signals.py b/apps/notifications/signals.py
@@ -1,9 +1,11 @@
+from django.db.models.signals import m2m_changed
 from django.db.models.signals import post_delete
 from django.db.models.signals import post_save
 from django.db.models.signals import pre_save
 from django.dispatch import receiver
 
 from adhocracy4.comments.models import Comment
+from adhocracy4.follows.models import Follow
 from apps.budgeting.models import Proposal
 from apps.ideas.models import Idea
 from apps.mapideas.models import MapIdea
@@ -30,6 +32,34 @@
 from .strategies import ProposalFeedback
 from .strategies import UserContentCreated
 
+
+def autofollow_project(instance, pk_set, reverse):
+    if not reverse:
+        project = instance
+        users_pks = pk_set
+
+        for user_pk in users_pks:
+            Follow.objects.update_or_create(
+                project=project, creator_id=user_pk, defaults={"enabled": True}
+            )
+    else:
+        user = instance
+        project_pks = pk_set
+        for project_pk in project_pks:
+            Follow.objects.update_or_create(
+                project_id=project_pk, creator=user, defaults={"enabled": True}
+            )
+
+
+#  Autofollow signals
+
+
+@receiver(m2m_changed, sender=Project.moderators.through)
+def autofollow_project_moderators(instance, action, pk_set, reverse, **kwargs):
+    if action == "post_add":
+        autofollow_project(instance, pk_set, reverse)
+
+
 # Comment Signals
 
 
diff --git a/apps/notifications/strategies/moderation_strategies.py b/apps/notifications/strategies/moderation_strategies.py
@@ -178,7 +178,6 @@ def get_recipients(self, comment) -> List[User]:
 
     def create_notification_data(self, comment) -> dict:
         project = comment.project
-
         email_context = {
             "subject": _("Your comment was blocked"),
             "headline": _("Your comment was blocked"),
@@ -192,7 +191,8 @@ def create_notification_data(self, comment) -> dict:
             # Template variables
             "project_name": project.name,
             "comment_text": comment.comment,
-            "netiquette_url": "/netiquette",  # You may want to make this configurable
+            # TODO: Check netiquette_url logic
+            "netiquette_url": project.organisation.slug,
             "organisation": project.organisation.name,
         }
 
diff --git a/apps/notifications/strategies/project_strategies.py b/apps/notifications/strategies/project_strategies.py
@@ -143,12 +143,12 @@ def create_notification_data(self, invitation) -> dict:
 
         email_context = {
             "subject": _(
-                'Invitation to the {project_type} project: "{project_name}"'
+                "Invitation to the {project_type} project: {project_name}"
             ).format(project_type=project_type, project_name=project.name),
             "headline": _(
                 'Invitation to the {project_type} project: "{project_name}"'
             ).format(project_type=project_type, project_name=project.name),
-            "cta_url": f"https://{invitation.site}{invitation.get_absolute_url()}",
+            "cta_url": f"{invitation.get_absolute_url()}",
             "cta_label": _("Accept invitation"),
             "reason": _("This email was sent to {receiver_email}."),
             "content_template": "a4_candy_notifications/emails/content/project_invitation.en.email",
@@ -298,17 +298,23 @@ def get_recipients(self, obj) -> List[User]:
         return self._get_project_moderators(obj.project)
 
     def create_notification_data(self, obj) -> dict:
-        # Auto-detect content type from object class if not provided
         content_type = self.content_type or obj.__class__.__name__
-        content_type_display = content_type  # Could add display mapping if needed
-
+        content_type_display = content_type
+        content_type_article = "A"
+        if content_type_display[0].lower() in ["a", "e", "i", "o", "u"]:
+            content_type_article = "An"
         email_context = {
-            "subject": _("A {content_type} was added to the project {project}").format(
-                content_type=content_type_display, project=obj.project.name
+            "subject": _(
+                "{article} {content_type} was added to the project {project}"
+            ).format(
+                article=content_type_article,
+                content_type=content_type_display,
+                project=obj.project.name,
             ),
             "headline": _(
-                "{creator_name} created a {content_type} on the project {project}"
+                "{creator_name} created {article} {content_type} on the project {project}"
             ).format(
+                article=content_type_article.lower(),
                 creator_name=obj.creator.username,
                 content_type=content_type_display,
                 project=obj.project.name,
diff --git a/apps/notifications/tasks.py b/apps/notifications/tasks.py
@@ -13,8 +13,7 @@
 from .strategies import ProjectStarted
 
 
-# TODO: Run daily (?) via celery
-@shared_task
+@shared_task(name="send_recently_started_project_notifications")
 def send_recently_started_project_notifications():
     """
     Send notifications to project followers for project completed
@@ -45,7 +44,7 @@ def is_last_phase_in_project(phase):
     return is_last_phase
 
 
-@shared_task
+@shared_task(name="send_recently_completed_project_notifications")
 def send_recently_completed_project_notifications():
     """
     Send notifications to project followers for project completed
@@ -67,8 +66,7 @@ def send_recently_completed_project_notifications():
     return
 
 
-# TODO: Run daily (?) via celery
-@shared_task
+@shared_task(name="send_upcoming_event_notifications")
 def send_upcoming_event_notifications():
     """
     Send notifications to project followers for events starting within 24 hours
diff --git a/apps/notifications/templates/a4_candy_notifications/_notification_card.html b/apps/notifications/templates/a4_candy_notifications/_notification_card.html
@@ -20,8 +20,7 @@ <h2 class="card-title text-decoration-underline mb-1 mb-md-0 mt-0">
                     method="post" 
                     action="{% url 'mark_all_notifications_as_read' %}"
                     hx-post="{% url 'mark_all_notifications_as_read' %}"
-                    hx-target="#notifications-container"
-                    hx-swap="innerHTML">
+                    hx-target="#notifications-container">
                     {% csrf_token %}
                     <input type="hidden" name="section" value="{{ section_id }}">
                     <button type="submit" class="btn btn-sm btn--transparent btn--transparent-border">
diff --git a/apps/notifications/templates/a4_candy_notifications/emails/content/project_invitation.en.email b/apps/notifications/templates/a4_candy_notifications/emails/content/project_invitation.en.email
@@ -1,7 +1,5 @@
 {% load i18n %}
 
-{% block subject %}{% if participantinvite.project.is_semipublic %}{% blocktranslate with project_name=participantinvite.project.name %}Invitation to the semi-public project: "{{ project_name }}"{% endblocktranslate %}{% else %}{% blocktranslate with project_name=participantinvite.project.name %}Invitation to the private project: "{{ project_name }}"{% endblocktranslate %}{% endif %}{% endblock %}
-
 {% block headline %}{% if participantinvite.project.is_semipublic %}{% blocktranslate with project_name=participantinvite.project.name %}Invitation to the semi-public project: "{{ project_name }}"{% endblocktranslate %}{% else %}{% blocktranslate with project_name=participantinvite.project.name %}Invitation to the private project: "{{ project_name }}"{% endblocktranslate %}{% endif %}{% endblock  %}
 
 {% block content %}
diff --git a/apps/notifications/views.py b/apps/notifications/views.py
@@ -72,8 +72,6 @@ def post(self, request, *args, **kwargs):
             response = render(
                 request, "a4_candy_notifications/_notifications_partial.html", context
             )
-            print("RESPOONDING WITH TRIGGER")
-            # Add HTMX trigger header to update the button
             response["HX-Trigger"] = "updateNotificationCount"
             return response
         else:
diff --git a/apps/userdashboard/templates/a4_candy_userdashboard/userdashboard_notifications.html b/apps/userdashboard/templates/a4_candy_userdashboard/userdashboard_notifications.html
@@ -16,8 +16,7 @@ <h1 class="visually-hidden">
             <div class="col-lg-10 mx-auto" 
                  id="notifications-container"
                  hx-get="{% url 'userdashboard-notifications-partial' %}"
-                 hx-trigger="load, every 10s, updateNotifications from:body"
-                 hx-swap="innerHTML">
+                 hx-trigger="load, every 10s, updateNotifications from:body">
                  
                 <div class="text-center py-4">
                     <i class="fas fa-spinner fa-spin"></i>
diff --git a/tests/notifications/test_initiator_notifications.py b/tests/notifications/test_initiator_notifications.py
@@ -32,6 +32,7 @@ def test_notify_on_project_created(client, organisation, user):
 def test_notify_on_project_deleted(client, project):
     """Check if initiator gets email on project delete."""
     organisation = project.organisation
+    organisation.language = "en"
     initiator = organisation.initiators.first()
     project.delete()
 
diff --git a/tests/notifications/test_moderator_notifications.py b/tests/notifications/test_moderator_notifications.py
@@ -1,20 +1,14 @@
 import pytest
-from django.core import mail
 
 from tests.helpers import get_emails_for_address
 
 
-# TODO: Fix: moderator isnt getting emails?
 @pytest.mark.django_db
 def test_notify_moderator_on_create(idea, comment_factory):
     """Check if moderator gets email on idea and comment create."""
     moderator = idea.project.moderators.first()
     comment_factory(content_object=idea)
 
     moderator_emails = get_emails_for_address(moderator.email)
-    # 3 emails because of creator notification for reaction on idea
-    assert len(moderator_emails) == 3
-    assert mail.outbox[0].to[0] == moderator.email
-    assert mail.outbox[0].subject.startswith("An idea was added to the project")
-    assert mail.outbox[2].to[0] == moderator.email
-    assert mail.outbox[2].subject.startswith("A comment was added to the project")
+    assert len(moderator_emails) == 1
+    assert moderator_emails[0].subject.startswith("An Idea was added to the project")
diff --git a/tests/notifications/test_notification_signals.py b/tests/notifications/test_notification_signals.py
@@ -277,6 +277,7 @@ def test_handle_event_update_notifications(
     project_factory, offline_event_factory, user_factory
 ):
     project = project_factory()
+    project.organisation.language = "en"
     attendee = user_factory()
 
     # Use proper datetime objects
@@ -403,6 +404,7 @@ def test_handle_project_deleted(project_factory, organisation_factory, user_fact
     organisation = organisation_factory()
     initiator = organisation.initiators.first()
     project = project_factory(organisation=organisation)
+    project.organisation.language = "en"
 
     get_emails_for_address(initiator.email)
 
