Refactor filter_active to not use ids/pks

program/filters.py

@@ -85,12 +85,14 @@ class ShowFilterSet(StaticFilterHelpTextMixin, filters.FilterSet):
         # Add limit for future?
         show_ids = (
             models.Schedule.objects.filter(
+                # not "once" schedules with first_date in the past and last_date in the future
                 Q(
-                    rrule_id__gt=1,
+                    rrule__freq__gt=0,
                     first_date__lte=timezone.now(),
                     last_date__gte=timezone.now(),
                 )
-                | Q(rrule_id=1, first_date__gte=timezone.now())
+                # "once" schedules with first_date in the future
+                | Q(rrule__freq=0, first_date__gte=timezone.now())
             )
             .distinct()
             .values_list("show_id", flat=True)