Compare commits

68 Commits
Author SHA1 Message Date
fromme 46934e278c fix: log authorization denials on the auth channel 2026-11-13 16:21:04 +01:00
fromme aebfc2ca9b feat: back-channel logout to client apps 2026-11-13 16:20:22 +01:00
fromme 3247df1171 feat: link ephub from account dashboard for eligible users 2026-11-13 15:48:54 +01:00
fromme 6cfaaf1ba9 feat: adopt ep-design 1.5.0 in admin 2026-11-13 15:14:05 +01:00
fromme fd3d88209c feat: adopt ep-design 1.4.0 in admin 2026-11-13 14:48:37 +01:00
fromme 21b00e3bd6 fix: adopt ep-design 1.3.1 menu click action 2026-11-13 13:47:29 +01:00
fromme e517163c9a feat: adopt ep-design 1.3.0 in admin 2026-11-13 12:42:00 +01:00
fromme df564c30ae feat: align admin dashboard cards with epteam 2026-11-13 12:03:39 +01:00
fromme 558e45fe5f feat: restyle admin views in corporate design 2026-11-13 11:51:46 +01:00
fromme c660bd68de feat: adopt E&P corporate design in admin 2026-11-13 11:51:46 +01:00
fromme 55378b2bbc feat: stop booking flow when BusPro is unreachable 2026-11-11 19:51:52 +01:00
fromme ac23baf625 feat: lock pooled rooms once the pool is used up 2026-11-11 17:16:42 +01:00
fromme a1645784fe fix: reword shared contingent hint 2026-11-11 17:12:55 +01:00
fromme 3d94505e8d feat: cap rooms sharing a contingent per booking 2026-11-11 16:35:49 +01:00
fromme 5942ecf340 docs: document pooled room contingents 2026-11-11 16:35:49 +01:00
fromme 0b0286787b feat: offer rooms on request by Anf code suffix 2026-11-11 11:35:38 +01:00
fromme 2936d8947a docs: update initial booking status comment 2026-11-10 17:32:38 +01:00
fromme 0ff312c0c0 feat: add bookable flag to product export rooms 2026-11-10 17:32:38 +01:00
fromme 2b27b9809d feat: offer only free rooms in booking step 1 2026-11-10 17:32:38 +01:00
fromme 980e378a7b feat: disable mailjet open and click tracking 2026-11-10 17:25:16 +01:00
fromme 77960fe81f chore: update project dependencies 2026-11-09 18:15:36 +01:00
fromme 9ce42de4c1 refactor: drop edit-mode room assignment code 2026-11-09 18:01:25 +01:00
fromme d50995a21c fix: pass BusPro room assignments through on edit 2026-11-09 18:00:47 +01:00
fromme 897a1ac7f9 fix: show booked room count in edit summary 2026-11-09 18:00:47 +01:00
fromme 2705401393 feat: add bus-only travel mailing lists 2026-11-09 15:53:53 +01:00
fromme f5894a6bef chore: update project dependencies 2026-11-04 16:50:54 +01:00
fromme e7df5ac03a feat: use a Mailjet sub-account for travel lists 2026-11-04 16:21:15 +01:00
fromme c16f368293 feat: create Mailjet lists for travel mailings 2026-11-04 15:32:50 +01:00
fromme d63fa10a56 fix: show warning flashes in the admin layout 2026-11-04 15:32:49 +01:00
fromme e8fa71175d chore: remove obsolete booking draft repair command 2026-11-04 10:14:10 +01:00
fromme 09610889f3 fix: map live service status to export wording 2026-11-04 10:12:34 +01:00
fromme d8fe9a3875 fix: stop counting held seats in edit usage 2026-11-04 10:10:37 +01:00
fromme e9766dbdce fix: strip invalid XML characters from responses 2026-11-03 15:07:47 +01:00
fromme b047465339 chore: update project dependencies 2026-10-29 15:52:06 +01:00
fromme a60bf68345 docs: document contingent hotel code contract 2026-10-29 15:34:27 +01:00
fromme 97c6330a9a feat: sync contingents for TYPO3 calendar hotels 2026-10-29 15:05:04 +01:00
fromme ec36b61275 feat: add raw contingent availability endpoint 2026-10-29 11:19:31 +01:00
fromme 7c8dbeef48 fix: validate newly entered phone numbers 2026-10-28 13:48:51 +01:00
fromme e293bd3b1c chore: update project dependencies 2026-10-26 16:42:20 +01:00
fromme a7b845751b chore: update project dependencies 2026-10-23 16:22:50 +02:00
fromme 234f3a0bd2 fix: submit BusPro nationality token for applicant 2026-10-23 16:20:37 +02:00
fromme f794d882ca chore: disable unused ssh-agent in ddev web container 2026-10-23 16:11:53 +02:00
fromme 05e348e9b7 chore: upgrade htmx from 1.9 to 2.0 2026-10-20 14:59:54 +02:00
fromme 654214cf37 chore: decide on npm install scripts 2026-10-20 14:58:13 +02:00
fromme 8a6f73bd9b chore: bump node to 24 2026-10-20 14:53:53 +02:00
fromme a6a8783319 fix: show scrollbars only when an inner area overflows 2026-10-20 14:43:10 +02:00
fromme 1d20524678 chore: raise browser targets to tailwind 4's floor 2026-10-20 14:41:43 +02:00
fromme 88f6807399 chore: upgrade tailwind css from 3.4 to 4.3 2026-10-20 14:41:25 +02:00
fromme 91270fdfc3 chore: apply frontend dependency quick fixes 2026-10-20 14:35:56 +02:00
fromme e8d1b69407 chore: update project dependencies 2026-10-20 13:41:57 +02:00
fromme 3428408db5 chore: upgrade to webpack encore 7 2026-10-20 10:06:35 +02:00
fromme 32083c7966 fix: clear inquiry status on room reselection 2026-10-20 09:41:33 +02:00
fromme d4296f30a5 fix: list boarding surcharges per leg and count them once in the summary 2026-10-19 10:38:17 +02:00
fromme 57b86a8fbc chore: remove boarding point price levelling 2026-10-19 10:29:12 +02:00
fromme 3f941bb4bf chore: update message to use informal language 2026-10-19 10:09:41 +02:00
fromme 60de688859 chore: update project dependencies 2026-10-19 09:20:10 +02:00
fromme 69eba9767a docs: committed bookings accept participants without email on the test system 2026-10-19 09:18:22 +02:00
fromme 1d9c852113 feat: make email optional for under-16 participants except applicant 2026-10-19 09:18:22 +02:00
fromme b958d1a371 feat: offer non-travelling applicant choice only on selected travels 2026-10-19 09:18:22 +02:00
fromme 5b75938c73 fix: applicant split in edit mode, drop create-mode agency checks 2026-10-19 09:18:22 +02:00
fromme 1ff293f41f feat: split booking between participants and applicant
addresses #869f2q1vu
2026-10-19 09:18:22 +02:00
fromme 2d49212b08 chore: update project dependencies 2026-10-18 15:27:48 +02:00
fromme b67f25606a fix: use correct config key for sbw subsite 2026-10-17 15:02:46 +02:00
fromme 0ee8fafbe1 fix: name missing fields the user cannot edit on personal data page 2026-10-16 17:46:05 +02:00
fromme 6d2db1b258 feat: add the product code to the travel export 2026-10-15 17:26:12 +02:00
fromme 6f6bf3695c feat: itemised price breakdown on the accommodation booking edit page 2026-10-14 17:16:31 +02:00
fromme a5f8d75caa feat: show and sort accommodation bookings by timestamp of last update 2026-10-14 17:06:50 +02:00
fromme ff722b5cef feat: show the travel name above the mailing list 2026-10-14 14:05:42 +02:00
267 changed files with 12041 additions and 6189 deletions

No files matched your search

+4
View File
@@ -0,0 +1,4 @@
# Tailwind 4's floor: browsers without cascade layers, or Chrome before 111, can't render the
# app's CSS, so the JS isn't transpiled for them either.
defaults and fully supports css-cascade-layers
not chrome < 111
+2 -1
View File
@@ -17,8 +17,9 @@ use_dns_when_possible: true
timezone: Europe/Berlin
composer_version: "2"
web_environment: [ ]
nodejs_version: "22"
nodejs_version: "24"
corepack_enable: false
omit_containers: [ddev-ssh-agent]
# Key features of DDEV's config.yaml:
+3 -9
View File
@@ -44,6 +44,9 @@ MAILJET_API_KEY=
MAILJET_API_SECRET=
MAILJET_API_BASE_URL=https://api.mailjet.com/v3/REST
MAILJET_DEFAULT_LIST_ID=
# Sub-account for the travel mailing lists
MAILJET_TRAVEL_MAILING_API_KEY=
MAILJET_TRAVEL_MAILING_API_SECRET=
# Development default for HTTP Basic Auth password; override in production secrets.
MAILJET_WEBHOOK_BASIC_PASSWORD=secret
APP_NEWSLETTER_CONFIRMATION_TTL_HOURS=1
@@ -98,15 +101,6 @@ APP_TRAVEL_PREFER_REMOTE=false
APP_TRAVEL_ENABLE_FALLBACK=true
APP_TRAVEL_SNAPSHOT_RETENTION_BUFFER_DAYS=14
# Compensates a BusPro export defect: a <zustieg_rueck> can omit its preis although the booking
# engine still bills the return-leg Abfahrtsortzuschlag, so we undercharge by exactly one leg.
# A boarding point costs the same in both directions, so the stated price is applied to both.
# Off = report the export verbatim. Provisional until the vendor fixes the export; see
# docs/buspro-database-reference.md section A7.
# Flipping this needs `app:bpn:xml-cache-invalidate` and `app:bpn:refresh-travel-snapshot`,
# because the cached travels and TravelSnapshot rows carry the parsed price.
APP_BPN_LEVEL_BOARDING_POINT_PRICES=true
# Off turns every navigation into a full page load, which the web debug toolbar needs: its loader
# script never runs on a boosted body swap. Explicit hx-get/hx-post requests are unaffected.
# Only for local debugging; prod and the boosted code paths (HxRedirectResponse, error modal) need it on.
+1
View File
@@ -0,0 +1 @@
24
+35
View File
@@ -0,0 +1,35 @@
import { Controller } from '@hotwired/stimulus'
/*
* The navigation (sidebar or header tabs) as a drawer on small screens: a modal <dialog> (target
* "dialog"), so focus stays inside and Escape closes it. A click on the dimmed page beside it closes it
* too, and so does widening the window until the navigation shows (lg).
*/
export default class extends Controller {
static targets = ['dialog']
connect () {
this.wide = window.matchMedia('(min-width: 64rem)')
this.onWide = (event) => event.matches && this.close()
this.wide.addEventListener('change', this.onWide)
}
disconnect () {
this.wide.removeEventListener('change', this.onWide)
}
open () {
this.dialogTarget.showModal()
}
close () {
this.dialogTarget.close()
}
// a click on the dialog element itself, not on its content, is a click on the backdrop
closeOnBackdrop (event) {
if (event.target === this.dialogTarget) {
this.close()
}
}
}
+89
View File
@@ -0,0 +1,89 @@
import { Controller } from '@hotwired/stimulus'
/*
* A small menu behind a "⋯" button: the button (menu#toggle) opens the panel (target "panel") below
* itself. The panel is positioned fixed, so a scrolling container can't cut it off. Escape, a click
* outside or a click on one of its items closes it; arrow keys move between the items. Scrolling or
* resizing closes it too: a fixed panel would stay put while its row moves away (a table swiped
* sideways on a phone).
*/
export default class extends Controller {
static targets = ['button', 'panel']
connect () {
this.onOutside = (event) => {
if (!this.element.contains(event.target)) {
this.close()
}
}
this.onKey = (event) => this.key(event)
this.onScroll = (event) => {
if (!this.panelTarget.contains(event.target)) {
this.close()
}
}
this.onResize = () => this.close()
}
disconnect () {
this.close()
}
toggle (event) {
event.stopPropagation()
this.panelTarget.hidden ? this.open() : this.close()
}
open () {
const box = this.buttonTarget.getBoundingClientRect()
const panel = this.panelTarget
panel.hidden = false
// below the button, aligned to its right edge, and inside the window
const left = Math.max(8, Math.min(box.right - panel.offsetWidth, window.innerWidth - panel.offsetWidth - 8))
const below = box.bottom + 4 + panel.offsetHeight <= window.innerHeight
panel.style.left = `${left}px`
panel.style.top = `${below ? box.bottom + 4 : box.top - panel.offsetHeight - 4}px`
this.buttonTarget.setAttribute('aria-expanded', 'true')
document.addEventListener('click', this.onOutside, true)
document.addEventListener('keydown', this.onKey)
// capture: scroll events don't bubble, and the scrolling box may be any ancestor
document.addEventListener('scroll', this.onScroll, true)
window.addEventListener('resize', this.onResize)
this.items()[0]?.focus({ preventScroll: true })
}
close () {
if (this.panelTarget.hidden) {
return
}
this.panelTarget.hidden = true
this.buttonTarget.setAttribute('aria-expanded', 'false')
document.removeEventListener('click', this.onOutside, true)
document.removeEventListener('keydown', this.onKey)
document.removeEventListener('scroll', this.onScroll, true)
window.removeEventListener('resize', this.onResize)
}
// an item was chosen: it does its own work (htmx, link), the menu only closes
choose () {
this.close()
}
key (event) {
const items = this.items()
const index = items.indexOf(document.activeElement)
if (event.key === 'Escape') {
event.stopPropagation()
this.close()
this.buttonTarget.focus()
} else if (event.key === 'ArrowDown' || event.key === 'ArrowUp') {
event.preventDefault()
const next = (index + (event.key === 'ArrowDown' ? 1 : -1) + items.length) % items.length
items[next]?.focus()
}
}
items () {
return [...this.panelTarget.querySelectorAll('a, button:not([disabled])')]
}
}
@@ -1,16 +0,0 @@
import { Controller } from '@hotwired/stimulus'
export default class extends Controller {
static outlets = [ 'mobilenav' ]
static classes = [ 'closed' ]
trigger({ params: { mode } }) {
this.mobilenavOutlet.toggle(mode)
}
toggle(mode) {
// Add animation classes only now to avoid fouc
this.element.classList.add('transition-transform', 'duration-300')
this.element.classList.toggle(this.closedClass, 'close' === mode)
}
}
@@ -1,30 +0,0 @@
import { Controller } from '@hotwired/stimulus'
export default class extends Controller {
static classes = ['closed', 'iconClosed', 'iconExpanded']
static targets = ['submenu', 'button', 'icon']
static values = { expanded: Boolean }
toggleSubmenu() {
this.expandedValue = !this.expandedValue
}
expandedValueChanged(expanded) {
this.submenuTarget.classList.toggle(this.closedClass, false === expanded)
if (false === this.hasButtonTarget) {
return
}
this.buttonTarget.setAttribute('aria-expanded', expanded)
if (false === this.hasIconTarget) {
return
}
if (true === expanded) {
this.iconTarget.classList.add(...this.iconExpandedClasses)
this.iconTarget.classList.remove(...this.iconClosedClasses)
} else {
this.iconTarget.classList.add(...this.iconClosedClasses)
this.iconTarget.classList.remove(...this.iconExpandedClasses)
}
}
}
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
+1
View File
@@ -0,0 +1 @@
<svg clip-rule="evenodd" fill-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="2" viewBox="0 0 500 153" xmlns="http://www.w3.org/2000/svg"><g fill="#0084d4"><path d="m332.922 85.597c4.527 0 7.819 3.292 7.819 7.819 0 4.115-2.675 6.79-5.762 7.613l6.791 11.934h-3.704l-6.379-11.523h-7.613v11.523h-3.292v-27.366zm-8.642 12.963h8.642c2.469 0 4.527-2.058 4.527-5.144 0-3.293-2.264-5.144-5.35-5.144h-7.819z" fill-rule="nonzero"/><path d="m374.28 85.597v2.88h-15.432v9.877h13.374v2.881h-13.374v9.053h15.843v2.675h-19.135v-27.366z" fill-rule="nonzero"/><path d="m389.095 85.597h3.292v27.366h-3.292z"/><path d="m406.79 111.317.823-2.675c1.029.411 4.733 1.852 8.436 1.852 4.527 0 6.791-1.852 6.791-4.527 0-3.498-3.498-4.321-6.996-5.35-4.321-1.234-8.848-2.675-8.848-8.024 0-4.939 3.704-7.408 9.259-7.408 3.292 0 6.79 1.029 8.642 1.852l-.823 2.675s-4.115-1.646-7.613-1.646c-3.704 0-6.173 1.852-6.173 4.527 0 3.292 3.704 4.321 6.996 5.349 4.321 1.235 8.848 2.675 8.848 8.025 0 5.144-4.116 7.407-9.671 7.407-4.321 0-8.025-1.234-9.671-2.057z" fill-rule="nonzero"/><path d="m458.848 85.597v2.88h-15.432v9.877h13.374v2.881h-13.374v9.053h15.843v2.675h-19.136v-27.366z" fill-rule="nonzero"/><path d="m476.955 85.597 8.642 12.963 5.967 9.259-.206-9.259v-12.963h3.292v27.366h-3.498l-8.642-13.375-5.761-9.053.206 9.259v13.169h-3.292v-27.366z" fill-rule="nonzero"/><path d="m339.712 123.663v2.88h-15.432v9.877h13.374v2.88h-13.374v9.054h15.843v2.881h-19.135v-27.572z" fill-rule="nonzero"/><path d="m352.263 123.663 8.231 23.251 8.23-23.251h3.498l-9.876 27.366h-3.704l-9.877-27.366z" fill-rule="nonzero"/><path d="m401.44 123.663v2.88h-15.432v9.877h13.375v2.88h-13.375v9.054h15.844v2.881h-19.136v-27.572z" fill-rule="nonzero"/><path d="m416.872 123.663 8.642 12.963 5.967 9.259-.205-9.259v-12.963h3.292v27.366h-3.498l-8.642-13.375-5.761-9.053.205 9.259v13.169h-3.292v-27.366z" fill-rule="nonzero"/><path d="m466.872 123.457v3.086h-9.259v24.486h-3.292v-24.692h-9.259v-2.88z" fill-rule="nonzero"/><path d="m475.309 149.177.823-2.675c1.028.412 4.732 1.852 8.436 1.852 4.527 0 6.79-1.852 6.79-4.527 0-3.498-3.498-4.321-6.996-5.35-4.321-1.234-8.848-2.675-8.848-8.024 0-4.939 3.704-7.408 9.26-7.408 3.292 0 6.79 1.029 8.642 1.852l-.823 2.675s-4.116-1.646-7.614-1.646c-3.703 0-6.172 1.852-6.172 4.527 0 3.292 3.703 4.321 6.995 5.349 4.321 1.235 8.848 2.675 8.848 8.025 0 5.144-4.115 7.408-9.671 7.408-4.115 0-8.024-1.235-9.67-2.058z" fill-rule="nonzero"/><path d="m367.695 1.852v10.905h-33.333v17.078h28.395v11.112h-28.395v15.637h33.951v10.906h-47.12v-65.638z" fill-rule="nonzero"/><path d="m418.93 16.255c0 5.556-3.292 11.729-10.7 16.255l11.317 13.169s2.264-4.115 2.264-9.465h9.876c-.206 10.082-4.938 17.901-4.938 17.901l12.14 13.992h-14.609l-4.938-5.761c-4.527 3.909-10.494 6.173-17.284 6.173-12.346 0-23.457-7.202-23.457-20.782 0-8.848 5.761-14.404 11.728-18.519-3.292-4.321-5.761-7.202-5.761-12.963 0-11.317 9.465-15.638 16.872-15.638 7.408 0 17.49 4.321 17.49 15.638zm-28.189 31.276c0 6.173 4.526 10.082 11.728 10.082 3.704 0 6.996-1.029 9.671-3.292l-14.403-16.667c-4.116 2.264-6.996 5.35-6.996 9.877zm5.967-30.659c0 3.293 2.057 5.144 4.321 7.614 3.704-1.646 6.378-4.527 6.378-7.819 0-3.91-2.674-5.35-5.349-5.35-3.498 0-5.35 2.263-5.35 5.555z" fill-rule="nonzero"/><path d="m479.424 1.852c11.111 0 20.164 9.259 20.164 20.988 0 12.551-9.053 21.399-19.958 21.399h-15.844v23.456h-13.169v-65.843zm-15.638 31.276h13.169c6.173 0 9.671-4.527 9.671-10.288 0-7.202-5.556-9.877-10.7-9.877h-12.14z" fill-rule="nonzero"/><path d="m220.165.617c-74.898 11.317-167.902 39.301-167.902 78.601 0 36.42 86.009 27.161 86.009 27.161s-137.86 45.884-137.86-14.404c0-68.312 173.868-91.358 219.753-91.358z" fill-rule="nonzero"/></g><path d="m34.979 151.235c74.898-11.112 167.902-39.301 167.902-78.601 0-36.42-86.009-27.161-86.009-27.161s137.861-45.885 137.861 14.404c0 68.518-173.869 91.358-219.754 91.358z" fill="#f8c62f" fill-rule="nonzero"/><path d="m124.897 70.576-26.337 8.231 25.103 1.646-.823-4.939z" fill="#0084d4" fill-rule="nonzero"/><path d="m156.173 72.428-18.93 5.967-7.202 19.959-3.498-23.251 8.231-22.017 3.498 16.256z" fill="#f8c62f" fill-rule="nonzero"/></svg>

After

Width:  |  Height:  |  Size: 4.0 KiB

+1 -1
View File
@@ -90,7 +90,7 @@ function handleHistoryRestore() {
function handleTimeout() {
// Don't decrement here — htmx:afterRequest always fires alongside htmx:timeout
// and handles the counter. This handler only shows the alert.
alert('Die Anfrage hat zu lange gedauert. Bitte versuchen Sie es erneut. Falls das Problem weiterhin besteht, kontaktieren Sie bitte unseren Support.')
alert('Die Anfrage hat zu lange gedauert. Bitte versuche es erneut. Falls das Problem weiterhin besteht, kontaktiere bitte unseren Support.')
}
function handleBeforeHistorySave() {
+64
View File
@@ -0,0 +1,64 @@
/* Admin-only additions to ep-design.css, built on its tokens */
@layer base {
.htmx-indicator {
@apply invisible;
}
.htmx-request .htmx-indicator,
.htmx-request.htmx-indicator {
@apply visible;
}
/* checked boxes and radios in the brand colour (@tailwindcss/forms fills them with currentColor) */
[type="checkbox"],
[type="radio"] {
@apply text-brand;
}
/* thin scrollbars without a track for inner scrolling areas, as in app.css */
body * {
scrollbar-width: thin;
scrollbar-color: var(--color-line) transparent;
}
}
@layer components {
.badge {
@apply inline-flex items-center px-1.5 py-0.5 text-xs font-bold whitespace-nowrap;
}
.tippy-box {
@apply bg-brand;
}
.tippy-box[data-placement^='top'] > .tippy-arrow::before {
border-top-color: var(--color-brand);
}
.tippy-box[data-placement^='bottom'] > .tippy-arrow::before {
border-bottom-color: var(--color-brand);
}
.tippy-box[data-placement^='left'] > .tippy-arrow::before {
border-left-color: var(--color-brand);
}
.tippy-box[data-placement^='right'] > .tippy-arrow::before {
border-right-color: var(--color-brand);
}
}
/* a list in a card, scrolling sideways when it is wider than the content column */
@layer components {
.data-table-wrapper {
@apply mb-8 overflow-x-auto border border-line bg-white;
}
.data-table-wrapper__inner {
@apply min-w-full align-middle;
}
.data-table tbody tr {
@apply hover:bg-brand-light/50;
}
}
+9 -9
View File
@@ -1,9 +1,9 @@
@import "components/button.css";
@import "components/forms.css";
@import "components/gallery.css";
@import "components/pagination.css";
@import "components/price_calendar.css";
@import "components/toast.css";
@import "components/tooltip.css";
@import "components/typography.css";
@import "components/rte-content.css";
@import "./components/button.css";
@import "./components/forms.css";
@import "./components/gallery.css";
@import "./components/pagination.css";
@import "./components/price_calendar.css";
@import "./components/toast.css";
@import "./components/tooltip.css";
@import "./components/typography.css";
@import "./components/rte-content.css";
-10
View File
@@ -1,10 +0,0 @@
@import "components/autocomplete.css";
@import "components/badge.css";
@import "components/button.css";
@import "components/datatable.css";
@import "components/datepicker.css";
@import "components/forms.css";
@import "components/pagination.css";
@import "components/toast.css";
@import "components/tooltip.css";
@import "components/typography.css";
+66
View File
@@ -0,0 +1,66 @@
/* Shared by app.css and admin.css, imported right after tailwindcss */
@source "../../templates";
@source "../../src";
@source "../../assets";
@source inline("rotate-90");
@plugin "@tailwindcss/forms";
@theme {
--font-sans: Lato, sans-serif;
--color-primary: #3d8ccb;
--color-secondary: #f9c700;
--color-primary-bg: #ebf3fa;
--color-primary-light: #0070e0;
--color-primary-medium: #165883;
--color-primary-dark: #18527b;
--color-pink: #fa1a8c;
--color-sbw-primary: #B3820F;
--color-sbw-secondary: #E91C26;
--color-sbw-primary-dark: #8D7207;
--color-sbw-overlay: #c20000;
--color-snz-primary: #82c3c6;
--color-snz-secondary: #f9c33d;
--color-snz-primary-dark: #82c3c6;
--color-ser-primary: #006fb6;
--color-ser-secondary: #DE2C1B;
--color-ser-primary-light: #04A4CC;
--background-image-badge-gradient: linear-gradient(120deg, rgba(150,1,103,1) 0%, rgba(158,3,106,1) 40%, rgba(250,26,140,1) 100%);
--background-image-brand-gradient: linear-gradient(to top right, #009fff, #165883, #18527b);
}
/*
* Tailwind 3 defaults that Tailwind 4 changed: borders were gray-200 instead of currentColor,
* and buttons had a pointer cursor.
*/
@layer base {
*,
::after,
::before,
::backdrop,
::file-selector-button {
border-color: var(--color-gray-200, currentcolor);
}
button:not(:disabled),
[role="button"]:not(:disabled) {
cursor: pointer;
}
}
/*
* Thin scrollbars without a track for inner scrolling areas. The page scrollbar takes its
* style from <html>, which body * leaves out. Firefox and Chrome/Edge 121+ honour these;
* Safari keeps its own overlay scrollbars.
*/
@layer base {
body * {
scrollbar-width: thin;
scrollbar-color: var(--color-gray-300) transparent;
}
}
+2 -4
View File
@@ -1,7 +1,5 @@
@layer utilities {
/* Reserve the scrollbar gutter so content does not shift width when a
/* Reserve the scrollbar gutter so content does not shift width when a
scrollbar appears (e.g. when a collapsible section is opened). */
.scroll-stable {
@utility scroll-stable {
scrollbar-gutter: stable;
}
}
+10 -5
View File
@@ -1,7 +1,12 @@
@import "tailwindcss/base";
@import "_base.css";
/* The admin in the E&P corporate design; shares nothing with app.css, so the frontend stays as it is */
@import "tailwindcss" source(none);
@import "toastify-js/src/toastify.css" layer(base);
@import "tippy.js/dist/tippy.css" layer(base);
@import "./ep-design.css";
@import "./_admin.css";
@import "tailwindcss/components";
@import "_components_admin.css";
@source "../../templates";
@source "../../src";
@source "../../assets";
@import "tailwindcss/utilities";
@plugin "@tailwindcss/forms";
+5 -8
View File
@@ -1,8 +1,5 @@
@import "tailwindcss/base";
@import "_base.css";
@import "tailwindcss/components";
@import "_components.css";
@import "tailwindcss/utilities";
@import "_utilities.css";
@import "tailwindcss" source(none);
@import "./_theme.css";
@import "./_base.css" layer(base);
@import "./_components.css" layer(components);
@import "./_utilities.css";
+3 -3
View File
@@ -3,15 +3,15 @@
The line height is set with each font size (text-sm/6), because text-sm's own line height would override a plain leading-6. */
@apply inline-flex items-center justify-center space-x-2 px-4 md:px-8 py-2 border border-transparent bg-origin-border cursor-pointer;
@apply uppercase text-center text-sm/6 md:text-base/6;
@apply transition-colors outline-none focus:outline-2 focus:outline-offset-2 focus:outline-primary-dark;
@apply transition-colors outline-hidden focus:outline-2 focus:outline-offset-2 focus:outline-primary-dark;
@apply rounded-md;
/* At least one line tall even when the content is only a smaller icon: line + padding + border */
min-height: calc(1lh + 2 * theme('spacing.2') + 2px);
min-height: calc(1lh + 2 * --spacing(2) + 2px);
}
.button--small {
@apply px-2 py-1 md:px-4 text-xs/6 sm:text-sm/6;
min-height: calc(1lh + 2 * theme('spacing.1') + 2px);
min-height: calc(1lh + 2 * --spacing(1) + 2px);
}
.button--primary {
+1 -1
View File
@@ -3,5 +3,5 @@
[data-vc-theme=light] .vc-date[data-vc-date-selected] .vc-date__btn,
[data-vc-theme=light] .vc-date[data-vc-date-selected] .vc-date__btn:hover {
background-color: theme('colors.secondary');
background-color: var(--color-secondary);
}
+4 -4
View File
@@ -1,5 +1,5 @@
.pc-day {
@apply relative w-full text-center py-1 px-0.5 text-sm leading-tight rounded text-white cursor-pointer;
@apply relative w-full text-center py-1 px-0.5 text-sm leading-tight rounded-sm text-white cursor-pointer;
}
.pc-day--out-of-month {
@@ -11,11 +11,11 @@
}
.pc-day[data-status="blocked-to-ok"] {
background: linear-gradient(to bottom right, theme('colors.gray.400') 50%, theme('colors.emerald.500') 50%);
background: linear-gradient(to bottom right, var(--color-gray-400) 50%, var(--color-emerald-500) 50%);
}
.pc-day[data-status="checkout-only"] {
background: linear-gradient(to bottom right, theme('colors.emerald.500') 50%, theme('colors.gray.400') 50%);
background: linear-gradient(to bottom right, var(--color-emerald-500) 50%, var(--color-gray-400) 50%);
}
.pc-day[data-status="past"] {
@@ -33,7 +33,7 @@
.pc-day.pc-day--pending-start,
.pc-day.pc-day--selected-start,
.pc-day.pc-day--selected-end {
@apply bg-none outline-none bg-secondary text-gray-700;
@apply bg-none outline-hidden bg-secondary text-gray-700;
}
.pc-day.pc-day--in-range {
+5 -5
View File
@@ -1,25 +1,25 @@
@import "toastify-js/src/toastify.css";
.toastify {
@apply shadow-lg rounded;
@apply shadow-lg rounded-sm;
}
.toastify--success {
@apply text-gray-100;
background: theme('colors.emerald.600');
background: var(--color-emerald-600);
}
.toastify--warning {
@apply text-gray-100;
background: theme('colors.red.600');
background: var(--color-red-600);
}
.toastify--error {
@apply text-gray-100;
background: theme('colors.red.700');
background: var(--color-red-700);
}
.toastify--info {
@apply text-gray-100;
background: theme('colors.primary');
background: var(--color-primary);
}
+20 -20
View File
@@ -1,71 +1,71 @@
@import "tippy.js/dist/tippy.css";
.tippy-box {
background-color: theme('colors.primary');
background-color: var(--color-primary);
}
.tippy-box[data-placement^='top'] > .tippy-arrow::before {
border-top-color: theme('colors.primary');
border-top-color: var(--color-primary);
}
.tippy-box[data-placement^='bottom'] > .tippy-arrow::before {
border-bottom-color: theme('colors.primary');
border-bottom-color: var(--color-primary);
}
.tippy-box[data-placement^='left'] > .tippy-arrow::before {
border-left-color: theme('colors.primary');
border-left-color: var(--color-primary);
}
.tippy-box[data-placement^='right'] > .tippy-arrow::before {
border-right-color: theme('colors.primary');
border-right-color: var(--color-primary);
}
.sbw {
.tippy-box {
background-color: theme('colors.sbw.secondary');
background-color: var(--color-sbw-secondary);
}
.tippy-box[data-placement^='top'] > .tippy-arrow::before {
border-top-color: theme('colors.sbw.secondary');
border-top-color: var(--color-sbw-secondary);
}
.tippy-box[data-placement^='bottom'] > .tippy-arrow::before {
border-bottom-color: theme('colors.sbw.secondary');
border-bottom-color: var(--color-sbw-secondary);
}
.tippy-box[data-placement^='left'] > .tippy-arrow::before {
border-left-color: theme('colors.sbw.secondary');
border-left-color: var(--color-sbw-secondary);
}
.tippy-box[data-placement^='right'] > .tippy-arrow::before {
border-right-color: theme('colors.sbw.secondary');
border-right-color: var(--color-sbw-secondary);
}
}
.snz {
.tippy-box {
background-color: theme('colors.snz.primary-dark');
background-color: var(--color-snz-primary-dark);
}
.tippy-box[data-placement^='top'] > .tippy-arrow::before {
border-top-color: theme('colors.snz.primary-dark');
border-top-color: var(--color-snz-primary-dark);
}
.tippy-box[data-placement^='bottom'] > .tippy-arrow::before {
border-bottom-color: theme('colors.snz.primary-dark');
border-bottom-color: var(--color-snz-primary-dark);
}
.tippy-box[data-placement^='left'] > .tippy-arrow::before {
border-left-color: theme('colors.snz.primary-dark');
border-left-color: var(--color-snz-primary-dark);
}
.tippy-box[data-placement^='right'] > .tippy-arrow::before {
border-right-color: theme('colors.snz.primary-dark');
border-right-color: var(--color-snz-primary-dark);
}
}
.ser {
.tippy-box {
background-color: theme('colors.ser.secondary');
background-color: var(--color-ser-secondary);
}
.tippy-box[data-placement^='top'] > .tippy-arrow::before {
border-top-color: theme('colors.ser.secondary');
border-top-color: var(--color-ser-secondary);
}
.tippy-box[data-placement^='bottom'] > .tippy-arrow::before {
border-bottom-color: theme('colors.ser.secondary');
border-bottom-color: var(--color-ser-secondary);
}
.tippy-box[data-placement^='left'] > .tippy-arrow::before {
border-left-color: theme('colors.ser.secondary');
border-left-color: var(--color-ser-secondary);
}
.tippy-box[data-placement^='right'] > .tippy-arrow::before {
border-right-color: theme('colors.ser.secondary');
border-right-color: var(--color-ser-secondary);
}
}
+377
View File
@@ -0,0 +1,377 @@
/*
* E&P corporate design for the internal Symfony tools, taken from the E&P apps template (Gitea EP/apps,
* frontend/app/globals.css, frontend/components/): Lato, deep blue as the brand colour, magenta only
* for the one main action of a page, square shapes, light blue page.
* Status colours (green, red, amber) always come with text, never alone.
*
* Import after Tailwind: @import "tailwindcss"; @import "./ep-design.css"; @plugin "@tailwindcss/forms";
* The toast styles expect toastify-js, imported into the base layer before this file:
* @import "toastify-js/src/toastify.css" layer(base); unlayered (or through its own <link>), its
* colours and gradient beat these layered styles whatever their specificity.
*/
/*
* Lato (OFL) ships with the app, so browsers load nothing from Google: 400 (and italic), 700, 900. No 600:
* font-semibold renders as 700, like font-bold; font-black is 900. The weights are not remapped.
*/
@font-face {
font-family: "Lato";
font-style: normal;
font-weight: 400;
font-display: swap;
src: url("../fonts/lato-400.woff2") format("woff2");
}
@font-face {
font-family: "Lato";
font-style: italic;
font-weight: 400;
font-display: swap;
src: url("../fonts/lato-400-italic.woff2") format("woff2");
}
@font-face {
font-family: "Lato";
font-style: normal;
font-weight: 700;
font-display: swap;
src: url("../fonts/lato-700.woff2") format("woff2");
}
@font-face {
font-family: "Lato";
font-style: normal;
font-weight: 900;
font-display: swap;
src: url("../fonts/lato-900.woff2") format("woff2");
}
@theme {
--font-sans: "Lato", ui-sans-serif, system-ui, sans-serif;
/* square everywhere; rounded-full stays round. Plain `rounded` reads --radius. */
--radius: 0px;
--radius-xs: 0px;
--radius-sm: 0px;
--radius-md: 0px;
--radius-lg: 0px;
--radius-xl: 0px;
--radius-2xl: 0px;
--radius-3xl: 0px;
--radius-4xl: 0px;
--color-brand: #18527b; /* E&P deep blue, 8.5:1 on white */
--color-brand-dark: #103c5b;
--color-brand-mid: #165883;
--color-brand-bright: #009fff; /* underlines and focus, never text */
--color-brand-light: #e3eef8;
--color-page: #ebf3fa; /* page background */
--color-line: #d8e3ed; /* borders */
--color-ink: #27272a; /* text */
--color-muted: #52525b; /* secondary text, 7.7:1 on white */
--color-accent: #c4097c; /* magenta of the main action */
--color-accent-from: #960167;
--color-accent-to: #fa1a8c;
}
/*
* Tailwind 3 defaults that Tailwind 4 changed: borders were a light gray instead of currentColor,
* and buttons had a pointer cursor.
*/
@layer base {
*,
::after,
::before,
::backdrop,
::file-selector-button {
border-color: var(--color-line, currentcolor);
}
button:not(:disabled),
[role="button"]:not(:disabled) {
cursor: pointer;
}
/* text size of every E&P app: 14px; text-base (16px) and up only for headings */
body {
font-size: var(--text-sm);
line-height: var(--text-sm--line-height);
}
/* modals: centred (Preflight resets the browser's margin: auto), the page behind dimmed and blurred */
dialog:modal {
margin: auto;
max-height: 85vh;
}
dialog::backdrop {
background: rgb(39 39 42 / 0.35);
backdrop-filter: blur(3px);
}
/* visible keyboard focus everywhere (WCAG 2.4.7) */
:where(a, button, input, select, textarea, summary, [tabindex]):focus-visible {
outline: 3px solid var(--color-brand-bright);
outline-offset: 2px;
}
}
/*
* Components as in the apps template (frontend/components/ui.ts, Field.tsx, Alert.tsx). Magenta
* only for the one main action of a page.
*/
@layer components {
.btn,
.btn-primary,
.btn-secondary {
@apply inline-flex items-center justify-center gap-2 px-4 py-2.5 text-xs font-bold uppercase tracking-wide no-underline transition-colors disabled:cursor-not-allowed;
}
.btn-primary {
@apply text-white;
background-image: linear-gradient(120deg, var(--color-accent-from), #9e036a 40%, var(--color-accent-to));
}
.btn-primary:hover {
background-image: linear-gradient(120deg, #7d0156, #8a035d 40%, #e3107c);
}
.btn-primary:disabled {
background-image: none;
background-color: #64748b;
}
.btn-secondary {
@apply border border-brand bg-white text-brand hover:bg-brand hover:text-white;
}
/* small actions in toolbars and on cards, next to the one main action */
.btn-tool {
@apply inline-flex items-center gap-1 rounded border border-line bg-white px-2 py-1 text-sm text-ink hover:border-brand hover:text-brand disabled:cursor-default disabled:border-line disabled:text-gray-400;
}
/* the "⋯" behind which the actions of a card or row wait (menu_controller.js); finger-sized on touch screens */
.btn-more {
@apply inline-flex h-6 w-6 pointer-coarse:h-10 pointer-coarse:w-10 shrink-0 items-center justify-center rounded text-muted hover:bg-page hover:text-brand aria-expanded:bg-page aria-expanded:text-brand;
}
.menu-panel {
@apply fixed z-40 min-w-48 border border-line bg-white py-1 text-sm shadow-lg;
}
.menu-item {
@apply block w-full px-3 py-1.5 pointer-coarse:py-3 text-left text-ink no-underline hover:bg-page hover:text-brand focus:bg-page;
}
.menu-item-danger {
@apply block w-full px-3 py-1.5 pointer-coarse:py-3 text-left text-red-800 hover:bg-page hover:text-red-900 focus:bg-page;
}
.input {
@apply block w-full border border-slate-500 bg-white px-3 py-2 text-sm text-slate-900 placeholder:text-slate-500 focus:border-brand-bright aria-[invalid=true]:border-red-700 aria-[invalid=true]:ring-1 aria-[invalid=true]:ring-red-700 disabled:bg-slate-100 disabled:text-slate-600;
}
.field-label {
@apply block text-xs font-bold uppercase tracking-wide text-slate-700;
}
/* white box on the light blue page */
.card {
@apply border border-line bg-white;
}
.section-title {
@apply text-base font-bold uppercase tracking-wide text-brand;
}
/* a row of tabs; the base line is an inset shadow, so a row that scrolls sideways doesn't scroll vertically too */
.tabs {
@apply flex overflow-x-auto shadow-[inset_0_-1px_0_var(--color-line)];
}
.tab {
@apply shrink-0 whitespace-nowrap border-b-4 border-transparent px-3 py-2 text-sm text-ink no-underline hover:text-brand;
}
.tab[aria-current],
.tab[aria-selected="true"] {
@apply border-brand-bright font-bold text-brand;
}
/* the main views as tabs in the header (_partials/_header.html.twig), for apps with few views */
.header-tab {
@apply flex items-center whitespace-nowrap border-b-4 border-transparent px-3 text-ink no-underline hover:text-brand;
}
.header-tab[aria-current] {
@apply border-brand-bright font-bold text-brand;
}
/*
* Sidebar navigation for apps with many views (_partials/_sidebar_menu.html.twig): on the light
* blue page, the current item is a white box.
*/
.sidebar-heading {
@apply px-2 pt-5 pb-1 text-[11px] font-bold uppercase tracking-wide text-muted;
}
.sidebar-link {
@apply flex w-full items-center gap-x-3 p-2 text-left text-sm leading-6 font-bold text-ink no-underline hover:bg-white/60 hover:text-brand;
}
.sidebar-sublink {
@apply block py-2 pr-2 pl-10 text-sm leading-6 text-ink no-underline hover:bg-white/60 hover:text-brand;
}
:is(.sidebar-link, .sidebar-sublink)[aria-current],
.sidebar-link--ancestor {
@apply bg-white text-brand;
}
.sidebar-group > summary {
@apply list-none;
}
.sidebar-group > summary::-webkit-details-marker {
display: none;
}
/* chevron of a group that opens in place */
.sidebar-group > summary::after {
@apply ml-auto size-2 shrink-0 rotate-45 border-r-2 border-b-2 border-current opacity-60 transition-transform content-[''];
}
.sidebar-group[open] > summary::after {
@apply -rotate-135;
}
/* the navigation (sidebar or header tabs) as a drawer from the left on small screens (drawer_controller.js) */
dialog.drawer {
@apply m-0 h-dvh max-h-none w-80 max-w-[calc(100vw-4rem)] bg-page p-0;
}
/*
* a modal dialog doesn't stop the page behind it from scrolling: on touch screens the page took the
* gesture first, and a long navigation in the drawer only scrolled once the page was at its end.
* Only for the drawer: locking for every dialog:modal would hide the page's scrollbar under a
* desktop modal and shift the layout sideways.
*/
html:has(dialog.drawer:modal) {
@apply overflow-hidden;
}
/* lists in a card: the outer cells line up with the card's padding */
.data-table {
@apply w-full;
}
.data-table thead tr {
@apply border-b-2 border-brand text-left text-[11px] font-bold uppercase tracking-wide text-brand;
}
.data-table th {
@apply px-2 py-2;
}
.data-table td {
@apply px-2 py-1.5;
}
.data-table :is(th, td):first-child {
@apply pl-5;
}
.data-table :is(th, td):last-child {
@apply pr-5;
}
.data-table tbody tr {
@apply border-b last:border-b-0;
}
/*
* Lists of entries in a card, as on a dashboard (components/dashboard/): one line per entry, the
* whole line is the link or button, its parts separated by a dot, the text cut off with "…".
*/
.entry-list {
@apply divide-y divide-line;
}
.entry-list > li {
@apply py-2 first:pt-0 last:pb-0;
}
/* a work queue that would otherwise grow the card without limit; keep it rare, it scrolls awkwardly on phones */
.entry-list--scroll {
@apply max-h-64 overflow-y-auto pr-3;
}
.entry-link {
@apply flex w-full min-w-0 items-center gap-1.5 text-left text-ink no-underline;
}
:is(a, button).entry-link {
@apply hover:text-brand;
}
.entry-link > * {
@apply shrink-0;
}
/* the text after the icon: one line, cut off as a whole with "…" */
.entry-text {
@apply min-w-0 shrink truncate;
}
/* icons and dots inside the text flow with it (Tailwind's preflight makes svg a block) */
.entry-text :is(svg, img) {
@apply inline-block align-middle;
}
.entry-dot {
@apply text-muted;
}
/* notices (_partials/_alert.html.twig): light, with a coloured bar on the left */
.notice {
@apply border-l-4 px-4 py-2;
}
/* toasts (toast_controller.js) in the colours of the notices */
.toastify {
@apply max-w-sm rounded-none border-l-4 bg-none px-4 py-3 text-sm shadow-lg;
}
.toastify--success {
@apply border-emerald-700 bg-emerald-50 text-emerald-950;
}
.toastify--error {
@apply border-red-700 bg-red-50 text-red-950;
}
.toastify--warning {
@apply border-amber-600 bg-amber-50 text-amber-950;
}
.toastify--info {
@apply border-brand bg-brand-light text-ink;
}
.toastify .toast-close {
@apply ml-3 text-current opacity-60 hover:opacity-100;
}
}
@media (prefers-reduced-motion: reduce) {
*,
*::before,
*::after {
animation-duration: 0.01ms !important;
animation-iteration-count: 1 !important;
transition-duration: 0.01ms !important;
scroll-behavior: auto !important;
}
}
Generated
+1016 -664
View File
File diff suppressed because it is too large. Load diff
+1 -1
View File
@@ -1,3 +1,3 @@
knp_menu:
twig:
template: _partials/_menu.html.twig
template: admin/_partials/_sidebar_menu.html.twig
+4
View File
@@ -29,6 +29,10 @@ zenstruck_schedule:
frequency: "45 1 * * *"
description: "Removes expired pending newsletter double opt-in requests"
- task: app:cleanup:travel-mailing-lists
frequency: "50 1 * * *"
description: "Deletes Mailjet travel mailing lists and their orphaned contacts 30 days after the travel started"
- task: league:oauth2-server:clear-expired-tokens
frequency: "0 * * * *"
description: "Removes expired oauth2 tokens hourly"
+17 -4
View File
@@ -201,10 +201,6 @@ services:
arguments:
$retentionBufferDays: '%travel_snapshot_retention_buffer_days%'
App\BusProNet\XmlParser\TravelParser:
arguments:
$levelBoardingPointPrices: '%env(bool:APP_BPN_LEVEL_BOARDING_POINT_PRICES)%'
App\Service\TravelDataProvider:
arguments:
$logger: '@monolog.logger.core'
@@ -430,6 +426,9 @@ services:
App\BpnConnect\TravelsClient:
parent: App\BpnConnect\AbstractApiClient
App\BpnConnect\RoomsClient:
parent: App\BpnConnect\AbstractApiClient
App\ClickUp\ApiClient:
arguments:
$apiToken: '%env(default::CLICKUP_API_TOKEN)%'
@@ -445,6 +444,20 @@ services:
$defaultListId: '%env(default::MAILJET_DEFAULT_LIST_ID)%'
$contactMetadataFields: '%mailjet_contact_metadata_fields%'
# Travel mailing lists live in a Mailjet sub-account, which has its own key pair and keeps
# its contacts and lists apart from the newsletter on the main account.
app.mailjet.travel_mailing_client:
class: App\Mailjet\ApiClient
arguments:
$apiKey: '%env(default::MAILJET_TRAVEL_MAILING_API_KEY)%'
$apiSecret: '%env(default::MAILJET_TRAVEL_MAILING_API_SECRET)%'
$apiBaseUrl: '%env(default::MAILJET_API_BASE_URL)%'
$contactMetadataFields: '%mailjet_contact_metadata_fields%'
App\Service\TravelMailingListManager:
arguments:
$mailjet: '@app.mailjet.travel_mailing_client'
App\EventListener\MaintenanceModeListener:
arguments:
$options:
+1 -1
View File
@@ -5,7 +5,7 @@ parameters:
theme: base
gtm_id: GTM-56LWRF
cmp_url: https://consent.cookiefirst.com/sites/my.ep-reisen.de-28eabc35-7085-4d8f-b450-522bd1a5247c/consent.js
myswb.ddev.site:
mysbw.ddev.site:
theme: sbw
gtm_id: GTM-MS2C8CH
cmp_url: https://consent.cookiefirst.com/sites/my.ski-boarderweek.de-d3641c34-8183-4b8d-b56e-c052e7a9223e/consent.js
+2 -2
View File
@@ -40,6 +40,7 @@ $rsyncOptions = [
'.env.dev.local.php',
'.env.test',
'.env.test.local',
'.browserslistrc',
'.gitignore',
'.nvmrc',
'.php-cs-fixer.cache',
@@ -58,8 +59,7 @@ $rsyncOptions = [
'phpunit.xml.dist',
'public/.htaccess',
'ray.php',
'tailwind.config.js',
'webpack.config.js',
'webpack.config.mjs',
'bin/.phpunit',
'temp/',
'tests/',
+74 -6
View File
@@ -172,6 +172,7 @@ an error: it returns `200` with an empty `data` array and the usual `meta`.
{
"busProId": 12794,
"code": "PCJSER261226",
"productCode": "PCJSER",
"product": "Semesterende - Portes du Soleil - Joliment",
"dateFrom": "2026-12-26",
"dateTo": "2026-12-30",
@@ -212,6 +213,11 @@ an error: it returns `200` with an empty `data` array and the usual `meta`.
is always an int and never null; `hotel` is always an object and never null; `pickups` is always an array, possibly
empty, never null.
**`productCode`** is the code of the travel (product) the date belongs to, e.g. `DKIWE`. Key on it to
recognise dates of the same product. Do not derive it from the date `code` by cutting off the date: some
products run dates under a different code (`DWWMP` runs `DWWMW…`), and group travels carry each group's own
code on the date. It is `null` for the few travels that have no code upstream.
**`meta` describes the whole export, not the page.** `total`, `totalPages`, `skipped`, `pickupsWithoutMasterData`,
`sourceGeneratedAt` and `generatedAt` are identical on every page, so you can read them once on page 1 and decide whether to walk the
rest. `total` is the row count **after** skips, and `totalPages` is `ceil(total / perPage)`.
@@ -262,6 +268,14 @@ page-consistency rule as `GET /api/exports/travels` above; only the rows differ.
`Buchungsstop` rooms and services, rooms without a price and boarding points with id `0` are all emitted. Which of
them a website shows, and how, is the client's rule, not this endpoint's.
**Which rooms can be booked.** Each room carries `bookable`, the one derived field: `true` exactly when the
booking flow offers the room for a new booking. That is status `Frei` with `available` above 0. A room on request
(`Anfrage`) is not bookable even with rooms left, because booking it would only produce an inquiry, unless its
`code` ends in `Anf` (case-sensitive, e.g. `6erSDAnf`): the office sells such a room on request on purpose, it is
`bookable`, and booking it makes the whole booking an inquiry. No room with `available` 0 or `null` is bookable. Show a room that is not bookable as sold out and do not count it towards places
or the "ab" price. Read `bookable` rather than deriving it from `status` and `available`, so a change to the rule
reaches you without a client change.
At current volumes the export is ~420 rows and ~3.8 MB of JSON (a row is 4–24 kB), so the default `perPage=500`
returns it in one page.
@@ -307,6 +321,7 @@ returns it in one page.
"price": 229,
"available": 24,
"status": "Frei",
"bookable": true,
"boardCode": "Lt. Auss.",
"boardBusProId": 2
}
@@ -501,21 +516,74 @@ Errors: `400 {"error":"Hotel not found for hotelCode."}`, `400` with violations
`502 {"error":"Failed to fetch contingent data."}` is still returned — with the same body as before — but it now means **"no usable local snapshot for this hotel"** rather than "the upstream call failed": either the hotel has never synced successfully, or its last successful sync is more than 6 hours old. Treat it as before: the data is unavailable, not empty. This matters because the alternative would be a `200` reporting every day as `BLOCKED`, which is indistinguishable from a genuinely fully-booked hotel.
#### `GET /api/contingents/availability?hotelCode=…&dateFrom=…&dateTo=…` — scope `api`
The raw contingent snapshot per day, without prices. Built for the iCal feed that external booking portals import, which blocks only what the contingent itself reports as unavailable.
Parameters are the same as for `calendar`: `hotelCode` is required, `dateFrom` and `dateTo` are optional, `Y-m-d`, inclusive, and must be supplied together (at most 366 days). **Omit both to get every snapshot day from today to the end of the snapshot** (the 24-month sync horizon). Prices play no part in that span.
Each entry, ordered by date:
```json
{"date": "2027-01-30", "status": "BLOCKED"}
```
`status` is `OK`, `BLOCKED` or `ON_REQUEST`.
Two differences from `calendar`:
- **No price rule.** A day without a maintained price keeps the status the contingent reports; it is not forced to `BLOCKED`.
- **Days the snapshot lacks are left out**, not returned as `BLOCKED`. The response is not contiguous: a day without an entry has no availability data, and the feed shows it as free, as it did when it read the upstream service directly.
- **Not limited to accommodations.** `hotelCode` may be any synced hotel code: an accommodation's calendar code, or the calendar hotel of a visible TYPO3 product (TYPO3's `/api/calendar-hotels`). Winter-only hotels without an accommodation are therefore served here, while `calendar` and `prices` still need an accommodation, since they need its prices.
Errors are the same as for `calendar`: `400 {"error":"Hotel not found for hotelCode."}` when the code is not synced, `400` with violations for invalid parameters, and `502 {"error":"Failed to fetch contingent data."}` when there is no usable snapshot. For this endpoint the `502` is the important one: an empty list would show every day as free, so a consumer should answer with an error and let the portals keep their last import.
#### `GET /api/contingents/status` — scope `api`
One row per synced hotel code, sorted by code, for an overview of which hotel supports which calendar:
```json
{
"hotelCode": "DGS",
"name": "Sportclub Spinabad",
"sources": ["accommodation", "typo3"],
"accommodation": {"name": "Davos Glaris - Gruppenhaus Spinabad", "cmsCode": "DGSGRP"},
"pricedFrom": "2027-06-01",
"pricedTo": "2027-09-30",
"syncedAt": "2026-10-29T10:15:00+01:00",
"lastError": null,
"failureCount": 0,
"available": true
}
```
- `sources`: where the code comes from, `accommodation` and/or `typo3`.
- `name`: the hotel's name in TYPO3's calendar hotel list, `null` for a code TYPO3 does not list.
- `accommodation`: `null` without one; `cmsCode` is the code the accommodation is known by in TYPO3, which may differ from `hotelCode`.
- `pricedFrom`/`pricedTo`: the span of the accommodation's prices, `null` without prices. `calendar` and `prices` work only for hotels that have them.
- `syncedAt`, `lastError`, `failureCount`: the last successful sync (`null` if none) and the failures since.
- `available`: whether `availability` currently serves the hotel, i.e. it has synced within the last 6 hours. `false` means that endpoint answers `502`.
---
### Operating the snapshot (deployment)
The snapshot is a new table populated by the scheduler, so it is **empty immediately after a deploy that runs the migration**. Until the first successful sync every hotel returns `502` — deliberately, so no consumer caches a fully-blocked calendar as if it were real availability.
The snapshot is filled only by the scheduler, so on an empty database (a new environment, or after the snapshot tables were truncated) every hotel returns `502` until the first successful sync — deliberately, so no consumer caches a fully-blocked calendar as if it were real availability.
Rollout order:
Bringing up an environment:
1. **Confirm `BPN_CONNECT_API_KEY` is valid for the target environment before deploying.** If it is rejected the sync cannot populate anything and the endpoint stays at `502`.
2. Deploy; `database:migrate` creates the empty tables.
3. Run `bin/console app:bpn:sync-contingents` on the host, promptly and ideally off-peak — a consumer that page-caches whatever it renders from a `502` may hold that for the length of its own cache period.
4. Verify: `contingent_sync_state.synced_at` populated and `failure_count` at 0 for every hotel, then spot-check one calendar response.
1. **Confirm `BPN_CONNECT_API_KEY` is valid for the environment.** If it is rejected the sync cannot populate anything and the endpoints stay at `502`.
2. Deploy; `database:migrate` creates the tables.
3. Run `bin/console app:bpn:sync-contingents -v` on the host promptly, ideally off-peak — a consumer that page-caches whatever it renders from a `502` may hold that for the length of its own cache period.
4. Verify with `GET /api/contingents/status`: every row `available: true`, `failureCount` 0.
Thereafter the scheduler keeps it current; a sync failing for one hotel puts only that hotel into `502` and leaves the rest serving normally.
**Which hotels are synced.** Every accommodation's calendar code plus every code in TYPO3's `/api/calendar-hotels` (same `APP_CMS_API_KEY` as the other CMS calls). Each run fetches TYPO3's list first and stores it in `calendar_hotel`; when TYPO3 errors or answers with an empty list, the run logs a warning and uses the stored list, so TYPO3 being down never drops its hotels. `--hotel=<code>` accepts any code from either source. A full run deletes the snapshot of codes that are in neither source any more; they answer `400` from then on, and come back with the next run if they reappear.
**TYPO3's codes must be BusPro calendar codes.** The sync sends every code to bpn-connect as is. A TYPO3 hotel whose code is a CMS code rather than the BusPro hotel code (group houses often have both, e.g. calendar code `DKS`, CMS code `DKSGRP`) is answered with a `404` by bpn-connect: that code fails on every run, logs two errors each time, and shows up in `contingents/status` with `lastError` set and `available: false`. The task itself keeps succeeding, since only a total failure fails it. The fix belongs in TYPO3, by pointing the product at a hotel whose code is the BusPro code; MyE&P does not translate CMS codes. `contingents/status` is the place to spot such codes, and `accommodation.cmsCode` there shows both codes side by side for group houses.
### Freshness and propagation
There is deliberately **no change-notification endpoint**. Availability changes slowly, and the measured cost of simply refetching on a TTL is low enough that a polling/revision mechanism was not worth the extra moving parts on either side.
+15 -6
View File
@@ -167,11 +167,20 @@ fails on `Telefon-Mobil` and `Nationalität` because its `Vorgang_Details` recor
`telefonprivat` and no `nationalitaet`.
**Participants are held to less than the Anmelder** (measured 2026-09-16 on 2036, travel 12500, from a
real step-3 `Anfrage`). Once a room is present, every `teilnehmer` needs a `Mail-Adresse`, children
included: without `kommunikation` the answer is `650 … 1.Teilnehmer-Mail-Adresse, 2.Teilnehmer-Mail-Adresse`.
`telefonmobil` and an empty `anschrift` pass for participants. An email identical to the Anmelder's is
accepted. The field list above (Strasse, Plz, Ort, Telefon-Mobil for every participant) was measured on
the placeholder records and is stricter than what BusPro applies to ordinary participants.
real step-3 `Anfrage`). `telefonmobil` and an empty `anschrift` pass for participants. The field list
above (Strasse, Plz, Ort, Telefon-Mobil for every participant) was measured on the placeholder records and
is stricter than what BusPro applies to ordinary participants.
**The participant `Mail-Adresse` is BusPro configuration, not a fixed rule.** Until 2026-10-13 every
`teilnehmer` needed one once a room was present, children included: without it the answer was
`650 … 1.Teilnehmer-Mail-Adresse, 2.Teilnehmer-Mail-Adresse`, while an email identical to the Anmelder's
was accepted. On 2026-10-15 the requirement was switched off on the test system, and the same requests
(no `email`, no `kommunikation`, an empty `<email/>`, adults and children, with and without a travelling
Anmelder) all pass with an unchanged price. A committed `Buchung` (status `A`) with an email-less child
goes through as well, both with a travelling Anmelder and with one who does not travel. BusPro now accepts a participant without an email at any age,
so the rule MyE&P applies (required from 16, and for the applicant at any age) is enforced only by
`ParticipantDto` and `BookingDto` validation. Production needs the same configuration before under-16s
without an email can be booked there.
**The Anmelder does not have to travel.** An `<anmelder>` that matches no `teilnehmer` (a parent booking
for their children) returns `möglich` with the same price as the control where the Anmelder is
@@ -208,7 +217,7 @@ the same way. Ask `MOEGLICHEAENDERUNGEN` first (`<idreise>`), which answers:
| `buchungsart` | yes | yes | Edit **hardcodes `Buchung`** (`BookingClient::updateBooking()`) |
| `status` | yes | yes | Edit replays the value read back from BusPro — see the caveat below |
| `idreise`, `idpartner`, `idagentur` | yes | yes | `idpartner` sent unconditionally, even with no room |
| `anmelder` | yes | yes | Create builds it from participant[0]; edit uses `PersonalData::toPayload()`. BusPro accepts an Anmelder who is not a participant |
| `anmelder` | yes | yes | Create builds it from participant[0], or from `BookingDto::$applicant` when the applicant does not travel; edit uses `PersonalData::toPayload()`. BusPro accepts an Anmelder who is not a participant |
| `anmelder/bemerkung` | — | yes | Via `PersonalData::toPayload()` |
| `teilnehmerliste` | yes | yes | |
| `wünsche` (`unterbringungswunsch`, `beförderungswunsch`) | yes | yes | |
+33 -13
View File
@@ -181,15 +181,37 @@ JOIN dbo.PartnerPreis pp ON pp.IDPartnerPreisKategorie_FS=pk.IDPartnerPreisKateg
WHERE pk.IDAdresse_FS=@HotelAddressId AND pk.IDArtPartnerPreisCode_FS=@PriceCode
AND pk.IDArtVerpflegung_FS=@BoardId AND pk.EK_VK='VK'
AND pp.IDPartnerSaisonTafel_FS=@SaisonTafelId AND pp.Naechte=@Nights;
-- room availability (flat, reproducible)
-- room allotment (remaining = allotment − bookings, computed by BusPro; see below)
SELECT IDZimmer_FS,Anzahl,BuchungsStatus FROM dbo.PartnerKontingent
WHERE IDAdresse_FS=@HotelAddressId AND IDZimmer_FS=@ZimmerartId
AND TerminVon<=@Abreise AND TerminBis>=@Anreise;
```
- V: `EK_VK` = `EK` purchase / `VK` sale. **Always filter `VK`** for customer prices.
- V: `PartnerKontingent.Anzahl` IS the available room count. Gate with `BuchungsStatus`
(`''` bookable, `S` stop, `A` on request).
- V 2026-11-11: `PartnerKontingent.Anzahl` is the room **allotment**, not what is left
(hotel 163113, room type 2366: `Anzahl=6` while the export reported `verfuegbar="1"`).
BusPro computes the remaining count; read it from the export, not from this table. Gate with
`BuchungsStatus` (`''` bookable, `S` stop, `A` on request).
- V 2026-11-11: **pooled room contingents.** `PartnerZimmer.IDPartnerZimmer_FS_KontiAus`
points at the `PartnerZimmer` (same hotel) whose contingent a room type uses; `0` = own.
Used for selling one room at several occupancies ("Unterbelegung"): at hotel 163113 room
types 2367–2369 (7/6/5 pax) point at `PartnerZimmer` 8709 (2366, 8 pax). Only the parent
has `PartnerKontingent` rows; the export reports the parent's remaining count on every room
of the pool. The link is per hotel × room type (the same `Zimmerart` ids recur at other
hotels), and room codes do not reveal it. `Zimmerart.Teilzimmer`/`TeilzimmerAus` were 0 for
all four rooms and are not this link.
```sql
-- room type → room type owning its contingent, one hotel
SELECT pz.IDZimmerart_FS, COALESCE(m.IDZimmerart_FS, pz.IDZimmerart_FS) AS PoolZimmerart
FROM dbo.PartnerZimmer pz
LEFT JOIN dbo.PartnerZimmer m ON m.IDPartnerZimmer = pz.IDPartnerZimmer_FS_KontiAus
WHERE pz.IDAdresse_FS = @HotelAddressId;
```
- V 2026-11-11: BusPro's booking check does not sum a booking's rooms per pool. One booking with two room
types of one pool is accepted against a remaining count of 1 and drives it to −1
(2026-11-11, travel 1591, rooms 2366 + 2367).
- A: `PartnerZimmer.PreisJeZimmer` flags per-room vs per-person. Observed booking
responses returned the room price **per person** — check the flag before multiplying.
- Service availability is a different, harder problem — see A10.
@@ -225,16 +247,12 @@ JOIN dbo.ZustiegPreis zp ON zp.IDArtZustiegPreis_FS=lb.IDArtZustiegPreis_FS
WHERE l.IDLeistung IN (@OutboundServiceId,@ReturnServiceId);
```
**V 2026-09-28 — the XML export can omit the return-leg price.** Since one price row is
surfaced twice, an asymmetric pair is an export defect: on products 701 and 2435 a
`<zustieg_rueck>` carries no `preis` although the engine still bills the return
`Abfahrtsortzuschlag`, so reading the export verbatim undercharges by one leg. Measured over
all exports, a stated return price never differs from its outbound counterpart (510 pairs,
zero counter-examples). `TravelParser` therefore levels a boarding point's price across both
directions, switchable through `APP_BPN_LEVEL_BOARDING_POINT_PRICES` while the defect is open
with the vendor. Flipping the flag needs `app:bpn:xml-cache-invalidate` and
`app:bpn:refresh-travel-snapshot`. A point appearing **only** in `zustiege_rueck` without a
price cannot be priced from our side — that is a catalog job.
**V 2026-10-02 — an unpriced return leg is free.** The export can state a `preis` on the
outbound `<zustieg>` but none on the matching `<zustieg_rueck>` (seen on products 701 and
2435). The booking engine bills a return `Abfahrtsortzuschlag` only where the return entry
states a price, so the export is read verbatim, per leg. A missing return price is a catalog
omission for the office to fix, not something to compensate locally: pricing the return leg
from the outbound one makes the booking inquiry fail with a price mismatch.
**N — the departure surcharge is computed.** Booking responses carry a position
`art="SON" unterart="TRA"` (*Abfahrtsortzuschlag*) with no matching row type: `ArtZuschlag`
@@ -330,6 +348,8 @@ guides · `Kalkulation*`/`VorplanungRaster*` costing and pre-planning.
- `BuchungTNZuschlag` holds the departure surcharge. → `ArtZuschlag` has no such entry (A7).
- `sys.objects.create_date` shows when a table was added. → Every object reported the same
date: that of the last DB restore. Use `modify_date` after the restore instead.
- `PartnerKontingent.Anzahl` is the remaining room count. → Hotel 163113, room type 2366:
`Anzahl=6` against export `verfuegbar="1"` on the same day (A6). It is the allotment.
# A12. Maintenance
+10 -6
View File
@@ -261,15 +261,18 @@ WHERE pk.IDAdresse_FS = @HotelAddressId
> customer price. `PartnerZimmer.PreisJeZimmer` flags per-room vs. per-person pricing.
```sql
-- availability (XML 'verfuegbar') — VALIDATED: = PartnerKontingent.Anzahl for the
-- (hotel, room-type, date-span). IDZimmer_FS = the XML idbuspro_zimmer (a Zimmerart).
-- Sample: IDAdresse_FS=224923, IDZimmer_FS=1413, 2026-12-11 → Anzahl=25 = XML verfuegbar.
-- allotment behind XML 'verfuegbar' for the (hotel, room-type, date-span).
-- IDZimmer_FS = the XML idbuspro_zimmer (a Zimmerart). Anzahl is the allotment, NOT what is
-- left: 2026-11-11, hotel 163113 / 2366 → Anzahl=6 against XML verfuegbar=1. The earlier
-- sample 224923 / 1413 / 2026-12-11 (Anzahl=25 = verfuegbar) presumably had no bookings yet.
SELECT IDZimmer_FS, Anzahl, BuchungsStatus FROM dbo.PartnerKontingent
WHERE IDAdresse_FS = @HotelAddressId
AND IDZimmer_FS = @ZimmerartId -- the room type (XML idbuspro_zimmer)
AND TerminVon <= @Abreise AND TerminBis >= @Anreise;
```
> `verfuegbar` is a **flat column** (`PartnerKontingent.Anzahl`) — reproducible by SQL.
> `verfuegbar` is **computed** by BusPro: allotment minus bookings (see
> `live-api-queries.md`), and for a pooled room type the parent's figure
> (`PartnerZimmer.IDPartnerZimmer_FS_KontiAus`, `buspro-database-reference.md` A6).
> Gate it with `BuchungsStatus` (`''` bookable, `S` stop, `A` on-request).
> `<abpreis>` (the headline "from" price) is still **computed** (cheapest valid room +
> mandatory services) — recompute in the proxy from the per-room prices above.
@@ -298,8 +301,9 @@ ORDER BY gs.Position, sg.Position;
4. ~~**Partner room pricing**~~ — ✅ fully validated end-to-end: room `1413` (MBZ) →
code `38` → category `9478` → season `15420` × `Naechte=2` × `VK` × schema `1` =
**`269,00`**. (XML `abpreis 289,00` = room + mandatory services = computed.)
5. ~~**`verfuegbar`**~~ — ✅ flat: `PartnerKontingent.Anzahl` for `(IDAdresse_FS, IDZimmer_FS,
date-span)`; `1413 / 2026-12-11 → 25`. `<abpreis>` remains computed (recompute in proxy).
5. **`verfuegbar`** — computed, not flat (corrected 2026-11-11): `PartnerKontingent.Anzahl`
is the allotment; `1413 / 2026-12-11 → 25` presumably matched because nothing was booked
yet. `<abpreis>` remains computed (recompute in proxy).
6. ~~**Minimum-services filter**~~ — ✅ defined: "included services" =
(A2a) `Leistung`s with sales price `0.00` (schema 1) **+** (A2b) selection items from
the hardcoded "Leistungen" `Selektionsgruppenstamm` ids, merged into one plain list.
+8 -3
View File
@@ -79,9 +79,14 @@ Trip rules (`App\Chatbot\TripCatalog`):
("NEU Sportclub Lederer Wochenenden und Kurztrips", "Vacanceole Résidence L'Edelweiss"), so a hotel is
shown under its TYPO3 title, and under BusPro's name only when TYPO3 has no hotel for its code.
`query` searches both. Trips have no name in BusPro's export, only a code; their names are TYPO3's.
- A room is bookable unless its status is `Buchungsstop`. The baby row (room code `Baby`) is not a room.
`available` counts rooms, so the places of a date at a hotel are `Σ available × maxPax` over its
bookable rooms. The tools never output room counts, only `frei` or `auf Anfrage`.
- A room is listed unless its status is `Buchungsstop`. The baby row (room code `Baby`) is not a room.
A listed room is bookable when the booking flow offers it (the export's `bookable`): `Frei` with rooms
left is `frei`; `Anfrage` with rooms left and a room code ending in `Anf` (sold on request on purpose,
booking it produces an inquiry) is `auf Anfrage`. Any other room, including any other one on request, is
sold out, as the website shows it. A date at a hotel is as available as its best room; dates with only
sold-out rooms stay in `search_trips`, marked `ausgebucht`. `available` counts rooms, so the places of a
date at a hotel are `Σ available × maxPax` over its bookable rooms, and the "ab" price is the cheapest
bookable room's. The tools never output room counts, only `frei`, `auf Anfrage` or `ausgebucht`.
- `search_trips` only offers products that TYPO3 lists in its own website search (`searchable`) and does
not mark as unbookable. Closed group trips and staff trainings are `searchable: false`. `get_trip` still
answers when someone names their code.
+54
View File
@@ -0,0 +1,54 @@
<?php
declare(strict_types=1);
namespace DoctrineMigrations;
use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;
final class Version20261029120000 extends AbstractMigration
{
public function getDescription(): string
{
return 'Keys the contingent snapshot by hotel code instead of accommodation, and adds calendar_hotel for TYPO3\'s calendar hotel list.';
}
public function up(Schema $schema): void
{
$this->addSql('CREATE TABLE calendar_hotel (id INT AUTO_INCREMENT NOT NULL, code VARCHAR(16) NOT NULL, name VARCHAR(255) NOT NULL, UNIQUE INDEX UNIQ_6F075DB777153098 (code), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB');
// Backfill from the linked accommodation. accommodation_id stays, nullable and no longer
// written, until a later migration drops it; that keeps this step reversible.
$this->addSql('ALTER TABLE contingent_day ADD hotel_code VARCHAR(16) DEFAULT NULL, CHANGE accommodation_id accommodation_id INT DEFAULT NULL');
$this->addSql('UPDATE contingent_day cd INNER JOIN accommodation a ON a.id = cd.accommodation_id SET cd.hotel_code = a.calendar_code');
$this->addSql('DELETE FROM contingent_day WHERE hotel_code IS NULL OR hotel_code = \'\'');
$this->addSql('ALTER TABLE contingent_day CHANGE hotel_code hotel_code VARCHAR(16) NOT NULL');
$this->addSql('DROP INDEX uniq_contingent_day_accommodation_date ON contingent_day');
$this->addSql('CREATE UNIQUE INDEX uniq_contingent_day_hotel_code_date ON contingent_day (hotel_code, date)');
$this->addSql('ALTER TABLE contingent_sync_state ADD hotel_code VARCHAR(16) DEFAULT NULL, CHANGE accommodation_id accommodation_id INT DEFAULT NULL');
$this->addSql('UPDATE contingent_sync_state s INNER JOIN accommodation a ON a.id = s.accommodation_id SET s.hotel_code = a.calendar_code');
$this->addSql('DELETE FROM contingent_sync_state WHERE hotel_code IS NULL OR hotel_code = \'\'');
$this->addSql('ALTER TABLE contingent_sync_state CHANGE hotel_code hotel_code VARCHAR(16) NOT NULL');
$this->addSql('CREATE UNIQUE INDEX UNIQ_737F167CC0D0E610 ON contingent_sync_state (hotel_code)');
}
public function down(Schema $schema): void
{
// Rows of hotel codes without an accommodation cannot be expressed in the old schema.
// The snapshot is a cache, so the next sync of the old code rebuilds whatever is lost.
$this->addSql('UPDATE contingent_day cd INNER JOIN accommodation a ON a.calendar_code = cd.hotel_code SET cd.accommodation_id = a.id');
$this->addSql('DELETE cd FROM contingent_day cd LEFT JOIN accommodation a ON a.calendar_code = cd.hotel_code WHERE a.id IS NULL');
$this->addSql('DROP INDEX uniq_contingent_day_hotel_code_date ON contingent_day');
$this->addSql('ALTER TABLE contingent_day DROP hotel_code, CHANGE accommodation_id accommodation_id INT NOT NULL');
$this->addSql('CREATE UNIQUE INDEX uniq_contingent_day_accommodation_date ON contingent_day (accommodation_id, date)');
$this->addSql('UPDATE contingent_sync_state s INNER JOIN accommodation a ON a.calendar_code = s.hotel_code SET s.accommodation_id = a.id');
$this->addSql('DELETE s FROM contingent_sync_state s LEFT JOIN accommodation a ON a.calendar_code = s.hotel_code WHERE a.id IS NULL');
$this->addSql('DROP INDEX UNIQ_737F167CC0D0E610 ON contingent_sync_state');
$this->addSql('ALTER TABLE contingent_sync_state DROP hotel_code, CHANGE accommodation_id accommodation_id INT NOT NULL');
$this->addSql('DROP TABLE calendar_hotel');
}
}
+26
View File
@@ -0,0 +1,26 @@
<?php
declare(strict_types=1);
namespace DoctrineMigrations;
use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;
final class Version20261104142531 extends AbstractMigration
{
public function getDescription(): string
{
return 'Adds travel_mailing_list to track the Mailjet contact lists created per travel until their deletion.';
}
public function up(Schema $schema): void
{
$this->addSql('CREATE TABLE travel_mailing_list (id INT AUTO_INCREMENT NOT NULL, travel_code VARCHAR(32) NOT NULL, mailjet_list_id INT NOT NULL, delete_after DATETIME NOT NULL COMMENT \'(DC2Type:datetime_immutable)\', created_at DATETIME NOT NULL COMMENT \'(DC2Type:datetime_immutable)\', UNIQUE INDEX UNIQ_68DC6E28BC4DD335 (travel_code), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB');
}
public function down(Schema $schema): void
{
$this->addSql('DROP TABLE travel_mailing_list');
}
}
+34
View File
@@ -0,0 +1,34 @@
<?php
declare(strict_types=1);
namespace DoctrineMigrations;
use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;
final class Version20261109074654 extends AbstractMigration
{
public function getDescription(): string
{
return 'Allows a bus-only travel mailing list next to the full one: adds bus_leg and the list name, which replaces travel_code as the unique key.';
}
public function up(Schema $schema): void
{
$this->addSql('ALTER TABLE travel_mailing_list ADD bus_leg VARCHAR(20) DEFAULT NULL, ADD name VARCHAR(64) DEFAULT NULL');
// Every existing list holds all participants and is named by its travel code alone.
$this->addSql('UPDATE travel_mailing_list SET name = travel_code');
$this->addSql('ALTER TABLE travel_mailing_list MODIFY name VARCHAR(64) NOT NULL');
$this->addSql('CREATE UNIQUE INDEX UNIQ_68DC6E285E237E06 ON travel_mailing_list (name)');
$this->addSql('ALTER TABLE travel_mailing_list DROP INDEX UNIQ_68DC6E28BC4DD335, ADD INDEX IDX_68DC6E28BC4DD335 (travel_code)');
}
public function down(Schema $schema): void
{
// Fails while a travel has two lists; delete the bus-only one first.
$this->addSql('ALTER TABLE travel_mailing_list DROP INDEX IDX_68DC6E28BC4DD335, ADD UNIQUE INDEX UNIQ_68DC6E28BC4DD335 (travel_code)');
$this->addSql('DROP INDEX UNIQ_68DC6E285E237E06 ON travel_mailing_list');
$this->addSql('ALTER TABLE travel_mailing_list DROP bus_leg, DROP name');
}
}
+26
View File
@@ -0,0 +1,26 @@
<?php
declare(strict_types=1);
namespace DoctrineMigrations;
use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;
final class Version20261113151744 extends AbstractMigration
{
public function getDescription(): string
{
return 'Adds the back-channel logout URL and secret to OAuth2 clients.';
}
public function up(Schema $schema): void
{
$this->addSql('ALTER TABLE oauth2_client ADD logout_url VARCHAR(255) DEFAULT NULL, ADD logout_secret VARCHAR(128) DEFAULT NULL');
}
public function down(Schema $schema): void
{
$this->addSql('ALTER TABLE oauth2_client DROP logout_url, DROP logout_secret');
}
}
+1810 -3097
View File
File diff suppressed because it is too large. Load diff
+14 -12
View File
@@ -1,31 +1,29 @@
{
"name": "myep",
"devDependencies": {
"@babel/core": "^7.17.0",
"@babel/preset-env": "^7.16.0",
"@babel/core": "^8.0.7",
"@babel/preset-env": "^8.0.7",
"@hotwired/stimulus": "^3.0.0",
"@symfony/stimulus-bridge": "^3.2.0",
"@symfony/webpack-encore": "^6.0.0",
"@symfony/webpack-encore": "^7.2.0",
"@tailwindcss/forms": "^0.5.9",
"@tailwindcss/typography": "^0.5.15",
"autoprefixer": "^10.4.20",
"core-js": "^3.38.0",
"@tailwindcss/postcss": "^4.3.3",
"babel-plugin-polyfill-corejs3": "^1.0.0",
"core-js": "^3.51.0",
"cypress": "^15.5.0",
"file-loader": "^6.2.0",
"htmx.org": "^1.9.12",
"htmx.org": "^2.0.11",
"lightningcss": "^1.33.0",
"postcss": "^8.4.49",
"postcss-loader": "^8.1.1",
"regenerator-runtime": "^0.13.9",
"tailwindcss": "^3.4.15",
"tailwindcss": "^4.3.3",
"tippy.js": "^6.3.7",
"toastify-js": "^1.12.0",
"webpack": "^5.74.0",
"webpack-cli": "^6.0.1"
"webpack-cli": "^7.2.3"
},
"license": "WTFPL",
"private": true,
"scripts": {
"dev-server": "encore dev-server",
"dev": "encore dev",
"watch": "encore dev --watch",
"build": "encore production --progress",
@@ -37,5 +35,9 @@
"sortablejs": "^1.15.7",
"stimulus-use": "^0.52.3",
"vanilla-calendar-pro": "^3.1.0"
},
"allowScripts": {
"cypress": true,
"core-js": false
}
}
+1 -3
View File
@@ -1,7 +1,5 @@
module.exports = {
plugins: {
'postcss-import': {},
tailwindcss: {},
autoprefixer: {},
'@tailwindcss/postcss': {},
}
}
@@ -4,6 +4,8 @@ declare(strict_types=1);
namespace App\BpnConnect\Model;
use App\Enum\BusLeg;
readonly class TravelMailingResponse
{
/**
@@ -12,6 +14,7 @@ readonly class TravelMailingResponse
public function __construct(
public string $travelCode,
public array $data,
public ?BusLeg $busLeg = null,
) {
}
}
+33
View File
@@ -0,0 +1,33 @@
<?php
declare(strict_types=1);
namespace App\BpnConnect;
class RoomsClient extends AbstractApiClient
{
private const string CONTINGENT_POOLS_PATH = '/api/v1/rooms/contingent-pools';
/**
* Which room type's contingent each room type of a hotel draws on.
*
* The office sells one room at several occupancies by pointing the extra room types at the
* first one's contingent (`PartnerZimmer.IDPartnerZimmer_FS_KontiAus`). A room type with its
* own contingent maps to itself.
*
* @param int $hotelId the hotel's BusPro address id (the export's `<hotel idbuspro>`)
*
* @return array<int, int> room type id => room type id owning its contingent
*/
public function getContingentPools(int $hotelId): array
{
$payload = $this->request(self::CONTINGENT_POOLS_PATH, ['hotelId' => $hotelId]);
$pools = [];
foreach ($payload['data'] ?? [] as $item) {
$pools[(int) $item['room_type_id']] = (int) $item['pool_room_type_id'];
}
return $pools;
}
}
+24 -4
View File
@@ -4,8 +4,10 @@ declare(strict_types=1);
namespace App\BpnConnect;
use App\BpnConnect\Exception\BpnConnectException;
use App\BpnConnect\Model\TravelMailingRecipient;
use App\BpnConnect\Model\TravelMailingResponse;
use App\Enum\BusLeg;
class TravelsClient extends AbstractApiClient
{
@@ -14,13 +16,31 @@ class TravelsClient extends AbstractApiClient
/**
* An unknown travel code yields an empty list, not an error: bpn-connect cannot tell it
* apart from a travel without confirmed participants.
*
* @param ?BusLeg $busLeg only participants who booked this bus leg, plus their bookings' applicants
*/
public function getMailingRecipients(string $travelCode): TravelMailingResponse
public function getMailingRecipients(string $travelCode, ?BusLeg $busLeg = null): TravelMailingResponse
{
$payload = $this->request(self::MAILING_PATH, [
'travelCode' => $travelCode,
$query = ['travelCode' => $travelCode];
if (null !== $busLeg) {
$query['busLeg'] = $busLeg->value;
}
$payload = $this->request(self::MAILING_PATH, $query);
// A bpn-connect that predates the filter ignores the parameter and returns everyone, which
// must not end up on a list meant for bus passengers only.
$appliedBusLeg = $payload['meta']['bus_leg'] ?? null;
if ($appliedBusLeg !== $busLeg?->value) {
$this->logger->error('BpnConnect ignored the travel mailing bus filter', [
'travel_code' => $travelCode,
'requested_bus_leg' => $busLeg?->value,
'applied_bus_leg' => $appliedBusLeg,
]);
throw new BpnConnectException('BpnConnect did not apply the requested bus leg filter.');
}
$recipients = array_map(
static fn (array $item) => new TravelMailingRecipient(
email: $item['email'],
@@ -30,6 +50,6 @@ class TravelsClient extends AbstractApiClient
$payload['data'] ?? [],
);
return new TravelMailingResponse($payload['meta']['travel_code'] ?? $travelCode, $recipients);
return new TravelMailingResponse($payload['meta']['travel_code'] ?? $travelCode, $recipients, $busLeg);
}
}
@@ -49,8 +49,9 @@ class BookingDataProcessor
* - ParticipantDto::fromPersonalData() clones address objects to prevent shared references
* - For normal bookings, participant[0]'s missing address/dimensions are filled from the
* applicant (same person in normal bookings, but BPN may omit fields in <teilnehmer>)
* - For internal agency bookings, this copy is skipped: the applicant is a customer, not
* the first participant, so copying applicant data into participant[0] would be incorrect
* - The copy is skipped wherever participant[0] is NOT the applicant: internal agency
* bookings (the applicant is a customer) and split bookings (the applicant does not
* travel), where it would write one person's address onto another
*/
public function createBookingDtoFromBooking(Booking $booking, Travel $travel, bool $isInternalAgencyBooking = false): BookingDto
{
@@ -74,32 +75,6 @@ class BookingDataProcessor
$participantData = ParticipantDto::fromPersonalData($participant);
$participantData->index = $index;
// For normal bookings, applicant === participant[0]: copy address and body dimensions
// from applicant when BPN returns full data only in <anmelder> and minimal data in
// <teilnehmer id="1">. Skipped for internal agency bookings where the applicant is
// a customer (a different entity from the first traveler).
if (0 === $index && false === $isInternalAgencyBooking) {
// Copy address if first participant has no street (indicating empty/incomplete address)
$isEmpty = null === $participantData->address
|| null === $participantData->address->street
|| u($participantData->address->street)->trim()->isEmpty();
if ($isEmpty) {
$participantData->address = clone $booking->applicant->address;
}
// Copy body dimensions from applicant if not present in participant
if (null === $participantData->height && null !== $booking->applicant->height) {
$participantData->height = $booking->applicant->height;
}
if (null === $participantData->weight && null !== $booking->applicant->weight) {
$participantData->weight = $booking->applicant->weight;
}
if (null === $participantData->shoeSize && null !== $booking->applicant->shoeSize) {
$participantData->shoeSize = $booking->applicant->shoeSize;
}
}
// Extract service selections from booking and assign to participant DTO
$participantData->courses = $booking
->getAdditionalServicesForParticipantByGroup($index, Constants::TOKEN_COURSES);
@@ -178,14 +153,57 @@ class BookingDataProcessor
$roomSelection->price = $room->price;
$roomSelection->quantity = $bookingRoom->totalCount; // Actual quantity from booking XML (anzahl)
$roomSelection->capacity = $room->minPax ?? 1;
$roomSelection->maxQuantity = $bookingRoom->totalCount + ($room->available ?? 0);
$dto->roomSelections[] = $roomSelection;
}
}
// Runs once the participants are in place, because the decision needs the assembled DTO.
// The explicit flag covers internal agency bookings, whose applicant is a customer; the
// DTO predicate covers a split booking, whose participant[0] is a different person.
if (false === $isInternalAgencyBooking && $dto->isFirstParticipantApplicant()) {
$this->fillFirstParticipantFromApplicant($dto, $booking);
}
return $dto;
}
/**
* Fills gaps in participant[0] from the applicant, who is the same person.
*
* BPN routinely returns the full record in <anmelder> and only a minimal one in
* <teilnehmer id="1">. Only ever called where participant[0] IS the applicant: on a
* split booking or an internal agency booking this would write somebody else's address
* onto a traveller at the next edit submit.
*/
private function fillFirstParticipantFromApplicant(BookingDto $dto, Booking $booking): void
{
$participantData = $dto->getParticipant(0);
if (null === $participantData) {
return;
}
// Copy address if first participant has no street (indicating empty/incomplete address)
$isEmpty = null === $participantData->address
|| null === $participantData->address->street
|| u($participantData->address->street)->trim()->isEmpty();
if ($isEmpty) {
$participantData->address = clone $booking->applicant->address;
}
// Copy body dimensions from applicant if not present in participant
if (null === $participantData->height && null !== $booking->applicant->height) {
$participantData->height = $booking->applicant->height;
}
if (null === $participantData->weight && null !== $booking->applicant->weight) {
$participantData->weight = $booking->applicant->weight;
}
if (null === $participantData->shoeSize && null !== $booking->applicant->shoeSize) {
$participantData->shoeSize = $booking->applicant->shoeSize;
}
}
/**
* Enriches participant service selections with data from travel model.
*
@@ -322,6 +340,7 @@ class BookingDataProcessor
$this->serviceProcessor->processParticipantServices($participant, $bookingData, $travelData);
}
$this->serviceProcessor->removeCanceledParticipantsFromRooms($bookingData);
$this->serviceProcessor->removeUnusedServices($bookingData);
$this->personalDataSynchronizer->updateParticipantPersonalData(
$formData->participants,
@@ -254,7 +254,11 @@ class BookingPayloadBuilder
*/
public function buildCreatePayload(BookingDto $bookingDto, string $bookingType): array
{
$firstParticipant = $bookingDto->participants[0];
// The applicant is participant[0] on an ordinary booking, and a person of their own
// when they do not travel along.
$applicantSource = $bookingDto->applicantTravels
? $bookingDto->participants[0]
: ($bookingDto->applicant ?? $bookingDto->participants[0]);
$payload = [
'buchungsart' => $bookingType,
@@ -264,36 +268,10 @@ class BookingPayloadBuilder
'idagentur' => $bookingDto->agencyId,
];
// Add applicant (first participant data)
$payload['anmelder'] = [
'name' => $firstParticipant->lastName,
'vorname' => $firstParticipant->firstName,
'geschlecht' => $firstParticipant->gender ?? '',
'nationalitaet' => $firstParticipant->nationality ?? '',
];
// DO NOT include personId or addressId in create mode
// BPN will automatically match existing customers by exact personal data (name, DOB, address)
// Including IDs would prevent automatic matching and could cause data inconsistencies
if (null !== $firstParticipant->dateOfBirth) {
$payload['anmelder']['geburtsdatum'] = $firstParticipant->dateOfBirth->format('d.m.Y');
}
// Add address for applicant
if (null !== $firstParticipant->address) {
$payload['anmelder']['anschrift'] = $firstParticipant->address->toPayload();
}
if (null !== $firstParticipant->email || null !== $firstParticipant->mobile) {
$payload['anmelder']['kommunikation'] = [];
if (null !== $firstParticipant->email) {
$payload['anmelder']['kommunikation']['email'] = $firstParticipant->email;
}
if (null !== $firstParticipant->mobile) {
$payload['anmelder']['kommunikation']['telefonmobil'] = $firstParticipant->mobile;
}
}
$payload['anmelder'] = $this->buildPersonalDataPayload($applicantSource);
// Determine if this is an inquiry booking for voucher handling
$isInquiryBooking = 'A' === $bookingDto->bookingStatus;
@@ -301,42 +279,13 @@ class BookingPayloadBuilder
// Add participants
$payload['teilnehmerliste']['teilnehmer'] = [];
foreach ($bookingDto->participants as $index => $participant) {
$participantData = [
'@id' => $index + 1,
'status' => self::DEFAULT_PARTICIPANT_STATUS,
'name' => $participant->lastName,
'vorname' => $participant->firstName,
'geschlecht' => $participant->gender ?? '',
'nationalitaet' => $participant->nationality ?? '',
];
// DO NOT include personId or addressId in create mode
// BPN will automatically match existing customers by exact personal data (name, DOB, address)
// Including IDs would prevent automatic matching and could cause data inconsistencies
if (null !== $participant->dateOfBirth) {
$participantData['geburtsdatum'] = $participant->dateOfBirth->format('d.m.Y');
}
// Add address (always include structure, even if empty)
$participantData['anschrift'] = $participant->address?->toPayload() ?? [
'strasse' => null,
'plz' => null,
'ort' => null,
'ortsteil' => null,
'land' => null,
];
// Add contact info for all participants
if (null !== $participant->email || null !== $participant->mobile) {
$participantData['kommunikation'] = [];
if (null !== $participant->email) {
$participantData['kommunikation']['email'] = $participant->email;
}
if (null !== $participant->mobile) {
$participantData['kommunikation']['telefonmobil'] = $participant->mobile;
}
}
$participantData = [
'@id' => $index + 1,
'status' => self::DEFAULT_PARTICIPANT_STATUS,
] + $this->buildPersonalDataPayload($participant, true);
// Add body dimensions
if (null !== $participant->height) {
@@ -434,6 +383,57 @@ class BookingPayloadBuilder
return $payload;
}
/**
* Maps one person's personal data onto the payload shape shared by anmelder and teilnehmer.
*
* @param ParticipantDto $person The applicant or participant to map
* @param bool $alwaysIncludeAddress Participants always carry the anschrift structure
* even when empty; the anmelder only when set
*
* @return array<string, mixed>
*/
private function buildPersonalDataPayload(ParticipantDto $person, bool $alwaysIncludeAddress = false): array
{
$data = [
'name' => $person->lastName,
'vorname' => $person->firstName,
'geschlecht' => $person->gender ?? '',
'nationalitaet' => $person->nationality ?? '',
];
if (null !== $person->dateOfBirth) {
$data['geburtsdatum'] = $person->dateOfBirth->format('d.m.Y');
}
if (null !== $person->address) {
$data['anschrift'] = $person->address->toPayload();
} elseif ($alwaysIncludeAddress) {
$data['anschrift'] = [
'strasse' => null,
'plz' => null,
'ort' => null,
'ortsteil' => null,
'land' => null,
];
}
// A participant may come without an email (under-16s, see ParticipantDto::$email), and
// BusPro accepts that, so a blank is sent as a blank rather than borrowing the applicant's.
$email = null !== $person->email && '' !== trim($person->email) ? $person->email : null;
if (null !== $email || null !== $person->mobile) {
$data['kommunikation'] = [];
if (null !== $email) {
$data['kommunikation']['email'] = $email;
}
if (null !== $person->mobile) {
$data['kommunikation']['telefonmobil'] = $person->mobile;
}
}
return $data;
}
/**
* Adds services from a mapping to the payload.
*
@@ -14,8 +14,9 @@ use Psr\Log\LoggerInterface;
* Processes participant service selections for booking updates.
*
* Handles the assignment and mapping of services (additional, transportation,
* pickup, room, insurance) from participant DTOs to the booking model during
* the update request workflow.
* pickup, insurance) from participant DTOs to the booking model during the
* update request workflow. Rooms are not taken from the DTOs: they cannot be
* changed in edit mode, so the booking's own room assignments are sent back.
*/
class ParticipantServiceProcessor
{
@@ -28,7 +29,7 @@ class ParticipantServiceProcessor
* Resets all existing participant-to-service mappings to start with a clean slate.
*
* This ensures that service assignments are rebuilt from scratch based on current form selections.
* Includes resetting room mappings to allow room reassignments during edit.
* Room mappings are left alone, see removeCanceledParticipantsFromRooms().
*
* @param Booking $bookingData The booking data object containing services to reset
*/
@@ -39,7 +40,6 @@ class ParticipantServiceProcessor
...$bookingData->transportationServices,
...$bookingData->pickups,
...$bookingData->dropOffs,
...$bookingData->rooms,
...$bookingData->insurances,
];
@@ -52,7 +52,7 @@ class ParticipantServiceProcessor
* Processes all services for a single participant.
*
* This orchestrator method handles the complete service assignment workflow for one participant,
* including additional services, transportation services, pickup locations, and room assignments.
* including additional services, transportation services, pickup locations, and insurance.
*
* @param ParticipantDto $participant The participant data from the form
* @param Booking $bookingData The booking data object to update
@@ -68,7 +68,6 @@ class ParticipantServiceProcessor
$this->processTransportationServices($participant, $bookingData, $travelData);
$this->processPickupLocations($participant, $bookingData);
$this->processDropOffLocations($participant, $bookingData);
$this->processRoomAssignment($participant, $bookingData);
$this->processInsurance($participant, $bookingData, $travelData);
}
@@ -271,27 +270,23 @@ class ParticipantServiceProcessor
}
/**
* Processes room assignment for a participant.
* Removes canceled participants from the booking's room assignments.
*
* Maps the participant to their assigned room. Allows room reassignment during
* booking edits while maintaining the constraint that participants can only be
* assigned to room types that have already been booked.
* Room assignments cannot be changed in edit mode, so they are sent back as BusPro reports
* them on the booking reloaded at submit, together with its anzahl. Rebuilding them from the
* session would undo any reassignment made in BusPro while the edit was open, and send a
* zuordnung that no longer matches anzahl. Canceled participants are left out, as for every
* other service.
*
* @param ParticipantDto $participant The participant data from the form
* @param Booking $bookingData The booking data object to update
*/
private function processRoomAssignment(ParticipantDto $participant, Booking $bookingData): void
public function removeCanceledParticipantsFromRooms(Booking $bookingData): void
{
if (null === $participant->assignedRoomId) {
return;
}
// Find the room in the existing booking by ID
foreach ($bookingData->rooms as $room) {
if ($room->id === $participant->assignedRoomId) {
$room->mapping[] = $participant->index;
break;
}
$room->mapping = array_values(array_filter(
$room->mapping,
fn (int $index) => 'S' !== ($bookingData->participantsStatus[$index] ?? null)
));
}
}
+33 -2
View File
@@ -4,6 +4,7 @@ declare(strict_types=1);
namespace App\BusProNet\Model;
use App\Validator\Constraints as AppAssert;
use Symfony\Component\Validator\Constraints as Assert;
/**
@@ -15,17 +16,47 @@ use Symfony\Component\Validator\Constraints as Assert;
*/
class Communication
{
#[Assert\When(
expression: 'this.isPhoneNewlyEntered()',
constraints: [new AppAssert\PhoneNumber()],
groups: ['personal_data'],
)]
public ?string $phone = null;
#[Assert\NotBlank(message: 'Bitte angeben', groups: ['personal_data'])]
#[Assert\When(
expression: 'this.isMobileNewlyEntered()',
constraints: [new AppAssert\PhoneNumber()],
groups: ['personal_data'],
)]
public ?string $mobile = null;
#[Assert\NotBlank(message: 'Bitte angeben', groups: ['personal_data'])]
#[Assert\Email(message: 'Bitte eine gültige Adresse angeben', mode: 'strict', groups: ['personal_data'])]
// The numbers as loaded from BusPro, which go back unchanged and are exempt from PhoneNumber.
public ?string $loadedPhone = null;
public ?string $loadedMobile = null;
#[Assert\NotBlank(message: 'Bitte angeben', groups: ['personal_identity'])]
#[Assert\Email(message: 'Bitte eine gültige Adresse angeben', mode: 'strict', groups: ['personal_identity'])]
public ?string $email = null;
public bool $newsletter = false;
public function rememberLoadedNumbers(): void
{
$this->loadedPhone = $this->phone;
$this->loadedMobile = $this->mobile;
}
public function isPhoneNewlyEntered(): bool
{
return AppAssert\PhoneNumber::isNewlyEntered($this->phone, $this->loadedPhone);
}
public function isMobileNewlyEntered(): bool
{
return AppAssert\PhoneNumber::isNewlyEntered($this->mobile, $this->loadedMobile);
}
/**
* Converts the communication data to API payload format.
*
+5 -3
View File
@@ -23,10 +23,12 @@ class PersonalData
public bool $mutable = false;
public ?string $status = null;
#[Assert\NotBlank(message: 'Bitte angeben', groups: ['Default', 'personal_data'])]
// personal_identity holds what the user cannot edit in MyE&P (name and the login e-mail), so the
// personal-data form can validate everything else while the completeness check still sees it.
#[Assert\NotBlank(message: 'Bitte angeben', groups: ['Default', 'personal_identity'])]
public ?string $name = null;
#[Assert\NotBlank(message: 'Bitte angeben', groups: ['Default', 'personal_data'])]
#[Assert\NotBlank(message: 'Bitte angeben', groups: ['Default', 'personal_identity'])]
public ?string $firstName = '';
public ?string $salutation = null;
@@ -53,7 +55,7 @@ class PersonalData
#[Assert\Valid(groups: ['personal_data'])]
public Address $address;
#[Assert\Valid(groups: ['personal_data'])]
#[Assert\Valid(groups: ['personal_data', 'personal_identity'])]
public Communication $communication;
/** @var list<string> */
+32
View File
@@ -4,6 +4,7 @@ declare(strict_types=1);
namespace App\BusProNet\Model;
use App\BusProNet\Constants;
use Symfony\Component\Serializer\Attribute\Context;
use Symfony\Component\Serializer\Attribute\Groups;
use Symfony\Component\Serializer\Normalizer\DateTimeNormalizer;
@@ -20,6 +21,37 @@ class Room
public const SELECTION_TYPE_BY_PAX = 'by_pax';
public const SELECTION_TYPE_BY_ROOM = 'by_room';
/**
* Room code suffix by which the office marks a room as deliberately sold on request.
*/
public const ON_REQUEST_CODE_SUFFIX = 'Anf';
/**
* Whether a room with this status, availability and code is offered for new bookings.
*
* 'Frei' rooms with rooms left. A room on request ('Anfrage') would turn the booking into
* an inquiry, so it is treated as sold out, unless isOnRequestByCode() says the office
* sells it that way on purpose. Static and taking the raw values so the product export
* and the chatbot, which hold rooms as arrays, apply the same rule.
*/
public static function isBookableState(?string $status, ?int $available, ?string $code): bool
{
if (($available ?? 0) <= 0) {
return false;
}
return Constants::STATUS_AVAILABLE === $status
|| (Constants::STATUS_ON_REQUEST === $status && self::isOnRequestByCode($code));
}
/**
* Whether the room code carries the on-request suffix (case-sensitive, e.g. `6erSDAnf`).
*/
public static function isOnRequestByCode(?string $code): bool
{
return null !== $code && str_ends_with($code, self::ON_REQUEST_CODE_SUFFIX);
}
#[Groups(['api:list', 'api:single', 'snapshot'])]
public ?int $id = null;
+19 -39
View File
@@ -4,7 +4,6 @@ declare(strict_types=1);
namespace App\BusProNet\Model;
use App\BusProNet\Constants;
use App\BusProNet\Traits\SortByPriceTrait;
use Symfony\Component\Serializer\Attribute\Context;
use Symfony\Component\Serializer\Attribute\Groups;
@@ -20,6 +19,12 @@ use Symfony\Component\Serializer\Normalizer\DateTimeNormalizer;
class Travel
{
use SortByPriceTrait;
/**
* CRM selection that offers the "I am not travelling myself" choice on a travel date.
*/
private const NON_TRAVELLING_APPLICANT_SELECTION_ID = 1488;
#[Groups(['api:list', 'api:single', 'snapshot'])]
public ?int $id = null;
@@ -240,6 +245,15 @@ class Travel
return false;
}
/**
* Whether a booking for this travel date may be placed by an applicant who does not travel
* along, such as a parent booking for their children.
*/
public function allowsNonTravellingApplicant(): bool
{
return $this->hasSelectionId(self::NON_TRAVELLING_APPLICANT_SELECTION_ID);
}
/**
* Retrieves rooms filtered by their IDs.
*
@@ -263,10 +277,10 @@ class Travel
}
/**
* Retrieves all bookable rooms (both regular and inquiry).
* Retrieves all bookable rooms.
*
* Returns rooms that have availability greater than zero and a bookable status
* (either 'Frei' for regular booking or 'Anfrage' for inquiry booking).
* Returns the rooms Room::isBookableState() accepts: status 'Frei' with rooms left, or rooms
* the office sells on request on purpose, which turn the booking into an inquiry.
*
* @return array<int, Room> The filtered array of bookable rooms, indexed by room ID
*/
@@ -274,7 +288,7 @@ class Travel
{
$result = [];
foreach ($this->rooms as $room) {
if ($room->available > 0 && $this->isBookableRoomStatus($room->status)) {
if (Room::isBookableState($room->status, $room->available, $room->code)) {
$result[$room->id] = $room;
}
}
@@ -292,40 +306,6 @@ class Travel
return [] !== $this->getAvailableRooms();
}
/**
* Checks if all bookable rooms require inquiry booking.
*
* Returns true if there are bookable rooms but none with 'Frei' status.
* This indicates the booking must be submitted as an inquiry.
*
* @return bool True if only inquiry rooms are available
*/
public function requiresInquiryBooking(): bool
{
$bookableRooms = $this->getAvailableRooms();
if ([] === $bookableRooms) {
return false;
}
foreach ($bookableRooms as $room) {
if (Constants::STATUS_AVAILABLE === $room->status) {
return false;
}
}
return true;
}
/**
* Checks if a room status allows booking.
*/
private function isBookableRoomStatus(?string $status): bool
{
return Constants::STATUS_AVAILABLE === $status
|| Constants::STATUS_ON_REQUEST === $status;
}
/**
* Retrieves a room by its ID.
*
+12 -1
View File
@@ -6,6 +6,7 @@ use App\BusProNet\Exception\ApiClientException;
use App\BusProNet\Exception\ImmediateConnectionCloseException;
use App\BusProNet\Exception\ResponseParserException;
use App\BusProNet\MessageType;
use App\BusProNet\Utility\XmlCharacterFilter;
use App\BusProNet\XmlParser\ApiResponseParser;
use App\Service\XmlDumpWriter;
use Psr\Log\LoggerInterface;
@@ -208,8 +209,18 @@ class XmlChannel
*/
private function parseResponse(MessageType $type, string $xml, array $parserArgs, string $requestId, bool $dumpOnFailure = true): mixed
{
// The dump keeps the raw response; only the parser sees the filtered one.
$filtered = XmlCharacterFilter::strip($xml, $removed);
if ($removed > 0) {
$this->logger->warning('Removed characters not allowed in XML from API response', [
'request_id' => $requestId,
'type' => $type->value,
'removed' => $removed,
]);
}
try {
return $this->responseParser->parseXmlString($type, $xml, $parserArgs);
return $this->responseParser->parseXmlString($type, $filtered, $parserArgs);
} catch (ResponseParserException $e) {
// Keep the evidence even outside debug mode: without the raw response a parse
// failure is not diagnosable after the fact. app:cleanup:xml-dumps prunes it.
@@ -0,0 +1,60 @@
<?php
declare(strict_types=1);
namespace App\BusProNet\Utility;
/**
* Removes characters XML 1.0 does not allow from a BusPro response before it is parsed.
*
* BusPro escapes whatever a field holds into a character reference without checking it,
* so a NUL-padded value comes out as `&#x0;`. libxml rejects that as fatal and the whole
* response fails to parse, not just the field. The same applies to the raw control bytes.
*/
final class XmlCharacterFilter
{
/**
* @param-out int $count the number of characters removed
*/
public static function strip(string $xml, ?int &$count = null): string
{
$count = 0;
$xml = preg_replace_callback(
'/&#(x[0-9a-f]+|[0-9]+);/i',
static function (array $match) use (&$count): string {
$reference = $match[1];
$codePoint = 'x' === strtolower($reference[0]) ? hexdec(substr($reference, 1)) : (int) $reference;
if (self::isAllowed($codePoint)) {
return $match[0];
}
++$count;
return '';
},
$xml,
);
// Control bytes never occur inside a UTF-8 multibyte sequence, so a byte-wise match is safe.
$xml = preg_replace('/[\x00-\x08\x0B\x0C\x0E-\x1F]/', '', $xml, -1, $rawCount);
$count += $rawCount;
return $xml;
}
/**
* The Char production of XML 1.0.
*/
private static function isAllowed(int|float $codePoint): bool
{
return 0x9 === $codePoint
|| 0xA === $codePoint
|| 0xD === $codePoint
|| ($codePoint >= 0x20 && $codePoint <= 0xD7FF)
|| ($codePoint >= 0xE000 && $codePoint <= 0xFFFD)
|| ($codePoint >= 0x10000 && $codePoint <= 0x10FFFF);
}
}
+4 -4
View File
@@ -307,10 +307,10 @@ class TravelLoader extends AbstractLoader
$availability = $serviceAvailabilities[$service->id];
$service->available = $availability->available;
// The live status is the only signal that a contingent has run out: BusPro moves a
// Leistung to 'Anfrage' without necessarily reporting frei="0". Only overwrite when the
// response actually carries one, so a response that omits the attribute does not wipe
// the value parsed from the XML export. Mirrors TravelSnapshotManager::applyExtendedToService().
// The live status is fresher than the nightly export's. The parser has already mapped it
// onto the export vocabulary. Only overwrite when the response actually carries one, so a
// response that omits the attribute does not wipe the value parsed from the XML export.
// Mirrors TravelSnapshotManager::applyExtendedToService().
if (null !== $availability->status && '' !== trim($availability->status)) {
$service->status = $availability->status;
}
@@ -2,6 +2,7 @@
namespace App\BusProNet\XmlParser;
use App\BusProNet\Constants;
use App\BusProNet\Traits\TypeConversionTrait;
use Symfony\Component\DomCrawler\Crawler;
@@ -9,6 +10,19 @@ abstract class AbstractParser
{
use TypeConversionTrait;
/**
* Live availability wording for a Leistung, mapped onto the XML export's.
*
* The availability endpoints answer "buchbar" or "ausgebucht", while every availability rule
* compares against the export's "Frei" / "Anfrage" / "Buchungsstop". "ausgebucht" also covers
* a Leistung that would still take an inquiry (anfragemoeglich="J"); that is not offered
* either, so it maps to the booking stop.
*/
private const LIVE_SERVICE_STATUS = [
'buchbar' => Constants::STATUS_AVAILABLE,
'ausgebucht' => Constants::STATUS_BLOCKED,
];
protected function getStringOrNullValue(Crawler $node): ?string
{
return 0 < $node->count() ? $node->text() : null;
@@ -87,4 +101,16 @@ abstract class AbstractParser
return $value;
}
/**
* Translates a live Leistung status into the export vocabulary; anything else passes through.
*/
protected function toServiceStatus(?string $liveStatus): ?string
{
if (null === $liveStatus) {
return null;
}
return self::LIVE_SERVICE_STATUS[strtolower(trim($liveStatus))] ?? $liveStatus;
}
}
@@ -19,7 +19,7 @@ class AvailabilitiesParser extends AbstractParser
->each(function (Crawler $node) use (&$availabilities) {
$availability = new Availability();
$availability->serviceId = (int) $node->attr('id');
$availability->status = $node->attr('status');
$availability->status = $this->toServiceStatus($node->attr('status'));
$availability->available = (int) $node->attr('frei');
$availability->price = $this->stringToFloat($node->attr('preis'));
@@ -30,7 +30,7 @@ class ExtendedAvailabilitiesParser extends AbstractParser
$availability = new ExtendedAvailability();
$availability->serviceId = $serviceId;
$availability->status = $node->attr('status');
$availability->status = $this->toServiceStatus($node->attr('status'));
$availability->available = (int) $node->attr('frei');
$availability->price = $this->stringToFloat($node->attr('preis'));
$availability->dateFrom = $this->stringToDate($node->attr('termin'));
@@ -50,6 +50,7 @@ class PersonalDataParser extends AbstractParser
$communication->mobile = $this->getStringOrNullValue($contactDataNode->filterXPath('//telefonmobil'));
$communication->email = $this->getStringOrNullValue($contactDataNode->filterXPath('//email'));
$communication->newsletter = $this->getBoolValue($contactDataNode->filterXPath('//newsletter'));
$communication->rememberLoadedNumbers();
$personalData->communication = $communication;
}
@@ -5,6 +5,7 @@ declare(strict_types=1);
namespace App\BusProNet\XmlParser;
use App\BusProNet\Constants;
use App\BusProNet\Model\Room;
use Symfony\Component\DomCrawler\Crawler;
/**
@@ -61,7 +62,8 @@ class ProductExportParser extends AbstractParser
* The hotel's rooms, without the PDGS pseudo room.
*
* `available` is a count of rooms, not persons. Occupancy is read case-insensitively:
* the travel export writes `MinPax`/`MaxPax`.
* the travel export writes `MinPax`/`MaxPax`. `bookable` is the one derived field: whether
* the booking flow offers the room, so a consumer need not re-derive that rule.
*
* @return list<array<string, mixed>>
*/
@@ -76,6 +78,9 @@ class ProductExportParser extends AbstractParser
return;
}
$available = $this->getIntAttrOrNullValue($room, 'verfuegbar');
$status = $this->getAttrOrNullValue($room, 'status');
$rooms[] = [
'busProId' => $this->getIntAttrOrNullValue($room, 'idbuspro_zimmer'),
'code' => $code,
@@ -85,8 +90,9 @@ class ProductExportParser extends AbstractParser
'maxPax' => $this->getIntAttrOrNullValue($room, 'maxpax'),
'nights' => $this->getIntAttrOrNullValue($room, 'naechte'),
'price' => $this->stringToFloat($this->getAttrOrNullValue($room, 'preis')),
'available' => $this->getIntAttrOrNullValue($room, 'verfuegbar'),
'status' => $this->getAttrOrNullValue($room, 'status'),
'available' => $available,
'status' => $status,
'bookable' => Room::isBookableState($status, $available, $code),
'boardCode' => $this->getAttrOrNullValue($room, 'vpcode'),
'boardBusProId' => $this->getIntAttrOrNullValue($room, 'idbuspro_vp'),
];
-58
View File
@@ -29,20 +29,8 @@ class TravelParser extends AbstractParser
Constants::PSEUDO_PRICE_ROOM_CODE,
];
/**
* `$levelBoardingPointPrices` carries no default on purpose: a hand-built parser would
* otherwise silently ignore APP_BPN_LEVEL_BOARDING_POINT_PRICES and price one travel tier
* differently from the others. The registry gave up its own default along with it, so that
* there is one way to build this class — through the container, or explicitly in a test.
*
* @param bool $levelBoardingPointPrices Whether to compensate the BusPro export defect that
* omits a boarding point's return-leg price. The
* container wires it from
* APP_BPN_LEVEL_BOARDING_POINT_PRICES.
*/
public function __construct(
private readonly AgeConstraintParserRegistry $ageConstraintRegistry,
private readonly bool $levelBoardingPointPrices,
) {
}
@@ -99,11 +87,6 @@ class TravelParser extends AbstractParser
$travel->pickups = $this->getPickups($node->filterXPath('.//zustiege/zustieg'), $dateFrom, true);
$travel->dropOffs = $this->getPickups($node->filterXPath('.//zustiege_rueck/zustieg_rueck'), $dateTo, false);
// A boarding point costs the same in both directions
if ($this->levelBoardingPointPrices) {
$this->applyBoardingPointPriceLevelling($travel->pickups, $travel->dropOffs);
}
$travel->guide = $this->getGuide($node);
return $travel;
@@ -466,47 +449,6 @@ class TravelParser extends AbstractParser
}
}
/**
* Levels the price of a boarding point across both travel directions.
*
* A boarding point is either free or costs the same in both directions:
* `ZustiegPreis` is keyed by (point, tariff scheme) and holds no per-leg price, so
* BusPro bills an `Abfahrtsortzuschlag` per leg at one and the same rate. An
* asymmetric pair is therefore always an export defect — on some products a
* `<zustieg_rueck>` carries no `preis` although the engine still charges the return
* leg — and the stated price is the one that applies to both legs.
*
* Where both directions state a price they agree in practice; the outbound one wins
* to keep the outcome deterministic. Points without a counterpart are left as they are.
*
* Compensating the defect locally is provisional, so it is switchable: with
* `$levelBoardingPointPrices` off the export is reported verbatim and the affected
* travels undercharge the return leg again. See
* `docs/buspro-database-reference.md` section A7.
*
* @param array<int, Pickup> $pickups Pickups indexed by ID (modified in place)
* @param array<int, Pickup> $dropOffs Drop-offs indexed by ID (modified in place)
*/
private function applyBoardingPointPriceLevelling(array $pickups, array $dropOffs): void
{
foreach ($dropOffs as $pickupId => $dropOff) {
if (false === isset($pickups[$pickupId])) {
continue;
}
$pickup = $pickups[$pickupId];
$price = $pickup->price ?? $dropOff->price;
$pickup->price = $price;
$pickup->priceOutbound = $price;
$pickup->priceInbound = $price;
$dropOff->price = $price;
$dropOff->priceOutbound = $price;
$dropOff->priceInbound = $price;
}
}
/**
* Adjusts time-only pickup entries for overnight bus routes.
*
+3 -5
View File
@@ -40,8 +40,6 @@ class TripCatalog
/** The feed's only language for now; trips are joined in it. */
public const LANGUAGE = 'de';
private const STATUS_FREE = 'Frei';
private const DATES_WITH_PICKUPS = 3;
private const BODY_LIMIT = 20000;
private const HOTEL_BODY_LIMIT = 8000;
@@ -571,7 +569,7 @@ class TripCatalog
*/
private function matches(array $row, TravelDateFacts $facts, ?HotelType $hotelType, TripCriteria $criteria): bool
{
if (!$facts->isBookable()) {
if (!$facts->isListed()) {
return false;
}
@@ -696,7 +694,7 @@ class TripCatalog
'board' => $room['boardCode'] ?? null,
'nights' => $room['nights'] ?? null,
'price' => $room['price'] ?? null,
'availability' => self::STATUS_FREE === ($room['status'] ?? null) ? TravelDateFacts::AVAILABILITY_FREE : TravelDateFacts::AVAILABILITY_ON_REQUEST,
'availability' => TravelDateFacts::roomAvailability($room),
], static fn (mixed $value): bool => null !== $value);
}
@@ -712,7 +710,7 @@ class TripCatalog
'hotel' => $this->hotelName($catalog, $hotel, $row),
'hotelCode' => $row['hotel']['code'],
'rooms' => $rooms,
'bookable' => [] !== $rooms,
'bookable' => [] !== array_diff(array_column($rooms, 'availability'), [TravelDateFacts::AVAILABILITY_SOLD_OUT]),
];
}
-491
View File
@@ -1,491 +0,0 @@
<?php
declare(strict_types=1);
namespace App\Command;
use App\BusProNet\Client\BookingClient;
use App\BusProNet\Client\TravelClient;
use App\BusProNet\Constants;
use App\BusProNet\DataProcessor\BookingDataProcessor;
use App\BusProNet\Model\Booking;
use App\BusProNet\Model\Notification;
use App\BusProNet\Model\Service;
use App\BusProNet\Model\Travel;
use App\Entity\BookingEditDraft;
use App\Entity\User;
use App\Repository\BookingEditDraftRepository;
use App\Security\Crypt;
use App\Service\BookingChangeTracker;
use App\Service\BookingEditDraftMerger;
use App\Service\TravelDataProvider;
use Doctrine\ORM\EntityManagerInterface;
use Symfony\Component\Console\Attribute\AsCommand;
use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Style\SymfonyStyle;
use Symfony\Component\DependencyInjection\Attribute\Autowire;
/**
* Repairs a booking edit draft that BusPro keeps rejecting.
*
* A draft survives every failed submission and is replayed on each re-entry into the edit flow.
* When one selection inside it has become unacceptable to BusPro - a Leistung whose status has
* drifted to "Anfrage" because its contingent ran out, say - the whole change is refused, nothing
* persists, and the customer is stuck in a loop they cannot edit their way out of. Booking 98787
* accumulated 37 such failures over two months.
*
* The valuable half of that draft is the personal data: names, dates of birth, contact details,
* addresses, room remarks. Re-entering it by hand for eighty participants is not a reasonable ask.
* So this command rebuilds the draft on top of the booking as BusPro currently holds it, keeps
* every field the customer typed, and reverts only the service selections that BusPro will not
* accept - naming each one, so the office can tell the customer what to pick again.
*
* Dry run by default. --apply writes a JSON backup of the original form data first.
*/
#[AsCommand(
name: 'app:booking:repair-draft',
description: 'Rebuild a rejected booking edit draft, keeping typed data and reverting unacceptable service selections',
)]
class BookingRepairDraftCommand extends Command
{
/**
* Draft `services` keys holding a single service id.
*/
/**
* Date of birth the office writes into the empty slots of a template booking.
*/
private const PLACEHOLDER_DATE_OF_BIRTH = '2000-01-01';
private const SINGLE_SERVICE_KEYS = ['skiPass', 'veg', 'insurance', 'rentalInsurance'];
/**
* Draft `services` keys holding a list of service ids.
*
* @var list<string>
*/
private const LIST_SERVICE_KEYS = ['courses', 'board', 'rentals', 'additionalServices'];
/**
* Transport is reverted as a unit: a participant put back on their own arrival must lose the
* pickup and drop-off that only make sense on a coach.
*
* @var list<string>
*/
private const TRANSPORT_KEYS = ['transportationOutbound', 'transportationInbound', 'pickup', 'dropOff'];
public function __construct(
private readonly BookingEditDraftRepository $draftRepository,
private readonly EntityManagerInterface $entityManager,
private readonly BookingClient $bookingClient,
private readonly TravelClient $travelClient,
private readonly Crypt $crypt,
private readonly TravelDataProvider $travelDataProvider,
private readonly BookingDataProcessor $bookingDataProcessor,
private readonly BookingEditDraftMerger $draftMerger,
private readonly BookingChangeTracker $changeTracker,
#[Autowire('%kernel.project_dir%')]
private readonly string $projectDir,
) {
parent::__construct();
}
protected function configure(): void
{
$this
->addOption('booking', 'b', InputOption::VALUE_REQUIRED, 'idbuchung whose draft should be repaired')
->addOption('apply', null, InputOption::VALUE_NONE, 'Write the repaired draft. Without this the command only reports')
->addOption('backup-dir', null, InputOption::VALUE_REQUIRED, 'Where to write the backup of the original form data', 'var/draft-backups')
;
}
protected function execute(InputInterface $input, OutputInterface $output): int
{
$io = new SymfonyStyle($input, $output);
$bookingId = $input->getOption('booking');
if (null === $bookingId) {
$io->error('--booking is required.');
return Command::INVALID;
}
$draft = $this->findSingleDraft($io, (int) $bookingId);
if (null === $draft) {
return Command::FAILURE;
}
$user = $draft->getUser();
$booking = $this->fetchLiveBooking($io, $user, (int) $bookingId);
if (null === $booking) {
return Command::FAILURE;
}
$travel = $this->travelDataProvider->getTravelData((int) $booking->dateId, $booking->hotelId, true);
if (null === $travel) {
$io->error(sprintf('No travel data for date id %d.', (int) $booking->dateId));
return Command::FAILURE;
}
$formData = $draft->getFormData();
$draftParticipants = $formData['participants'] ?? [];
if (false === $this->assertAlignment($io, $booking, $draftParticipants)) {
return Command::FAILURE;
}
$blocked = $this->collectUnbookableServices($io, $travel);
// The booking as BusPro currently holds it is the only state known to be acceptable, so
// it is the base everything is rebuilt on.
$repairedDto = $this->bookingDataProcessor->createBookingDtoFromBooking(
$booking,
$travel,
false,
);
$liveSelections = $this->changeTracker->extractUserData($repairedDto)['participants'] ?? [];
$reverted = [];
foreach ($draftParticipants as $index => $participantData) {
if (false === isset($repairedDto->participants[$index])) {
continue;
}
$filtered = $this->filterServiceSelections(
$participantData,
$liveSelections[$index]['services'] ?? [],
$blocked,
$index,
$reverted,
);
$this->draftMerger->apply($repairedDto, $index, $repairedDto->participants[$index], $filtered, $travel);
}
$repaired = $this->changeTracker->extractUserData($repairedDto);
$this->report($io, $formData, $repaired, $reverted, $blocked);
if (false === $input->getOption('apply')) {
$io->note('Dry run. Re-run with --apply to write the repaired draft.');
return Command::SUCCESS;
}
$backupPath = $this->writeBackup($draft, (string) $input->getOption('backup-dir'));
$io->success(sprintf('Original form data backed up to %s', $backupPath));
$draft->setFormData($repaired);
$this->entityManager->flush();
$io->success(sprintf('Draft %d repaired.', (int) $draft->getId()));
return Command::SUCCESS;
}
private function findSingleDraft(SymfonyStyle $io, int $bookingId): ?BookingEditDraft
{
$drafts = $this->draftRepository->findBy(['bookingId' => $bookingId]);
if ([] === $drafts) {
$io->error(sprintf('No draft found for booking %d.', $bookingId));
return null;
}
if (count($drafts) > 1) {
$io->error(sprintf('Booking %d has %d drafts; resolve by hand.', $bookingId, count($drafts)));
return null;
}
$draft = $drafts[0];
$io->definitionList(
['Draft' => sprintf('%d (user %d)', (int) $draft->getId(), (int) $draft->getUser()->getId())],
['Created' => $draft->getCreatedAt()->format('Y-m-d H:i')],
['Last saved' => $draft->getUpdatedAt()->format('Y-m-d H:i')],
['Participants' => (string) count($draft->getFormData()['participants'] ?? [])],
);
return $draft;
}
private function fetchLiveBooking(SymfonyStyle $io, User $user, int $bookingId): ?Booking
{
$result = $this->bookingClient->getBooking(
(string) $user->getEmail(),
$this->crypt->decrypt((string) $user->getPassword()),
$bookingId,
);
if ($result instanceof Notification) {
$io->error(sprintf('Vorgang_Details failed: %d %s', (int) $result->code, (string) $result->message));
return null;
}
return $result;
}
/**
* Refuses to repair a draft whose positions no longer line up with the live booking.
*
* Drafts are merged positionally, by array index, with no identity check. Empty template
* slots are interchangeable, so they prove nothing; the participants BusPro already knows by
* date of birth are the only anchors available. If one of those has moved, every later
* position is suspect and rebuilding would quietly graft data onto the wrong people.
*
* @param array<int, array<string, mixed>> $draftParticipants
*/
private function assertAlignment(SymfonyStyle $io, Booking $booking, array $draftParticipants): bool
{
$liveCount = count($booking->participants);
$draftCount = count($draftParticipants);
if ($liveCount !== $draftCount) {
$io->warning(sprintf(
'Live booking has %d participants, the draft has %d. Seats were added or removed since the draft was written.',
$liveCount,
$draftCount,
));
}
$anchors = 0;
$mismatches = [];
foreach (array_values($booking->participants) as $index => $participant) {
$liveDob = $participant->dateOfBirth?->format('Y-m-d');
if (null === $liveDob || self::PLACEHOLDER_DATE_OF_BIRTH === $liveDob) {
continue;
}
++$anchors;
$draftDob = $draftParticipants[$index]['personalData']['dateOfBirth'] ?? null;
if (null !== $draftDob && $draftDob !== $liveDob) {
$mismatches[] = sprintf('position %d: live %s, draft %s', $index + 1, $liveDob, $draftDob);
}
}
if ([] !== $mismatches) {
$io->error('Draft positions no longer match the live booking:');
$io->listing($mismatches);
$io->comment('Repairing would move typed data onto the wrong participants. Resolve by hand.');
return false;
}
$io->text(sprintf('Alignment verified against %d participant(s) BusPro already knows.', $anchors));
return true;
}
/**
* Collects the services BusPro will not accept as an addition.
*
* A Leistung only takes new participants while its own status is "Frei"; anything else is the
* condition behind "Status der Leistung (A) ist unterschiedlich zum Status des Teilnehmers".
* Live availability is preferred over the travel data, which lags behind it.
*
* @return array<int, string> service id => status
*/
private function collectUnbookableServices(SymfonyStyle $io, Travel $travel): array
{
$statuses = [];
foreach ([...$travel->additionalServices, ...$travel->transportationServices] as $service) {
if (null !== $service->id && null !== $service->status) {
$statuses[$service->id] = $service->status;
}
}
$live = $this->travelClient->getAvailabilitiesExtended((int) $travel->id);
if ($live instanceof Notification) {
$io->warning(sprintf(
'VERFUEGBARKEIT2 failed (%d %s); falling back to travel data, which may be stale.',
(int) $live->code,
(string) $live->message,
));
} else {
foreach ($live->getServices() as $availability) {
if (null !== $availability->serviceId && null !== $availability->status && '' !== trim($availability->status)) {
$statuses[$availability->serviceId] = $availability->status;
}
}
}
$blocked = array_filter($statuses, static fn (string $status): bool => Constants::STATUS_AVAILABLE !== $status);
if ([] === $blocked) {
$io->text('Every service on this travel is currently "Frei".');
return [];
}
$rows = [];
foreach ($blocked as $serviceId => $status) {
$service = $travel->additionalServices[$serviceId] ?? $travel->transportationServices[$serviceId] ?? null;
$label = $service instanceof Service ? (string) $service->label : '?';
$rows[] = [$serviceId, $label, $status];
}
$io->section('Services that cannot take new participants');
$io->table(['id', 'Leistung', 'status'], $rows);
return $blocked;
}
/**
* Drops the draft's selections that would add a participant to a service BusPro has closed.
*
* Removing a key leaves the live booking's own value in place, because the merger applies
* only the keys it is given. Selections BusPro still accepts - a different ski pass, a meal
* preference - are kept, so the customer loses as little as possible.
*
* @param array<string, mixed> $participantData
* @param array<string, mixed> $liveServices
* @param array<int, string> $blocked
* @param list<string> $reverted
*
* @return array<string, mixed>
*/
private function filterServiceSelections(
array $participantData,
array $liveServices,
array $blocked,
int $index,
array &$reverted,
): array {
if (false === isset($participantData['services']) || [] === $blocked) {
return $participantData;
}
$services = $participantData['services'];
$position = $index + 1;
foreach (self::SINGLE_SERVICE_KEYS as $key) {
$selected = $services[$key] ?? null;
if (null !== $selected && isset($blocked[$selected]) && ($liveServices[$key] ?? null) !== $selected) {
unset($services[$key]);
$reverted[] = sprintf('participant %d: %s (service %d, %s)', $position, $key, $selected, $blocked[$selected]);
}
}
foreach (self::LIST_SERVICE_KEYS as $key) {
$selected = $services[$key] ?? null;
if (false === is_array($selected)) {
continue;
}
$liveList = $liveServices[$key] ?? [];
$kept = [];
foreach ($selected as $serviceId) {
if (isset($blocked[$serviceId]) && false === in_array($serviceId, $liveList, true)) {
$reverted[] = sprintf('participant %d: %s (service %d, %s)', $position, $key, $serviceId, $blocked[$serviceId]);
continue;
}
$kept[] = $serviceId;
}
$services[$key] = $kept;
}
foreach (['transportationOutbound', 'transportationInbound'] as $key) {
$selected = $services[$key] ?? null;
if (null === $selected || false === isset($blocked[$selected]) || ($liveServices[$key] ?? null) === $selected) {
continue;
}
$reverted[] = sprintf('participant %d: %s (service %d, %s)', $position, $key, $selected, $blocked[$selected]);
// Transport reverts as a unit, pickup and drop-off included.
foreach (self::TRANSPORT_KEYS as $transportKey) {
unset($services[$transportKey]);
}
break;
}
$participantData['services'] = $services;
return $participantData;
}
/**
* @param array<string, mixed> $original
* @param array<string, mixed> $repaired
* @param list<string> $reverted
* @param array<int, string> $blocked
*/
private function report(SymfonyStyle $io, array $original, array $repaired, array $reverted, array $blocked): void
{
$io->section('Typed data preserved');
$fields = ['firstName', 'lastName', 'dateOfBirth', 'email', 'mobile'];
$kept = 0;
$lost = [];
foreach ($original['participants'] ?? [] as $index => $participantData) {
foreach ($fields as $field) {
$before = $participantData['personalData'][$field] ?? null;
if (null === $before || '' === $before) {
continue;
}
$after = $repaired['participants'][$index]['personalData'][$field] ?? null;
if ($before === $after) {
++$kept;
continue;
}
$lost[] = sprintf('participant %d: %s', $index + 1, $field);
}
}
$io->text(sprintf('<info>%d</info> personal-data field(s) carried over.', $kept));
if ([] !== $lost) {
$io->warning(sprintf('%d field(s) could NOT be carried over:', count($lost)));
$io->listing(array_slice($lost, 0, 25));
}
$io->section('Service selections reverted');
if ([] === $reverted) {
$io->text([] === $blocked
? 'None - no service on this travel is closed.'
: 'None - the draft selects no closed service.');
return;
}
$io->warning(sprintf('%d selection(s) reverted to the booked state. The customer must choose again:', count($reverted)));
$io->listing($reverted);
}
private function writeBackup(BookingEditDraft $draft, string $backupDir): string
{
$directory = $this->projectDir.'/'.trim($backupDir, '/');
if (false === is_dir($directory)) {
mkdir($directory, 0o775, true);
}
$path = sprintf(
'%s/draft-%d-booking-%d-%s.json',
$directory,
(int) $draft->getId(),
$draft->getBookingId(),
(new \DateTimeImmutable())->format('Ymd-His'),
);
file_put_contents($path, json_encode($draft->getFormData(), \JSON_PRETTY_PRINT | \JSON_UNESCAPED_UNICODE));
return $path;
}
}
+38 -31
View File
@@ -4,10 +4,9 @@ declare(strict_types=1);
namespace App\Command;
use App\Entity\Groups\Accommodation;
use App\Repository\Groups\AccommodationRepository;
use App\Repository\Groups\ContingentDayRepository;
use App\Repository\Groups\ContingentSyncStateRepository;
use App\Service\ContingentHotelDirectory;
use App\Service\ContingentSnapshotManager;
use Carbon\CarbonImmutable;
use Psr\Log\LoggerInterface;
@@ -28,14 +27,18 @@ use Symfony\Component\Console\Style\SymfonyStyle;
*
* Scheduled over the full horizon throughout: every 15 minutes during peak hours, hourly
* outside them. The options exist for ad-hoc runs — a narrower --horizon-months, or --hotel
* to re-sync a single accommodation while debugging.
* to re-sync a single hotel code while debugging.
*
* Syncs every code of {@see ContingentHotelDirectory}: the accommodations' calendar codes plus
* TYPO3's calendar hotels. A full run also drops the snapshot of codes that have left both
* sources, so the snapshot tables only ever describe hotels that are still synced.
*/
class BpnSyncContingentsCommand extends Command
{
use LockableTrait;
public function __construct(
private readonly AccommodationRepository $accommodationRepository,
private readonly ContingentHotelDirectory $hotelDirectory,
private readonly ContingentSyncStateRepository $syncStateRepository,
private readonly ContingentDayRepository $dayRepository,
private readonly ContingentSnapshotManager $snapshotManager,
@@ -51,8 +54,8 @@ class BpnSyncContingentsCommand extends Command
{
$this
->addOption('horizon-months', null, InputOption::VALUE_REQUIRED, 'How many months ahead to sync (defaults to the full horizon)', '24')
->addOption('hotel', null, InputOption::VALUE_REQUIRED, 'Restrict the run to a single calendarCode')
->addOption('stale-after', null, InputOption::VALUE_REQUIRED, 'Minimum minutes since the last sync before an accommodation is eligible (ignored with --force)', '0')
->addOption('hotel', null, InputOption::VALUE_REQUIRED, 'Restrict the run to a single hotel code')
->addOption('stale-after', null, InputOption::VALUE_REQUIRED, 'Minimum minutes since the last sync before a hotel is eligible (ignored with --force)', '0')
->addOption('force', 'f', InputOption::VALUE_NONE, 'Sync even if the snapshot was refreshed recently')
;
}
@@ -79,10 +82,13 @@ class BpnSyncContingentsCommand extends Command
$dateFrom = $today->toDateTimeImmutable();
$dateTo = $today->addMonths($horizonMonths)->toDateTimeImmutable();
$accommodations = $this->resolveAccommodations(is_string($hotelCode) ? $hotelCode : null);
$this->hotelDirectory->refresh();
// array_keys() turns a numeric code into an int.
$allHotelCodes = array_map('strval', array_keys($this->hotelDirectory->all()));
$hotelCodes = is_string($hotelCode) ? array_values(array_intersect($allHotelCodes, [$hotelCode])) : $allHotelCodes;
if ([] === $accommodations) {
$io->warning('No accommodation with a calendarCode matched.');
if ([] === $hotelCodes) {
$io->warning('No accommodation calendarCode or TYPO3 calendar hotel matched.');
return Command::SUCCESS;
}
@@ -92,19 +98,19 @@ class BpnSyncContingentsCommand extends Command
$changed = 0;
$failedCodes = [];
foreach ($accommodations as $accommodation) {
if (!$force && $this->isFresh($accommodation, $staleAfterMinutes)) {
foreach ($hotelCodes as $code) {
if (!$force && $this->isFresh($code, $staleAfterMinutes)) {
++$skipped;
continue;
}
$result = $this->snapshotManager->sync($accommodation, $dateFrom, $dateTo);
$result = $this->snapshotManager->sync($code, $dateFrom, $dateTo);
++$processed;
if (!$result->successful) {
$failedCodes[] = (string) $accommodation->getCalendarCode();
$io->warning(sprintf('%s: %s', (string) $accommodation->getCalendarCode(), (string) $result->error));
$failedCodes[] = $code;
$io->warning(sprintf('%s: %s', $code, (string) $result->error));
continue;
}
@@ -115,7 +121,7 @@ class BpnSyncContingentsCommand extends Command
$io->writeln(sprintf(
'<info>%s</info>: %s (+%d ~%d -%d, %d beyond the previous horizon)',
(string) $accommodation->getCalendarCode(),
$code,
$result->changed ? 'changed' : 'unchanged',
$result->added,
$result->updated,
@@ -149,6 +155,21 @@ class BpnSyncContingentsCommand extends Command
$deleted = $this->dayRepository->deleteBefore($today->subDay()->toDateTimeImmutable());
$io->note(sprintf('Deleted %d outdated snapshot days.', $deleted));
// Only a full run knows the whole set. A code that left both sources is not served any
// more (the availability endpoint answers 400 for it), so its snapshot is dead weight;
// should it come back, the next run rebuilds it.
if (!is_string($hotelCode)) {
$orphanedDays = $this->dayRepository->deleteExceptHotelCodes($allHotelCodes);
$orphanedStates = $this->syncStateRepository->deleteExceptHotelCodes($allHotelCodes);
if ($orphanedStates > 0) {
$this->logger->info('Dropped the contingent snapshot of hotel codes that are no longer synced', [
'hotels' => $orphanedStates,
'days' => $orphanedDays,
]);
}
}
// Only a *total* failure is worth failing the task over: that means upstream is down or
// the API key is rejected, and the scheduler's failure mail is genuinely actionable.
// A single hotel breaking must stay quiet — this task runs every 15 minutes during the
@@ -158,27 +179,13 @@ class BpnSyncContingentsCommand extends Command
return $processed > 0 && $failed === $processed ? Command::FAILURE : Command::SUCCESS;
}
/**
* @return Accommodation[]
*/
private function resolveAccommodations(?string $hotelCode): array
{
if (null === $hotelCode) {
return $this->accommodationRepository->findAllWithCalendarCode();
}
$accommodation = $this->accommodationRepository->findOneByCalendarCode($hotelCode);
return null !== $accommodation ? [$accommodation] : [];
}
private function isFresh(Accommodation $accommodation, int $staleAfterMinutes): bool
private function isFresh(string $hotelCode, int $staleAfterMinutes): bool
{
if (0 === $staleAfterMinutes) {
return false;
}
$syncedAt = $this->syncStateRepository->findOneByAccommodation($accommodation)?->getSyncedAt();
$syncedAt = $this->syncStateRepository->findOneByHotelCode($hotelCode)?->getSyncedAt();
if (null === $syncedAt) {
return false;
@@ -0,0 +1,77 @@
<?php
declare(strict_types=1);
namespace App\Command;
use App\Entity\TravelMailingList;
use App\Exception\NewsletterProviderException;
use App\Repository\TravelMailingListRepository;
use App\Service\TravelMailingListManager;
use Psr\Log\LoggerInterface;
use Symfony\Component\Console\Attribute\AsCommand;
use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Style\SymfonyStyle;
#[AsCommand(
name: 'app:cleanup:travel-mailing-lists',
description: 'Deletes travel mailing lists and their orphaned contacts from Mailjet 30 days after the travel started',
)]
class CleanupTravelMailingListsCommand extends Command
{
public function __construct(
private readonly TravelMailingListRepository $travelMailingListRepository,
private readonly TravelMailingListManager $travelMailingListManager,
private readonly LoggerInterface $logger,
) {
parent::__construct();
}
protected function execute(InputInterface $input, OutputInterface $output): int
{
$io = new SymfonyStyle($input, $output);
$mailingLists = $this->travelMailingListRepository->findDueForDeletion(new \DateTimeImmutable());
if ([] === $mailingLists) {
$io->success('No travel mailing lists due for deletion.');
return Command::SUCCESS;
}
// A travel's lists are deleted together (see TravelMailingListManager::delete()), including
// one that is not due yet because the travel's start date moved after it was created.
$travelCodes = array_unique(array_map(static fn (TravelMailingList $mailingList) => $mailingList->getTravelCode(), $mailingLists));
$failed = 0;
$deletedLists = 0;
foreach ($travelCodes as $travelCode) {
$travelLists = $this->travelMailingListRepository->findByTravelCode($travelCode);
$listIds = implode(', ', array_map(static fn (TravelMailingList $mailingList) => $mailingList->getMailjetListId(), $travelLists));
try {
$deletedContacts = $this->travelMailingListManager->delete($travelLists);
$deletedLists += count($travelLists);
$io->writeln(sprintf('Deleted %s (lists %s) and %d orphaned contact(s).', $travelCode, $listIds, $deletedContacts));
} catch (NewsletterProviderException $exception) {
// The rows of lists not yet deleted stay, so the next run picks them up again.
++$failed;
$this->logger->error('Delete travel mailing lists failed', [
'travel_code' => $travelCode,
'mailjet_list_ids' => $listIds,
'error' => $exception->getMessage(),
]);
$io->error(sprintf('%s (lists %s): %s', $travelCode, $listIds, $exception->getMessage()));
}
}
if ($failed > 0) {
return Command::FAILURE;
}
$io->success(sprintf('Deleted %d travel mailing list(s).', $deletedLists));
return Command::SUCCESS;
}
}
@@ -158,9 +158,16 @@ class PersonalDataController extends AbstractController
return $this->redirectToRoute('app_personal_data');
}
// The form leaves these out of validation because the user has no field for them, so they
// are reported separately. Skipped for a failed load, which would list every field.
$invalidIdentityFields = null !== $personalData->addressId
? $this->completenessChecker->invalidIdentityFields($personalData)
: [];
return $this->render('account/personal_data.html.twig', [
'personalData' => $personalData,
'personalDataForm' => $personalDataForm,
'invalidIdentityFields' => $invalidIdentityFields,
'newsletterSubscribed' => $newsletterSubscribed,
'newsletterPendingConfirmation' => $newsletterPendingConfirmation,
]);
@@ -52,7 +52,7 @@ class IndexController extends AbstractController
$request->query->getInt('page', 1),
$request->query->getInt('limit', 20),
[
'defaultSortFieldName' => 'booking.createdAt',
'defaultSortFieldName' => 'booking.updatedAt',
'defaultSortDirection' => 'DESC',
]
);
@@ -0,0 +1,105 @@
<?php
declare(strict_types=1);
namespace App\Controller\Admin\TravelMailing;
use App\BpnConnect\Exception\BpnConnectException;
use App\BpnConnect\TravelsClient;
use App\BusProNet\Utility\DateCodeUtility;
use App\Entity\TravelMailingList;
use App\Exception\NewsletterProviderException;
use App\Form\Model\TravelMailingLookupDto;
use App\Repository\TravelMailingListRepository;
use App\Service\TravelDataProvider;
use App\Service\TravelMailingListManager;
use Psr\Log\LoggerInterface;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Routing\Attribute\Route;
use Symfony\Component\Security\Http\Attribute\IsGranted;
#[IsGranted('ROLE_CUSTOMER_EXPERT')]
class CreateListController extends AbstractController
{
public const string CSRF_TOKEN_ID = 'create_travel_mailing_list';
public function __construct(
private readonly TravelsClient $travelsClient,
private readonly TravelDataProvider $travelDataProvider,
private readonly TravelMailingListRepository $travelMailingListRepository,
private readonly TravelMailingListManager $travelMailingListManager,
private readonly LoggerInterface $adminLogger,
) {
}
#[Route('/admin/travel-mailing/list', name: 'app_admin_travelmailing_createlist', methods: ['POST'])]
public function index(Request $request): Response
{
if (!$this->isCsrfTokenValid(self::CSRF_TOKEN_ID, $request->request->getString('_token'))) {
throw $this->createAccessDeniedException('Invalid CSRF token.');
}
$lookup = new TravelMailingLookupDto();
$lookup->travelCode = (new DateCodeUtility())->sanitize($request->request->getString('travelCode'));
$lookup->busOnly = $request->request->getBoolean('busOnly');
$travelCode = $lookup->travelCode;
$busLeg = $lookup->getBusLeg();
$returnUrl = $this->generateUrl('app_admin_travelmailing', array_filter([
'travelCode' => $travelCode,
'busOnly' => $lookup->busOnly ? 1 : null,
]));
$name = TravelMailingList::nameFor($travelCode, $busLeg);
if (null !== $this->travelMailingListRepository->findOneByName($name)) {
$this->addFlash('error', sprintf('Die Mailjet-Liste %s gibt es bereits.', $name));
return $this->redirect($returnUrl);
}
$travelStartsAt = $this->travelDataProvider->mapDateCodeToStartDate($travelCode);
if (null === $travelStartsAt) {
$this->addFlash('error', sprintf('Für %s ist kein Reisebeginn bekannt, die Liste könnte nicht automatisch gelöscht werden.', $travelCode));
return $this->redirect($returnUrl);
}
// Fetched again rather than posted from the page, so the list holds what BusPro reports now.
try {
$recipients = $this->travelsClient->getMailingRecipients($travelCode, $busLeg)->data;
} catch (BpnConnectException) {
$this->addFlash('error', 'Die Teilnehmerliste konnte nicht von BusPro abgerufen werden. Bitte später erneut versuchen.');
return $this->redirect($returnUrl);
}
if ([] === $recipients) {
$this->addFlash('error', sprintf('Keine Empfänger für %s gefunden.', $travelCode));
return $this->redirect($returnUrl);
}
try {
$mailingList = $this->travelMailingListManager->create($travelCode, $recipients, $busLeg, $travelStartsAt);
} catch (NewsletterProviderException $exception) {
$this->adminLogger->error('Create travel mailing list failed', [
'travel_code' => $travelCode,
'error' => $exception->getMessage(),
]);
$this->addFlash('error', 'Die Mailjet-Liste konnte nicht angelegt werden: '.$exception->getMessage());
return $this->redirect($returnUrl);
}
$this->adminLogger->info('Create travel mailing list', [
'travel_code' => $travelCode,
'mailjet_list_id' => $mailingList->getMailjetListId(),
'bus_leg' => $busLeg?->value,
'recipients' => count($recipients),
]);
$this->addFlash('success', sprintf('Die Mailjet-Liste %s wurde mit %d Empfängern angelegt.', $mailingList->getName(), count($recipients)));
return $this->redirect($returnUrl);
}
}
@@ -6,8 +6,12 @@ namespace App\Controller\Admin\TravelMailing;
use App\BpnConnect\Exception\BpnConnectException;
use App\BpnConnect\TravelsClient;
use App\BusProNet\Utility\DateCodeUtility;
use App\Entity\TravelMailingList;
use App\Form\Admin\TravelMailingLookupType;
use App\Form\Model\TravelMailingLookupDto;
use App\Repository\TravelMailingListRepository;
use App\Service\TravelDataProvider;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
@@ -19,6 +23,8 @@ class IndexController extends AbstractController
{
public function __construct(
private readonly TravelsClient $travelsClient,
private readonly TravelDataProvider $travelDataProvider,
private readonly TravelMailingListRepository $travelMailingListRepository,
) {
}
@@ -32,10 +38,29 @@ class IndexController extends AbstractController
$form->handleRequest($request);
$result = null;
$travelLabel = null;
$travelStartsAt = null;
$mailingLists = [];
$mailingList = null;
$listName = null;
$failed = false;
if ($form->isSubmitted() && $form->isValid()) {
// The local index matches codes exactly, so "lpjmp-281126" has to become "LPJMP281126"
// before the label lookup; bpn-connect gets the same code to keep both in step.
$travelCode = (new DateCodeUtility())->sanitize((string) $lookup->travelCode);
try {
$result = $this->travelsClient->getMailingRecipients((string) $lookup->travelCode);
$result = $this->travelsClient->getMailingRecipients($travelCode, $lookup->getBusLeg());
$travelLabel = $this->travelDataProvider->mapDateCodeToLabel($travelCode);
$travelStartsAt = $this->travelDataProvider->mapDateCodeToStartDate($travelCode);
$mailingLists = $this->travelMailingListRepository->findByTravelCode($travelCode);
// The list matching the current filter, if one exists, replaces the create button.
$listName = TravelMailingList::nameFor($travelCode, $lookup->getBusLeg());
foreach ($mailingLists as $existing) {
if ($listName === $existing->getName()) {
$mailingList = $existing;
}
}
} catch (BpnConnectException) {
// The client has already logged the cause; the page only needs to say it failed.
$failed = true;
@@ -45,6 +70,11 @@ class IndexController extends AbstractController
return $this->render('admin/travel_mailing/index.html.twig', [
'form' => $form,
'result' => $result,
'travel_label' => $travelLabel,
'travel_starts_at' => $travelStartsAt,
'mailing_lists' => $mailingLists,
'mailing_list' => $mailingList,
'list_name' => $listName,
'failed' => $failed,
]);
}
+85 -1
View File
@@ -11,7 +11,9 @@ use App\Model\ContingentCalendarQuery;
use App\Model\ContingentPricesQuery;
use App\Repository\Groups\AccommodationPriceRepository;
use App\Repository\Groups\AccommodationRepository;
use App\Repository\Groups\ContingentSyncStateRepository;
use App\Service\AccommodationPriceCoverage;
use App\Service\ContingentHotelDirectory;
use App\Service\ContingentSnapshotReader;
use App\Service\PriceTimelineBuilder;
use Carbon\CarbonImmutable;
@@ -33,6 +35,8 @@ class ContingentController extends AbstractController
private readonly ContingentSnapshotReader $snapshotReader,
private readonly PriceTimelineBuilder $priceTimelineBuilder,
private readonly AccommodationPriceCoverage $priceCoverage,
private readonly ContingentHotelDirectory $hotelDirectory,
private readonly ContingentSyncStateRepository $syncStateRepository,
private readonly LoggerInterface $logger,
) {
}
@@ -107,7 +111,7 @@ class ContingentController extends AbstractController
// An empty or stale snapshot must not be served as though every day were blocked: that
// is a plausible-looking 200 nobody can distinguish from real data. Fail the way this
// endpoint always failed instead, so existing consumers need no change.
$statuses = $this->snapshotReader->statusesFor($accommodation, $dateFrom, $dateTo);
$statuses = $this->snapshotReader->statusesFor($query->hotelCode, $dateFrom, $dateTo);
if (null === $statuses) {
return $this->json(['error' => 'Failed to fetch contingent data.'], Response::HTTP_BAD_GATEWAY);
@@ -133,6 +137,86 @@ class ContingentController extends AbstractController
return $this->json($data);
}
/**
* The snapshot as it is, for the iCal feed: no price rule, and days the snapshot lacks are
* left out rather than blocked, so a portal shows them as free like it did with the feed
* that read bpn-connect directly.
*
* Serves every synced hotel code, including TYPO3's calendar hotels that have no
* accommodation (winter-only hotels).
*/
#[Route(path: '/contingents/availability', name: 'api_contingents_availability', methods: ['GET'])]
public function availability(
#[MapQueryString(validationFailedStatusCode: Response::HTTP_BAD_REQUEST)]
ContingentCalendarQuery $query,
): JsonResponse {
if (null === $this->hotelDirectory->find($query->hotelCode)) {
$this->logger->error('Hotel not found for hotelcode '.$query->hotelCode);
return $this->json(['error' => 'Hotel not found for hotelCode.'], Response::HTTP_BAD_REQUEST);
}
// Without a range: from today to wherever the snapshot ends.
$dateFrom = $query->dateFromDate() ?? CarbonImmutable::now()->setTime(0, 0);
$dateTo = $query->dateToDate();
// Same reasoning as calendar(): a missing or stale snapshot must not pass for real data.
// Here it matters even more, since an empty feed would show every day as free.
$statuses = $this->snapshotReader->statusesFor($query->hotelCode, $dateFrom, $dateTo);
if (null === $statuses) {
return $this->json(['error' => 'Failed to fetch contingent data.'], Response::HTTP_BAD_GATEWAY);
}
ksort($statuses);
$data = [];
foreach ($statuses as $date => $status) {
$data[] = ['date' => (string) $date, 'status' => $status->value];
}
return $this->json($data);
}
/**
* One row per synced hotel code, for the overview of which hotel supports which calendar.
*
* `available` is whether `availability` currently serves the hotel; calendar and price table
* additionally need an accommodation with prices, which `pricedFrom`/`pricedTo` show.
*/
#[Route(path: '/contingents/status', name: 'api_contingents_status', methods: ['GET'])]
public function status(): JsonResponse
{
$states = $this->syncStateRepository->findAllIndexedByHotelCode();
$data = [];
foreach ($this->hotelDirectory->all() as $hotel) {
$state = $states[$hotel->code] ?? null;
$accommodation = $hotel->accommodation;
$bounds = null !== $accommodation ? $this->priceRepository->findPricedDateBoundsByHotelCode($hotel->code) : null;
$data[] = [
'hotelCode' => $hotel->code,
'name' => $hotel->calendarHotel?->getName(),
'sources' => array_map(static fn ($source) => $source->value, $hotel->sources()),
'accommodation' => null !== $accommodation ? [
'name' => $accommodation->getName(),
'cmsCode' => $accommodation->getEffectiveCmsCode(),
] : null,
'pricedFrom' => null !== $bounds ? $bounds['from']->format('Y-m-d') : null,
'pricedTo' => null !== $bounds ? $bounds['to']->format('Y-m-d') : null,
'syncedAt' => $state?->getSyncedAt()?->format(\DateTimeInterface::ATOM),
'lastError' => $state?->getLastError(),
'failureCount' => $state?->getFailureCount() ?? 0,
'available' => $this->snapshotReader->isCurrent($state),
];
}
return $this->json($data);
}
/**
* @param AccommodationPrice[] $prices
* @param array<string, true> $covered
@@ -5,6 +5,7 @@ declare(strict_types=1);
namespace App\Controller\Booking\Create;
use App\BusProNet\XmlLoader\AgencyLoader;
use App\Exception\BookingBackendUnavailableException;
use App\Exception\HotelNotFoundException;
use App\Exception\HotelNotInTravelException;
use App\Exception\NoRoomsAvailableException;
@@ -119,6 +120,10 @@ class IndexController extends AbstractController
} catch (TravelNotFoundException|HotelNotFoundException|HotelNotInTravelException|NoRoomsAvailableException $e) {
$this->addFlash('error', $e->getMessage());
return $this->htmxRedirect($request, $this->generateUrl('app_booking_create_error'));
} catch (BookingBackendUnavailableException) {
$this->addFlash('error', 'Unser Buchungssystem ist gerade nicht erreichbar. Bitte versuche es in ein paar Minuten erneut.');
return $this->htmxRedirect($request, $this->generateUrl('app_booking_create_error'));
}
}
@@ -13,7 +13,6 @@ use App\Htmx\HxTrait;
use App\Service\BookingConfigurator;
use App\Service\BookingCreateContextFactory;
use App\Service\BookingSessionManager;
use App\Service\RoomPricingCalculator;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Routing\Attribute\Route;
@@ -66,7 +65,6 @@ class Step1Controller extends AbstractBookingCreateController
$bookingCreateDto->resetParticipantAssignments();
}
// Check if room selection forces inquiry mode
$this->bookingService->updateBookingStatusFromRoomSelection($bookingCreateDto);
$bookingCreateDto->currentStep = 2;
@@ -78,10 +76,7 @@ class Step1Controller extends AbstractBookingCreateController
return $this->redirectToRoute('app_booking_create_step_2');
}
$context = $this->createContextFactory->create(
$bookingCreateDto,
RoomPricingCalculator::PRICING_MODE_SELECTION
);
$context = $this->createContextFactory->createForRoomSelection($bookingCreateDto);
return $this->render('booking/create/step_1.html.twig', [
'bookingCreateContext' => $context,
@@ -108,10 +103,7 @@ class Step1Controller extends AbstractBookingCreateController
]);
$form->handleRequest($request);
$context = $this->createContextFactory->create(
$bookingCreateDto,
RoomPricingCalculator::PRICING_MODE_SELECTION
);
$context = $this->createContextFactory->createForRoomSelection($bookingCreateDto);
// The DTO is now updated with the latest selection.
// We can now render the blocks with the fresh data.
@@ -6,9 +6,11 @@ namespace App\Controller\Booking\Create;
use App\BusProNet\Model\Travel;
use App\Entity\User;
use App\Exception\BookingBackendUnavailableException;
use App\Exception\BookingSessionNotFoundException;
use App\Exception\HotelNotInTravelException;
use App\Exception\TravelNotFoundException;
use App\Form\BookingApplicantTravelsType;
use App\Form\BookingCreateStep2Type;
use App\Form\Model\BookingDto;
use App\Form\Model\ParticipantDto;
@@ -22,10 +24,12 @@ use App\Service\RoomAssigner;
use App\Service\TravelDataProvider;
use Psr\Log\LoggerInterface;
use Symfony\Component\DependencyInjection\Attribute\Autowire;
use Symfony\Component\Form\FormInterface;
use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Routing\Attribute\Route;
use Symfony\Component\Validator\ConstraintViolationInterface;
/**
* Handles the second step of the booking creation process using card-based UI.
@@ -64,8 +68,19 @@ class Step2Controller extends AbstractBookingCreateController
return $redirect;
}
// Enrich with fresh availability data
$this->travelDataService->enrichWithFreshAvailabilities($bookingCreateDto->travel);
// Enrich with fresh availability data. Opening the step is the last moment before the customer
// types in participant data, so an unreachable BusPro stops them here rather than at the inquiry
// in step 3. Submitting the step stays lenient: the data is entered by then, and step 3 says so.
try {
$this->travelDataService->enrichWithFreshAvailabilities(
$bookingCreateDto->travel,
requireReachable: false === $request->isMethod(Request::METHOD_POST),
);
} catch (BookingBackendUnavailableException) {
$this->addFlash('error', 'Unser Buchungssystem ist gerade nicht erreichbar. Deine Zimmerauswahl bleibt gespeichert, bitte versuche es in ein paar Minuten erneut.');
return $this->redirectToRoute('app_booking_create_step_1');
}
// Resync the room selections with the refreshed travel before any participant count is derived
// from them, and send the customer back to step 1 when a room they picked is gone.
@@ -80,15 +95,33 @@ class Step2Controller extends AbstractBookingCreateController
$this->ensureCorrectNumberOfParticipants($bookingCreateDto);
// A session can still hold a split for a travel date that does not offer the choice.
if (false === $bookingCreateDto->applicantTravels
&& false === $bookingCreateDto->travel->allowsNonTravellingApplicant()) {
$bookingCreateDto->restoreTravellingApplicant();
}
// The account's own data belongs to whoever is the applicant: participant[0] normally,
// and the separate applicant record when they do not travel along.
$user = $this->getUser();
if ($user instanceof User
&& isset($bookingCreateDto->participants[0])
if ($user instanceof User) {
if (false === $bookingCreateDto->applicantTravels) {
$bookingCreateDto->applicant ??= new ParticipantDto();
if ($this->prepopulationService->shouldPrefillApplicant($bookingCreateDto->applicant)) {
$bookingCreateDto->applicant = $this->prepopulationService->prefillApplicantFromUser(
$user,
$bookingCreateDto->applicant
);
}
} elseif (isset($bookingCreateDto->participants[0])
&& $this->prepopulationService->shouldPrefillApplicant($bookingCreateDto->participants[0])) {
$bookingCreateDto->participants[0] = $this->prepopulationService->prefillApplicantFromUser(
$user,
$bookingCreateDto->participants[0]
);
}
}
// Validate room assignments against current selection (handles back-navigation from step 2 to step 1)
$this->roomAssignmentService->validateAndResetInvalidAssignments($bookingCreateDto);
@@ -122,6 +155,10 @@ class Step2Controller extends AbstractBookingCreateController
$templateData = [
'form' => $form->createView(),
'bookingCreateContext' => $context,
'applicantErrors' => $this->collectApplicantErrors($form),
'applicantTravelsForm' => $this
->createForm(BookingApplicantTravelsType::class, $bookingCreateDto)
->createView(),
];
return $this->render('booking/create/step_2.html.twig', $templateData);
@@ -200,6 +237,42 @@ class Step2Controller extends AbstractBookingCreateController
];
}
/**
* Pulls out the violations that belong to the applicant block rather than a participant.
*
* The step-2 form carries no fields of its own, so every violation surfaces at the form root
* and the page can only say "check the participants". An incomplete applicant would then be
* an invisible blocker: nothing on the page is marked and the button simply does nothing.
*
* @param FormInterface<mixed> $form
*
* @return string[] Messages to render on the applicant card
*/
private function collectApplicantErrors(FormInterface $form): array
{
if (false === $form->isSubmitted()) {
return [];
}
$messages = [];
foreach ($form->getErrors(true) as $error) {
$cause = $error->getCause();
if (false === $cause instanceof ConstraintViolationInterface) {
continue;
}
if (false === str_contains($cause->getPropertyPath(), 'applicant')) {
continue;
}
$messages[] = $error->getMessage();
}
return array_values(array_unique($messages));
}
/**
* Rejects a room selection that resolves to no participants at all.
*
@@ -4,8 +4,11 @@ declare(strict_types=1);
namespace App\Controller\Booking\Create;
use App\Form\BookingApplicantTravelsType;
use App\Form\BookingApplicantType;
use App\Form\BookingParticipantType;
use App\Form\Model\BookingDto;
use App\Form\Model\ParticipantDto;
use App\Htmx\HxTrait;
use App\Service\ApplicantInsuranceCascade;
use App\Service\BookingConfigurator;
@@ -130,6 +133,135 @@ class Step2ParticipantController extends AbstractController
);
}
/**
* Flips the booking-level "I am not travelling myself" choice.
*
* Toggling on moves participant[0]'s personal data into the applicant record and leaves
* behind a blank traveller that keeps only its index and room assignment: the services were
* derived from an age that no longer applies. Toggling off moves it back.
*
* Only offered where the travel date allows it; elsewhere the request changes nothing.
*/
#[Route(
path: '/bookings/create/applicant-toggle',
name: 'app_booking_create_step_2_applicant_toggle',
methods: ['POST']
)]
public function toggleApplicantTravels(Request $request): Response
{
$result = $this->loadBookingDtoOrRedirect($request);
if ($result instanceof Response) {
return $result;
}
$bookingDto = $result;
if (false === $bookingDto->travel->allowsNonTravellingApplicant()) {
return $this->htmxRedirect($request, $this->generateUrl('app_booking_create_step_2'));
}
$this->travelDataService->enrichWithFreshAvailabilities($bookingDto->travel);
// Captured before handleRequest(), which binds the new choice straight onto the DTO.
$previousChoice = $bookingDto->applicantTravels;
$form = $this->createForm(BookingApplicantTravelsType::class, $bookingDto);
$form->handleRequest($request);
if (false === $form->isSubmitted() || false === $form->isValid()) {
return $this->htmxRedirect($request, $this->generateUrl('app_booking_create_step_2'));
}
$applicantTravels = $bookingDto->applicantTravels;
if ($applicantTravels !== $previousChoice) {
$this->participantFormSupportService->ensureParticipantExists($bookingDto, 0);
if (false === $applicantTravels) {
$bookingDto->applicant = $bookingDto->participants[0];
$bookingDto->applicant->index = null;
$bookingDto->participants[0] = $this->participantFormSupportService
->createBlankTravellerFrom($bookingDto->applicant);
} else {
$bookingDto->restoreTravellingApplicant();
}
// Family insurance is not offered on a split booking, so a choice already made on
// participant[0] has to go with it.
if (false === $applicantTravels) {
$this->participantFormSupportService->clearFamilyInsurance($bookingDto);
}
$this->bookingService->preselectDefaultServices($bookingDto);
$this->applicantInsuranceCascade->apply($bookingDto);
$this->bookingService->applyCreateBookingStatusRules($bookingDto);
}
$this->bookingSessionService->saveBookingDto($request, $bookingDto, BookingDto::MODE_CREATE);
// The choice rebuilds the whole participant list, so navigate rather than swap a fragment.
return $this->htmxRedirect($request, $this->generateUrl('app_booking_create_step_2'));
}
/**
* Contact data of an applicant who does not travel along.
*
* Guests only. A logged-in applicant's data comes from their account and is rendered as
* static text on the step-2 card, because editing it here would create a duplicate BusPro
* record - the same reason participant[0] is static when the applicant travels.
*/
#[Route(
path: '/bookings/create/applicant',
name: 'app_booking_create_applicant'
)]
public function editApplicant(Request $request): Response
{
$result = $this->loadBookingDtoOrRedirect($request);
if ($result instanceof Response) {
return $result;
}
$bookingDto = $result;
if (true === $bookingDto->applicantTravels || false === $bookingDto->travel->allowsNonTravellingApplicant()) {
return $this->redirectToRoute('app_booking_create_step_2');
}
$bookingDto->applicant ??= new ParticipantDto();
$form = $this->createForm(BookingApplicantType::class, $bookingDto->applicant);
$form->handleRequest($request);
// Same `#KUN#` shortcut the participant forms offer: a last name of '#KUN#' fills the
// whole block with dummy data instead of saving what was typed.
if ($form->isSubmitted()
&& $this->prepopulationService->isDummyDataFillRequested($bookingDto->applicant, $bookingDto->getMode())) {
$this->prepopulationService->fillDummyApplicant($bookingDto->applicant);
$this->bookingSessionService->saveBookingDto($request, $bookingDto, BookingDto::MODE_CREATE);
return $this->redirectToRoute('app_booking_create_applicant');
}
if ($form->isSubmitted() && $form->isValid()) {
$this->bookingSessionService->saveBookingDto($request, $bookingDto, BookingDto::MODE_CREATE);
return $this->redirectToRoute('app_booking_create_step_2');
}
// Keep an invalid submission in the session so the entered data survives a reload.
$this->bookingSessionService->saveBookingDto($request, $bookingDto, BookingDto::MODE_CREATE);
$bookingCreateContext = $this->createContextFactory->create(
$bookingDto,
RoomPricingCalculator::PRICING_MODE_SELECTION
);
return $this->render('booking/create/applicant.html.twig', [
'form' => $form,
'bookingCreateContext' => $bookingCreateContext,
'bookingDto' => $bookingCreateContext->bookingDto,
'summaryData' => $bookingCreateContext->summaryData,
]);
}
/**
* @param FormInterface<mixed> $form
* @param array<array{type: string, message: string}> $notifications
@@ -5,6 +5,7 @@ declare(strict_types=1);
namespace App\Controller\Booking\Create;
use App\BusProNet\Client\BookingClient;
use App\BusProNet\Exception\ApiClientException;
use App\BusProNet\Exception\TimeoutException;
use App\BusProNet\Model\BookingResponse;
use App\BusProNet\Model\Notification;
@@ -183,7 +184,17 @@ class Step3Controller extends AbstractBookingCreateController
'exception' => $e->getMessage(),
'trace' => $e->getTraceAsString(),
],
'Die Anfrage hat zu lange gedauert. Bitte versuche es erneut oder wende dich an den Kundenservice.',
'Die Anfrage hat zu lange gedauert. Deine Angaben bleiben gespeichert, bitte versuche es in ein paar Minuten erneut oder wende dich an den Kundenservice.',
);
} catch (ApiClientException $e) {
$this->handleApiError(
$this->logger,
'Booking inquiry failed to reach BusPro',
[
'exception' => $e->getMessage(),
'trace' => $e->getTraceAsString(),
],
'Unser Buchungssystem ist gerade nicht erreichbar. Deine Angaben bleiben gespeichert, bitte versuche es in ein paar Minuten erneut.',
);
} catch (\Exception $e) {
$this->handleApiError(
@@ -240,7 +240,7 @@ class Step1Controller extends AbstractController
\DateTimeImmutable $dateTo,
): array {
$contingentStatus = null !== $accommodation
? $this->snapshotReader->statusesFor($accommodation, $dateFrom, $dateTo) ?? []
? $this->snapshotReader->statusesFor($hotelCode, $dateFrom, $dateTo) ?? []
: [];
$prices = $this->priceRepository->findByHotelCodeAndDateRange($hotelCode, $dateFrom, $dateTo);
+8
View File
@@ -55,6 +55,14 @@ class Mailer
->context($context)
;
// Mailjet tracks per its account settings unless a message says otherwise: an open pixel
// and links rewritten through its redirect domain. These headers only work over SMTP - the
// Send API refuses them - and Symfony's SMTP transport passes them through untouched.
$email->getHeaders()
->addTextHeader('X-Mailjet-TrackOpen', '0')
->addTextHeader('X-Mailjet-TrackClick', '0')
;
foreach ($config['attachments'] as $attachment) {
/* @var EmailAttachmentInterface $attachment */
$attachment->attachTo($email);
+60
View File
@@ -0,0 +1,60 @@
<?php
declare(strict_types=1);
namespace App\Entity\Groups;
use App\Repository\Groups\CalendarHotelRepository;
use Doctrine\ORM\Mapping as ORM;
/**
* Local copy of the last calendar hotel list TYPO3 answered successfully.
*
* Kept so the contingent sync still covers TYPO3's hotels while TYPO3 is unreachable. Written
* only by {@see \App\Service\ContingentHotelDirectory::refresh()}, never by hand: the list is
* TYPO3's, this is not a third place to maintain hotel codes in.
*/
#[ORM\Entity(repositoryClass: CalendarHotelRepository::class)]
#[ORM\Table(name: 'calendar_hotel')]
class CalendarHotel
{
#[ORM\Id]
#[ORM\GeneratedValue]
#[ORM\Column]
private ?int $id = null;
#[ORM\Column(length: 16, unique: true)]
private ?string $code = null;
#[ORM\Column(length: 255)]
private ?string $name = null;
public function getId(): ?int
{
return $this->id;
}
public function getCode(): ?string
{
return $this->code;
}
public function setCode(string $code): self
{
$this->code = $code;
return $this;
}
public function getName(): ?string
{
return $this->name;
}
public function setName(string $name): self
{
$this->name = $name;
return $this;
}
}
+24 -2
View File
@@ -12,11 +12,14 @@ use Doctrine\ORM\Mapping as ORM;
/**
* Local snapshot of a single day of contingent availability as reported by bpn-connect.
*
* Keyed by hotel code, not by accommodation: the snapshot also covers TYPO3's calendar hotels,
* which have no `Accommodation`.
*
* Written exclusively by the scheduled sync, never by a user, hence no Blameable/Timestampable.
*/
#[ORM\Entity(repositoryClass: ContingentDayRepository::class)]
#[ORM\Table(name: 'contingent_day')]
#[ORM\UniqueConstraint(name: 'uniq_contingent_day_accommodation_date', columns: ['accommodation_id', 'date'])]
#[ORM\UniqueConstraint(name: 'uniq_contingent_day_hotel_code_date', columns: ['hotel_code', 'date'])]
class ContingentDay
{
#[ORM\Id]
@@ -24,8 +27,15 @@ class ContingentDay
#[ORM\Column]
private ?int $id = null;
#[ORM\Column(length: 16)]
private ?string $hotelCode = null;
/**
* Superseded by $hotelCode and no longer written. Only rows from before the switch still
* carry it; it stays mapped until the column is dropped, so the switch can be rolled back.
*/
#[ORM\ManyToOne]
#[ORM\JoinColumn(nullable: false, onDelete: 'CASCADE')]
#[ORM\JoinColumn(nullable: true, onDelete: 'CASCADE')]
private ?Accommodation $accommodation = null;
#[ORM\Column(type: Types::DATE_IMMUTABLE)]
@@ -39,6 +49,18 @@ class ContingentDay
return $this->id;
}
public function getHotelCode(): ?string
{
return $this->hotelCode;
}
public function setHotelCode(string $hotelCode): self
{
$this->hotelCode = $hotelCode;
return $this;
}
public function getAccommodation(): ?Accommodation
{
return $this->accommodation;
+15 -4
View File
@@ -9,7 +9,7 @@ use Doctrine\DBAL\Types\Types;
use Doctrine\ORM\Mapping as ORM;
/**
* Bookkeeping for the scheduled contingent sync of a single accommodation.
* Bookkeeping for the scheduled contingent sync of a single hotel code.
*
* `changedAt` records when the sync last saw a day appear, vanish or switch status within the
* horizon it had already reached; `horizonTo` is how far that reach extends.
@@ -23,8 +23,14 @@ class ContingentSyncState
#[ORM\Column]
private ?int $id = null;
#[ORM\Column(length: 16, unique: true)]
private ?string $hotelCode = null;
/**
* Superseded by $hotelCode, see {@see ContingentDay::$accommodation}.
*/
#[ORM\OneToOne]
#[ORM\JoinColumn(nullable: false, unique: true, onDelete: 'CASCADE')]
#[ORM\JoinColumn(nullable: true, unique: true, onDelete: 'CASCADE')]
private ?Accommodation $accommodation = null;
/**
@@ -48,9 +54,9 @@ class ContingentSyncState
#[ORM\Column]
private int $failureCount = 0;
public function __construct(?Accommodation $accommodation = null)
public function __construct(?string $hotelCode = null)
{
$this->accommodation = $accommodation;
$this->hotelCode = $hotelCode;
}
public function getId(): ?int
@@ -58,6 +64,11 @@ class ContingentSyncState
return $this->id;
}
public function getHotelCode(): ?string
{
return $this->hotelCode;
}
public function getAccommodation(): ?Accommodation
{
return $this->accommodation;
+39
View File
@@ -50,6 +50,21 @@ class OAuth2Client extends AbstractClient
#[ORM\Column(type: 'json')]
private array $requiredRoles = [];
/**
* Where BackchannelLogoutListener tells this client that an account logged out of
* MyE&P. Null for a client that has no back channel, which is then simply not told.
*/
#[ORM\Column(type: 'string', length: 255, nullable: true)]
private ?string $logoutUrl = null;
/**
* The bearer token sent with the back-channel logout call. Stored readable, unlike the
* client secret, because MyE&P is the side that sends it rather than the side that
* checks it.
*/
#[ORM\Column(type: 'string', length: 128, nullable: true)]
private ?string $logoutSecret = null;
/**
* @return list<string>
*/
@@ -67,4 +82,28 @@ class OAuth2Client extends AbstractClient
return $this;
}
public function getLogoutUrl(): ?string
{
return $this->logoutUrl;
}
public function setLogoutUrl(?string $logoutUrl): self
{
$this->logoutUrl = $logoutUrl;
return $this;
}
public function getLogoutSecret(): ?string
{
return $this->logoutSecret;
}
public function setLogoutSecret(?string $logoutSecret): self
{
$this->logoutSecret = $logoutSecret;
return $this;
}
}
+98
View File
@@ -0,0 +1,98 @@
<?php
declare(strict_types=1);
namespace App\Entity;
use App\Enum\BusLeg;
use App\Repository\TravelMailingListRepository;
use Doctrine\ORM\Mapping as ORM;
/**
* A Mailjet contact list created for one travel's participants. The row exists so the list can
* be deleted again once the travel is past; the list itself is never updated after creation.
*
* A travel can have two lists, one for all participants and one for bus passengers only, told
* apart by their name.
*/
#[ORM\Entity(repositoryClass: TravelMailingListRepository::class)]
#[ORM\Index(columns: ['travel_code'])]
class TravelMailingList
{
private const string BUS_ONLY_SUFFIX = ' nur Bus';
#[ORM\Id]
#[ORM\GeneratedValue]
#[ORM\Column(type: 'integer')]
private ?int $id = null;
#[ORM\Column(type: 'string', length: 32)]
private string $travelCode;
/** The Mailjet list name. */
#[ORM\Column(type: 'string', length: 64, unique: true)]
private string $name;
#[ORM\Column(type: 'integer')]
private int $mailjetListId;
/** The bus leg its participants were filtered by; null when it holds all participants. */
#[ORM\Column(length: 20, nullable: true, enumType: BusLeg::class)]
private ?BusLeg $busLeg;
#[ORM\Column(type: 'datetime_immutable')]
private \DateTimeImmutable $deleteAfter;
#[ORM\Column(type: 'datetime_immutable')]
private \DateTimeImmutable $createdAt;
public function __construct(string $travelCode, int $mailjetListId, ?BusLeg $busLeg, \DateTimeImmutable $deleteAfter)
{
$this->travelCode = $travelCode;
$this->name = self::nameFor($travelCode, $busLeg);
$this->mailjetListId = $mailjetListId;
$this->busLeg = $busLeg;
$this->deleteAfter = $deleteAfter;
$this->createdAt = new \DateTimeImmutable();
}
public static function nameFor(string $travelCode, ?BusLeg $busLeg): string
{
return null !== $busLeg ? $travelCode.self::BUS_ONLY_SUFFIX : $travelCode;
}
public function getId(): ?int
{
return $this->id;
}
public function getTravelCode(): string
{
return $this->travelCode;
}
public function getName(): string
{
return $this->name;
}
public function getMailjetListId(): int
{
return $this->mailjetListId;
}
public function getBusLeg(): ?BusLeg
{
return $this->busLeg;
}
public function getDeleteAfter(): \DateTimeImmutable
{
return $this->deleteAfter;
}
public function getCreatedAt(): \DateTimeImmutable
{
return $this->createdAt;
}
}
+27
View File
@@ -0,0 +1,27 @@
<?php
declare(strict_types=1);
namespace App\Enum;
/**
* Which bus leg a travel participant must have booked to be selected, as bpn-connect's travel
* mailing endpoint takes it (`busLeg`).
*/
enum BusLeg: string
{
case Outbound = 'outbound';
case Inbound = 'inbound';
case Any = 'any';
case Both = 'both';
public function label(): string
{
return match ($this) {
self::Outbound => 'Busreisende (Hinfahrt)',
self::Inbound => 'Busreisende (Rückfahrt)',
self::Any => 'Busreisende (Hin- oder Rückfahrt)',
self::Both => 'Busreisende (Hin- und Rückfahrt)',
};
}
}
+17
View File
@@ -0,0 +1,17 @@
<?php
declare(strict_types=1);
namespace App\Enum;
/**
* Where a hotel code in the contingent snapshot comes from. A code can have both.
*/
enum ContingentHotelSource: string
{
/** The calendarCode of a group house (`Accommodation`). */
case Accommodation = 'accommodation';
/** The calendar hotel of a visible TYPO3 product, from TYPO3's `/api/calendar-hotels`. */
case Typo3 = 'typo3';
}
@@ -39,7 +39,7 @@ class AuthorizationCodeListener
private readonly UrlGeneratorInterface $urlGenerator,
private readonly RequestStack $requestStack,
private readonly Security $security,
private readonly LoggerInterface $authenticationLogger,
private readonly LoggerInterface $authLogger,
private readonly Environment $twig,
) {
}
@@ -62,7 +62,7 @@ class AuthorizationCodeListener
Response::HTTP_TEMPORARY_REDIRECT
);
$event->setResponse($response);
$this->authenticationLogger->info('Authorization request without session');
$this->authLogger->info('Authorization request without session');
return;
}
@@ -126,7 +126,7 @@ class AuthorizationCodeListener
array $required,
string $reason,
): void {
$this->authenticationLogger->info('Authorization request denied', [
$this->authLogger->info('Authorization request denied', [
'client' => $client,
'user_id' => $user->getId(),
'required_roles' => $required,
@@ -0,0 +1,103 @@
<?php
declare(strict_types=1);
namespace App\EventListener;
use App\Entity\OAuth2Client;
use App\Entity\User;
use Doctrine\ORM\EntityManagerInterface;
use Psr\Log\LoggerInterface;
use Symfony\Component\EventDispatcher\Attribute\AsEventListener;
use Symfony\Component\Security\Http\Event\LogoutEvent;
use Symfony\Contracts\HttpClient\Exception\ExceptionInterface;
use Symfony\Contracts\HttpClient\HttpClientInterface;
/**
* Tells every client application with a back channel that an account logged out of MyE&P,
* so the application can end that account's sessions as well.
*
* Each client gets a form-encoded POST of the account's `sub` — the uuid, exactly as
* /api/userinfo exports it — authorized with the client's own logout secret. The call is
* best effort: a client that is down, slow or misconfigured is logged and skipped, because
* a failed call must never keep the user signed in to MyE&P.
*
* Only an explicit logout gets here. A session that merely expires dispatches nothing, so
* the client applications are not told about it.
*
* Runs before SessionLogoutListener (priority 0), which invalidates the session the
* `_oauth2` flag is read from.
*/
#[AsEventListener(event: LogoutEvent::class, priority: 64)]
class BackchannelLogoutListener
{
public function __construct(
private readonly EntityManagerInterface $entityManager,
private readonly HttpClientInterface $httpClient,
private readonly LoggerInterface $authLogger,
) {
}
public function __invoke(LogoutEvent $event): void
{
$user = $event->getToken()?->getUser();
if (false === $user instanceof User) {
return;
}
// AuthorizationCodeListener logs the user out of MyE&P straight after authorizing an
// application that sent them here to sign in. Telling the applications about that
// logout would sign the user out of the very application they just signed in to.
if ($event->getRequest()->hasSession() && true === $event->getRequest()->getSession()->get('_oauth2', false)) {
return;
}
// a handful of rows, so filtered here rather than in a query
$clients = array_filter(
$this->entityManager->getRepository(OAuth2Client::class)->findAll(),
static fn (OAuth2Client $client): bool => null !== $client->getLogoutUrl(),
);
// Requests first, responses second: HttpClient sends concurrently, so a slow client
// costs its own timeout once rather than adding it to every other client's.
$responses = [];
foreach ($clients as $client) {
try {
$responses[] = [$client, $this->httpClient->request('POST', (string) $client->getLogoutUrl(), [
'auth_bearer' => (string) $client->getLogoutSecret(),
'body' => ['sub' => $user->getUuid()],
'timeout' => 3,
])];
} catch (ExceptionInterface $e) {
// a malformed URL is refused before anything is sent
$this->warn($client, $user, ['error' => $e->getMessage()]);
}
}
foreach ($responses as [$client, $response]) {
try {
$status = $response->getStatusCode();
} catch (ExceptionInterface $e) {
$this->warn($client, $user, ['error' => $e->getMessage()]);
continue;
}
if (200 !== $status) {
$this->warn($client, $user, ['status' => $status]);
}
}
}
/**
* @param array<string, mixed> $context
*/
private function warn(OAuth2Client $client, User $user, array $context): void
{
$this->authLogger->warning('Back-channel logout failed', [
'client' => $client->getName(),
'user_id' => $user->getId(),
] + $context);
}
}
@@ -0,0 +1,16 @@
<?php
declare(strict_types=1);
namespace App\Exception;
/**
* Thrown when BusPro cannot be reached at a point where the booking flow must not continue without it.
*
* The flow can render most steps from XML export and snapshot data, but the inquiry in step 3 and the
* booking itself always need BusPro. Failing before the customer types in participant data is kinder
* than failing after.
*/
class BookingBackendUnavailableException extends \RuntimeException
{
}
+6 -1
View File
@@ -6,13 +6,14 @@ namespace App\Form\Admin;
use App\Form\Model\TravelMailingLookupDto;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
use Symfony\Component\Form\Extension\Core\Type\TextType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
/**
* Submits as GET with an empty block prefix, so a lookup is the plain URL `?travelCode=…`
* and can be bookmarked or shared.
* (plus `&busOnly=1`) and can be bookmarked or shared.
*
* @extends AbstractType<TravelMailingLookupDto>
*/
@@ -26,6 +27,10 @@ class TravelMailingLookupType extends AbstractType
'placeholder' => 'z. B. LPJMP281126',
],
]);
$builder->add('busOnly', CheckboxType::class, [
'label' => 'nur '.TravelMailingLookupDto::BUS_LEG->label(),
'required' => false,
]);
}
public function configureOptions(OptionsResolver $resolver): void
+47
View File
@@ -0,0 +1,47 @@
<?php
declare(strict_types=1);
namespace App\Form;
use App\Form\Model\BookingDto;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
/**
* The booking-level choice "do I travel along myself?".
*
* Rendered inside the step 2 form, so the template emits the widget alone and never a second
* <form> tag; htmx posts the enclosed inputs, the CSRF token among them, to the toggle route.
*
* Validation is switched off: this form only carries the choice, and running the step 2 groups
* here would report every gap in the participant data the moment somebody flips the radio.
*
* @extends AbstractType<BookingDto>
*/
class BookingApplicantTravelsType extends AbstractType
{
public function buildForm(FormBuilderInterface $builder, array $options): void
{
$builder->add('applicantTravels', ChoiceType::class, [
'label' => 'Wer reist mit?',
'choices' => [
'Ich reise selbst mit' => true,
// Note the literal non-breaking space in "z. B." - it keeps the abbreviation
// from wrapping, and replacing it with a plain space is a silent regression.
'Ich buche für andere (z. B. mein Kind)' => false,
],
'expanded' => true,
]);
}
public function configureOptions(OptionsResolver $resolver): void
{
$resolver->setDefaults([
'data_class' => BookingDto::class,
'validation_groups' => false,
]);
}
}
+94
View File
@@ -0,0 +1,94 @@
<?php
declare(strict_types=1);
namespace App\Form;
use App\BusProNet\Form\CountryType;
use App\Form\Model\ParticipantDto;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\Extension\Core\Type\BirthdayType;
use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
use Symfony\Component\Form\Extension\Core\Type\EmailType;
use Symfony\Component\Form\Extension\Core\Type\TextType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
/**
* Contact data of an applicant who does not travel along.
*
* Bound to ParticipantDto rather than a contact DTO of its own: the fields are the same
* personal-data set, and a second near-identical type would only have to be kept in step with
* this one. Only shown to guests; a logged-in applicant's data comes from their account and is
* rendered as static text, because editing it here would create a duplicate BusPro record.
*
* Validation runs in the dedicated 'booking_applicant' group, which BookingDto::validateApplicant()
* owns, so the applicant is checked independently of the participant cards.
*
* @extends AbstractType<ParticipantDto>
*/
class BookingApplicantType extends AbstractType
{
public function buildForm(FormBuilderInterface $builder, array $options): void
{
$builder
->add('firstName', TextType::class, [
'label' => 'Vorname',
'required' => true,
])
->add('lastName', TextType::class, [
'label' => 'Nachname',
'required' => true,
])
->add('gender', ChoiceType::class, [
'label' => 'Gender',
'required' => true,
'placeholder' => false,
'choices' => [
'männlich' => 'M',
'weiblich' => 'W',
'divers' => 'D',
],
])
->add('nationality', CountryType::class, [
'label' => 'Nationalität',
'required' => true,
'property' => 'nationality',
'placeholder' => 'Bitte auswählen...',
'preferred_choices' => ['D', 'A', 'CH'],
])
->add('dateOfBirth', BirthdayType::class, [
'label' => 'Geburtsdatum',
'required' => true,
'widget' => 'text',
'input' => 'datetime_immutable',
'html5' => false,
])
->add('email', EmailType::class, [
'label' => 'E-Mail',
'required' => true,
'attr' => [
'autocomplete' => 'leave-me-alone-chrome',
],
])
->add('mobile', TextType::class, [
'label' => 'Telefon (mobil)',
'required' => true,
'attr' => [
'autocomplete' => 'leave-me-alone-chrome',
],
])
->add('address', AddressType::class, [
'label' => 'Adresse',
'required' => true,
]);
}
public function configureOptions(OptionsResolver $resolver): void
{
$resolver->setDefaults([
'data_class' => ParticipantDto::class,
'validation_groups' => ['booking_applicant', 'booking_create'],
]);
}
}
+35
View File
@@ -3,14 +3,22 @@
namespace App\Form;
use App\Form\Model\BookingDto;
use App\Service\RoomContingentPoolResolver;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\Extension\Core\Type\CollectionType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\Form\FormInterface;
use Symfony\Component\Form\FormView;
use Symfony\Component\OptionsResolver\OptionsResolver;
/** @extends AbstractType<BookingDto> */
class BookingCreateStep1Type extends AbstractType
{
public function __construct(
private readonly RoomContingentPoolResolver $poolResolver,
) {
}
public function buildForm(FormBuilderInterface $builder, array $options): void
{
$builder
@@ -28,6 +36,33 @@ class BookingCreateStep1Type extends AbstractType
;
}
/**
* Caps the step buttons of rooms sharing a contingent at what the other rooms leave of it.
*
* Runs on every render, including the htmx refresh after each change, so selecting one room
* of a pool locks the others once the pool is used up. Only the view changes: the choices
* keep the room's own count, and RoomSelectionValidator stays the check on submit.
*/
public function finishView(FormView $view, FormInterface $form, array $options): void
{
$bookingDto = $form->getData();
$selectionViews = $view['roomSelections'];
foreach ($this->poolResolver->findSharedPools($bookingDto->travel) as $pool) {
$remaining = max(0, $pool->getAvailable() - $pool->getSelectedQuantity($bookingDto->roomSelections));
foreach (array_keys($pool->rooms) as $roomId) {
if (!isset($selectionViews[$roomId]) || !isset($selectionViews[$roomId]['quantity'])) {
continue;
}
$quantityView = $selectionViews[$roomId]['quantity'];
$quantity = $bookingDto->roomSelections[$roomId]->quantity ?? 0;
$quantityView->vars['max_value'] = min($quantityView->vars['max_value'], $quantity + $remaining);
}
}
}
public function configureOptions(OptionsResolver $resolver): void
{
$resolver->setDefaults([
+3 -2
View File
@@ -31,8 +31,9 @@ class BookingCreateStep2Type extends AbstractType
$resolver->setDefaults([
'data_class' => BookingDto::class,
'validation_groups' => function (FormInterface $form) {
// Create mode: always strict validation
return ['strict_required', 'booking_create'];
// Create mode: always strict validation. 'booking_applicant' additionally
// requires a complete applicant when they do not travel along.
return ['strict_required', 'booking_create', 'booking_applicant'];
},
]);
}
-1
View File
@@ -222,7 +222,6 @@ class BookingParticipantType extends AbstractType
$form->add('mobile', TextType::class, $this->mergeFieldState([
'label' => 'Telefon (mobil)',
'required' => false,
'sanitize_html' => true,
'property_path' => 'participant.mobile',
'attr' => [
'autocomplete' => 'leave-me-alone-chrome',
+4
View File
@@ -4,6 +4,8 @@ declare(strict_types=1);
namespace App\Form\Model;
use App\Model\RoomContingentPool;
/**
* Bundles the data needed to render the booking create flow.
*/
@@ -12,6 +14,7 @@ class BookingCreateContext
/**
* @param array<int, ParticipantCardDataDto>|null $cardsData
* @param array<int, float>|null $participantPrices
* @param array<int, RoomContingentPool> $roomContingentPools shared pools by member room id, step 1 only
*/
public function __construct(
public readonly BookingDto $bookingDto,
@@ -21,6 +24,7 @@ class BookingCreateContext
public readonly bool $isSubmitted = false,
public readonly ?array $participantPrices = null,
public readonly bool $familyInsuranceUpgradeAvailable = false,
public readonly array $roomContingentPools = [],
) {
}
}
+176
View File
@@ -58,11 +58,40 @@ class BookingDto
*/
public string $bookingStatus = 'F';
/**
* Booking status the travel itself calls for when the booking starts, before any room is
* selected and before the create-flow status rules run. Step 1 falls back to it, so an 'A'
* from the Step 3 BusPro fallback is cleared when the rooms change.
*
* Null in sessions started before it was introduced.
*/
public ?string $initialBookingStatus = null;
/**
* Reference to booking entity (only populated in edit mode).
*/
public ?Booking $booking = null;
/**
* Whether the applicant travels along, i.e. is also participant[0].
*
* Create mode only: it is the booking-level choice behind "Ich reise selbst mit".
* In edit mode the split is derived from the loaded booking instead, see
* isFirstParticipantApplicant().
*/
public bool $applicantTravels = true;
/**
* The applicant's own personal data, used only when they do not travel.
*
* Reuses ParticipantDto for the personal fields rather than introducing a second,
* near-identical contact DTO. Its index stays null, which is what tells the shared
* 'booking_applicant' rules apart from an ordinary traveller, and validateApplicant()
* below drives its checks explicitly rather than by cascade, so the violations land
* under 'applicant.' exactly once.
*/
public ?ParticipantDto $applicant = null;
/**
* Fingerprint of the booking state when loaded from API (edit mode only).
* This property stores the original state and is never updated after initial load.
@@ -173,6 +202,105 @@ class BookingDto
return $this->participants[$index] ?? null;
}
/**
* Ends a split: the applicant takes the participant[0] slot back and travels again.
*
* The traveller who held the slot is dropped; only the room assignment carries over,
* the mirror image of what the split left behind.
*/
public function restoreTravellingApplicant(): void
{
$restored = $this->applicant;
if (null !== $restored) {
$restored->index = 0;
$restored->assignedRoomId = ($this->participants[0] ?? null)?->assignedRoomId;
$this->participants[0] = $restored;
}
$this->applicant = null;
$this->applicantTravels = true;
}
/**
* Whether the participant at $index has to supply an email address.
*
* Everyone does except an under-16 who is not the applicant; BusPro itself accepts a blank
* for any participant. Validation enforces this in two parts, the Assert\When on
* ParticipantDto::$email (age) and validateFirstParticipantApplicant() (the applicant), and
* this is the same rule in one place for the field state. A participant that does not exist
* yet counts as needing one, matching the "unknown counts as an adult" stance of isChild().
*/
public function requiresParticipantEmail(int $index): bool
{
$participant = $this->getParticipant($index);
if (null === $participant || false === $participant->isChild()) {
return true;
}
return 0 === $index && true === $this->isFirstParticipantApplicant();
}
/**
* The applicant's email address, wherever the applicant is held.
*
* - participant[0] where they are the applicant
* - create, split: the separate applicant block
* - edit, split: the loaded booking's anmelder, since $applicant is only filled in create mode
*/
public function getApplicantEmail(): ?string
{
if (true === $this->isFirstParticipantApplicant()) {
$email = $this->getParticipant(0)?->email;
} elseif (self::MODE_CREATE === $this->getMode()) {
$email = $this->applicant?->email;
} else {
$email = $this->booking?->applicant?->communication->email;
}
if (null === $email || '' === trim($email)) {
return null;
}
return trim($email);
}
/**
* Whether participant[0] is also the applicant.
*
* This is the single predicate for "the first participant IS the booking's contact".
* It replaces the former practice of reading isInternalAgencyBooking() to mean the
* same thing, which only held because the internal agency was the one case where
* applicant and participant[0] differed.
*
* - create: the booking-level choice. The agency plays no part here: internal agency
* bookings are made in the BusPro backend and only ever edited in this application.
* - edit, internal agency: always false, their applicant is a customer who is not the
* first traveller
* - edit, otherwise: derived from the loaded booking. A null person id on either side
* counts as "same", so incomplete BPN data keeps today's stricter, locked-down behaviour.
*/
public function isFirstParticipantApplicant(): bool
{
if (self::MODE_CREATE === $this->getMode()) {
return $this->applicantTravels;
}
if ($this->isInternalAgencyBooking()) {
return false;
}
$applicantPersonId = $this->booking?->applicant?->personId;
$firstParticipantPersonId = $this->getParticipant(0)?->personId;
if (null === $applicantPersonId || null === $firstParticipantPersonId) {
return true;
}
return $applicantPersonId === $firstParticipantPersonId;
}
/**
* Determines if this is a family booking based on participant age distribution.
*
@@ -182,6 +310,13 @@ class BookingDto
*/
public function isFamilyBooking(): bool
{
// Family insurance is not offered when the applicant does not travel. The age
// distribution alone would not rule it out: an 18-year-old sibling travelling with a
// younger child still satisfies the adult/child counts below.
if (false === $this->applicantTravels) {
return false;
}
$adults = 0;
$children = 0;
@@ -204,6 +339,47 @@ class BookingDto
return ($adults >= 1 && $adults <= 2) && ($children >= 1);
}
/**
* Requires a complete, adult applicant whenever the applicant does not travel.
*
* Delegates the field checks to ParticipantDto::validateApplicantCompleteness(), which the
* applicant form runs directly through the 'booking_applicant' group.
*/
#[Assert\Callback(groups: ['booking_applicant'])]
public function validateApplicant(ExecutionContextInterface $context): void
{
if (true === $this->applicantTravels) {
return;
}
if (null === $this->applicant) {
$context->buildViolation('Bitte gib die Daten der anmeldenden Person an.')
->atPath('applicant')
->addViolation();
return;
}
$this->applicant->validateApplicantCompleteness($context, 'applicant.');
}
/**
* Requires a complete address and an email from participant[0] only where they are the applicant.
*
* BusPro asks neither of an ordinary participant, so on a split booking the traveller at index 0
* is not asked for an address, and an under-16 there may leave the email blank.
*/
#[Assert\Callback(groups: ['strict_required'])]
public function validateFirstParticipantApplicant(ExecutionContextInterface $context): void
{
if (false === $this->isFirstParticipantApplicant()) {
return;
}
$this->getParticipant(0)?->validateApplicantEmail($context, 'participants[0].');
$this->getParticipant(0)?->validateAddressFields($context, 'participants[0].');
}
#[Assert\Callback]
public function validateBankAccount(ExecutionContextInterface $context): void
{
+106 -36
View File
@@ -21,8 +21,9 @@ class ParticipantDto
/**
* Age below which a participant counts as a child.
*
* Children may share an email address with an adult and are not required to have one of
* their own; both rules go through isChild(), so this is the only place the age lives.
* Children may share an email address with an adult, and have the applicant's address
* pre-filled for them; both rules go through isChild(), so this is the only place the
* age lives.
*/
public const CHILD_AGE_THRESHOLD = 16;
@@ -79,18 +80,30 @@ class ParticipantDto
#[Assert\NotNull(message: 'Bitte angeben', groups: ['strict_required'])]
public ?\DateTimeImmutable $dateOfBirth = null;
// Requiredness is delegated to requiresOwnEmail() so the constraint and the field state
// conditions cannot state the rule differently.
// BusPro accepts a participant without an email address, so this is the only gate. Under-16s
// may leave it blank, everyone else needs one. An under-16 applicant needs one as well; that
// case depends on the booking and is enforced by BookingDto::validateFirstParticipantApplicant()
// and ParticipantEditDto::validateApplicant(). It stays a property constraint so the missing-field
// labels keep their order (see BookingEditPreFlightChecker).
#[Assert\Email(message: 'Bitte eine gültige E-Mail Adresse angeben', mode: 'strict', groups: ['booking_edit', 'booking_create'])]
#[Assert\When(
expression: 'this.requiresOwnEmail()',
expression: 'not this.isChild()',
constraints: [new Assert\NotBlank(message: 'Bitte angeben')],
groups: ['strict_required']
groups: ['strict_required'],
)]
public ?string $email = null;
#[Assert\When(
expression: 'this.isMobileNewlyEntered()',
constraints: [new AppAssert\PhoneNumber()],
groups: ['booking_edit', 'booking_create'],
)]
public ?string $mobile = null;
// The number as loaded from BusPro, which goes back unchanged and is exempt from PhoneNumber.
// Public so it survives the session round trip through __unserialize().
public ?string $loadedMobile = null;
#[Assert\Valid(groups: ['booking_edit', 'booking_create'])]
#[Assert\NotNull(message: 'Bitte Adresse angeben', groups: ['applicant_address'])]
public ?Address $address = null;
@@ -236,6 +249,7 @@ class ParticipantDto
$instance->nationality = $personalData->nationality ?: 'D';
$instance->email = $personalData->communication->email;
$instance->mobile = $personalData->communication->mobile;
$instance->loadedMobile = $personalData->communication->mobile;
$instance->dateOfBirth = $personalData->dateOfBirth;
$instance->height = $personalData->height;
$instance->weight = $personalData->weight;
@@ -250,6 +264,11 @@ class ParticipantDto
return $instance;
}
public function isMobileNewlyEntered(): bool
{
return AppAssert\PhoneNumber::isNewlyEntered($this->mobile, $this->loadedMobile);
}
public function isApplicant(): bool
{
return 0 === $this->index;
@@ -369,22 +388,6 @@ class ParticipantDto
*
* @return bool True if participant is under the age threshold, false otherwise or if age unknown
*/
/**
* Decides whether this participant has to supply an email address of their own.
*
* The applicant is the booking's contact and always has to be reachable. Everyone else only
* needs an address once they are old enough to have one, so children are exempt. An unknown
* date of birth counts as an adult, following isChild().
*
* Single source for the rule: the Assert\When on $email enforces it, and the 'required'
* field state conditions in CreateFieldStateProvider/EditFieldStateProvider render the
* matching mandatory marker.
*/
public function requiresOwnEmail(): bool
{
return $this->isApplicant() || false === $this->isChild();
}
public function isChild(int $ageThreshold = self::CHILD_AGE_THRESHOLD): bool
{
$age = $this->getAge();
@@ -495,28 +498,95 @@ class ParticipantDto
}
/**
* Validates that the participant has a complete address when required.
* Validates that this person is usable as the booking's applicant.
*
* In regular create/edit submission flows this only applies to participant 0.
* The edit overview preflight checks address fields separately for the applicant only.
* Runs on its own in the 'booking_applicant' group, which only the applicant form activates,
* the way 'applicant_address' already scopes the address NotNull above. BookingDto delegates
* to the same body for the step-2 submit, so the rule has one home.
*/
#[Assert\Callback(groups: ['strict_required'])]
public function validateApplicantAddress(ExecutionContextInterface $context): void
#[Assert\Callback(groups: ['booking_applicant'])]
public function validateAsApplicant(ExecutionContextInterface $context): void
{
// Only validate applicant's address in regular create/edit submission flows.
if (0 !== $this->index) {
// The applicant record is the only ParticipantDto without an index. Travellers carry one,
// and BookingDto cascades the 'booking_applicant' group into $participants as well, so
// without this guard every traveller would be held to the applicant's rules - an adult
// address and a minimum age of 18.
if (null !== $this->index) {
return;
}
$this->validateAddressFields($context);
$this->validateApplicantCompleteness($context);
}
private function validateAddressFields(ExecutionContextInterface $context): void
/**
* Shared body. $pathPrefix places the violations in the caller's object graph; it is not a
* callback itself, because Symfony passes the constraint payload as the second argument.
*/
public function validateApplicantCompleteness(ExecutionContextInterface $context, string $pathPrefix = ''): void
{
foreach (['firstName', 'lastName', 'gender', 'nationality', 'email', 'mobile'] as $field) {
$value = $this->$field;
if (null === $value || '' === trim($value)) {
$context->buildViolation('Bitte angeben')
->atPath($pathPrefix.$field)
->addViolation();
}
}
$this->validateAddressFields($context, $pathPrefix);
if (null === $this->dateOfBirth) {
$context->buildViolation('Bitte angeben')
->atPath($pathPrefix.'dateOfBirth')
->addViolation();
return;
}
$age = $this->getAge();
if (null !== $age && 18 > $age) {
$context->buildViolation('Die anmeldende Person muss volljährig sein.')
->atPath($pathPrefix.'dateOfBirth')
->addViolation();
}
}
/**
* Validates that this person, as the booking's contact, has an email address.
*
* The property constraint on $email already holds everyone aged 16 or older (and anyone
* without a date of birth) to it, so this only adds the under-16 contact and never reports
* the same field twice. Like validateAddressFields(), the callers decide who the contact is.
*/
public function validateApplicantEmail(ExecutionContextInterface $context, string $pathPrefix = ''): void
{
if (false === $this->isChild()) {
return;
}
if (null !== $this->email && false === u($this->email)->trim()->isEmpty()) {
return;
}
$context->buildViolation('Bitte angeben')
->atPath($pathPrefix.'email')
->addViolation();
}
/**
* Validates that this person has a complete address.
*
* Only the booking's contact needs one: BusPro does not require an anschrift from an
* ordinary participant (measured on 2036, an empty anschrift passes). Deciding who the
* contact is needs the booking, so the callers own the gate and this method only ever
* runs the field checks. $pathPrefix places the violations in the caller's object graph.
*/
public function validateAddressFields(ExecutionContextInterface $context, string $pathPrefix = ''): void
{
// Address object is required for the validated participant
if (null === $this->address) {
$context->buildViolation('Bitte angeben')
->atPath('address')
->atPath($pathPrefix.'address')
->addViolation();
return;
@@ -525,25 +595,25 @@ class ParticipantDto
// Validate address subfields
if (null === $this->address->street || u($this->address->street)->trim()->isEmpty()) {
$context->buildViolation('Bitte angeben')
->atPath('address.street')
->atPath($pathPrefix.'address.street')
->addViolation();
}
if (null === $this->address->postCode || u($this->address->postCode)->trim()->isEmpty()) {
$context->buildViolation('Bitte angeben')
->atPath('address.postCode')
->atPath($pathPrefix.'address.postCode')
->addViolation();
}
if (null === $this->address->city || u($this->address->city)->trim()->isEmpty()) {
$context->buildViolation('Bitte angeben')
->atPath('address.city')
->atPath($pathPrefix.'address.city')
->addViolation();
}
if (null === $this->address->country || u($this->address->country)->trim()->isEmpty()) {
$context->buildViolation('Bitte angeben')
->atPath('address.country')
->atPath($pathPrefix.'address.country')
->addViolation();
}
}
+43 -5
View File
@@ -92,12 +92,37 @@ class ParticipantEditDto
}
}
/**
* Requires a complete address and an email from the participant form's applicant only.
*
* Mirrors BookingDto::validateFirstParticipantApplicant() for the per-participant form, which
* binds this wrapper rather than the booking.
*/
#[Assert\Callback(groups: ['strict_required'])]
public function validateApplicant(ExecutionContextInterface $context): void
{
if (false === $this->participant->isApplicant()) {
return;
}
if (false === $this->bookingContext->isFirstParticipantApplicant()) {
return;
}
$this->participant->validateApplicantEmail($context, 'participant.');
$this->participant->validateAddressFields($context, 'participant.');
}
/**
* Validates that non-applicant adult participants have unique email addresses.
*
* Exempt from validation:
* - Applicant (index 0): Can share email with dependents they're booking for
* - Children (under 16): Can share email addresses with adults
* - The applicant: can share an email with dependents they're booking for
* - Children (under 16): Can share email addresses with adults, or have none at all
*
* Where the applicant does not travel they are not among the participants, so their address
* is checked separately: an adult traveller may not reuse it, just as on an ordinary booking
* an adult may not reuse participant[0]'s.
*
* Email comparison is case-insensitive and whitespace is normalized.
*/
@@ -109,8 +134,9 @@ class ParticipantEditDto
return;
}
// In regular create/edit submission flows, the applicant can share an email with dependents.
if (true === $this->participant->isApplicant()) {
// The applicant can share an email with dependents. On a split booking participant[0] is
// an ordinary traveller, so an adult there is held to uniqueness like everyone else.
if (true === $this->participant->isApplicant() && true === $this->bookingContext->isFirstParticipantApplicant()) {
return;
}
@@ -119,7 +145,7 @@ class ParticipantEditDto
return;
}
// Skip if email is null or empty (handled by @Email and @NotBlank constraints)
// Nothing to compare. Whether a blank is allowed is the property constraint's business.
if (null === $this->participant->email || u($this->participant->email)->trim()->isEmpty()) {
return;
}
@@ -157,5 +183,17 @@ class ParticipantEditDto
return;
}
}
if (true === $this->bookingContext->isFirstParticipantApplicant()) {
return;
}
$applicantEmail = $this->bookingContext->getApplicantEmail();
if (null !== $applicantEmail && $normalizedEmail === u($applicantEmail)->lower()->toString()) {
$context->buildViolation('Diese E-Mail Adresse wird bereits von der anmeldenden Person verwendet')
->atPath('participant.email')
->addViolation();
}
}
}
Loaded 100 of 267 files, more files were not shown because too many files have changed in this diff. Show more