generated from bisco/codex-bootstrap
Compare commits
22 Commits
v0.1.0-mvp
...
d6d83fbb07
| Author | SHA1 | Date | |
|---|---|---|---|
| d6d83fbb07 | |||
| f343512ec2 | |||
| 769614278c | |||
| bc6f1c3c2e | |||
| c725fdb912 | |||
| cafa9226e3 | |||
| 9a378902d5 | |||
| 099b2f10ca | |||
| 9c9acd3e1d | |||
| 833d4e629c | |||
| 240ea3aba3 | |||
| 8a47740049 | |||
| ff9f9f2716 | |||
| 05de8c75a2 | |||
| 3dca43bc5c | |||
| 1629544b76 | |||
| 47449ce8dd | |||
| ded07346a6 | |||
| b51ca9fdbf | |||
| 7c90da5884 | |||
| ffbe1a5b04 | |||
| 1a5e9103f6 |
@@ -32,3 +32,4 @@ ENVIRONMENT=local
|
||||
|
||||
# Local convention: nginx is the public entrypoint on http://localhost.
|
||||
# If you change the published nginx port, update SITE_BASE_URL and trusted origins to match.
|
||||
# In local/debug mode, failed or attempted reservation emails also log the confirmation URL for manual browser testing.
|
||||
|
||||
@@ -9,6 +9,7 @@ from django.core.exceptions import ImproperlyConfigured
|
||||
BASE_DIR = Path(__file__).resolve().parent.parent
|
||||
|
||||
DEBUG = os.environ.get("DJANGO_DEBUG", "false").lower() == "true"
|
||||
ENVIRONMENT = os.environ.get("ENVIRONMENT", "production").lower()
|
||||
SECRET_KEY = os.environ.get("DJANGO_SECRET_KEY")
|
||||
if not SECRET_KEY:
|
||||
if DEBUG:
|
||||
@@ -25,6 +26,7 @@ ALLOWED_HOSTS = csv_env("DJANGO_ALLOWED_HOSTS", "localhost,127.0.0.1")
|
||||
CSRF_TRUSTED_ORIGINS = csv_env("DJANGO_CSRF_TRUSTED_ORIGINS")
|
||||
CORS_ALLOWED_ORIGINS = csv_env("CORS_ALLOWED_ORIGINS")
|
||||
SITE_BASE_URL = os.environ.get("SITE_BASE_URL", "http://localhost").rstrip("/")
|
||||
LOG_RESERVATION_CONFIRMATION_URLS = DEBUG or ENVIRONMENT == "local"
|
||||
|
||||
INSTALLED_APPS = [
|
||||
"django.contrib.admin",
|
||||
@@ -114,6 +116,8 @@ if "test" in sys.argv:
|
||||
|
||||
STATIC_URL = "/static/"
|
||||
STATIC_ROOT = BASE_DIR / "staticfiles"
|
||||
MEDIA_URL = "/media/"
|
||||
MEDIA_ROOT = BASE_DIR / "media"
|
||||
DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"
|
||||
|
||||
REST_FRAMEWORK = {
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
from django.contrib import admin
|
||||
from django.conf import settings
|
||||
from django.conf.urls.static import static
|
||||
from django.urls import include, path
|
||||
from rest_framework.decorators import api_view
|
||||
from rest_framework.response import Response
|
||||
@@ -16,3 +18,6 @@ urlpatterns = [
|
||||
path("api/", include("bookings.urls")),
|
||||
path("api/", include("checkins.urls")),
|
||||
]
|
||||
|
||||
if settings.DEBUG:
|
||||
urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
|
||||
|
||||
+218
-1
@@ -1,8 +1,23 @@
|
||||
from django import forms
|
||||
from django.contrib import admin, messages
|
||||
from django.http import HttpResponseRedirect
|
||||
from django.template.response import TemplateResponse
|
||||
from django.urls import path, reverse
|
||||
from django.utils.html import format_html
|
||||
|
||||
from .models import Reservation, ReservationToken
|
||||
from .services import PerformanceNotAvailable, create_pending_reservation
|
||||
from .services import (
|
||||
AlreadyConfirmedReservation,
|
||||
NotEnoughSeats,
|
||||
PerformanceNotAvailable,
|
||||
ReservationNotConfirmed,
|
||||
ReservationNotPending,
|
||||
confirm_reservation_manually,
|
||||
create_pending_reservation,
|
||||
issue_check_in_access_for_reservation,
|
||||
)
|
||||
from checkins.models import CheckIn
|
||||
from checkins.services import AlreadyCheckedIn, confirm_check_in_for_reservation
|
||||
|
||||
|
||||
class ReservationAdminForm(forms.ModelForm):
|
||||
@@ -83,6 +98,8 @@ class ReservationAdmin(admin.ModelAdmin):
|
||||
"venue_name",
|
||||
"confirmation_state_display",
|
||||
"check_in_state_display",
|
||||
"check_in_access_display",
|
||||
"operational_tools",
|
||||
"created_at",
|
||||
"updated_at",
|
||||
"confirmed_at",
|
||||
@@ -90,6 +107,27 @@ class ReservationAdmin(admin.ModelAdmin):
|
||||
)
|
||||
autocomplete_fields = ("performance",)
|
||||
|
||||
def get_urls(self):
|
||||
urls = super().get_urls()
|
||||
custom_urls = [
|
||||
path(
|
||||
"<path:object_id>/manual-confirm/",
|
||||
self.admin_site.admin_view(self.manual_confirm_view),
|
||||
name="bookings_reservation_manual_confirm",
|
||||
),
|
||||
path(
|
||||
"<path:object_id>/check-in-pass/",
|
||||
self.admin_site.admin_view(self.check_in_pass_view),
|
||||
name="bookings_reservation_check_in_pass",
|
||||
),
|
||||
path(
|
||||
"<path:object_id>/manual-check-in/",
|
||||
self.admin_site.admin_view(self.manual_check_in_view),
|
||||
name="bookings_reservation_manual_check_in",
|
||||
),
|
||||
]
|
||||
return custom_urls + urls
|
||||
|
||||
def get_queryset(self, request):
|
||||
return super().get_queryset(request).select_related(
|
||||
"performance",
|
||||
@@ -149,6 +187,8 @@ class ReservationAdmin(admin.ModelAdmin):
|
||||
"status",
|
||||
"confirmation_state_display",
|
||||
"check_in_state_display",
|
||||
"check_in_access_display",
|
||||
"operational_tools",
|
||||
"confirmed_at",
|
||||
"qr_code_generated_at",
|
||||
),
|
||||
@@ -228,6 +268,183 @@ class ReservationAdmin(admin.ModelAdmin):
|
||||
def check_in_state_display(self, obj):
|
||||
return "Checked in" if hasattr(obj, "check_in") else "Not checked in"
|
||||
|
||||
@admin.display(description="Check-in access")
|
||||
def check_in_access_display(self, obj):
|
||||
if obj.status != Reservation.Status.CONFIRMED:
|
||||
return "Available after confirmation"
|
||||
|
||||
url = reverse("admin:bookings_reservation_check_in_pass", args=[obj.pk])
|
||||
return format_html('<a href="{}">Generate operational QR / URL</a>', url)
|
||||
|
||||
@admin.display(description="Operational tools")
|
||||
def operational_tools(self, obj):
|
||||
links = []
|
||||
if obj.status == Reservation.Status.PENDING:
|
||||
confirm_url = reverse("admin:bookings_reservation_manual_confirm", args=[obj.pk])
|
||||
links.append(f'<a href="{confirm_url}">Confirm reservation now</a>')
|
||||
if obj.status == Reservation.Status.CONFIRMED and not hasattr(obj, "check_in"):
|
||||
check_in_url = reverse("admin:bookings_reservation_manual_check_in", args=[obj.pk])
|
||||
links.append(f'<a href="{check_in_url}">Mark as checked in</a>')
|
||||
if obj.status == Reservation.Status.CONFIRMED:
|
||||
pass_url = reverse("admin:bookings_reservation_check_in_pass", args=[obj.pk])
|
||||
links.append(f'<a href="{pass_url}">Show QR / check-in URL</a>')
|
||||
if not links:
|
||||
return "-"
|
||||
return format_html(" | ".join(links))
|
||||
|
||||
def manual_confirm_view(self, request, object_id):
|
||||
reservation = self.get_object(request, object_id)
|
||||
if reservation is None:
|
||||
return self._redirect_to_changelist()
|
||||
|
||||
if request.method == "POST":
|
||||
try:
|
||||
result = confirm_reservation_manually(reservation_id=reservation.pk)
|
||||
except AlreadyConfirmedReservation:
|
||||
self.message_user(request, "Reservation is already confirmed.", level=messages.WARNING)
|
||||
return HttpResponseRedirect(self._change_url(reservation.pk))
|
||||
except ReservationNotPending as exc:
|
||||
self.message_user(request, str(exc), level=messages.ERROR)
|
||||
return HttpResponseRedirect(self._change_url(reservation.pk))
|
||||
except NotEnoughSeats as exc:
|
||||
self.message_user(request, str(exc), level=messages.ERROR)
|
||||
return HttpResponseRedirect(self._change_url(reservation.pk))
|
||||
|
||||
self.message_user(
|
||||
request,
|
||||
"Reservation confirmed manually. A check-in token was generated for operations.",
|
||||
level=messages.SUCCESS,
|
||||
)
|
||||
return self._render_operation_page(
|
||||
request,
|
||||
reservation=result.reservation,
|
||||
title="Reservation confirmed manually",
|
||||
heading="Reservation confirmed manually",
|
||||
description=(
|
||||
"Use this operational QR code or check-in URL only when the guest cannot complete the normal email flow."
|
||||
),
|
||||
qr_code_image=result.qr_code_image,
|
||||
qr_code_url=result.qr_code_url,
|
||||
)
|
||||
|
||||
return self._render_operation_page(
|
||||
request,
|
||||
reservation=reservation,
|
||||
title="Confirm reservation manually",
|
||||
heading="Confirm reservation manually",
|
||||
description=(
|
||||
"This bypasses guest email confirmation, but still rechecks booking availability and generates a check-in token."
|
||||
),
|
||||
submit_label="Confirm reservation",
|
||||
)
|
||||
|
||||
def check_in_pass_view(self, request, object_id):
|
||||
reservation = self.get_object(request, object_id)
|
||||
if reservation is None:
|
||||
return self._redirect_to_changelist()
|
||||
|
||||
if request.method == "POST":
|
||||
try:
|
||||
result = issue_check_in_access_for_reservation(reservation_id=reservation.pk)
|
||||
except ReservationNotConfirmed as exc:
|
||||
self.message_user(request, str(exc), level=messages.ERROR)
|
||||
return HttpResponseRedirect(self._change_url(reservation.pk))
|
||||
|
||||
self.message_user(
|
||||
request,
|
||||
"Operational check-in access generated for this reservation.",
|
||||
level=messages.SUCCESS,
|
||||
)
|
||||
return self._render_operation_page(
|
||||
request,
|
||||
reservation=result.reservation,
|
||||
title="Operational check-in access",
|
||||
heading="Operational check-in access",
|
||||
description=(
|
||||
"This page shows a one-time operational QR code and check-in URL for manual testing or guest support."
|
||||
),
|
||||
qr_code_image=result.qr_code_image,
|
||||
qr_code_url=result.qr_code_url,
|
||||
)
|
||||
|
||||
return self._render_operation_page(
|
||||
request,
|
||||
reservation=reservation,
|
||||
title="Generate operational check-in access",
|
||||
heading="Generate operational check-in access",
|
||||
description=(
|
||||
"Generate a fresh QR code and check-in URL without exposing token hashes in normal admin screens."
|
||||
),
|
||||
submit_label="Generate QR / URL",
|
||||
)
|
||||
|
||||
def manual_check_in_view(self, request, object_id):
|
||||
reservation = self.get_object(request, object_id)
|
||||
if reservation is None:
|
||||
return self._redirect_to_changelist()
|
||||
|
||||
if request.method == "POST":
|
||||
try:
|
||||
confirm_check_in_for_reservation(
|
||||
reservation_id=reservation.pk,
|
||||
staff_user=request.user,
|
||||
source=CheckIn.Source.MANUAL,
|
||||
)
|
||||
except ReservationNotConfirmed as exc:
|
||||
self.message_user(request, str(exc), level=messages.ERROR)
|
||||
return HttpResponseRedirect(self._change_url(reservation.pk))
|
||||
except AlreadyCheckedIn:
|
||||
self.message_user(request, "Reservation has already been checked in.", level=messages.WARNING)
|
||||
return HttpResponseRedirect(self._change_url(reservation.pk))
|
||||
|
||||
self.message_user(request, "Reservation marked as checked in.", level=messages.SUCCESS)
|
||||
return HttpResponseRedirect(self._change_url(reservation.pk))
|
||||
|
||||
return self._render_operation_page(
|
||||
request,
|
||||
reservation=reservation,
|
||||
title="Mark reservation as checked in",
|
||||
heading="Mark reservation as checked in",
|
||||
description="Use this only for staff-side emergency or desk check-in workflows.",
|
||||
submit_label="Confirm check-in",
|
||||
)
|
||||
|
||||
def _change_url(self, reservation_id):
|
||||
return reverse("admin:bookings_reservation_change", args=[reservation_id])
|
||||
|
||||
def _redirect_to_changelist(self):
|
||||
return HttpResponseRedirect(reverse("admin:bookings_reservation_changelist"))
|
||||
|
||||
def _render_operation_page(
|
||||
self,
|
||||
request,
|
||||
*,
|
||||
reservation,
|
||||
title,
|
||||
heading,
|
||||
description,
|
||||
submit_label=None,
|
||||
qr_code_image=None,
|
||||
qr_code_url=None,
|
||||
):
|
||||
context = {
|
||||
**self.admin_site.each_context(request),
|
||||
"opts": self.model._meta,
|
||||
"original": reservation,
|
||||
"title": title,
|
||||
"heading": heading,
|
||||
"description": description,
|
||||
"submit_label": submit_label,
|
||||
"qr_code_image": qr_code_image,
|
||||
"qr_code_url": qr_code_url,
|
||||
"change_url": self._change_url(reservation.pk),
|
||||
}
|
||||
return TemplateResponse(
|
||||
request,
|
||||
"admin/bookings/reservation/operation.html",
|
||||
context,
|
||||
)
|
||||
|
||||
|
||||
@admin.register(ReservationToken)
|
||||
class ReservationTokenAdmin(admin.ModelAdmin):
|
||||
|
||||
@@ -13,6 +13,16 @@ def build_confirmation_link(raw_confirmation_token):
|
||||
return f"{settings.SITE_BASE_URL}{CONFIRMATION_PATH}?token={raw_confirmation_token}"
|
||||
|
||||
|
||||
def _log_confirmation_link_for_local_debug(*, confirmation_link):
|
||||
if not settings.LOG_RESERVATION_CONFIRMATION_URLS:
|
||||
return
|
||||
|
||||
logger.warning(
|
||||
"LOCAL DEV confirmation URL: %s",
|
||||
confirmation_link,
|
||||
)
|
||||
|
||||
|
||||
def send_confirmation_email(*, reservation, raw_confirmation_token):
|
||||
confirmation_link = build_confirmation_link(raw_confirmation_token)
|
||||
subject = f"Confirm your reservation for {reservation.performance.show.title}"
|
||||
@@ -23,6 +33,10 @@ def send_confirmation_email(*, reservation, raw_confirmation_token):
|
||||
"If you did not request this reservation, you can ignore this email."
|
||||
)
|
||||
|
||||
_log_confirmation_link_for_local_debug(
|
||||
confirmation_link=confirmation_link,
|
||||
)
|
||||
|
||||
try:
|
||||
send_mail(
|
||||
subject=subject,
|
||||
@@ -32,6 +46,13 @@ def send_confirmation_email(*, reservation, raw_confirmation_token):
|
||||
fail_silently=False,
|
||||
)
|
||||
except Exception:
|
||||
if settings.LOG_RESERVATION_CONFIRMATION_URLS:
|
||||
logger.warning(
|
||||
"Local/debug email delivery failed for reservation %s.",
|
||||
reservation.id,
|
||||
)
|
||||
return
|
||||
|
||||
logger.exception(
|
||||
"Failed to send confirmation email for reservation %s.",
|
||||
reservation.id,
|
||||
|
||||
@@ -44,7 +44,9 @@ class Reservation(TimeStampedModel):
|
||||
]
|
||||
|
||||
def __str__(self):
|
||||
return f"{self.name} ({self.party_size}) for {self.performance}"
|
||||
if self.party_size > 1:
|
||||
return f"{self.name} ({self.party_size})"
|
||||
return self.name
|
||||
|
||||
@property
|
||||
def is_confirmed(self):
|
||||
|
||||
@@ -7,11 +7,11 @@ from django.conf import settings
|
||||
from .models import Reservation
|
||||
|
||||
|
||||
CHECK_IN_PREVIEW_PATH = "/api/check-ins/preview/"
|
||||
CHECK_IN_PAGE_PATH = "/check-in"
|
||||
|
||||
|
||||
def build_check_in_preview_url(raw_check_in_token):
|
||||
return f"{settings.SITE_BASE_URL}{CHECK_IN_PREVIEW_PATH}?token={raw_check_in_token}"
|
||||
return f"{settings.SITE_BASE_URL}{CHECK_IN_PAGE_PATH}?token={raw_check_in_token}"
|
||||
|
||||
|
||||
def generate_check_in_qr_png(raw_check_in_token):
|
||||
|
||||
@@ -44,6 +44,10 @@ class ReservationNotConfirmed(BookingServiceError):
|
||||
pass
|
||||
|
||||
|
||||
class ReservationNotPending(BookingServiceError):
|
||||
pass
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class PendingReservationResult:
|
||||
reservation: Reservation
|
||||
@@ -55,7 +59,7 @@ class PendingReservationResult:
|
||||
@dataclass(frozen=True)
|
||||
class ConfirmedReservationResult:
|
||||
reservation: Reservation
|
||||
confirmation_token: ReservationToken
|
||||
confirmation_token: ReservationToken | None
|
||||
check_in_token: ReservationToken
|
||||
raw_check_in_token: str
|
||||
available_seats: int
|
||||
@@ -70,6 +74,15 @@ class ReservationQRResult:
|
||||
qr_code_url: str
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class ReservationCheckInAccessResult:
|
||||
reservation: Reservation
|
||||
check_in_token: ReservationToken
|
||||
raw_check_in_token: str
|
||||
qr_code_image: str
|
||||
qr_code_url: str
|
||||
|
||||
|
||||
def calculate_available_seats(performance):
|
||||
confirmed_seats = (
|
||||
Reservation.objects.filter(
|
||||
@@ -171,37 +184,53 @@ def confirm_reservation_from_token(raw_token):
|
||||
raise InvalidToken("Confirmation token is not valid for this reservation.")
|
||||
|
||||
if not token_was_expired:
|
||||
performance = _get_locked_bookable_performance(reservation.performance_id)
|
||||
available_seats = calculate_available_seats(performance)
|
||||
if reservation.party_size > available_seats:
|
||||
raise NotEnoughSeats("Not enough seats are available for this performance.")
|
||||
|
||||
reservation.confirm()
|
||||
confirmation_token.mark_used()
|
||||
|
||||
check_in_token, raw_check_in_token = ReservationToken.create_token(
|
||||
result = _confirm_pending_reservation(
|
||||
reservation=reservation,
|
||||
purpose=ReservationToken.Purpose.CHECK_IN,
|
||||
expires_at=performance.starts_at + CHECK_IN_TOKEN_AFTER_PERFORMANCE_TTL,
|
||||
confirmation_token=confirmation_token,
|
||||
)
|
||||
reservation.qr_code_generated_at = timezone.now()
|
||||
reservation.save(update_fields=["qr_code_generated_at", "updated_at"])
|
||||
|
||||
if token_was_expired:
|
||||
raise ExpiredToken("Confirmation token has expired.")
|
||||
|
||||
return ConfirmedReservationResult(
|
||||
reservation=reservation,
|
||||
confirmation_token=confirmation_token,
|
||||
check_in_token=check_in_token,
|
||||
raw_check_in_token=raw_check_in_token,
|
||||
available_seats=available_seats - reservation.party_size,
|
||||
qr_code_image=generate_check_in_qr_base64(
|
||||
return result
|
||||
|
||||
|
||||
def confirm_reservation_manually(*, reservation_id):
|
||||
with transaction.atomic():
|
||||
reservation = Reservation.objects.select_for_update().get(pk=reservation_id)
|
||||
if reservation.status == Reservation.Status.CONFIRMED:
|
||||
raise AlreadyConfirmedReservation("Reservation is already confirmed.")
|
||||
if reservation.status != Reservation.Status.PENDING:
|
||||
raise ReservationNotPending("Only pending reservations can be confirmed manually.")
|
||||
|
||||
confirmation_token = (
|
||||
ReservationToken.objects.select_for_update()
|
||||
.filter(
|
||||
reservation=reservation,
|
||||
purpose=ReservationToken.Purpose.CONFIRMATION,
|
||||
)
|
||||
.order_by("-created_at")
|
||||
.first()
|
||||
)
|
||||
return _confirm_pending_reservation(
|
||||
reservation=reservation,
|
||||
raw_check_in_token=raw_check_in_token,
|
||||
),
|
||||
qr_code_url=build_check_in_preview_url(raw_check_in_token),
|
||||
)
|
||||
confirmation_token=confirmation_token,
|
||||
)
|
||||
|
||||
|
||||
def issue_check_in_access_for_reservation(*, reservation_id):
|
||||
with transaction.atomic():
|
||||
reservation = (
|
||||
Reservation.objects.select_for_update()
|
||||
.select_related("performance__show", "performance__venue")
|
||||
.get(pk=reservation_id)
|
||||
)
|
||||
if reservation.status != Reservation.Status.CONFIRMED:
|
||||
raise ReservationNotConfirmed("Reservation must be confirmed before QR retrieval.")
|
||||
|
||||
result = _issue_check_in_access(reservation)
|
||||
|
||||
return result
|
||||
|
||||
|
||||
def retrieve_reservation_qr_from_token(raw_token):
|
||||
@@ -237,3 +266,48 @@ def _get_locked_bookable_performance(performance_id):
|
||||
raise PerformanceNotAvailable("Performance is not available for booking.")
|
||||
|
||||
return performance
|
||||
|
||||
|
||||
def _confirm_pending_reservation(*, reservation, confirmation_token=None):
|
||||
performance = _get_locked_bookable_performance(reservation.performance_id)
|
||||
available_seats = calculate_available_seats(performance)
|
||||
if reservation.party_size > available_seats:
|
||||
raise NotEnoughSeats("Not enough seats are available for this performance.")
|
||||
|
||||
reservation.confirm()
|
||||
if confirmation_token is not None and not confirmation_token.is_used:
|
||||
confirmation_token.mark_used()
|
||||
|
||||
check_in_access = _issue_check_in_access(reservation)
|
||||
|
||||
return ConfirmedReservationResult(
|
||||
reservation=reservation,
|
||||
confirmation_token=confirmation_token,
|
||||
check_in_token=check_in_access.check_in_token,
|
||||
raw_check_in_token=check_in_access.raw_check_in_token,
|
||||
available_seats=available_seats - reservation.party_size,
|
||||
qr_code_image=check_in_access.qr_code_image,
|
||||
qr_code_url=check_in_access.qr_code_url,
|
||||
)
|
||||
|
||||
|
||||
def _issue_check_in_access(reservation):
|
||||
check_in_token, raw_check_in_token = ReservationToken.create_token(
|
||||
reservation=reservation,
|
||||
purpose=ReservationToken.Purpose.CHECK_IN,
|
||||
expires_at=reservation.performance.starts_at + CHECK_IN_TOKEN_AFTER_PERFORMANCE_TTL,
|
||||
)
|
||||
if reservation.qr_code_generated_at is None:
|
||||
reservation.qr_code_generated_at = timezone.now()
|
||||
reservation.save(update_fields=["qr_code_generated_at", "updated_at"])
|
||||
|
||||
return ReservationCheckInAccessResult(
|
||||
reservation=reservation,
|
||||
check_in_token=check_in_token,
|
||||
raw_check_in_token=raw_check_in_token,
|
||||
qr_code_image=generate_check_in_qr_base64(
|
||||
reservation=reservation,
|
||||
raw_check_in_token=raw_check_in_token,
|
||||
),
|
||||
qr_code_url=build_check_in_preview_url(raw_check_in_token),
|
||||
)
|
||||
|
||||
@@ -0,0 +1,35 @@
|
||||
{% extends "admin/base_site.html" %}
|
||||
|
||||
{% block content %}
|
||||
<div id="content-main">
|
||||
<h1>{{ heading }}</h1>
|
||||
<p>{{ description }}</p>
|
||||
|
||||
<p>
|
||||
<strong>Reservation:</strong> {{ original.name }}<br>
|
||||
<strong>Show:</strong> {{ original.performance.show.title }}<br>
|
||||
<strong>Performance:</strong> {{ original.performance.starts_at }}<br>
|
||||
<strong>Party size:</strong> {{ original.party_size }}
|
||||
</p>
|
||||
|
||||
{% if qr_code_url %}
|
||||
<p>
|
||||
<strong>Check-in URL:</strong><br>
|
||||
<a href="{{ qr_code_url }}">{{ qr_code_url }}</a>
|
||||
</p>
|
||||
{% endif %}
|
||||
|
||||
{% if qr_code_image %}
|
||||
<p><img src="{{ qr_code_image }}" alt="Operational QR code"></p>
|
||||
{% endif %}
|
||||
|
||||
{% if submit_label %}
|
||||
<form method="post">
|
||||
{% csrf_token %}
|
||||
<input type="submit" value="{{ submit_label }}" class="default">
|
||||
</form>
|
||||
{% endif %}
|
||||
|
||||
<p><a href="{{ change_url }}">Back to reservation</a></p>
|
||||
</div>
|
||||
{% endblock %}
|
||||
@@ -8,6 +8,7 @@ from django.urls import reverse
|
||||
from django.utils import timezone
|
||||
|
||||
from bookings.models import Reservation, ReservationToken
|
||||
from checkins.models import CheckIn
|
||||
from shows.models import Performance, Show, Venue
|
||||
|
||||
|
||||
@@ -109,3 +110,70 @@ class ReservationAdminTests(TestCase):
|
||||
self.assertContains(change_response, token.get_purpose_display())
|
||||
self.assertContains(change_response, "Expires at")
|
||||
self.assertContains(change_response, "Used at")
|
||||
|
||||
def test_admin_can_confirm_pending_reservation_manually_and_get_qr_access(self):
|
||||
reservation = Reservation.objects.create(
|
||||
performance=self.performance,
|
||||
name="Maria Rossi",
|
||||
email="maria@example.com",
|
||||
party_size=2,
|
||||
)
|
||||
confirmation_token, _ = ReservationToken.create_token(
|
||||
reservation=reservation,
|
||||
purpose=ReservationToken.Purpose.CONFIRMATION,
|
||||
expires_at=timezone.now() + timedelta(hours=2),
|
||||
)
|
||||
|
||||
response = self.client.post(
|
||||
reverse("admin:bookings_reservation_manual_confirm", args=[reservation.id]),
|
||||
)
|
||||
|
||||
reservation.refresh_from_db()
|
||||
confirmation_token.refresh_from_db()
|
||||
self.assertEqual(response.status_code, 200)
|
||||
self.assertEqual(reservation.status, Reservation.Status.CONFIRMED)
|
||||
self.assertIsNotNone(confirmation_token.used_at)
|
||||
self.assertContains(response, "Reservation confirmed manually")
|
||||
self.assertContains(response, "/check-in?token=")
|
||||
self.assertTrue(
|
||||
ReservationToken.objects.filter(
|
||||
reservation=reservation,
|
||||
purpose=ReservationToken.Purpose.CHECK_IN,
|
||||
).exists()
|
||||
)
|
||||
|
||||
def test_admin_can_mark_confirmed_reservation_as_checked_in(self):
|
||||
reservation = Reservation.objects.create(
|
||||
performance=self.performance,
|
||||
name="Checked Guest",
|
||||
email="checked@example.com",
|
||||
party_size=1,
|
||||
status=Reservation.Status.CONFIRMED,
|
||||
confirmed_at=timezone.now(),
|
||||
)
|
||||
|
||||
response = self.client.post(
|
||||
reverse("admin:bookings_reservation_manual_check_in", args=[reservation.id]),
|
||||
)
|
||||
|
||||
self.assertEqual(response.status_code, 302)
|
||||
check_in = CheckIn.objects.get(reservation=reservation)
|
||||
self.assertEqual(check_in.checked_in_by, self.admin_user)
|
||||
self.assertEqual(check_in.source, CheckIn.Source.MANUAL)
|
||||
|
||||
def test_reservation_string_is_concise_without_performance_details(self):
|
||||
single_guest_reservation = Reservation.objects.create(
|
||||
performance=self.performance,
|
||||
name="Maria Rossi",
|
||||
email="maria@example.com",
|
||||
party_size=1,
|
||||
)
|
||||
group_reservation = Reservation.objects.create(
|
||||
performance=self.performance,
|
||||
name="Luca Bianchi",
|
||||
email="luca@example.com",
|
||||
party_size=3,
|
||||
)
|
||||
|
||||
self.assertEqual(str(single_guest_reservation), "Maria Rossi")
|
||||
self.assertEqual(str(group_reservation), "Luca Bianchi (3)")
|
||||
|
||||
@@ -1,12 +1,14 @@
|
||||
from datetime import timedelta
|
||||
from unittest.mock import patch
|
||||
|
||||
from django.contrib.auth import get_user_model
|
||||
from django.core.cache import cache
|
||||
from django.core import mail
|
||||
from django.urls import reverse
|
||||
from django.test.utils import override_settings
|
||||
from django.utils import timezone
|
||||
from rest_framework import status
|
||||
from rest_framework.test import APITestCase
|
||||
from rest_framework.test import APIClient, APITestCase
|
||||
|
||||
from bookings.models import Reservation
|
||||
from bookings.services import generate_confirmation_token
|
||||
@@ -16,6 +18,7 @@ from shows.models import Performance, Show, Venue
|
||||
|
||||
class BookingApiTests(APITestCase):
|
||||
def setUp(self):
|
||||
cache.clear()
|
||||
self.show = Show.objects.create(
|
||||
title="Open Stage",
|
||||
slug="open-stage-api",
|
||||
@@ -90,6 +93,48 @@ class BookingApiTests(APITestCase):
|
||||
mail.outbox[0].body,
|
||||
)
|
||||
|
||||
@override_settings(SITE_BASE_URL="https://tickets.azionelab.example")
|
||||
def test_reservation_creation_allows_anonymous_post_without_csrf(self):
|
||||
csrf_client = APIClient(enforce_csrf_checks=True)
|
||||
|
||||
with self.captureOnCommitCallbacks(execute=True):
|
||||
response = csrf_client.post(
|
||||
reverse("api-reservation-create", kwargs={"performance_id": self.performance.id}),
|
||||
{
|
||||
"name": "Maria Rossi",
|
||||
"email": "maria@example.com",
|
||||
"party_size": 2,
|
||||
},
|
||||
format="json",
|
||||
)
|
||||
|
||||
self.assertEqual(response.status_code, status.HTTP_201_CREATED)
|
||||
self.assertEqual(response.data["status"], Reservation.Status.PENDING)
|
||||
|
||||
@override_settings(SITE_BASE_URL="https://tickets.azionelab.example")
|
||||
def test_reservation_creation_ignores_session_csrf_for_public_endpoint(self):
|
||||
csrf_client = APIClient(enforce_csrf_checks=True)
|
||||
user = get_user_model().objects.create_user(
|
||||
username="box-office",
|
||||
email="staff@example.com",
|
||||
password="test-pass-123",
|
||||
)
|
||||
csrf_client.force_login(user)
|
||||
|
||||
with self.captureOnCommitCallbacks(execute=True):
|
||||
response = csrf_client.post(
|
||||
reverse("api-reservation-create", kwargs={"performance_id": self.performance.id}),
|
||||
{
|
||||
"name": "Maria Rossi",
|
||||
"email": "maria@example.com",
|
||||
"party_size": 2,
|
||||
},
|
||||
format="json",
|
||||
)
|
||||
|
||||
self.assertEqual(response.status_code, status.HTTP_201_CREATED)
|
||||
self.assertEqual(response.data["status"], Reservation.Status.PENDING)
|
||||
|
||||
def test_reservation_creation_schedules_email_after_commit(self):
|
||||
with self.captureOnCommitCallbacks(execute=False) as callbacks:
|
||||
response = self.client.post(
|
||||
@@ -165,7 +210,7 @@ class BookingApiTests(APITestCase):
|
||||
self.assertEqual(response.data["party_size"], reservation.party_size)
|
||||
self.assertTrue(
|
||||
response.data["qr_code_url"].startswith(
|
||||
"https://tickets.azionelab.example/api/check-ins/preview/?token="
|
||||
"https://tickets.azionelab.example/check-in?token="
|
||||
)
|
||||
)
|
||||
self.assertNotIn(raw_token, response.data["qr_code_url"])
|
||||
@@ -257,7 +302,7 @@ class BookingApiTests(APITestCase):
|
||||
self.assertEqual(response.data["reservation_id"], reservation.id)
|
||||
self.assertTrue(
|
||||
response.data["qr_code_url"].startswith(
|
||||
"https://tickets.azionelab.example/api/check-ins/preview/?token="
|
||||
"https://tickets.azionelab.example/check-in?token="
|
||||
)
|
||||
)
|
||||
self.assertTrue(response.data["qr_code_image"].startswith("data:image/png;base64,"))
|
||||
|
||||
@@ -15,10 +15,13 @@ from bookings.services import (
|
||||
ExpiredToken,
|
||||
InvalidToken,
|
||||
NotEnoughSeats,
|
||||
ReservationNotConfirmed,
|
||||
calculate_available_seats,
|
||||
confirm_reservation_manually,
|
||||
confirm_reservation_from_token,
|
||||
create_pending_reservation,
|
||||
generate_confirmation_token,
|
||||
issue_check_in_access_for_reservation,
|
||||
retrieve_reservation_qr_from_token,
|
||||
)
|
||||
from shows.models import Performance, Show, Venue
|
||||
@@ -96,6 +99,31 @@ class BookingServiceTests(TestCase):
|
||||
self.assertEqual(len(callbacks), 1)
|
||||
self.assertEqual(len(mail.outbox), 0)
|
||||
|
||||
@override_settings(
|
||||
EMAIL_BACKEND="django.core.mail.backends.locmem.EmailBackend",
|
||||
LOG_RESERVATION_CONFIRMATION_URLS=True,
|
||||
SITE_BASE_URL="https://tickets.azionelab.example",
|
||||
)
|
||||
def test_create_pending_reservation_logs_confirmation_link_in_local_mode(self):
|
||||
with self.assertLogs("bookings.emailing", level="WARNING") as captured_logs:
|
||||
with self.captureOnCommitCallbacks(execute=True):
|
||||
result = create_pending_reservation(
|
||||
performance_id=self.performance.id,
|
||||
name="Maria Rossi",
|
||||
email="maria@example.com",
|
||||
party_size=1,
|
||||
)
|
||||
|
||||
self.assertEqual(result.reservation.status, Reservation.Status.PENDING)
|
||||
self.assertTrue(
|
||||
any(
|
||||
"LOCAL DEV confirmation URL:" in log_entry
|
||||
and result.raw_confirmation_token in log_entry
|
||||
for log_entry in captured_logs.output
|
||||
)
|
||||
)
|
||||
|
||||
@override_settings(LOG_RESERVATION_CONFIRMATION_URLS=False)
|
||||
@patch("bookings.emailing.send_mail", side_effect=RuntimeError("SMTP down"))
|
||||
def test_create_pending_reservation_logs_email_failure_without_crashing(self, mocked_send_mail):
|
||||
with self.assertLogs("bookings.emailing", level="ERROR") as captured_logs:
|
||||
@@ -116,6 +144,74 @@ class BookingServiceTests(TestCase):
|
||||
for log_entry in captured_logs.output
|
||||
)
|
||||
)
|
||||
self.assertFalse(
|
||||
any(result.raw_confirmation_token in log_entry for log_entry in captured_logs.output)
|
||||
)
|
||||
|
||||
@override_settings(
|
||||
LOG_RESERVATION_CONFIRMATION_URLS=True,
|
||||
SITE_BASE_URL="https://tickets.azionelab.example",
|
||||
)
|
||||
@patch("bookings.emailing.send_mail", side_effect=RuntimeError("SMTP down"))
|
||||
def test_create_pending_reservation_logs_confirmation_link_before_email_failure_in_local_mode(
|
||||
self,
|
||||
mocked_send_mail,
|
||||
):
|
||||
with self.assertLogs("bookings.emailing", level="WARNING") as captured_logs:
|
||||
with self.captureOnCommitCallbacks(execute=True):
|
||||
result = create_pending_reservation(
|
||||
performance_id=self.performance.id,
|
||||
name="Maria Rossi",
|
||||
email="maria@example.com",
|
||||
party_size=1,
|
||||
)
|
||||
|
||||
self.assertEqual(result.reservation.status, Reservation.Status.PENDING)
|
||||
mocked_send_mail.assert_called_once()
|
||||
confirmation_log_index = next(
|
||||
index
|
||||
for index, log_entry in enumerate(captured_logs.output)
|
||||
if "LOCAL DEV confirmation URL:" in log_entry
|
||||
and result.raw_confirmation_token in log_entry
|
||||
)
|
||||
failure_log_index = next(
|
||||
index
|
||||
for index, log_entry in enumerate(captured_logs.output)
|
||||
if "Local/debug email delivery failed for reservation" in log_entry
|
||||
)
|
||||
|
||||
self.assertLess(confirmation_log_index, failure_log_index)
|
||||
self.assertEqual(
|
||||
sum(
|
||||
result.raw_confirmation_token in log_entry
|
||||
for log_entry in captured_logs.output
|
||||
),
|
||||
1,
|
||||
)
|
||||
self.assertFalse(
|
||||
any("Traceback" in log_entry for log_entry in captured_logs.output)
|
||||
)
|
||||
|
||||
@override_settings(
|
||||
LOG_RESERVATION_CONFIRMATION_URLS=False,
|
||||
SITE_BASE_URL="https://tickets.azionelab.example",
|
||||
)
|
||||
@patch("bookings.emailing.send_mail")
|
||||
def test_create_pending_reservation_does_not_log_confirmation_link_outside_local_mode(
|
||||
self,
|
||||
mocked_send_mail,
|
||||
):
|
||||
with self.assertNoLogs("bookings.emailing", level="WARNING"):
|
||||
with self.captureOnCommitCallbacks(execute=True):
|
||||
result = create_pending_reservation(
|
||||
performance_id=self.performance.id,
|
||||
name="Maria Rossi",
|
||||
email="maria@example.com",
|
||||
party_size=1,
|
||||
)
|
||||
|
||||
self.assertEqual(result.reservation.status, Reservation.Status.PENDING)
|
||||
mocked_send_mail.assert_called_once()
|
||||
|
||||
def test_generate_confirmation_token_returns_raw_token_once(self):
|
||||
reservation = self.create_reservation()
|
||||
@@ -151,7 +247,7 @@ class BookingServiceTests(TestCase):
|
||||
)
|
||||
self.assertTrue(
|
||||
result.qr_code_url.startswith(
|
||||
"https://tickets.azionelab.example/api/check-ins/preview/?token="
|
||||
"https://tickets.azionelab.example/check-in?token="
|
||||
)
|
||||
)
|
||||
self.assertTrue(result.qr_code_image.startswith("data:image/png;base64,"))
|
||||
@@ -186,7 +282,7 @@ class BookingServiceTests(TestCase):
|
||||
self.assertGreater(len(qr_code_image), len("data:image/png;base64,"))
|
||||
self.assertEqual(
|
||||
build_check_in_preview_url(raw_check_in_token),
|
||||
"https://tickets.azionelab.example/api/check-ins/preview/?token=opaque-check-in-token",
|
||||
"https://tickets.azionelab.example/check-in?token=opaque-check-in-token",
|
||||
)
|
||||
|
||||
def test_qr_code_is_not_generated_for_pending_reservation(self):
|
||||
@@ -320,6 +416,54 @@ class BookingServiceTests(TestCase):
|
||||
|
||||
self.assertTrue(any("FOR UPDATE" in query["sql"] for query in queries))
|
||||
|
||||
@override_settings(SITE_BASE_URL="https://tickets.azionelab.example")
|
||||
def test_manual_confirmation_reuses_capacity_rules_and_generates_check_in_access(self):
|
||||
reservation = self.create_reservation()
|
||||
confirmation_token, _ = generate_confirmation_token(reservation)
|
||||
|
||||
result = confirm_reservation_manually(reservation_id=reservation.id)
|
||||
|
||||
reservation.refresh_from_db()
|
||||
confirmation_token.refresh_from_db()
|
||||
self.assertEqual(reservation.status, Reservation.Status.CONFIRMED)
|
||||
self.assertIsNotNone(confirmation_token.used_at)
|
||||
self.assertEqual(result.check_in_token.purpose, ReservationToken.Purpose.CHECK_IN)
|
||||
self.assertTrue(
|
||||
result.qr_code_url.startswith(
|
||||
"https://tickets.azionelab.example/check-in?token="
|
||||
)
|
||||
)
|
||||
|
||||
def test_manual_confirmation_rejects_non_pending_reservation(self):
|
||||
reservation = self.create_reservation(
|
||||
status=Reservation.Status.CONFIRMED,
|
||||
confirmed_at=timezone.now(),
|
||||
)
|
||||
|
||||
with self.assertRaises(AlreadyConfirmedReservation):
|
||||
confirm_reservation_manually(reservation_id=reservation.id)
|
||||
|
||||
@override_settings(SITE_BASE_URL="https://tickets.azionelab.example")
|
||||
def test_issue_check_in_access_requires_confirmed_reservation(self):
|
||||
reservation = self.create_reservation()
|
||||
|
||||
with self.assertRaises(ReservationNotConfirmed):
|
||||
issue_check_in_access_for_reservation(reservation_id=reservation.id)
|
||||
|
||||
@override_settings(SITE_BASE_URL="https://tickets.azionelab.example")
|
||||
def test_issue_check_in_access_generates_qr_for_confirmed_reservation(self):
|
||||
reservation = self.create_reservation(
|
||||
status=Reservation.Status.CONFIRMED,
|
||||
confirmed_at=timezone.now(),
|
||||
)
|
||||
|
||||
result = issue_check_in_access_for_reservation(reservation_id=reservation.id)
|
||||
|
||||
self.assertEqual(result.reservation, reservation)
|
||||
self.assertEqual(result.check_in_token.purpose, ReservationToken.Purpose.CHECK_IN)
|
||||
self.assertTrue(result.qr_code_image.startswith("data:image/png;base64,"))
|
||||
self.assertIn("/check-in?token=", result.qr_code_url)
|
||||
|
||||
def create_reservation(self, **overrides):
|
||||
data = {
|
||||
"performance": self.performance,
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
from django.shortcuts import get_object_or_404
|
||||
from rest_framework import status
|
||||
from rest_framework.decorators import api_view, throttle_classes
|
||||
from rest_framework.decorators import api_view, authentication_classes, permission_classes, throttle_classes
|
||||
from rest_framework.permissions import AllowAny
|
||||
from rest_framework.response import Response
|
||||
from rest_framework.throttling import AnonRateThrottle
|
||||
|
||||
@@ -35,6 +36,8 @@ class ReservationConfirmThrottle(AnonRateThrottle):
|
||||
|
||||
|
||||
@api_view(["POST"])
|
||||
@authentication_classes([])
|
||||
@permission_classes([AllowAny])
|
||||
@throttle_classes([ReservationCreateThrottle])
|
||||
def create_reservation(request, performance_id):
|
||||
get_object_or_404(Performance, pk=performance_id, show__is_published=True)
|
||||
|
||||
@@ -6,7 +6,7 @@ from .models import CheckIn
|
||||
@admin.register(CheckIn)
|
||||
class CheckInAdmin(admin.ModelAdmin):
|
||||
list_display = (
|
||||
"reservation",
|
||||
"reservation_guest_name",
|
||||
"performance",
|
||||
"checked_in_at",
|
||||
"checked_in_by",
|
||||
@@ -25,6 +25,10 @@ class CheckInAdmin(admin.ModelAdmin):
|
||||
list_select_related = ("reservation", "reservation__performance", "checked_in_by")
|
||||
autocomplete_fields = ("reservation", "checked_in_by")
|
||||
|
||||
@admin.display(description="Reservation", ordering="reservation__name")
|
||||
def reservation_guest_name(self, obj):
|
||||
return obj.reservation.name
|
||||
|
||||
@admin.display(description="Performance")
|
||||
def performance(self, obj):
|
||||
return obj.reservation.performance
|
||||
|
||||
@@ -75,6 +75,29 @@ def confirm_check_in_from_token(raw_token, *, staff_user, source=CheckIn.Source.
|
||||
return CheckInResult(check_in=check_in, preview=_build_preview(reservation))
|
||||
|
||||
|
||||
def confirm_check_in_for_reservation(*, reservation_id, staff_user, source=CheckIn.Source.MANUAL):
|
||||
_validate_staff_user(staff_user)
|
||||
|
||||
with transaction.atomic():
|
||||
reservation = (
|
||||
Reservation.objects.select_for_update()
|
||||
.select_related("performance__show", "performance__venue")
|
||||
.get(pk=reservation_id)
|
||||
)
|
||||
_validate_reservation_for_check_in(reservation)
|
||||
|
||||
try:
|
||||
check_in = CheckIn.objects.create(
|
||||
reservation=reservation,
|
||||
checked_in_by=staff_user,
|
||||
source=source,
|
||||
)
|
||||
except IntegrityError as exc:
|
||||
raise AlreadyCheckedIn("Reservation has already been checked in.") from exc
|
||||
|
||||
return CheckInResult(check_in=check_in, preview=_build_preview(reservation))
|
||||
|
||||
|
||||
def _validate_staff_user(staff_user):
|
||||
if staff_user is None:
|
||||
raise MissingStaffUser("A staff user is required for check-in.")
|
||||
|
||||
@@ -0,0 +1,56 @@
|
||||
from datetime import timedelta
|
||||
|
||||
from django.contrib import admin
|
||||
from django.contrib.auth import get_user_model
|
||||
from django.test import TestCase
|
||||
from django.utils import timezone
|
||||
|
||||
from bookings.models import Reservation
|
||||
from checkins.admin import CheckInAdmin
|
||||
from checkins.models import CheckIn
|
||||
from shows.models import Performance, Show, Venue
|
||||
|
||||
|
||||
class CheckInAdminTests(TestCase):
|
||||
def setUp(self):
|
||||
user_model = get_user_model()
|
||||
self.admin_user = user_model.objects.create_superuser(
|
||||
username="admin-checkins",
|
||||
email="admin-checkins@example.com",
|
||||
password="password123",
|
||||
)
|
||||
self.show = Show.objects.create(
|
||||
title="Open Stage",
|
||||
slug="open-stage-checkins-admin",
|
||||
is_published=True,
|
||||
)
|
||||
self.venue = Venue.objects.create(
|
||||
name="AzioneLab Theatre",
|
||||
slug="azionelab-theatre-checkins-admin",
|
||||
address="Via Example 1",
|
||||
city="Rome",
|
||||
)
|
||||
self.performance = Performance.objects.create(
|
||||
show=self.show,
|
||||
venue=self.venue,
|
||||
starts_at=timezone.now() + timedelta(days=7),
|
||||
room_capacity=20,
|
||||
)
|
||||
self.reservation = Reservation.objects.create(
|
||||
performance=self.performance,
|
||||
name="Maria Rossi",
|
||||
email="maria@example.com",
|
||||
party_size=3,
|
||||
status=Reservation.Status.CONFIRMED,
|
||||
confirmed_at=timezone.now(),
|
||||
)
|
||||
self.check_in = CheckIn.objects.create(
|
||||
reservation=self.reservation,
|
||||
checked_in_at=timezone.now(),
|
||||
checked_in_by=self.admin_user,
|
||||
source=CheckIn.Source.MANUAL,
|
||||
)
|
||||
self.model_admin = CheckInAdmin(CheckIn, admin.site)
|
||||
|
||||
def test_reservation_column_shows_guest_name_only(self):
|
||||
self.assertEqual(self.model_admin.reservation_guest_name(self.check_in), "Maria Rossi")
|
||||
@@ -11,6 +11,7 @@ from checkins.services import (
|
||||
InvalidToken,
|
||||
MissingStaffUser,
|
||||
ReservationNotConfirmed,
|
||||
confirm_check_in_for_reservation,
|
||||
confirm_check_in_from_token,
|
||||
preview_check_in_token,
|
||||
)
|
||||
@@ -125,6 +126,27 @@ class CheckInServiceTests(TestCase):
|
||||
with self.assertRaises(MissingStaffUser):
|
||||
confirm_check_in_from_token(raw_token, staff_user=None)
|
||||
|
||||
def test_manual_check_in_by_reservation_id_succeeds_for_confirmed_reservation(self):
|
||||
reservation = self.create_reservation()
|
||||
|
||||
result = confirm_check_in_for_reservation(
|
||||
reservation_id=reservation.id,
|
||||
staff_user=self.staff_user,
|
||||
)
|
||||
|
||||
self.assertEqual(result.check_in.reservation, reservation)
|
||||
self.assertEqual(result.check_in.checked_in_by, self.staff_user)
|
||||
self.assertEqual(result.check_in.source, CheckIn.Source.MANUAL)
|
||||
|
||||
def test_manual_check_in_by_reservation_id_rejects_pending_reservation(self):
|
||||
reservation = self.create_reservation(status=Reservation.Status.PENDING, confirmed_at=None)
|
||||
|
||||
with self.assertRaises(ReservationNotConfirmed):
|
||||
confirm_check_in_for_reservation(
|
||||
reservation_id=reservation.id,
|
||||
staff_user=self.staff_user,
|
||||
)
|
||||
|
||||
def test_check_in_rejects_confirmation_token_even_for_confirmed_reservation(self):
|
||||
reservation = self.create_reservation()
|
||||
_, raw_token = ReservationToken.create_token(
|
||||
|
||||
+27
-2
@@ -7,11 +7,36 @@ from .models import Performance, Show, Venue
|
||||
|
||||
@admin.register(Show)
|
||||
class ShowAdmin(admin.ModelAdmin):
|
||||
list_display = ("title", "slug", "is_published", "created_at", "updated_at")
|
||||
list_display = ("title", "slug", "is_published", "image_preview", "created_at", "updated_at")
|
||||
list_filter = ("is_published",)
|
||||
search_fields = ("title", "slug", "summary", "description")
|
||||
prepopulated_fields = {"slug": ("title",)}
|
||||
readonly_fields = ("created_at", "updated_at")
|
||||
readonly_fields = ("image_preview", "created_at", "updated_at")
|
||||
fields = (
|
||||
"title",
|
||||
"slug",
|
||||
"summary",
|
||||
"description",
|
||||
"uploaded_image",
|
||||
"poster_image",
|
||||
"image_preview",
|
||||
"is_published",
|
||||
"created_at",
|
||||
"updated_at",
|
||||
)
|
||||
|
||||
@admin.display(description="Preview")
|
||||
def image_preview(self, obj):
|
||||
if not getattr(obj, "pk", None):
|
||||
return "-"
|
||||
image_url = obj.image_url()
|
||||
if not image_url:
|
||||
return "No image"
|
||||
return format_html(
|
||||
'<img src="{}" alt="{}" style="max-width: 120px; border-radius: 6px;" />',
|
||||
image_url,
|
||||
obj.title,
|
||||
)
|
||||
|
||||
|
||||
@admin.register(Venue)
|
||||
|
||||
@@ -0,0 +1,17 @@
|
||||
# Generated by Django 5.2.3 on 2026-04-29
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
dependencies = [
|
||||
("shows", "0001_initial"),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name="show",
|
||||
name="uploaded_image",
|
||||
field=models.ImageField(blank=True, upload_to="shows/"),
|
||||
),
|
||||
]
|
||||
@@ -16,6 +16,7 @@ class Show(TimeStampedModel):
|
||||
summary = models.TextField(blank=True)
|
||||
description = models.TextField(blank=True)
|
||||
poster_image = models.URLField(blank=True)
|
||||
uploaded_image = models.ImageField(upload_to="shows/", blank=True)
|
||||
is_published = models.BooleanField(default=False, db_index=True)
|
||||
|
||||
class Meta:
|
||||
@@ -28,6 +29,14 @@ class Show(TimeStampedModel):
|
||||
def __str__(self):
|
||||
return self.title
|
||||
|
||||
def image_url(self, request=None):
|
||||
if self.uploaded_image:
|
||||
image_url = self.uploaded_image.url
|
||||
if request is not None:
|
||||
return request.build_absolute_uri(image_url)
|
||||
return image_url
|
||||
return self.poster_image
|
||||
|
||||
|
||||
class Venue(TimeStampedModel):
|
||||
name = models.CharField(max_length=200)
|
||||
|
||||
@@ -1,7 +1,15 @@
|
||||
from rest_framework import serializers
|
||||
|
||||
|
||||
class PublicShowListSerializer(serializers.Serializer):
|
||||
class PublicShowImageMixin(serializers.Serializer):
|
||||
image_url = serializers.SerializerMethodField()
|
||||
|
||||
def get_image_url(self, obj):
|
||||
request = self.context.get("request")
|
||||
return obj.image_url(request=request)
|
||||
|
||||
|
||||
class PublicShowListSerializer(PublicShowImageMixin, serializers.Serializer):
|
||||
id = serializers.IntegerField()
|
||||
title = serializers.CharField()
|
||||
slug = serializers.SlugField()
|
||||
@@ -18,7 +26,7 @@ class PublicVenueDetailSerializer(PublicVenueSummarySerializer):
|
||||
address = serializers.CharField()
|
||||
|
||||
|
||||
class PublicShowSummarySerializer(serializers.Serializer):
|
||||
class PublicShowSummarySerializer(PublicShowImageMixin, serializers.Serializer):
|
||||
title = serializers.CharField()
|
||||
slug = serializers.SlugField()
|
||||
summary = serializers.CharField()
|
||||
|
||||
@@ -0,0 +1,77 @@
|
||||
from datetime import timedelta
|
||||
from tempfile import TemporaryDirectory
|
||||
|
||||
from django.core.files.uploadedfile import SimpleUploadedFile
|
||||
from django.test import override_settings
|
||||
from django.urls import reverse
|
||||
from django.utils import timezone
|
||||
from rest_framework import status
|
||||
from rest_framework.test import APITestCase
|
||||
|
||||
from shows.models import Performance, Show, Venue
|
||||
|
||||
|
||||
SMALL_GIF = (
|
||||
b"GIF89a\x01\x00\x01\x00\x80\x00\x00"
|
||||
b"\x00\x00\x00\xff\xff\xff!\xf9\x04\x01"
|
||||
b"\x00\x00\x00\x00,\x00\x00\x00\x00\x01"
|
||||
b"\x00\x01\x00\x00\x02\x02D\x01\x00;"
|
||||
)
|
||||
|
||||
|
||||
class ShowApiTests(APITestCase):
|
||||
def setUp(self):
|
||||
self.temp_media = TemporaryDirectory()
|
||||
self.addCleanup(self.temp_media.cleanup)
|
||||
self.settings_override = override_settings(MEDIA_ROOT=self.temp_media.name)
|
||||
self.settings_override.enable()
|
||||
self.addCleanup(self.settings_override.disable)
|
||||
|
||||
self.show = Show.objects.create(
|
||||
title="Open Stage",
|
||||
slug="open-stage-media",
|
||||
summary="A contemporary theatre performance.",
|
||||
description="Full public show description.",
|
||||
poster_image="https://cdn.example.com/open-stage-poster.jpg",
|
||||
is_published=True,
|
||||
)
|
||||
self.external_only_show = Show.objects.create(
|
||||
title="External Poster Stage",
|
||||
slug="external-poster-stage",
|
||||
summary="External image only.",
|
||||
description="External image only.",
|
||||
poster_image="https://cdn.example.com/external-only.jpg",
|
||||
is_published=True,
|
||||
)
|
||||
self.venue = Venue.objects.create(
|
||||
name="AzioneLab Theatre",
|
||||
slug="azionelab-theatre-show-api",
|
||||
address="Via Example 1",
|
||||
city="Rome",
|
||||
)
|
||||
self.performance = Performance.objects.create(
|
||||
show=self.show,
|
||||
venue=self.venue,
|
||||
starts_at=timezone.now() + timedelta(days=7),
|
||||
room_capacity=20,
|
||||
)
|
||||
|
||||
def test_show_list_prefers_uploaded_image_url_when_present(self):
|
||||
self.show.uploaded_image.save(
|
||||
"open-stage.gif",
|
||||
SimpleUploadedFile("open-stage.gif", SMALL_GIF, content_type="image/gif"),
|
||||
save=True,
|
||||
)
|
||||
|
||||
response = self.client.get(reverse("api-show-list"))
|
||||
|
||||
self.assertEqual(response.status_code, status.HTTP_200_OK)
|
||||
list_item = next(item for item in response.data["results"] if item["slug"] == self.show.slug)
|
||||
self.assertTrue(list_item["image_url"].endswith("/media/shows/open-stage.gif"))
|
||||
self.assertEqual(list_item["poster_image"], "https://cdn.example.com/open-stage-poster.jpg")
|
||||
|
||||
def test_show_detail_falls_back_to_existing_external_image_url(self):
|
||||
response = self.client.get(reverse("api-show-detail", kwargs={"slug": self.external_only_show.slug}))
|
||||
|
||||
self.assertEqual(response.status_code, status.HTTP_200_OK)
|
||||
self.assertEqual(response.data["image_url"], "https://cdn.example.com/external-only.jpg")
|
||||
@@ -24,7 +24,7 @@ def public_performance_queryset():
|
||||
@api_view(["GET"])
|
||||
def show_list(request):
|
||||
shows = Show.objects.filter(is_published=True).order_by("title")
|
||||
serializer = PublicShowListSerializer(shows, many=True)
|
||||
serializer = PublicShowListSerializer(shows, many=True, context={"request": request})
|
||||
return Response({"results": serializer.data})
|
||||
|
||||
|
||||
@@ -32,7 +32,7 @@ def show_list(request):
|
||||
def show_detail(request, slug):
|
||||
show = get_object_or_404(Show, slug=slug, is_published=True)
|
||||
show.public_performances = public_performance_queryset().filter(show=show)
|
||||
serializer = PublicShowDetailSerializer(show)
|
||||
serializer = PublicShowDetailSerializer(show, context={"request": request})
|
||||
return Response(serializer.data)
|
||||
|
||||
|
||||
@@ -54,12 +54,16 @@ def performance_list(request):
|
||||
)
|
||||
performances = performances.filter(starts_at__gte=starts_from)
|
||||
|
||||
serializer = PublicPerformanceListSerializer(performances.order_by("starts_at"), many=True)
|
||||
serializer = PublicPerformanceListSerializer(
|
||||
performances.order_by("starts_at"),
|
||||
many=True,
|
||||
context={"request": request},
|
||||
)
|
||||
return Response({"results": serializer.data})
|
||||
|
||||
|
||||
@api_view(["GET"])
|
||||
def performance_detail(request, pk):
|
||||
performance = get_object_or_404(public_performance_queryset(), pk=pk)
|
||||
serializer = PublicPerformanceDetailSerializer(performance)
|
||||
serializer = PublicPerformanceDetailSerializer(performance, context={"request": request})
|
||||
return Response(serializer.data)
|
||||
|
||||
@@ -114,6 +114,14 @@ This operational flow should still follow the same backend rules as the public b
|
||||
5. after the reservation transaction commits, the backend sends the standard confirmation email;
|
||||
6. the guest still confirms through the email link before the reservation becomes confirmed and usable for check-in.
|
||||
|
||||
For operational testing or guest-support exceptions, Django admin also provides staff-only manual tools:
|
||||
|
||||
1. staff may confirm a pending reservation from the reservation admin page;
|
||||
2. manual confirmation still rechecks booking availability before confirming;
|
||||
3. the backend generates the same `check_in` token type used by the normal confirmation flow;
|
||||
4. admin can generate a one-time operational QR code and check-in URL without showing token hashes in normal admin screens;
|
||||
5. staff may mark a confirmed reservation as checked in from admin when the browser/mobile check-in flow is unavailable.
|
||||
|
||||
## Duplicate Check-In
|
||||
|
||||
If the same QR code is scanned again:
|
||||
|
||||
+6
-2
@@ -10,7 +10,7 @@ Required production changes:
|
||||
- set a strong random `DJANGO_SECRET_KEY`;
|
||||
- set `DJANGO_ALLOWED_HOSTS` to the real public hostnames only;
|
||||
- set `DJANGO_CSRF_TRUSTED_ORIGINS` to the real public HTTPS origins;
|
||||
- set `SITE_BASE_URL` to the real public HTTPS base URL used for confirmation emails and QR/check-in links;
|
||||
- set `SITE_BASE_URL` to one real public HTTPS base URL used for confirmation emails and QR/check-in links;
|
||||
- replace the console email backend with real SMTP settings and a valid sender address;
|
||||
- publish only nginx and terminate HTTPS at nginx or a trusted upstream reverse proxy;
|
||||
- keep `collectstatic --noinput` in the deployment flow before `up -d`;
|
||||
@@ -106,7 +106,7 @@ The database should not be published to the host in production.
|
||||
Recommended volumes:
|
||||
|
||||
- `postgres_data`: PostgreSQL data directory;
|
||||
- `media`: uploaded media and generated QR assets if stored on disk;
|
||||
- `media`: uploaded show images and generated QR assets if stored on disk;
|
||||
- `static`: collected Django static files if served by nginx from a shared volume.
|
||||
|
||||
Generated QR codes may also be generated on demand instead of stored as files. If stored, they must not reveal personal data and access must remain controlled.
|
||||
@@ -134,8 +134,10 @@ Local Docker convention:
|
||||
|
||||
- use nginx as the public entrypoint at `http://localhost`;
|
||||
- set `SITE_BASE_URL=http://localhost`;
|
||||
- keep `SITE_BASE_URL` as a single URL value, never a comma-separated list;
|
||||
- keep `DJANGO_CSRF_TRUSTED_ORIGINS` and browser-facing `CORS_ALLOWED_ORIGINS` aligned with that public URL;
|
||||
- if you publish nginx on a different port, update `SITE_BASE_URL` and trusted origins to the same host and port.
|
||||
- local/debug reservation email sends also log the confirmation URL so browser testing can continue even if SMTP is missing or fails.
|
||||
|
||||
Required database configuration:
|
||||
|
||||
@@ -149,6 +151,7 @@ Required nginx configuration:
|
||||
- upstream backend service name and port;
|
||||
- static frontend root;
|
||||
- proxy rules for `/api/` and `/admin/`;
|
||||
- media root for `/media/` if uploaded assets are served by nginx from a shared volume;
|
||||
- TLS certificate paths for production.
|
||||
|
||||
Secrets must be provided through deployment-managed environment variables, Docker secrets, or another secret manager. Do not commit real secret values.
|
||||
@@ -213,6 +216,7 @@ Database rollback needs special care once migrations exist. Down migrations or b
|
||||
## Operational Notes
|
||||
|
||||
- Configure database backups before accepting real bookings.
|
||||
- Back up the shared media volume together with the database if staff uploads show images.
|
||||
- Monitor backend errors, email delivery failures, and check-in failures.
|
||||
- Keep container images explicitly versioned; do not use `latest` tags.
|
||||
- Keep the system small until operational needs justify additional services.
|
||||
|
||||
@@ -31,23 +31,37 @@ type ApiValidationErrors = Record<string, string[]>;
|
||||
<header class="page-header">
|
||||
<p class="eyebrow">Booking</p>
|
||||
<h1>Reserve seats</h1>
|
||||
<p class="supporting">Performance {{ performanceId }}. Complete the form and we will send a confirmation email.</p>
|
||||
<p class="supporting">
|
||||
Performance {{ performanceId }}. Complete the form and we will email a confirmation link before any reservation becomes active.
|
||||
</p>
|
||||
</header>
|
||||
|
||||
<mat-card class="content-card">
|
||||
<mat-card-content>
|
||||
@if (isSuccess()) {
|
||||
<div class="status-copy success" aria-live="polite">
|
||||
<mat-icon>check_circle</mat-icon>
|
||||
<div class="status-panel success" aria-live="polite">
|
||||
<div class="status-icon">
|
||||
<mat-icon fontSet="material-symbols-outlined">mark_email_read</mat-icon>
|
||||
</div>
|
||||
<div>
|
||||
<h2>Reservation created</h2>
|
||||
<p>check your email</p>
|
||||
<p>Check your email to confirm the booking and unlock the QR code for admission.</p>
|
||||
<div class="status-steps">
|
||||
<span><mat-icon fontSet="material-symbols-outlined">mail</mat-icon> Open the confirmation email</span>
|
||||
<span><mat-icon fontSet="material-symbols-outlined">verified</mat-icon> Confirm your reservation</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
} @else {
|
||||
<form [formGroup]="bookingForm" (ngSubmit)="submit()" novalidate>
|
||||
<div class="intro-note">
|
||||
<mat-icon fontSet="material-symbols-outlined">info</mat-icon>
|
||||
<p>We only ask for the essentials. Your seats are held only after email confirmation.</p>
|
||||
</div>
|
||||
|
||||
<div class="form-grid">
|
||||
<mat-form-field appearance="outline">
|
||||
<mat-icon matPrefix fontSet="material-symbols-outlined">person</mat-icon>
|
||||
<mat-label>Name</mat-label>
|
||||
<input matInput type="text" formControlName="name" autocomplete="name" />
|
||||
@if (bookingForm.controls.name.touched && bookingForm.controls.name.hasError('required')) {
|
||||
@@ -56,8 +70,10 @@ type ApiValidationErrors = Record<string, string[]>;
|
||||
</mat-form-field>
|
||||
|
||||
<mat-form-field appearance="outline">
|
||||
<mat-icon matPrefix fontSet="material-symbols-outlined">mail</mat-icon>
|
||||
<mat-label>Email</mat-label>
|
||||
<input matInput type="email" formControlName="email" autocomplete="email" />
|
||||
<mat-hint>We will send the confirmation link here.</mat-hint>
|
||||
@if (bookingForm.controls.email.touched && bookingForm.controls.email.hasError('required')) {
|
||||
<mat-error>Email is required.</mat-error>
|
||||
}
|
||||
@@ -67,8 +83,10 @@ type ApiValidationErrors = Record<string, string[]>;
|
||||
</mat-form-field>
|
||||
|
||||
<mat-form-field appearance="outline">
|
||||
<mat-icon matPrefix fontSet="material-symbols-outlined">group</mat-icon>
|
||||
<mat-label>Number of seats</mat-label>
|
||||
<input matInput type="number" min="1" step="1" formControlName="partySize" />
|
||||
<mat-hint>Enter the total number of guests in your party.</mat-hint>
|
||||
@if (bookingForm.controls.partySize.touched && bookingForm.controls.partySize.hasError('required')) {
|
||||
<mat-error>Number of seats is required.</mat-error>
|
||||
}
|
||||
@@ -79,14 +97,21 @@ type ApiValidationErrors = Record<string, string[]>;
|
||||
</div>
|
||||
|
||||
@if (submitError()) {
|
||||
<p class="error-message" aria-live="assertive">{{ submitError() }}</p>
|
||||
<div class="message-panel error" aria-live="assertive">
|
||||
<mat-icon fontSet="material-symbols-outlined">error</mat-icon>
|
||||
<p>{{ submitError() }}</p>
|
||||
</div>
|
||||
}
|
||||
|
||||
@if (fieldErrors().length > 0) {
|
||||
<div class="field-errors" aria-live="assertive">
|
||||
<div class="message-panel error field-errors" aria-live="assertive">
|
||||
<mat-icon fontSet="material-symbols-outlined">warning</mat-icon>
|
||||
<div>
|
||||
<p class="message-title">Please check the highlighted details:</p>
|
||||
@for (message of fieldErrors(); track message) {
|
||||
<p>{{ message }}</p>
|
||||
}
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
|
||||
@@ -96,7 +121,10 @@ type ApiValidationErrors = Record<string, string[]>;
|
||||
<mat-progress-spinner mode="indeterminate" diameter="18"></mat-progress-spinner>
|
||||
<span>Submitting...</span>
|
||||
} @else {
|
||||
<span>Reserve</span>
|
||||
<ng-container>
|
||||
<mat-icon fontSet="material-symbols-outlined">confirmation_number</mat-icon>
|
||||
<span>Reserve</span>
|
||||
</ng-container>
|
||||
}
|
||||
</button>
|
||||
<a mat-button routerLink="/shows">Back to shows</a>
|
||||
@@ -138,10 +166,35 @@ type ApiValidationErrors = Record<string, string[]>;
|
||||
}
|
||||
|
||||
.content-card {
|
||||
border-radius: 8px;
|
||||
border-radius: 20px;
|
||||
border: 1px solid var(--azionelab-border);
|
||||
background: var(--azionelab-surface);
|
||||
background: var(--azionelab-surface-strong);
|
||||
box-shadow: var(--azionelab-shadow);
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
mat-card-content {
|
||||
padding: 28px !important;
|
||||
}
|
||||
|
||||
.intro-note {
|
||||
display: flex;
|
||||
align-items: flex-start;
|
||||
gap: 12px;
|
||||
margin-bottom: 20px;
|
||||
padding: 14px 16px;
|
||||
border-radius: 16px;
|
||||
background: rgba(159, 47, 40, 0.06);
|
||||
color: var(--azionelab-muted);
|
||||
}
|
||||
|
||||
.intro-note p {
|
||||
margin: 0;
|
||||
line-height: 1.55;
|
||||
}
|
||||
|
||||
.intro-note mat-icon {
|
||||
color: var(--azionelab-accent);
|
||||
}
|
||||
|
||||
.form-grid {
|
||||
@@ -153,18 +206,37 @@ type ApiValidationErrors = Record<string, string[]>;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.error-message,
|
||||
.message-panel {
|
||||
display: flex;
|
||||
align-items: flex-start;
|
||||
gap: 12px;
|
||||
margin-top: 14px;
|
||||
padding: 14px 16px;
|
||||
border-radius: 16px;
|
||||
border: 1px solid transparent;
|
||||
}
|
||||
|
||||
.message-panel.error {
|
||||
background: var(--azionelab-error-bg);
|
||||
border-color: var(--azionelab-error-border);
|
||||
color: var(--azionelab-error-ink);
|
||||
}
|
||||
|
||||
.message-panel p,
|
||||
.field-errors p {
|
||||
margin: 0;
|
||||
color: #b3261e;
|
||||
line-height: 1.4;
|
||||
font-size: 0.92rem;
|
||||
}
|
||||
|
||||
.field-errors {
|
||||
.message-title {
|
||||
font-weight: 700;
|
||||
margin-bottom: 6px !important;
|
||||
}
|
||||
|
||||
.field-errors > div {
|
||||
display: grid;
|
||||
gap: 6px;
|
||||
margin-top: 10px;
|
||||
}
|
||||
|
||||
.actions {
|
||||
@@ -183,23 +255,77 @@ type ApiValidationErrors = Record<string, string[]>;
|
||||
gap: 8px;
|
||||
}
|
||||
|
||||
.status-copy {
|
||||
.status-panel {
|
||||
display: flex;
|
||||
align-items: flex-start;
|
||||
gap: 14px;
|
||||
gap: 16px;
|
||||
padding: 4px 0;
|
||||
}
|
||||
|
||||
.status-copy h2 {
|
||||
.status-panel h2 {
|
||||
margin: 0 0 6px;
|
||||
}
|
||||
|
||||
.status-copy p {
|
||||
.status-panel p {
|
||||
margin: 0;
|
||||
color: var(--azionelab-muted);
|
||||
line-height: 1.55;
|
||||
}
|
||||
|
||||
.status-copy.success mat-icon {
|
||||
color: #2e7d32;
|
||||
.status-panel.success {
|
||||
padding: 22px;
|
||||
border-radius: 18px;
|
||||
background: var(--azionelab-success-bg);
|
||||
border: 1px solid var(--azionelab-success-border);
|
||||
}
|
||||
|
||||
.status-icon {
|
||||
display: grid;
|
||||
place-items: center;
|
||||
width: 52px;
|
||||
height: 52px;
|
||||
border-radius: 16px;
|
||||
background: rgba(46, 125, 50, 0.12);
|
||||
}
|
||||
|
||||
.status-icon mat-icon {
|
||||
color: var(--azionelab-success-ink);
|
||||
}
|
||||
|
||||
.status-steps {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
gap: 10px;
|
||||
margin-top: 14px;
|
||||
}
|
||||
|
||||
.status-steps span {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: 6px;
|
||||
padding: 8px 12px;
|
||||
border-radius: 999px;
|
||||
background: rgba(255, 255, 255, 0.72);
|
||||
color: var(--azionelab-success-ink);
|
||||
font-size: 0.92rem;
|
||||
}
|
||||
|
||||
.status-steps mat-icon {
|
||||
font-size: 18px;
|
||||
width: 18px;
|
||||
height: 18px;
|
||||
}
|
||||
|
||||
@media (max-width: 640px) {
|
||||
mat-card-content {
|
||||
padding: 22px !important;
|
||||
}
|
||||
|
||||
.status-panel,
|
||||
.message-panel,
|
||||
.intro-note {
|
||||
border-radius: 14px;
|
||||
}
|
||||
}
|
||||
`],
|
||||
changeDetection: ChangeDetectionStrategy.OnPush,
|
||||
|
||||
@@ -11,7 +11,7 @@ import {
|
||||
} from '@angular/core';
|
||||
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
|
||||
import { FormBuilder, ReactiveFormsModule, Validators } from '@angular/forms';
|
||||
import { RouterLink } from '@angular/router';
|
||||
import { ActivatedRoute, RouterLink } from '@angular/router';
|
||||
import { MatButtonModule } from '@angular/material/button';
|
||||
import { MatCardModule } from '@angular/material/card';
|
||||
import { MatFormFieldModule } from '@angular/material/form-field';
|
||||
@@ -170,7 +170,7 @@ type BarcodeDetectorConstructor = new (options?: { formats?: string[] }) => Barc
|
||||
<p class="error-message" aria-live="assertive">This reservation is already checked in.</p>
|
||||
}
|
||||
@if (state() === 'unauthorized') {
|
||||
<p class="error-message" aria-live="assertive">You are not authorized. Staff login is required.</p>
|
||||
<p class="error-message" aria-live="assertive">You are not authorized. Log into <code>/admin</code> with a staff account, then retry this check-in.</p>
|
||||
}
|
||||
@if (state() === 'error') {
|
||||
<p class="error-message" aria-live="assertive">Something went wrong. Please try again.</p>
|
||||
@@ -326,6 +326,7 @@ type BarcodeDetectorConstructor = new (options?: { formats?: string[] }) => Barc
|
||||
export class CheckInPlaceholderPageComponent {
|
||||
private readonly destroyRef = inject(DestroyRef);
|
||||
private readonly formBuilder = inject(FormBuilder);
|
||||
private readonly route = inject(ActivatedRoute);
|
||||
private readonly showsApi = inject(ShowsApiService);
|
||||
private readonly barcodeDetectorCtor = (globalThis as { BarcodeDetector?: BarcodeDetectorConstructor }).BarcodeDetector;
|
||||
private readonly scannerSupported =
|
||||
@@ -358,6 +359,12 @@ export class CheckInPlaceholderPageComponent {
|
||||
|
||||
constructor() {
|
||||
this.destroyRef.onDestroy(() => this.stopScanner());
|
||||
const tokenFromQuery = this.route.snapshot.queryParamMap.get('token')?.trim() ?? '';
|
||||
if (tokenFromQuery) {
|
||||
this.tokenForm.controls.token.setValue(tokenFromQuery);
|
||||
this.tokenForm.controls.token.markAsTouched();
|
||||
this.preview();
|
||||
}
|
||||
}
|
||||
|
||||
protected preview(): void {
|
||||
|
||||
@@ -25,12 +25,13 @@ type ConfirmationState = 'loading' | 'success' | 'invalid' | 'expired' | 'error'
|
||||
<header class="page-header">
|
||||
<p class="eyebrow">Reservation confirmation</p>
|
||||
<h1>Email confirmation</h1>
|
||||
<p class="supporting">Use the link from your inbox to confirm your reservation and retrieve the QR code for venue check-in.</p>
|
||||
</header>
|
||||
|
||||
<mat-card class="status-card">
|
||||
<mat-card-content>
|
||||
@if (state() === 'loading') {
|
||||
<div class="status-copy" aria-live="polite">
|
||||
<div class="status-panel loading" aria-live="polite">
|
||||
<mat-progress-spinner mode="indeterminate" diameter="36"></mat-progress-spinner>
|
||||
<div>
|
||||
<h2>Confirming reservation...</h2>
|
||||
@@ -40,28 +41,40 @@ type ConfirmationState = 'loading' | 'success' | 'invalid' | 'expired' | 'error'
|
||||
}
|
||||
|
||||
@if (state() === 'success' && confirmation()) {
|
||||
<div class="status-copy success" aria-live="polite">
|
||||
<mat-icon>check_circle</mat-icon>
|
||||
<div class="status-panel success" aria-live="polite">
|
||||
<div class="status-icon">
|
||||
<mat-icon fontSet="material-symbols-outlined">verified</mat-icon>
|
||||
</div>
|
||||
<div>
|
||||
<h2>Reservation confirmed</h2>
|
||||
<p>Your seats are confirmed. Present this QR code at check-in.</p>
|
||||
<p>Your seats are confirmed. Present this QR code at check-in and keep the link handy if staff needs manual access.</p>
|
||||
<div class="success-points">
|
||||
<span><mat-icon fontSet="material-symbols-outlined">qr_code_2</mat-icon> Ready for entry</span>
|
||||
<span><mat-icon fontSet="material-symbols-outlined">theater_comedy</mat-icon> See you at the performance</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@if (confirmation()!.qr_code_image) {
|
||||
<div class="qr-panel">
|
||||
<p class="panel-label">Your check-in QR code</p>
|
||||
<img [src]="confirmation()!.qr_code_image" alt="Reservation QR code" />
|
||||
</div>
|
||||
}
|
||||
|
||||
@if (confirmation()!.qr_code_url) {
|
||||
<p class="meta">Check-in URL: <a [href]="confirmation()!.qr_code_url">{{ confirmation()!.qr_code_url }}</a></p>
|
||||
<div class="meta-card">
|
||||
<mat-icon fontSet="material-symbols-outlined">link</mat-icon>
|
||||
<p>Check-in URL: <a [href]="confirmation()!.qr_code_url">{{ confirmation()!.qr_code_url }}</a></p>
|
||||
</div>
|
||||
}
|
||||
}
|
||||
|
||||
@if (state() === 'invalid') {
|
||||
<div class="status-copy" aria-live="assertive">
|
||||
<mat-icon>error</mat-icon>
|
||||
<div class="status-panel error" aria-live="assertive">
|
||||
<div class="status-icon">
|
||||
<mat-icon fontSet="material-symbols-outlined">error</mat-icon>
|
||||
</div>
|
||||
<div>
|
||||
<h2>Invalid confirmation link</h2>
|
||||
<p>This token is not valid. Please use the latest email confirmation link.</p>
|
||||
@@ -70,8 +83,10 @@ type ConfirmationState = 'loading' | 'success' | 'invalid' | 'expired' | 'error'
|
||||
}
|
||||
|
||||
@if (state() === 'expired') {
|
||||
<div class="status-copy" aria-live="assertive">
|
||||
<mat-icon>schedule</mat-icon>
|
||||
<div class="status-panel warning" aria-live="assertive">
|
||||
<div class="status-icon">
|
||||
<mat-icon fontSet="material-symbols-outlined">schedule</mat-icon>
|
||||
</div>
|
||||
<div>
|
||||
<h2>Confirmation link expired</h2>
|
||||
<p>This link has expired. Please create a new reservation.</p>
|
||||
@@ -80,8 +95,10 @@ type ConfirmationState = 'loading' | 'success' | 'invalid' | 'expired' | 'error'
|
||||
}
|
||||
|
||||
@if (state() === 'error') {
|
||||
<div class="status-copy" aria-live="assertive">
|
||||
<mat-icon>warning</mat-icon>
|
||||
<div class="status-panel error" aria-live="assertive">
|
||||
<div class="status-icon">
|
||||
<mat-icon fontSet="material-symbols-outlined">warning</mat-icon>
|
||||
</div>
|
||||
<div>
|
||||
<h2>Could not confirm reservation</h2>
|
||||
<p>Please try again in a moment.</p>
|
||||
@@ -120,54 +137,195 @@ type ConfirmationState = 'loading' | 'success' | 'invalid' | 'expired' | 'error'
|
||||
font-size: clamp(2rem, 4vw, 3rem);
|
||||
}
|
||||
|
||||
.status-card {
|
||||
border-radius: 8px;
|
||||
border: 1px solid var(--azionelab-border);
|
||||
background: var(--azionelab-surface);
|
||||
box-shadow: var(--azionelab-shadow);
|
||||
.supporting {
|
||||
color: var(--azionelab-muted);
|
||||
line-height: 1.6;
|
||||
max-width: 58ch;
|
||||
margin: 14px 0 0;
|
||||
}
|
||||
|
||||
.status-copy {
|
||||
.status-card {
|
||||
border-radius: 20px;
|
||||
border: 1px solid var(--azionelab-border);
|
||||
background: var(--azionelab-surface-strong);
|
||||
box-shadow: var(--azionelab-shadow);
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
mat-card-content {
|
||||
padding: 28px !important;
|
||||
}
|
||||
|
||||
mat-card-actions {
|
||||
padding: 0 28px 24px !important;
|
||||
gap: 8px;
|
||||
}
|
||||
|
||||
.status-panel {
|
||||
display: flex;
|
||||
align-items: flex-start;
|
||||
gap: 14px;
|
||||
gap: 16px;
|
||||
padding: 20px;
|
||||
border-radius: 18px;
|
||||
border: 1px solid transparent;
|
||||
}
|
||||
|
||||
.status-copy h2 {
|
||||
.status-panel h2 {
|
||||
margin: 0 0 6px;
|
||||
font-size: 1.2rem;
|
||||
}
|
||||
|
||||
.status-copy p {
|
||||
.status-panel p {
|
||||
margin: 0;
|
||||
color: var(--azionelab-muted);
|
||||
line-height: 1.5;
|
||||
}
|
||||
|
||||
.status-copy.success mat-icon {
|
||||
color: #2e7d32;
|
||||
.status-panel.loading {
|
||||
background: rgba(159, 47, 40, 0.04);
|
||||
border-color: rgba(159, 47, 40, 0.1);
|
||||
}
|
||||
|
||||
.status-panel.success {
|
||||
background: var(--azionelab-success-bg);
|
||||
border-color: var(--azionelab-success-border);
|
||||
}
|
||||
|
||||
.status-panel.warning {
|
||||
background: #fff7ea;
|
||||
border-color: rgba(181, 126, 0, 0.15);
|
||||
}
|
||||
|
||||
.status-panel.error {
|
||||
background: var(--azionelab-error-bg);
|
||||
border-color: var(--azionelab-error-border);
|
||||
}
|
||||
|
||||
.status-icon {
|
||||
display: grid;
|
||||
place-items: center;
|
||||
width: 52px;
|
||||
height: 52px;
|
||||
border-radius: 16px;
|
||||
flex: 0 0 auto;
|
||||
background: rgba(30, 27, 24, 0.06);
|
||||
}
|
||||
|
||||
.status-panel.success .status-icon {
|
||||
background: rgba(46, 125, 50, 0.12);
|
||||
}
|
||||
|
||||
.status-panel.warning .status-icon {
|
||||
background: rgba(181, 126, 0, 0.14);
|
||||
}
|
||||
|
||||
.status-panel.error .status-icon {
|
||||
background: rgba(179, 38, 30, 0.12);
|
||||
}
|
||||
|
||||
.status-panel.success .status-icon mat-icon {
|
||||
color: var(--azionelab-success-ink);
|
||||
}
|
||||
|
||||
.status-panel.warning .status-icon mat-icon {
|
||||
color: #9b6c00;
|
||||
}
|
||||
|
||||
.status-panel.error .status-icon mat-icon {
|
||||
color: var(--azionelab-error-ink);
|
||||
}
|
||||
|
||||
.success-points {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
gap: 10px;
|
||||
margin-top: 14px;
|
||||
}
|
||||
|
||||
.success-points span {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: 6px;
|
||||
padding: 8px 12px;
|
||||
border-radius: 999px;
|
||||
background: rgba(255, 255, 255, 0.72);
|
||||
color: var(--azionelab-success-ink);
|
||||
font-size: 0.92rem;
|
||||
}
|
||||
|
||||
.success-points mat-icon {
|
||||
font-size: 18px;
|
||||
width: 18px;
|
||||
height: 18px;
|
||||
}
|
||||
|
||||
.qr-panel {
|
||||
margin-top: 18px;
|
||||
padding: 14px;
|
||||
border-radius: 8px;
|
||||
padding: 16px;
|
||||
border-radius: 18px;
|
||||
border: 1px solid var(--azionelab-border);
|
||||
display: inline-block;
|
||||
background: white;
|
||||
}
|
||||
|
||||
.panel-label {
|
||||
margin: 0 0 12px;
|
||||
font-size: 0.88rem;
|
||||
font-weight: 700;
|
||||
color: var(--azionelab-muted);
|
||||
text-transform: uppercase;
|
||||
letter-spacing: 0.08em;
|
||||
}
|
||||
|
||||
.qr-panel img {
|
||||
width: min(280px, 100%);
|
||||
height: auto;
|
||||
display: block;
|
||||
}
|
||||
|
||||
.meta {
|
||||
margin: 14px 0 0;
|
||||
word-break: break-word;
|
||||
.meta-card {
|
||||
display: flex;
|
||||
align-items: flex-start;
|
||||
gap: 10px;
|
||||
margin-top: 16px;
|
||||
padding: 14px 16px;
|
||||
border-radius: 16px;
|
||||
background: rgba(159, 47, 40, 0.05);
|
||||
color: var(--azionelab-muted);
|
||||
}
|
||||
|
||||
.meta-card p {
|
||||
margin: 0;
|
||||
word-break: break-word;
|
||||
}
|
||||
|
||||
.meta-card a {
|
||||
color: var(--azionelab-accent-strong);
|
||||
}
|
||||
|
||||
@media (max-width: 640px) {
|
||||
mat-card-content {
|
||||
padding: 22px !important;
|
||||
}
|
||||
|
||||
mat-card-actions {
|
||||
padding: 0 22px 20px !important;
|
||||
}
|
||||
|
||||
.status-panel {
|
||||
padding: 18px;
|
||||
border-radius: 16px;
|
||||
}
|
||||
|
||||
.qr-panel {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.qr-panel img {
|
||||
width: min(100%, 280px);
|
||||
margin: 0 auto;
|
||||
}
|
||||
}
|
||||
`],
|
||||
changeDetection: ChangeDetectionStrategy.OnPush,
|
||||
})
|
||||
|
||||
@@ -45,9 +45,16 @@ import { ShowDetail, ShowPerformance, ShowsApiService } from '../services/shows-
|
||||
</mat-card>
|
||||
} @else if (show()) {
|
||||
<header class="page-header">
|
||||
<p class="eyebrow">Show detail</p>
|
||||
<h1>{{ show()!.title }}</h1>
|
||||
<p class="supporting">{{ show()!.description || show()!.summary }}</p>
|
||||
<div class="hero-copy">
|
||||
<p class="eyebrow">Show detail</p>
|
||||
<h1>{{ show()!.title }}</h1>
|
||||
<p class="supporting">{{ show()!.description || show()!.summary }}</p>
|
||||
</div>
|
||||
@if (show()!.image_url) {
|
||||
<div class="hero-image-wrap">
|
||||
<img class="hero-image" [src]="show()!.image_url" [alt]="show()!.title" />
|
||||
</div>
|
||||
}
|
||||
</header>
|
||||
|
||||
<section class="section">
|
||||
@@ -115,9 +122,17 @@ import { ShowDetail, ShowPerformance, ShowsApiService } from '../services/shows-
|
||||
}
|
||||
|
||||
.page-header {
|
||||
display: grid;
|
||||
grid-template-columns: minmax(0, 1.2fr) minmax(280px, 420px);
|
||||
gap: 24px;
|
||||
align-items: start;
|
||||
margin-bottom: 28px;
|
||||
}
|
||||
|
||||
.hero-copy {
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
.eyebrow {
|
||||
margin: 0 0 10px;
|
||||
color: var(--azionelab-accent);
|
||||
@@ -138,6 +153,24 @@ import { ShowDetail, ShowPerformance, ShowsApiService } from '../services/shows-
|
||||
max-width: 64ch;
|
||||
}
|
||||
|
||||
.hero-image-wrap {
|
||||
overflow: hidden;
|
||||
border-radius: 12px;
|
||||
border: 1px solid var(--azionelab-border);
|
||||
background:
|
||||
linear-gradient(135deg, rgba(207, 71, 51, 0.16), rgba(15, 22, 36, 0.08)),
|
||||
#f8f1ea;
|
||||
box-shadow: var(--azionelab-shadow);
|
||||
aspect-ratio: 4 / 5;
|
||||
}
|
||||
|
||||
.hero-image {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
display: block;
|
||||
object-fit: cover;
|
||||
}
|
||||
|
||||
.section {
|
||||
display: grid;
|
||||
gap: 20px;
|
||||
@@ -231,6 +264,10 @@ import { ShowDetail, ShowPerformance, ShowsApiService } from '../services/shows-
|
||||
}
|
||||
|
||||
@media (max-width: 860px) {
|
||||
.page-header {
|
||||
grid-template-columns: 1fr;
|
||||
}
|
||||
|
||||
.section-heading {
|
||||
align-items: flex-start;
|
||||
flex-direction: column;
|
||||
|
||||
@@ -59,6 +59,11 @@ import { ShowListItem, ShowsApiService } from '../services/shows-api.service';
|
||||
<div class="show-grid">
|
||||
@for (show of shows(); track show.slug) {
|
||||
<mat-card class="show-card">
|
||||
@if (show.image_url) {
|
||||
<div class="show-image-wrap">
|
||||
<img class="show-image" [src]="show.image_url" [alt]="show.title" />
|
||||
</div>
|
||||
}
|
||||
<mat-card-title>{{ show.title }}</mat-card-title>
|
||||
<mat-card-content>
|
||||
<p>{{ show.summary }}</p>
|
||||
@@ -157,6 +162,22 @@ import { ShowListItem, ShowsApiService } from '../services/shows-api.service';
|
||||
box-shadow: var(--azionelab-shadow);
|
||||
}
|
||||
|
||||
.show-image-wrap {
|
||||
aspect-ratio: 16 / 10;
|
||||
overflow: hidden;
|
||||
border-bottom: 1px solid var(--azionelab-border);
|
||||
background:
|
||||
linear-gradient(135deg, rgba(207, 71, 51, 0.14), rgba(15, 22, 36, 0.06)),
|
||||
#f8f1ea;
|
||||
}
|
||||
|
||||
.show-image {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
display: block;
|
||||
object-fit: cover;
|
||||
}
|
||||
|
||||
.show-card mat-card-content {
|
||||
flex: 1;
|
||||
}
|
||||
|
||||
@@ -9,6 +9,7 @@ export type ShowListItem = {
|
||||
title: string;
|
||||
slug: string;
|
||||
summary: string;
|
||||
image_url: string;
|
||||
poster_image: string;
|
||||
};
|
||||
|
||||
@@ -114,10 +115,18 @@ export class ShowsApiService {
|
||||
}
|
||||
|
||||
previewCheckIn(token: string): Observable<CheckInPreviewResponse> {
|
||||
return this.http.post<CheckInPreviewResponse>(`${this.apiBaseUrl}/check-ins/preview/`, { token });
|
||||
return this.http.post<CheckInPreviewResponse>(
|
||||
`${this.apiBaseUrl}/check-ins/preview/`,
|
||||
{ token },
|
||||
{ withCredentials: true },
|
||||
);
|
||||
}
|
||||
|
||||
confirmCheckIn(token: string): Observable<CheckInConfirmResponse> {
|
||||
return this.http.post<CheckInConfirmResponse>(`${this.apiBaseUrl}/check-ins/confirm/`, { token });
|
||||
return this.http.post<CheckInConfirmResponse>(
|
||||
`${this.apiBaseUrl}/check-ins/confirm/`,
|
||||
{ token },
|
||||
{ withCredentials: true },
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5,6 +5,12 @@
|
||||
<title>AzioneLab</title>
|
||||
<base href="/">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<link rel="preconnect" href="https://fonts.googleapis.com">
|
||||
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
|
||||
<link
|
||||
href="https://fonts.googleapis.com/css2?family=Fraunces:opsz,wght@9..144,600;9..144,700&family=Manrope:wght@400;500;600;700&family=Material+Symbols+Outlined:opsz,wght,FILL,GRAD@24,500,0,0"
|
||||
rel="stylesheet"
|
||||
>
|
||||
</head>
|
||||
<body>
|
||||
<app-root></app-root>
|
||||
|
||||
+21
-1
@@ -1,12 +1,19 @@
|
||||
:root {
|
||||
--azionelab-bg: #f3eee6;
|
||||
--azionelab-surface: rgba(255, 255, 255, 0.78);
|
||||
--azionelab-surface-strong: rgba(255, 255, 255, 0.92);
|
||||
--azionelab-ink: #1e1b18;
|
||||
--azionelab-muted: #645b53;
|
||||
--azionelab-accent: #9f2f28;
|
||||
--azionelab-accent-strong: #7f211c;
|
||||
--azionelab-border: rgba(30, 27, 24, 0.12);
|
||||
--azionelab-shadow: 0 18px 48px rgba(46, 28, 18, 0.12);
|
||||
--azionelab-success-bg: #edf7ef;
|
||||
--azionelab-success-ink: #1f5f2b;
|
||||
--azionelab-success-border: rgba(46, 125, 50, 0.18);
|
||||
--azionelab-error-bg: #fff3f1;
|
||||
--azionelab-error-ink: #8b2a20;
|
||||
--azionelab-error-border: rgba(179, 38, 30, 0.16);
|
||||
}
|
||||
|
||||
* {
|
||||
@@ -16,7 +23,7 @@
|
||||
html, body {
|
||||
margin: 0;
|
||||
min-height: 100%;
|
||||
font-family: "Segoe UI", "Helvetica Neue", sans-serif;
|
||||
font-family: "Manrope", "Segoe UI", sans-serif;
|
||||
color: var(--azionelab-ink);
|
||||
background:
|
||||
radial-gradient(circle at top right, rgba(159, 47, 40, 0.12), transparent 28%),
|
||||
@@ -28,6 +35,19 @@ body {
|
||||
min-height: 100vh;
|
||||
}
|
||||
|
||||
h1, h2, h3 {
|
||||
font-family: "Fraunces", "Times New Roman", serif;
|
||||
letter-spacing: -0.02em;
|
||||
}
|
||||
|
||||
button, input, textarea {
|
||||
font: inherit;
|
||||
}
|
||||
|
||||
.material-symbols-outlined {
|
||||
font-variation-settings:
|
||||
'FILL' 0,
|
||||
'wght' 500,
|
||||
'GRAD' 0,
|
||||
'opsz' 24;
|
||||
}
|
||||
|
||||
@@ -10,6 +10,7 @@ services:
|
||||
DJANGO_CSRF_TRUSTED_ORIGINS: ${DJANGO_CSRF_TRUSTED_ORIGINS}
|
||||
DJANGO_DEBUG: ${DJANGO_DEBUG:-false}
|
||||
CORS_ALLOWED_ORIGINS: ${CORS_ALLOWED_ORIGINS}
|
||||
SITE_BASE_URL: ${SITE_BASE_URL}
|
||||
TIME_ZONE: ${TIME_ZONE:-Europe/Rome}
|
||||
DATABASE_URL: ${DATABASE_URL}
|
||||
POSTGRES_DB: ${POSTGRES_DB}
|
||||
@@ -21,6 +22,7 @@ services:
|
||||
- "${BACKEND_PORT:-8000}"
|
||||
volumes:
|
||||
- django_static:/app/staticfiles
|
||||
- django_media:/app/media
|
||||
depends_on:
|
||||
postgres:
|
||||
condition: service_healthy
|
||||
@@ -70,6 +72,7 @@ services:
|
||||
volumes:
|
||||
- ./nginx/templates:/etc/nginx/templates:ro
|
||||
- django_static:/var/www/static:ro
|
||||
- django_media:/var/www/media:ro
|
||||
depends_on:
|
||||
- backend
|
||||
- frontend
|
||||
@@ -80,6 +83,7 @@ services:
|
||||
volumes:
|
||||
postgres_data:
|
||||
django_static:
|
||||
django_media:
|
||||
|
||||
networks:
|
||||
internal:
|
||||
|
||||
@@ -35,9 +35,9 @@ server {
|
||||
}
|
||||
|
||||
location /media/ {
|
||||
proxy_pass http://azionelab_backend;
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header X-Forwarded-Proto $scheme;
|
||||
alias /var/www/media/;
|
||||
access_log off;
|
||||
expires 1d;
|
||||
}
|
||||
|
||||
location / {
|
||||
|
||||
Reference in New Issue
Block a user