feat: watch abcd shift by qualification

tapir/shifts/forms.py

@@ -765,6 +765,7 @@ class Meta:
             "weekdays",
             "shift_template_group",
             "staffing_status",
+            "watched_capabilities",
         ]
 
     weekdays = forms.MultipleChoiceField(
@@ -788,21 +789,35 @@ class Meta:
         label=_("ABCD Week"),
     )
     staffing_status = forms.MultipleChoiceField(
-        required=True,
+        required=False,
         choices=get_staffingstatus_choices,
         label=_("Shift changes you would like to be informed about"),
         widget=CheckboxSelectMultiple(),
         disabled=False,
     )
+    watched_capabilities = forms.MultipleChoiceField(
+        required=False,
+        choices=SHIFT_USER_CAPABILITY_CHOICES.items(),
+        label=_("Notify me when these capabilities become available or unavailable"),
+        widget=CheckboxSelectMultiple(),
+        disabled=False,
+        help_text=_(
+            "Get notified when someone with specific skills registers or unregisters"
+        ),
+    )
 
     WEEKDAYS_ERROR = _(
         "If weekdays or %(shift_template_group)s are selected, "
         "%(shift_templates)s may not be selected, and vice versa."
     )
-    AT_LEAST_ONE_ERROR = _(
+    AT_LEAST_ONE_PATTERN_ERROR = _(
         "At least one of the fields (%(shift_templates)s, weekdays, or %(shift_template_group)s) must be selected."
     )
 
+    AT_LEAST_ONE_TARGET_ERROR = _(
+        "At least one of the fields staffing_status or required capabilities must be selected."
+    )
+
     def _format_field_names(self):
         return {
             "shift_template_group": self.fields["shift_template_group"].label,
@@ -813,6 +828,8 @@ def clean(self):
         cleaned_data = super().clean()
         shift_templates = cleaned_data.get("shift_templates")
         weekdays = cleaned_data.get("weekdays")
+        staffing_status = cleaned_data.get("staffing_status")
+        watched_capabilities = cleaned_data.get("watched_capabilities")
         cleaned_data["weekdays"] = list(map(int, weekdays))
         shift_template_group = cleaned_data.get("shift_template_group")
 
@@ -823,6 +840,10 @@ def clean(self):
 
         if not (shift_templates or weekdays or shift_template_group):
             raise forms.ValidationError(
-                self.AT_LEAST_ONE_ERROR % self._format_field_names()
+                self.AT_LEAST_ONE_PATTERN_ERROR % self._format_field_names()
+            )
+        if not (staffing_status or watched_capabilities):
+            raise forms.ValidationError(
+                self.AT_LEAST_ONE_TARGET_ERROR % self._format_field_names()
             )
         return cleaned_data

tapir/shifts/management/commands/send_shift_watch_mail.py

@@ -14,6 +14,52 @@
 from tapir.shifts.services.shift_watch_creation_service import ShiftWatchCreator
 
 
+def check_staffing_status(
+    shift_watch_data: ShiftWatch,
+    valid_attendances_count: int,
+    notification_reasons: list[str],
+) -> None:
+    """Check for staffing status changes and add notifications if needed."""
+    if len(shift_watch_data.staffing_status) == 0:
+        return
+
+    # Determine staffing status
+    current_status = ShiftWatchCreator.get_staffing_status_if_changed(
+        number_of_available_slots=shift_watch_data.shift.slots.count(),
+        valid_attendances=valid_attendances_count,
+        required_attendances=shift_watch_data.shift.num_required_attendances,
+        last_status=shift_watch_data.last_staffing_status,
+    )
+    if current_status:
+        notification_reasons.append(current_status.label)
+        shift_watch_data.last_staffing_status = current_status
+
+    # General attendance change notifications
+    if not notification_reasons:
+        if valid_attendances_count > len(shift_watch_data.last_valid_slot_ids):
+            notification_reasons.append(StaffingStatusChoices.ATTENDANCE_PLUS.label)
+        elif valid_attendances_count < len(shift_watch_data.last_valid_slot_ids):
+            notification_reasons.append(StaffingStatusChoices.ATTENDANCE_MINUS.label)
+
+
+def check_watched_capabilities(
+    shift_watch_data: ShiftWatch,
+    this_valid_slot_ids: list,
+    notification_reasons: list[str],
+) -> None:
+    """Check for watched capability changes and add notifications if needed."""
+    if len(shift_watch_data.watched_capabilities) == 0:
+        return
+
+    capability_notifications = ShiftWatchCreator.get_capability_status_changes(
+        this_valid_slot_ids=this_valid_slot_ids,
+        last_valid_slot_ids=shift_watch_data.last_valid_slot_ids,
+        watched_capabilities=shift_watch_data.watched_capabilities,
+    )
+    if capability_notifications:
+        notification_reasons.extend(capability_notifications)
+
+
 class Command(BaseCommand):
     help = "Sent to a member when there is a relevant change in shift staffing and the member wants to know about it."
 
@@ -31,36 +77,14 @@ def send_shift_watch_mail_per_user_and_shift(self, shift_watch_data: ShiftWatch)
         )
 
         valid_attendances_count = len(this_valid_slot_ids)
-        required_attendances_count = shift_watch_data.shift.num_required_attendances
-        number_of_available_slots = shift_watch_data.shift.slots.count()
-
-        # Determine staffing status
-        current_status = ShiftWatchCreator.get_staffing_status_if_changed(
-            number_of_available_slots=number_of_available_slots,
-            valid_attendances=valid_attendances_count,
-            required_attendances=required_attendances_count,
-            last_status=shift_watch_data.last_staffing_status,
-        )
-        if current_status:
-            notification_reasons.append(current_status.label)
-            shift_watch_data.last_staffing_status = current_status
-
-        # Check watched capabilities
-        capability_notifications = ShiftWatchCreator.get_capability_status_changes(
-            this_valid_slot_ids=this_valid_slot_ids,
-            last_valid_slot_ids=shift_watch_data.last_valid_slot_ids,
-            watched_capabilities=shift_watch_data.watched_capabilities,
+
+        check_staffing_status(
+            shift_watch_data, valid_attendances_count, notification_reasons
         )
-        notification_reasons.extend(capability_notifications)
 
-        # General attendance change notifications
-        if not notification_reasons:
-            if valid_attendances_count > len(shift_watch_data.last_valid_slot_ids):
-                notification_reasons.append(StaffingStatusChoices.ATTENDANCE_PLUS.label)
-            elif valid_attendances_count < len(shift_watch_data.last_valid_slot_ids):
-                notification_reasons.append(
-                    StaffingStatusChoices.ATTENDANCE_MINUS.label
-                )
+        check_watched_capabilities(
+            shift_watch_data, this_valid_slot_ids, notification_reasons
+        )
 
         for reason in notification_reasons:
             self.send_shift_watch_mail(shift_watch=shift_watch_data, reason=reason)

tapir/shifts/management/commands/send_understaffed_shift_reminder_mail.py

@@ -41,5 +41,5 @@ def handle(self, *args, **options):
             )
             if current_status == StaffingStatusChoices.UNDERSTAFFED:
                 SendShiftWatchCommand.send_shift_watch_mail(
-                    shift_watch_data, staffing_status=StaffingStatusChoices.UNDERSTAFFED
+                    shift_watch_data, reason=StaffingStatusChoices.UNDERSTAFFED
                 )

tapir/shifts/migrations/0076_recurringshiftwatch_watched_capabilities.py

@@ -0,0 +1,28 @@
+# Generated by Django 5.2.15 on 2026-06-14 18:50
+
+import django.contrib.postgres.fields
+import tapir.shifts.models
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("shifts", "0075_shiftwatch_watched_capabilities"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="recurringshiftwatch",
+            name="watched_capabilities",
+            field=django.contrib.postgres.fields.ArrayField(
+                base_field=models.CharField(
+                    choices=tapir.shifts.models.get_shift_capability_choices,
+                    max_length=128,
+                ),
+                blank=True,
+                default=list,
+                size=None,
+            ),
+        ),
+    ]

tapir/shifts/models.py

@@ -1262,12 +1262,17 @@ class ShiftWatch(models.Model):
     def __str__(self):
         shift_name = self.shift.get_display_name()
         shift_url = self.shift.get_absolute_url()
+
+        staffing_statuses = ", ".join(status for status in self.staffing_status)
+        watched_caps = ", ".join(cap for cap in self.watched_capabilities)
+
         return format_html(
-            '{} is watching <a href="{}">{}</a> for changes of {}',
+            '{} is watching <a href="{}">{}</a> for changes of {} (capabilities: {})',
             self.user.username,
             shift_url,
             shift_name,
-            ", ".join(status for status in self.staffing_status),
+            staffing_statuses,
+            watched_caps,
         )
 
     class Meta:
@@ -1307,3 +1312,12 @@ class to generate recurring ShiftWatches from.
         blank=False,
         default=get_staffingstatus_defaults,
     )
+
+    watched_capabilities = ArrayField(
+        models.CharField(
+            max_length=128, choices=get_shift_capability_choices, blank=False
+        ),
+        default=list,
+        blank=True,
+        null=False,
+    )

tapir/shifts/services/shift_watch_creation_service.py

@@ -13,7 +13,7 @@
 class ShiftWatchCreator:
     @classmethod
     def get_staffing_status_for_shift(
-        cls, shift: Shift, last_status: str = None
+        cls, shift: Shift, last_status: str | None = None
     ) -> str | None:
         """
         Compute the staffing status for a Shift instance by extracting the required
@@ -58,7 +58,7 @@ def calculate_staffing_status(
         number_of_available_slots: int,
         valid_attendances: int,
         required_attendances: int,
-        last_status: str = None,
+        last_status: str | None = None,
     ):
         """Determine the staffing status based on attendance counts. Returns None if status has not changed."""
         if valid_attendances < required_attendances:
@@ -81,7 +81,7 @@ def get_staffing_status_if_changed(
         number_of_available_slots: int,
         valid_attendances: int,
         required_attendances: int,
-        last_status: str = None,
+        last_status: str | None = None,
     ) -> None | StaffingStatusChoices:
         """
         Determine if the staffing status has changed. Return **None** if the staffing status has not changed.
@@ -135,6 +135,7 @@ def create_shift_watches_for_recurring(cls, recurring: RecurringShiftWatch):
                     user=recurring.user,
                     shift=shift,
                     staffing_status=recurring.staffing_status,
+                    watched_capabilities=recurring.watched_capabilities,
                     last_staffing_status=ShiftWatchCreator.get_initial_staffing_status_for_shift(
                         shift=shift
                     ),

tapir/shifts/templates/shifts/shiftwatch_overview.html

@@ -62,6 +62,7 @@ <h5>{% translate "Recurring Shift Watches" %}</h5>
                                 <strong>{% translate "Observed changes:" %}</strong>
                                 <ul>
                                     {% for status in recurringshiftwatch.staffing_status %}<li>{{ status }}</li>{% endfor %}
+                                    {% for status in recurringshiftwatch.watched_capabilities %}<li>{{ status }}</li>{% endfor %}
                                 </ul>
                             </div>
                         </li>