Ignore cancelled & denied reservations in first reservable time deduction

Author: Matti Lamppu

reservations/querysets.py

@@ -83,6 +83,7 @@ def get_affecting_reservations_as_closed_time_spans(
         # Reservations that are on the given period and contain any of the given spaces or resources.
         reservation_queryset = (
             self.filter_buffered_reservations_period(start_date=start_date, end_date=end_date)
+            .going_to_occur()
             .filter(
                 Q(reservation_unit__id__in=[info.pk for info in reservation_unit_infos])
                 | Q(reservation_unit__spaces__in=space_ids)

tests/test_graphql_api/test_reservation_unit/test_query_reservable_fields.py

@@ -9,6 +9,7 @@
 
 from applications.choices import ApplicationRoundStatusChoice
 from reservation_units.models import ReservationUnit
+from reservations.choices import ReservationStateChoice
 from tests.factories import (
     ApplicationRoundFactory,
     OriginHaukiResourceFactory,
@@ -937,6 +938,7 @@ def test__query_reservation_unit_reservable__reservations__own_reservation(graph
         begin=_datetime(day=20, hour=10),
         end=_datetime(day=20, hour=12),
         reservation_unit=[reservation_unit],
+        state=ReservationStateChoice.CREATED,
     )
 
     # 2023-05-20 10:00 - 12:00 (2h)
@@ -964,6 +966,7 @@ def test__query_reservation_unit_reservable__reservations__not_in_common_hierarc
         begin=_datetime(day=20, hour=10),
         end=_datetime(day=20, hour=12),
         reservation_unit=[reservation_unit_2],
+        state=ReservationStateChoice.CREATED,
     )
 
     # 2023-05-20 10:00 - 12:00 (2h)
@@ -994,6 +997,7 @@ def test__query_reservation_unit_reservable__reservations__in_common_hierarchy__
         begin=_datetime(day=20, hour=10),
         end=_datetime(day=20, hour=12),
         reservation_unit=[reservation_unit_2],
+        state=ReservationStateChoice.CREATED,
     )
 
     # 2023-05-20 10:00 - 12:00 (2h)
@@ -1024,6 +1028,7 @@ def test__query_reservation_unit_reservable__reservations__in_common_hierarchy__
         begin=_datetime(day=20, hour=10),
         end=_datetime(day=20, hour=12),
         reservation_unit=[reservation_unit_2],
+        state=ReservationStateChoice.CREATED,
     )
 
     # 2023-05-20 10:00 - 12:00 (2h)
@@ -1125,12 +1130,14 @@ def test__query_reservation_unit_reservable__reservations__start_and_end_same_da
         begin=_datetime(year=2024, month=1, day=8, hour=8),
         end=_datetime(year=2024, month=1, day=8, hour=11),
         reservation_unit=[reservation_unit],
+        state=ReservationStateChoice.CREATED,
     )
     # Monday | 2024-01-08 | 12:00 - 17:00 (5h)
     ReservationFactory.create(
         begin=_datetime(year=2024, month=1, day=8, hour=12),
         end=_datetime(year=2024, month=1, day=8, hour=17),
         reservation_unit=[reservation_unit],
+        state=ReservationStateChoice.CREATED,
     )
 
     # Monday | 2024-01-08 | 08:00 - 20:30 (12.5h)
@@ -1174,6 +1181,7 @@ def test__query_reservation_unit_reservable__reservations__filter_start_time_at_
         begin=_datetime(year=2024, month=1, day=9, hour=14),
         end=_datetime(year=2024, month=1, day=9, hour=15, minute=30),
         reservation_unit=[reservation_unit],
+        state=ReservationStateChoice.CREATED,
     )
 
     # Monday | 2024-01-09 | 08:00 - 20:30 (12.5h)
@@ -1199,3 +1207,46 @@ def test__query_reservation_unit_reservable__reservations__filter_start_time_at_
         "isClosed": False,
         "firstReservableDatetime": _datetime(year=2024, month=1, day=9, hour=15, minute=30).isoformat(),
     }
+
+
+@pytest.mark.parametrize(
+    "state",
+    [ReservationStateChoice.CANCELLED, ReservationStateChoice.DENIED],
+)
+@freezegun.freeze_time(datetime(2024, 1, 4, tzinfo=DEFAULT_TIMEZONE))
+def test__query_reservation_unit_reservable__reservations__dont_include_cancelled_or_denied_reservations(
+    graphql,
+    reservation_unit,
+    state,
+):
+    reservation_unit.reservation_start_interval = ReservationUnit.RESERVATION_START_INTERVAL_30_MINUTES
+    reservation_unit.save()
+
+    # Monday | 2024-01-09 | 10:00 - 12:00 (2h)
+    ReservationFactory.create(
+        begin=_datetime(year=2024, month=1, day=9, hour=10),
+        end=_datetime(year=2024, month=1, day=9, hour=12),
+        reservation_unit=[reservation_unit],
+        state=state,
+    )
+
+    # Monday | 2024-01-09 | 10:00 - 20:30 (12.5h)
+    ReservableTimeSpanFactory.create(
+        resource=reservation_unit.origin_hauki_resource,
+        start_datetime=_datetime(year=2024, month=1, day=9, hour=10),
+        end_datetime=_datetime(year=2024, month=1, day=9, hour=20),
+    )
+
+    query = reservation_units_reservable_query(
+        reservable_date_start="2024-01-09",
+        reservable_date_end="2024-01-09",
+    )
+
+    response = graphql(query)
+
+    assert response.has_errors is False, response
+    assert len(response.edges) == 1, response
+    assert response.node(0) == {
+        "isClosed": False,
+        "firstReservableDatetime": _datetime(year=2024, month=1, day=9, hour=10).isoformat(),
+    }

tests/test_querysets/test_reservation_querysets.py

@@ -5,6 +5,7 @@
 
 from opening_hours.utils.reservable_time_span_client import TimeSpanElement
 from reservation_units.models import ReservationUnit
+from reservations.choices import ReservationStateChoice
 from reservations.models import Reservation
 from tests.factories import (
     ReservationFactory,
@@ -43,6 +44,7 @@ def _create_test_reservations_for_all_reservation_units() -> None:
             end=_datetime(minute=0),
             reservation_unit=[reservation_unit],
             user=None,
+            state=ReservationStateChoice.CREATED,
         )