Merge pull request #275 from City-of-Helsinki/KK-912-leeway-changes

KK-912 | Show event ticket for longer

Author: charn

children/schema.py

@@ -128,8 +128,10 @@ def resolve_past_events(self: Child, info, **kwargs):
         past.
         """
         events = self.project.events.user_can_view(info.context.user).published()
-        past_enough_enrolled_occurrences = self.occurrences.filter(
-            time__lt=timezone.now()
+
+        occurrences = self.occurrences.with_end_time()
+        past_enough_enrolled_occurrences = occurrences.filter(
+            end_time__lt=timezone.now()
             - timedelta(minutes=settings.KUKKUU_ENROLLED_OCCURRENCE_IN_PAST_LEEWAY)
         )
         return events.filter(occurrences__in=past_enough_enrolled_occurrences)

children/tests/snapshots/snap_test_api.py

@@ -408,8 +408,8 @@
             "availableEvents": {"edges": []},
             "occurrences": {
                 "edges": [
-                    {"node": {"time": "2020-12-11T23:29:00+00:00"}},
-                    {"node": {"time": "2020-12-11T23:31:00+00:00"}},
+                    {"node": {"time": "2020-12-11T22:59:00+00:00"}},
+                    {"node": {"time": "2020-12-11T23:01:00+00:00"}},
                 ]
             },
             "pastEvents": {

children/tests/test_api.py

@@ -884,18 +884,23 @@ def test_get_past_events(
     snapshot, guardian_api_client, child_with_user_guardian, project, venue
 ):
     variables = {"id": to_global_id("ChildNode", child_with_user_guardian.id)}
-
-    past = timezone.now() - timedelta(
-        minutes=settings.KUKKUU_ENROLLED_OCCURRENCE_IN_PAST_LEEWAY + 1
+    duration = 30
+    past = (
+        timezone.now()
+        - timedelta(minutes=duration)
+        - timedelta(minutes=settings.KUKKUU_ENROLLED_OCCURRENCE_IN_PAST_LEEWAY + 1)
     )
-    not_enough_past = timezone.now() - timedelta(
-        minutes=settings.KUKKUU_ENROLLED_OCCURRENCE_IN_PAST_LEEWAY - 1
+    not_enough_past = (
+        timezone.now()
+        - timedelta(minutes=duration)
+        - timedelta(minutes=settings.KUKKUU_ENROLLED_OCCURRENCE_IN_PAST_LEEWAY - 1)
     )
     future = timezone.now() + timedelta(minutes=1)
 
     # Enrolled occurrence in the past, event should be visible
     event = EventFactory(
         published_at=timezone.now(),
+        duration=duration,
         project=project,
         name="enrolled occurrence in the past",
     )
@@ -906,6 +911,7 @@ def test_get_past_events(
     # Enrolled occurrence in the past but not enough, event should NOT be visible
     event_2 = EventFactory(
         published_at=timezone.now(),
+        duration=duration,
         project=project,
         name="enrolled occurrence in the past but not enough",
     )
@@ -920,6 +926,7 @@ def test_get_past_events(
     # Event without an enrolment in the past, should NOT be visible
     event_3 = EventFactory(
         published_at=timezone.now(),
+        duration=duration,
         project=project,
         name="unenrolled event in the past",
     )

common/tests/conftest.py

@@ -32,6 +32,8 @@ def setup_test_environment(settings):
     settings.MEDIA_ROOT = "test_media"
     settings.KUKKUU_HASHID_SALT = "topsecret"
     settings.KUKKUU_REMINDER_DAYS_IN_ADVANCE = 7
+    settings.KUKKUU_DEFAULT_EVENT_DURATION = 120
+    settings.KUKKUU_ENROLLED_OCCURRENCE_IN_PAST_LEEWAY = 30
     with translation.override("fi"), freeze_time("2020-12-12"):
         yield
     shutil.rmtree("test_media", ignore_errors=True)

events/filters.py

@@ -1,8 +1,4 @@
-from datetime import timedelta
-
 import django_filters
-from django.conf import settings
-from django.utils import timezone
 from graphql_relay import from_global_id
 
 from children.models import Child
@@ -14,11 +10,12 @@
 class OccurrenceFilter(django_filters.FilterSet):
     date = django_filters.DateFilter(lookup_expr="date", field_name="time")
     time = django_filters.TimeFilter(method="filter_by_time", field_name="time")
-    upcoming = django_filters.BooleanFilter(
-        method="filter_by_upcoming", field_name="time"
-    )
+    upcoming = django_filters.BooleanFilter(method="filter_by_upcoming")
     upcoming_with_leeway = django_filters.BooleanFilter(
-        method="filter_by_upcoming_with_leeway", field_name="time"
+        method="filter_by_upcoming_with_leeway"
+    )
+    upcoming_with_ongoing = django_filters.BooleanFilter(
+        method="filter_by_upcoming_with_ongoing"
     )
     venue_id = django_filters.CharFilter(
         field_name="venue", method="filter_by_venue_global_id"
@@ -49,20 +46,17 @@ def filter_by_time(self, qs, name, value):
 
     def filter_by_upcoming(self, qs, name, value):
         if value:
-            return qs.filter(**{name + "__gte": timezone.now()})
+            return qs.upcoming()
         return qs
 
     def filter_by_upcoming_with_leeway(self, qs, name, value):
         if value:
-            return qs.filter(
-                **{
-                    name
-                    + "__gte": timezone.now()
-                    - timedelta(
-                        minutes=settings.KUKKUU_ENROLLED_OCCURRENCE_IN_PAST_LEEWAY
-                    )
-                }
-            )
+            return qs.upcoming_with_leeway()
+        return qs
+
+    def filter_by_upcoming_with_ongoing(self, qs, name, value):
+        if value:
+            return qs.upcoming_with_ongoing()
         return qs
 
     def filter_by_venue_global_id(self, qs, name, value):
@@ -86,9 +80,6 @@ class EventFilter(django_filters.FilterSet):
         method="filter_by_available_for_child"
     )
     upcoming = django_filters.BooleanFilter(method="filter_by_upcoming")
-    upcoming_with_leeway = django_filters.BooleanFilter(
-        method="filter_by_upcoming_with_leeway"
-    )
 
     class Meta:
         model = Event
@@ -109,8 +100,3 @@ def filter_by_upcoming(self, qs, name, value):
         if value:
             return qs.upcoming()
         return qs
-
-    def filter_by_upcoming_with_leeway(self, qs, name, value):
-        if value:
-            return qs.upcoming_with_leeway()
-        return qs

events/models.py

@@ -44,12 +44,6 @@ def published(self):
     def upcoming(self):
         return self.filter(events__occurrences__time__gte=timezone.now()).distinct()
 
-    def upcoming_with_leeway(self):
-        return self.filter(
-            events__occurrences__time__gte=timezone.now()
-            - timedelta(minutes=settings.KUKKUU_ENROLLED_OCCURRENCE_IN_PAST_LEEWAY)
-        ).distinct()
-
 
 class EventGroup(TimestampedModel, TranslatableModel):
     translations = TranslatedFields(
@@ -152,12 +146,6 @@ def unpublished(self):
     def upcoming(self):
         return self.filter(occurrences__time__gte=timezone.now()).distinct()
 
-    def upcoming_with_leeway(self):
-        return self.filter(
-            occurrences__time__gte=timezone.now()
-            - timedelta(minutes=settings.KUKKUU_ENROLLED_OCCURRENCE_IN_PAST_LEEWAY)
-        ).distinct()
-
     def available(self, child):
         """
         A child's available events must match all of the following rules:
@@ -369,11 +357,38 @@ def send_free_spot_notifications_if_needed(self):
             obj.send_free_spot_notifications_if_needed()
 
     def upcoming(self):
-        return self.filter(time__gt=timezone.now())
+        return self.filter(time__gte=timezone.now())
+
+    def upcoming_with_leeway(self):
+        return self.filter(
+            time__gte=timezone.now()
+            - timedelta(minutes=settings.KUKKUU_ENROLLED_OCCURRENCE_IN_PAST_LEEWAY)
+        )
+
+    def upcoming_with_ongoing(self):
+        """Return occurrences that are upcoming or still ongoing (with added leeway)."""
+        qs = self.with_end_time()
+        return qs.filter(
+            end_time__gte=timezone.now()
+            - timedelta(minutes=settings.KUKKUU_ENROLLED_OCCURRENCE_IN_PAST_LEEWAY)
+        )
 
     def in_past(self):
         return self.exclude(time__gt=timezone.now())
 
+    def with_end_time(self):
+        return self.annotate(
+            end_time=ExpressionWrapper(
+                F("time")
+                + Coalesce(
+                    F("event__duration"),
+                    settings.KUKKUU_DEFAULT_EVENT_DURATION,
+                )
+                * timedelta(minutes=1),
+                output_field=models.DateTimeField(),
+            ),
+        )
+
 
 class Occurrence(TimestampedModel):
     time = models.DateTimeField(verbose_name=_("time"))
@@ -506,7 +521,20 @@ def delete(self):
             enrolment.delete()
 
     def upcoming(self):
-        return self.filter(occurrence__time__gt=timezone.now())
+        return self.filter(occurrence__time__gte=timezone.now())
+
+    def with_end_time(self):
+        return self.annotate(
+            end_time=ExpressionWrapper(
+                F("occurrence__time")
+                + Coalesce(
+                    F("occurrence__event__duration"),
+                    settings.KUKKUU_DEFAULT_EVENT_DURATION,
+                )
+                * timedelta(minutes=1),
+                output_field=models.DateTimeField(),
+            ),
+        )
 
     def send_reminder_notifications(self):
         today = timezone.localtime().date()
@@ -531,15 +559,7 @@ def send_feedback_notifications(self):
         delay = timedelta(minutes=settings.KUKKUU_FEEDBACK_NOTIFICATION_DELAY)
 
         enrolments = (
-            self.annotate(
-                end_time=ExpressionWrapper(
-                    F("occurrence__time")
-                    # use 120min as the default value for duration
-                    + Coalesce(F("occurrence__event__duration"), 120)
-                    * timedelta(minutes=1),
-                    output_field=models.DateTimeField(),
-                ),
-            )
+            self.with_end_time()
             .filter(
                 feedback_notification_sent_at=None,
                 child__guardians__isnull=False,

events/schema.py

@@ -1000,7 +1000,6 @@ class Query:
         EventOrEventGroupConnection,
         project_id=graphene.ID(),
         upcoming=graphene.Boolean(),
-        upcoming_with_leeway=graphene.Boolean(),
     )
     occurrences = DjangoFilterConnectionField(OccurrenceNode)
 
@@ -1020,10 +1019,7 @@ def resolve_events_and_event_groups(self, info, **kwargs):
             event_qs = event_qs.filter(project_id=project_id)
             event_group_qs = event_group_qs.filter(project_id=project_id)
 
-        if kwargs.get("upcoming_with_leeway", False):
-            event_qs = event_qs.upcoming_with_leeway()
-            event_group_qs = event_group_qs.upcoming_with_leeway()
-        elif kwargs.get("upcoming", False):
+        if kwargs.get("upcoming", False):
             event_qs = event_qs.upcoming()
             event_group_qs = event_group_qs.upcoming()
 

events/tests/snapshots/snap_test_api.py

@@ -524,15 +524,15 @@
     }
 }
 
-snapshots["test_events_and_event_groups_query_upcoming_filter[False-False] 1"] = {
+snapshots["test_events_and_event_groups_query_upcoming_filter[False] 1"] = {
     "data": {
         "eventsAndEventGroups": {
             "edges": [{"node": {"__typename": "EventNode", "name": "In the future"}}]
         }
     }
 }
 
-snapshots["test_events_and_event_groups_query_upcoming_filter[False-True] 1"] = {
+snapshots["test_events_and_event_groups_query_upcoming_filter[True] 1"] = {
     "data": {
         "eventsAndEventGroups": {
             "edges": [
@@ -542,28 +542,6 @@
     }
 }
 
-snapshots["test_events_and_event_groups_query_upcoming_filter[True-False] 1"] = {
-    "data": {
-        "eventsAndEventGroups": {
-            "edges": [
-                {"node": {"__typename": "EventNode", "name": "Within leeway"}},
-                {"node": {"__typename": "EventNode", "name": "In the future"}},
-            ]
-        }
-    }
-}
-
-snapshots["test_events_and_event_groups_query_upcoming_filter[True-True] 1"] = {
-    "data": {
-        "eventsAndEventGroups": {
-            "edges": [
-                {"node": {"__typename": "EventGroupNode", "name": "Within leeway"}},
-                {"node": {"__typename": "EventGroupNode", "name": "In the future"}},
-            ]
-        }
-    }
-}
-
 snapshots["test_events_query_normal_user 1"] = {
     "data": {
         "events": {
@@ -1004,6 +982,23 @@
     }
 }
 
+snapshots["test_occurrences_filter_by_upcoming_with_ongoing[False] 1"] = {
+    "data": {
+        "occurrences": {
+            "edges": [
+                {"node": {"time": "2020-12-11T22:29:00+00:00"}},
+                {"node": {"time": "2020-12-11T22:31:00+00:00"}},
+            ]
+        }
+    }
+}
+
+snapshots["test_occurrences_filter_by_upcoming_with_ongoing[True] 1"] = {
+    "data": {
+        "occurrences": {"edges": [{"node": {"time": "2020-12-11T22:31:00+00:00"}}]}
+    }
+}
+
 snapshots["test_occurrences_filter_by_venue 1"] = {
     "data": {
         "occurrences": {
@@ -1527,7 +1522,7 @@
     "data": {
         "verifyTicket": {
             "eventName": "Record card my. Sure sister return.",
-            "occurrenceTime": "2020-12-13T00:00:00+00:00",
+            "occurrenceTime": "2020-12-12T00:00:00+00:00",
             "validity": True,
             "venueName": "Remember stay public high concern glass person.",
         }