Add ApplicationSection and RecurringReservation Pindora GraphQL info

backend/pyproject.toml

@@ -22,7 +22,7 @@ django-filter = "24.3"
 django-health-check = "3.18.3"
 django-helusers = "0.13.0"
 django-jinja = "2.11.0"
-django-lookup-property = "0.1.7"
+django-lookup-property = "0.1.8"
 django-modeltranslation = "0.19.12"
 django-mptt = "0.16.0"
 django-redis = "5.4.0"

backend/tests/factories/__init__.py

@@ -33,6 +33,7 @@
 from .reservation_metadata_set import ReservationMetadataSetFactory
 from .reservation_purpose import ReservationPurposeFactory
 from .reservation_unit import ReservationUnitFactory
+from .reservation_unit_access_type import ReservationUnitAccessTypeFactory
 from .reservation_unit_cancellation_rule import ReservationUnitCancellationRuleFactory
 from .reservation_unit_image import ReservationUnitImageFactory
 from .reservation_unit_option import ReservationUnitOptionFactory
@@ -87,6 +88,7 @@
     "ReservationMetadataFieldFactory",
     "ReservationMetadataSetFactory",
     "ReservationPurposeFactory",
+    "ReservationUnitAccessTypeFactory",
     "ReservationUnitCancellationRuleFactory",
     "ReservationUnitFactory",
     "ReservationUnitImageFactory",

backend/tests/factories/reservation_unit.py

@@ -9,7 +9,7 @@
 from factory import LazyAttribute
 from factory.fuzzy import FuzzyInteger
 
-from tilavarauspalvelu.enums import AccessType, AuthenticationType, ReservationKind, ReservationStartInterval
+from tilavarauspalvelu.enums import AuthenticationType, ReservationKind, ReservationStartInterval
 from tilavarauspalvelu.models import ReservationUnit
 from utils.date_utils import local_start_of_day
 from utils.utils import as_p_tags
@@ -93,8 +93,6 @@ class Meta:
     min_reservation_duration = None
     buffer_time_before = factory.LazyFunction(datetime.timedelta)
     buffer_time_after = factory.LazyFunction(datetime.timedelta)
-    access_type_start_date = None
-    access_type_end_date = None
 
     # Booleans
     is_draft = False
@@ -109,7 +107,6 @@ class Meta:
     authentication = AuthenticationType.WEAK.value
     reservation_start_interval = ReservationStartInterval.INTERVAL_15_MINUTES.value
     reservation_kind = ReservationKind.DIRECT_AND_SEASON.value
-    access_type = AccessType.UNRESTRICTED.value
 
     # Lists
     search_terms = LazyAttribute(lambda i: [])
@@ -146,6 +143,7 @@ class Meta:
     recurring_reservations = ReverseForeignKeyFactory("tests.factories.RecurringReservationFactory")
     application_round_time_slots = ReverseForeignKeyFactory("tests.factories.ApplicationRoundTimeSlotFactory")
     reservation_unit_options = ReverseForeignKeyFactory("tests.factories.ReservationUnitOptionFactory")
+    access_types = ReverseForeignKeyFactory("tests.factories.ReservationUnitAccessTypeFactory")
 
     @classmethod
     def create_reservable_now(cls, **kwargs: Any) -> ReservationUnit:

backend/tests/factories/reservation_unit_access_type.py

@@ -0,0 +1,27 @@
+from __future__ import annotations
+
+import datetime
+
+from tilavarauspalvelu.enums import AccessType
+from tilavarauspalvelu.models import ReservationUnitAccessType, ReservationUnitPricing
+
+from ._base import ForeignKeyFactory, GenericDjangoModelFactory, ModelFactoryBuilder
+
+__all__ = [
+    "ReservationUnitAccessTypeBuilder",
+    "ReservationUnitAccessTypeFactory",
+]
+
+
+class ReservationUnitAccessTypeFactory(GenericDjangoModelFactory[ReservationUnitAccessType]):
+    class Meta:
+        model = ReservationUnitAccessType
+
+    begin_date = datetime.date(2021, 1, 1)
+    access_type = AccessType.UNRESTRICTED
+
+    reservation_unit = ForeignKeyFactory("tests.factories.ReservationUnitFactory")
+
+
+class ReservationUnitAccessTypeBuilder(ModelFactoryBuilder[ReservationUnitPricing]):
+    factory = ReservationUnitAccessTypeFactory

backend/tests/test_actions/test_reservation_unit_actions/test_access_types.py

@@ -0,0 +1,122 @@
+from __future__ import annotations
+
+import datetime
+
+import freezegun
+import pytest
+from lookup_property import L
+
+from tilavarauspalvelu.enums import AccessType
+from utils.date_utils import local_datetime
+
+from tests.factories import ReservationUnitAccessTypeFactory, ReservationUnitFactory
+
+pytestmark = [
+    pytest.mark.django_db,
+]
+
+
+@freezegun.freeze_time("2025-01-01")
+def test_reservation_unit__access_types__end_date():
+    now = local_datetime()
+
+    reservation_unit = ReservationUnitFactory.create()
+    ReservationUnitAccessTypeFactory.create(
+        reservation_unit=reservation_unit,
+        access_type=AccessType.UNRESTRICTED,
+        begin_date=now.date(),
+    )
+    ReservationUnitAccessTypeFactory.create(
+        reservation_unit=reservation_unit,
+        access_type=AccessType.ACCESS_CODE,
+        begin_date=now.date() + datetime.timedelta(days=7),
+    )
+
+    qs = reservation_unit.access_types.annotate(end_date=L("end_date")).order_by("begin_date").values("end_date")
+    assert list(qs) == [
+        {"end_date": datetime.date(2025, 1, 8)},
+        {"end_date": datetime.date.max},
+    ]
+
+
+@freezegun.freeze_time("2025-01-01")
+def test_reservation_unit__access_types__active():
+    now = local_datetime()
+
+    reservation_unit = ReservationUnitFactory.create()
+    ReservationUnitAccessTypeFactory.create(
+        reservation_unit=reservation_unit,
+        access_type=AccessType.UNRESTRICTED,
+        begin_date=now.date(),
+    )
+    ReservationUnitAccessTypeFactory.create(
+        reservation_unit=reservation_unit,
+        access_type=AccessType.ACCESS_CODE,
+        begin_date=now.date() + datetime.timedelta(days=7),
+    )
+
+    qs = (
+        reservation_unit.access_types.active()
+        .annotate(end_date=L("end_date"))
+        .order_by("begin_date")
+        .values("access_type", "begin_date", "end_date")
+    )
+    assert list(qs) == [
+        {
+            "access_type": AccessType.UNRESTRICTED,
+            "begin_date": datetime.date(2025, 1, 1),
+            "end_date": datetime.date(2025, 1, 8),
+        },
+    ]
+
+
+@freezegun.freeze_time("2025-01-01")
+@pytest.mark.parametrize(
+    "access_type",
+    [
+        AccessType.UNRESTRICTED,
+        AccessType.ACCESS_CODE,
+        AccessType.PHYSICAL_KEY,
+    ],
+)
+def test_reservation_unit__access_type_at(access_type):
+    now = local_datetime()
+    past = now - datetime.timedelta(days=1)
+    future = now + datetime.timedelta(days=1)
+
+    reservation_unit = ReservationUnitFactory.create(
+        access_types__access_type=access_type,
+        access_types__begin_date=now.date(),
+    )
+
+    assert reservation_unit.actions.get_access_type_at(past) is None
+    assert reservation_unit.actions.get_access_type_at(now) == access_type
+    assert reservation_unit.actions.get_access_type_at(future) == access_type
+
+    assert reservation_unit.current_access_type == access_type
+
+
+@freezegun.freeze_time("2025-01-01")
+@pytest.mark.parametrize(
+    "access_type",
+    [
+        AccessType.UNRESTRICTED,
+        AccessType.ACCESS_CODE,
+        AccessType.PHYSICAL_KEY,
+    ],
+)
+def test_reservation_unit__access_type_at__null(access_type):
+    now = local_datetime()
+    past = now - datetime.timedelta(days=1)
+    future = now + datetime.timedelta(days=1)
+
+    reservation_unit = ReservationUnitFactory.create(
+        access_types__access_type=access_type,
+        access_types__begin_date=future.date(),
+    )
+
+    assert reservation_unit.actions.get_access_type_at(past) is None
+    assert reservation_unit.actions.get_access_type_at(now) is None
+    assert reservation_unit.actions.get_access_type_at(future) == access_type
+
+    assert reservation_unit.current_access_type is None

backend/tests/test_admin/conftest.py

@@ -0,0 +1,9 @@
+from __future__ import annotations
+
+import pytest
+
+
+@pytest.fixture(autouse=True)
+def _language_fix(settings):
+    # Override languages, since TinyMCE can't handle lazy language name translations in tests ¯\_(ツ)_/¯
+    settings.LANGUAGES = [("fi", "Finnish"), ("en", "English"), ("sv", "Swedish")]

backend/tests/test_admin/helpers.py

@@ -0,0 +1,61 @@
+from __future__ import annotations
+
+from contextlib import contextmanager
+from typing import TYPE_CHECKING, Any
+from unittest.mock import patch
+
+from django.template.response import TemplateResponse
+
+if TYPE_CHECKING:
+    from collections.abc import Generator
+
+    from tilavarauspalvelu.models import ReservationUnit
+    from tilavarauspalvelu.typing import WSGIRequest
+
+
+@contextmanager
+def collect_admin_form_errors(errors: list[dict[str, Any]]) -> Generator[None, Any]:
+    """Collect errors from the admin form to the given list of errors."""
+
+    def hook(request: WSGIRequest, template: list[str], context: dict[str, Any], *args, **kwargs) -> TemplateResponse:
+        errors.extend(context["errors"].get_json_data())
+        return TemplateResponse(request, template, context, *args, **kwargs)
+
+    path = "django.contrib.admin.options.TemplateResponse"
+    with patch(path, side_effect=hook):
+        yield
+
+
+def management_form_data(name: str, *, total_forms: int = 0, initial_forms: int = 0) -> dict[str, Any]:
+    """
+    Required formset "management form" data for inline forms.
+
+    :params name: Name of the one-to-many or many-to-many relationship the inline form is for.
+    :params total_forms: Number of forms in the formset after the form has been submitted.
+    :params initial_forms: Number of forms in the formset before the form has been submitted.
+    """
+    return {
+        f"{name}-TOTAL_FORMS": total_forms,
+        f"{name}-INITIAL_FORMS": initial_forms,
+        f"{name}-MIN_NUM_FORMS": 0,
+        f"{name}-MAX_NUM_FORMS": 1000,
+    }
+
+
+def required_reservation_unit_form_data(reservation_unit: ReservationUnit) -> dict[str, Any]:
+    """Required fields for a new reservation unit."""
+    return {
+        #
+        # Required fields
+        "name": reservation_unit.name,
+        "name_fi": reservation_unit.name_fi,
+        "reservation_kind": reservation_unit.reservation_kind,
+        "authentication": reservation_unit.authentication,
+        "reservation_start_interval": reservation_unit.reservation_start_interval,
+        #
+        # Inline form metadata
+        **management_form_data("images"),
+        **management_form_data("pricings"),
+        **management_form_data("application_round_time_slots"),
+        **management_form_data("access_types"),
+    }