Extend announcment to support more filtering event

It can now exclude waiting lists from events, and specific meeting
invitation statuses from meetings.

lego/apps/events/models.py

@@ -776,10 +776,14 @@ def restricted_lookup(self) -> tuple[list[User], list]:
         )
         return [registration.user for registration in registrations], []
 
-    def announcement_lookup(self) -> list[User]:
+    def announcement_lookup(self, exclude_waiting_list: bool) -> list[User]:
         registrations: QuerySet[Registration] = self.registrations.filter(
             status=constants.SUCCESS_REGISTER
         )
+
+        if exclude_waiting_list:
+            registrations = registrations.exclude(pool=None)
+
         return [registration.user for registration in registrations]
 
     def add_legacy_registration(self) -> None:

lego/apps/meetings/models.py

@@ -105,8 +105,17 @@ def restricted_lookup(self):
         """
         return self.invited_users, []
 
-    def announcement_lookup(self):
-        return self.invited_users
+    def announcement_lookup(self, meeting_invitation_status) -> list[User]:
+        meeting_invitations = self.invitations
+
+        if meeting_invitation_status:
+            meeting_invitations = meeting_invitations.filter(
+                status=meeting_invitation_status
+            )
+
+        return User.objects.filter(
+            id__in=meeting_invitations.values_list("user", flat=True)
+        )
 
     @property
     def content_target(self):

lego/apps/notifications/migrations/0015_announcement_exclude_waiting_list_and_more.py

@@ -0,0 +1,30 @@
+# Generated by Django 4.0.10 on 2024-03-07 14:51
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("notifications", "0014_alter_notificationsetting_notification_type"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="announcement",
+            name="exclude_waiting_list",
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AddField(
+            model_name="announcement",
+            name="meeting_invitation_status",
+            field=models.CharField(
+                blank=True,
+                choices=[
+                    ("NO_ANSWER", "NO_ANSWER"),
+                    ("ATTENDING", "ATTENDING"),
+                    ("NOT_ATTENDING", "NOT_ATTENDING"),
+                ],
+                max_length=50,
+            ),
+        ),
+    ]

lego/apps/notifications/models.py

@@ -3,6 +3,7 @@
 from django.utils import timezone
 
 from lego.apps.action_handlers.events import handle_event
+from lego.apps.meetings import constants
 from lego.utils.models import BasisModel
 
 from .constants import (
@@ -76,12 +77,16 @@ class Announcement(BasisModel):
     message = models.TextField()
     sent = models.DateTimeField(null=True, default=None)
 
-    MANY_TO_MANY_RELATIONS = ["users", "groups", "events", "meetings"]
+    MANY_TO_MANY_RELATIONS = ["users", "groups"]
 
     users = models.ManyToManyField("users.User", blank=True)
     groups = models.ManyToManyField("users.AbakusGroup", blank=True)
     events = models.ManyToManyField("events.Event", blank=True)
+    exclude_waiting_list = models.BooleanField(default=False)
     meetings = models.ManyToManyField("meetings.Meeting", blank=True)
+    meeting_invitation_status = models.CharField(
+        max_length=50, choices=constants.INVITATION_STATUS_TYPES, blank=True
+    )
     from_group = models.ForeignKey(
         "users.AbakusGroup",
         on_delete=models.PROTECT,
@@ -104,6 +109,12 @@ def lookup_recipients(self):
                     users = announcement_lookup()
                     all_users += list(users)
 
+        for event in self.events.all():
+            all_users += event.announcement_lookup(self.exclude_waiting_list)
+
+        for meeting in self.meetings.all():
+            all_users += meeting.announcement_lookup(self.meeting_invitation_status)
+
         return list(set(all_users))
 
     def send(self):

lego/apps/notifications/serializers.py

@@ -43,7 +43,9 @@ class Meta:
             "users",
             "groups",
             "events",
+            "exclude_waiting_list",
             "meetings",
+            "meeting_invitation_status",
         )
         read_only_fields = ("sent",)
 
@@ -59,6 +61,8 @@ class Meta(AnnouncementListSerializer.Meta):
             "users",
             "groups",
             "events",
+            "exclude_waiting_list",
             "meetings",
+            "meeting_invitation_status",
         )
         read_only_fields = ("sent",)