From 26dcec1c8d0675cbced0d9d6ac6fa35e2add9a9f Mon Sep 17 00:00:00 2001
From: Ernesto Rico Schmidt <ernesto@helsinki.at>
Date: Wed, 15 Feb 2023 17:21:25 -0400
Subject: [PATCH] Refactor filter_active to not use ids/pks
---
program/filters.py | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/program/filters.py b/program/filters.py
index 3ec956d0..b218b426 100644
--- a/program/filters.py
+++ b/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)
--
GitLab