Add a filter to the workshop request view for requests where an active member did not use their code

amy/extrequests/filters.py

@@ -1,6 +1,7 @@
+from datetime import date
 import re
 
-from django.db.models import Q
+from django.db.models import Case, F, Q, QuerySet, When
 from django.forms import widgets
 from django.http import QueryDict
 import django_filters
@@ -29,7 +30,7 @@ def __init__(self, data=None, *args, **kwargs):
         # client-side unless the user deliberately chooses to do so.
         # See https://github.com/carpentries/amy/issues/2314
         if not data:
-            data = QueryDict("state=no_d&matched=u")
+            data = QueryDict("state=pa&matched=u")
 
         super().__init__(data, *args, **kwargs)
 
@@ -39,12 +40,12 @@ def __init__(self, data=None, *args, **kwargs):
     )
 
     member_code = django_filters.CharFilter(
-        field_name="member_code", lookup_expr="icontains", label="Group"
+        field_name="member_code", lookup_expr="icontains", label="Member code"
     )
 
     state = django_filters.ChoiceFilter(
         label="State",
-        choices=(("no_d", "Pending or accepted"),) + TrainingRequest.STATE_CHOICES,
+        choices=(("pa", "Pending or accepted"),) + TrainingRequest.STATE_CHOICES,
         method="filter_training_requests_by_state",
     )
 
@@ -65,6 +66,12 @@ def __init__(self, data=None, *args, **kwargs):
         widget=widgets.CheckboxInput,
     )
 
+    invalid_member_code = django_filters.BooleanFilter(
+        label="Member code marked as invalid",
+        field_name="member_code_override",
+        widget=widgets.CheckboxInput,
+    )
+
     affiliation = django_filters.CharFilter(
         method="filter_affiliation",
     )
@@ -140,8 +147,8 @@ def filter_affiliation(self, queryset, name, affiliation):
             return queryset.filter(q).distinct()
 
     def filter_training_requests_by_state(self, queryset, name, choice):
-        if choice == "no_d":
-            return queryset.exclude(state="d")
+        if choice == "pa":
+            return queryset.filter(state__in=["p", "a"])
         else:
             return queryset.filter(state=choice)
 
@@ -165,6 +172,11 @@ class WorkshopRequestFilter(AMYFilterSet, StateFilterSet):
         queryset=Curriculum.objects.all(),
         widget=widgets.CheckboxSelectMultiple(),
     )
+    unused_member_code = django_filters.BooleanFilter(
+        label="Institution has an active member code but did not provide it",
+        method="filter_unused_member_code",
+        widget=widgets.CheckboxInput(),
+    )
 
     order_by = django_filters.OrderingFilter(
         fields=("created_at",),
@@ -179,6 +191,29 @@ class Meta:
             "country",
         ]
 
+    def filter_unused_member_code(
+        self, queryset: QuerySet, name: str, apply_filter: bool
+    ) -> QuerySet:
+        if apply_filter:
+            # find requests where no member code was provided
+            requests_without_code = queryset.filter(member_code="")
+
+            # find requests where institution has an active membership
+            # ideally compare to workshop dates, but fall back on today
+            return requests_without_code.annotate(
+                date_to_check=Case(
+                    When(
+                        preferred_dates__isnull=False,
+                        then=F("preferred_dates"),
+                    ),
+                    default=date.today(),
+                )
+            ).filter(
+                institution__memberships__agreement_end__gte=F("date_to_check"),
+                institution__memberships__agreement_start__lte=F("date_to_check"),
+            )
+        return queryset
+
 
 # ------------------------------------------------------------
 # WorkshopInquiryRequest related filter and filter methods