Seasonal Reservation Email Fixes

templates/email/html/seasonal_reservation_modified_series.jinja

@@ -4,8 +4,8 @@
     <mj-text>{{ text_reservation_modified | sentence | safe }}</mj-text>
     {% include "email/html/partials/application_section_name.jinja" %}
     <mj-spacer />
-    <mj-text font-size="16px">{{ weekday_label | safe }}: {{ weekday_value | safe }}</mj-text>
-    <mj-text font-size="16px">{{ time_label | safe }}: {{ time_value | safe }}</mj-text>
+    <mj-text>{{ weekday_label | safe }}: {{ weekday_value | safe }}</mj-text>
+    <mj-text>{{ time_label | safe }}: {{ time_value | safe }}</mj-text>
     <mj-spacer />
     <mj-text>{{ check_booking_details_text | safe }}: {{ check_booking_details_url_html | safe }}</mj-text>
 {% endblock %}

templates/email/html/seasonal_reservation_rejected_series.jinja

@@ -5,8 +5,8 @@
     <mj-text>{{ rejection_reason_label | safe }}: {{ rejection_reason | safe }}</mj-text>
     {% include "email/html/partials/application_section_name.jinja" %}
     <mj-spacer />
-    <mj-text font-size="16px">{{ weekday_label | safe }}: {{ weekday_value | safe }}</mj-text>
-    <mj-text font-size="16px">{{ time_label | safe }}: {{ time_value | safe }}</mj-text>
+    <mj-text>{{ weekday_label | safe }}: {{ weekday_value | safe }}</mj-text>
+    <mj-text>{{ time_label | safe }}: {{ time_value | safe }}</mj-text>
     <mj-spacer />
     <mj-text>{{ check_booking_details_text | safe }}: {{ check_booking_details_url_html | safe }}</mj-text>
 {% endblock %}

tests/test_integrations/test_email/test_email_service.py

@@ -1173,6 +1173,7 @@ def test_email_service__send_seasonal_reservation_modified_single(outbox):
 def test_email_service__send_seasonal_reservation_rejected_series(outbox):
     reservation_series = create_reservation_series(
         reservations__type=ReservationTypeChoice.SEASONAL,
+        reservations__state=ReservationStateChoice.DENIED,
         allocated_time_slot__day_of_the_week=Weekday.MONDAY,
         allocated_time_slot__reservation_unit_option__application_section__application__user__email="user@email.com",
         allocated_time_slot__reservation_unit_option__application_section__application__contact_person__email="contact@email.com",

tilavarauspalvelu/admin/email_template/utils.py

@@ -31,6 +31,7 @@
     get_context_for_staff_notification_application_section_cancelled,
 )
 from tilavarauspalvelu.integrations.email.template_context.common import get_staff_reservations_ext_link
+from tilavarauspalvelu.translation import get_translated
 from utils.date_utils import local_datetime
 
 if TYPE_CHECKING:
@@ -41,6 +42,7 @@
 ]
 
 
+@get_translated
 def get_mock_data(*, email_type: EmailType, language: Lang, **kwargs: Any) -> EmailContext | None:  # noqa: PLR0912, PLR0911
     email_recipient_name = kwargs.get("email_recipient_name", "[SÄHKÖPOSTIN VASTAANOTTAJAN NIMI]")
     reservee_name = kwargs.get("reservee_name", "[VARAAJAN NIMI]")
@@ -62,20 +64,20 @@ def get_mock_data(*, email_type: EmailType, language: Lang, **kwargs: Any) -> Em
     confirmed_instructions = kwargs.get("confirmed_instructions", "[HYVÄKSYTYN VARAUKSEN OHJEET]")
     cancelled_instructions = kwargs.get("cancelled_instructions", "[PERUUTETUN VARAUKSEN OHJEET]")
     pending_instructions = kwargs.get("pending_instructions", "[KÄSITELTÄVÄN VARAUKSEN OHJEET]")
-    weekday_value = kwargs.get("weekday_value", "Monday")
+    weekday_value = kwargs.get("weekday_value", str(WeekdayChoice.MONDAY.label))
     time_value = kwargs.get("time_value", "13:00-15:00")
     application_section_name = kwargs.get("application_section_name", "[HAKEMUKSEN OSAN NIMI]")
     application_round_name = kwargs.get("application_round_name", "[KAUSIVARAUSKIERROKSEN NIMI]")
     cancelled_reservation_series = kwargs.get(
         "cancelled_reservation_series",
         [
             {
-                "weekday": WeekdayChoice.MONDAY.label,
+                "weekday": str(WeekdayChoice.MONDAY.label),
                 "time": "13:00-15:00",
                 "url": get_staff_reservations_ext_link(reservation_id=1234),
             },
             {
-                "weekday": WeekdayChoice.TUESDAY.label,
+                "weekday": str(WeekdayChoice.TUESDAY.label),
                 "time": "21:00-22:00",
                 "url": get_staff_reservations_ext_link(reservation_id=5678),
             },

tilavarauspalvelu/admin/recurring_reservation/admin.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 from django.contrib import admin
+from django.contrib.admin import EmptyFieldListFilter
 
 from tilavarauspalvelu.admin.reservation.admin import ReservationInline
 from tilavarauspalvelu.models import RecurringReservation
@@ -18,9 +19,10 @@ class RecurringReservationAdmin(admin.ModelAdmin):
         "end_date",
         "recurrence_in_days",
     ]
+    list_filter = [("allocated_time_slot", EmptyFieldListFilter)]
+
+    # Form
     readonly_fields = [
         "ext_uuid",
     ]
-
-    # Form
     inlines = [ReservationInline]

tilavarauspalvelu/integrations/email/template_context/common.py

@@ -208,7 +208,9 @@ def params_for_reservation_series_info(*, reservation_series: RecurringReservati
 def params_for_application_section_info(*, application_section: ApplicationSection, language: Lang) -> dict[str, Any]:
     return {
         "application_section_name": application_section.name,
-        "application_round_name": get_attr_by_language(application_section.application, "name", language=language),
+        "application_round_name": get_attr_by_language(
+            application_section.application.application_round, "name", language=language
+        ),
     }
 
 

tilavarauspalvelu/integrations/email/template_context/reservation.py

@@ -4,6 +4,7 @@
 
 from django.utils.translation import pgettext
 
+from tilavarauspalvelu.enums import ReservationStateChoice
 from tilavarauspalvelu.translation import get_attr_by_language, get_translated
 from utils.date_utils import local_date
 
@@ -740,7 +741,7 @@ def get_context_for_seasonal_reservation_rejected_series(
 ) -> EmailContext:
     if reservation_series is not None:
         section = reservation_series.allocated_time_slot.reservation_unit_option.application_section
-        reservation = reservation_series.reservations.first()
+        reservation = reservation_series.reservations.filter(state=ReservationStateChoice.DENIED).last()
 
         data: dict[str, Any] = {
             "email_recipient_name": section.application.applicant,