Compare commits
533
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
26a19388f3 | ||
|
|
ca6e38cb9c | ||
|
|
ca5a604a3e | ||
|
|
0fcecc9c58 | ||
|
|
4e925171b3 | ||
|
|
41e2fe19bc | ||
|
|
a927d6bf59 | ||
|
|
c0cc183c59 | ||
|
|
b68c4ff9b4 | ||
|
|
132329361f | ||
|
|
4d86629315 | ||
|
|
d1c92f2957 | ||
|
|
0d2cc5b998 | ||
|
|
fdfd5d56c9 | ||
|
|
059c520a50 | ||
|
|
d8818dc435 | ||
|
|
2baa147afa | ||
|
|
e179bbe259 | ||
|
|
16cab4b768 | ||
|
|
6ab34fa87c | ||
|
|
fcfd366dec | ||
|
|
98dd685679 | ||
|
|
2597318488 | ||
|
|
aa997826f8 | ||
|
|
69705052b3 | ||
|
|
f903f17ebd | ||
|
|
95d50e9833 | ||
|
|
63e8a068b3 | ||
|
|
dbc0b4acee | ||
|
|
f31ac660d2 | ||
|
|
8b72f8c277 | ||
|
|
ca052682bb | ||
|
|
1b0e479e49 | ||
|
|
f22ceae41c | ||
|
|
346256f895 | ||
|
|
a0cbd5a23f | ||
|
|
803b0608cc | ||
|
|
7eb1cbdabd | ||
|
|
ca873a99f4 | ||
|
|
8d666baf28 | ||
|
|
be0c9d67bb | ||
|
|
f0594ba09c | ||
|
|
fce6d1615a | ||
|
|
a264526127 | ||
|
|
fbfffbb31a | ||
|
|
bca3610cff | ||
|
|
facd91375c | ||
|
|
96321005e0 | ||
|
|
6f07678f04 | ||
|
|
3b6ee90a7e | ||
|
|
909e8a1d8e | ||
|
|
8f2baca339 | ||
|
|
637166bfd6 | ||
|
|
45af3a21b7 | ||
|
|
7e686cef6b | ||
|
|
be43d30cc7 | ||
|
|
77b16f287a | ||
|
|
bc7fb794bf | ||
|
|
c1ab6d8687 | ||
|
|
ccfafc5da4 | ||
|
|
502281e219 | ||
|
|
b81cc58d5e | ||
|
|
05ac07d656 | ||
|
|
3234c78f0d | ||
|
|
3849ae306c | ||
|
|
301b14f518 | ||
|
|
df8566e1b5 | ||
|
|
45d05786da | ||
|
|
6a6bebb2d1 | ||
|
|
ea76c808de | ||
|
|
f9069540a9 | ||
|
|
8a9868b644 | ||
|
|
d1e2bf3e7d | ||
|
|
66c55f0722 | ||
|
|
ca7d0b6965 | ||
|
|
02ff28acdd | ||
|
|
cb56a4fe46 | ||
|
|
752e6752b4 | ||
|
|
00df76269a | ||
|
|
99483b3506 | ||
|
|
5619a6f22f | ||
|
|
c510cbf590 | ||
|
|
6d9265de0f | ||
|
|
49ea562322 | ||
|
|
1f087b6c08 | ||
|
|
37c839600e | ||
|
|
cef2e4fa49 | ||
|
|
11ff2b9084 | ||
|
|
69f16b59cb | ||
|
|
0e644260b6 | ||
|
|
33609ab534 | ||
|
|
1cc7a025a1 | ||
|
|
709b0ff61e | ||
|
|
0d7d90a442 | ||
|
|
5cbdc5eaf2 | ||
|
|
a7c3064df6 | ||
|
|
f63d52c9d6 | ||
|
|
b752256bda | ||
|
|
474d171779 | ||
|
|
51ce9b6e45 | ||
|
|
9cef24f827 | ||
|
|
e6880b7fed | ||
|
|
e505eba111 | ||
|
|
4e067d13b3 | ||
|
|
40c0042158 | ||
|
|
6abfa122e4 | ||
|
|
032540a712 | ||
|
|
cf95048f2b | ||
|
|
29a1ce7de7 | ||
|
|
1670b8b8d2 | ||
|
|
3644b935fd | ||
|
|
20162cceef | ||
|
|
44a9de7db7 | ||
|
|
f99a2d99a2 | ||
|
|
f795a3ea21 | ||
|
|
f8a56b7de2 | ||
|
|
8a667ccaba | ||
|
|
6ddd0b00bd | ||
|
|
c597cfda51 | ||
|
|
f673bc59d0 | ||
|
|
78b925daa6 | ||
|
|
4e05c94912 | ||
|
|
acb599b760 | ||
|
|
c7b70dbd56 | ||
|
|
b4f7299f27 | ||
|
|
6fd5a218a3 | ||
|
|
a1518c06fb | ||
|
|
c517a0b41f | ||
|
|
ded904fac8 | ||
|
|
abea6bff7b | ||
|
|
06f53ba6eb | ||
|
|
eda0919f52 | ||
|
|
1f27c744d2 | ||
|
|
bbc011ddb9 | ||
|
|
c2054a1ef6 | ||
|
|
f9d420fecd | ||
|
|
3e1d719512 | ||
|
|
f685bd18ab | ||
|
|
f46cc59041 | ||
|
|
380b1ed329 | ||
|
|
1056b4fba6 | ||
|
|
19031dba99 | ||
|
|
028db7a7ee | ||
|
|
a1764faaeb | ||
|
|
8529bb0e21 | ||
|
|
9eefdd1858 | ||
|
|
e5803860df | ||
|
|
2754d734aa | ||
|
|
3487ca4822 | ||
|
|
02ebddc34a | ||
|
|
3957f6bd09 | ||
|
|
11ab98b3d8 | ||
|
|
e24403949c | ||
|
|
288f6b91d0 | ||
|
|
8ca105966d | ||
|
|
592cd517ff | ||
|
|
586b410a66 | ||
|
|
a444940db2 | ||
|
|
afe5aef9f7 | ||
|
|
21a3e8fafc | ||
|
|
26bbba5a2e | ||
|
|
b68d5c9398 | ||
|
|
c1425f0562 | ||
|
|
e1f1b60608 | ||
|
|
ea1c95528c | ||
|
|
0cac2969ae | ||
|
|
b856c51389 | ||
|
|
aa3b23ecb8 | ||
|
|
1e653e213a | ||
|
|
7d91dcfb70 | ||
|
|
8e7e6266f0 | ||
|
|
167ccf5151 | ||
|
|
c582e0820a | ||
|
|
7d3a63d744 | ||
|
|
0a0987873f | ||
|
|
18d60c8781 | ||
|
|
7708ea6a0f | ||
|
|
71a46c6b63 | ||
|
|
667324df69 | ||
|
|
957e20d763 | ||
|
|
029a87c6ca | ||
|
|
baa4609102 | ||
|
|
875943e4da | ||
|
|
10e674cdd0 | ||
|
|
0bf78b0b81 | ||
|
|
c90b93556a | ||
|
|
f45718ea06 | ||
|
|
6d418ee8cc | ||
|
|
4851b1b72d | ||
|
|
dfb6f88be9 | ||
|
|
f28227384d | ||
|
|
cef9be92f3 | ||
|
|
f849d67a79 | ||
|
|
fba3becb06 | ||
|
|
a23ff6d119 | ||
|
|
384744c958 | ||
|
|
70c6617e88 | ||
|
|
9afe3b334e | ||
|
|
ad67d4c7ae | ||
|
|
b7eaed3ac3 | ||
|
|
136e2d68a2 | ||
|
|
bdcd54687d | ||
|
|
99190b0ef1 | ||
|
|
c7702b0c37 | ||
|
|
9b88a2c14d | ||
|
|
6a945e6a08 | ||
|
|
9c7cf0778f | ||
|
|
dd0f1a25d0 | ||
|
|
7f4cf3060e | ||
|
|
30496a4875 | ||
|
|
027508f495 | ||
|
|
b5e2b2a2ad | ||
|
|
9c9db05b86 | ||
|
|
1fa17a7df7 | ||
|
|
e09e5858d8 | ||
|
|
6ede062a66 | ||
|
|
b351b4042f | ||
|
|
95d0ce33d4 | ||
|
|
75366167e8 | ||
|
|
7fa7e4be45 | ||
|
|
d14dafbade | ||
|
|
e222f448bb | ||
|
|
f55ed3dc4c | ||
|
|
fedfcc247e | ||
|
|
8186adfaeb | ||
|
|
00304facba | ||
|
|
ff241f437f | ||
|
|
4a6b9cd64d | ||
|
|
8646dfbf02 | ||
|
|
d6f2681c61 | ||
|
|
5a47ca6053 | ||
|
|
d7fd273475 | ||
|
|
ce828a6ef5 | ||
|
|
15dbd72f93 | ||
|
|
e3bdd8737f | ||
|
|
7942656026 | ||
|
|
1fe8a2cb17 | ||
|
|
ab48b1f867 | ||
|
|
3043842254 | ||
|
|
249e326de4 | ||
|
|
b3cace3b43 | ||
|
|
ad578179d8 | ||
|
|
c57351f8b5 | ||
|
|
c5934e4c5b | ||
|
|
06e64bd3b8 | ||
|
|
48572812a9 | ||
|
|
46b610370a | ||
|
|
96d4b8ed45 | ||
|
|
c18ba3d815 | ||
|
|
fd81079247 | ||
|
|
e5781fbabc | ||
|
|
8887b06583 | ||
|
|
9955ff7df9 | ||
|
|
db74b6049c | ||
|
|
0b5c7af4be | ||
|
|
721016a00e | ||
|
|
563522d261 | ||
|
|
04f4455491 | ||
|
|
b976ce480a | ||
|
|
6d5f7cfd22 | ||
|
|
9baed0987e | ||
|
|
b76d17d35c | ||
|
|
4e182612e8 | ||
|
|
645729a518 | ||
|
|
9ee4c1cd5c | ||
|
|
02742aef5b | ||
|
|
87af2c3855 | ||
|
|
ea1ce4a029 | ||
|
|
2fe9185a6f | ||
|
|
ef191c55be | ||
|
|
abd74a127a | ||
|
|
52ac269b8d | ||
|
|
643f65ce3b | ||
|
|
465ce3e69a | ||
|
|
207b648f36 | ||
|
|
7f2d52a5ce | ||
|
|
f1eaa95c44 | ||
|
|
e203de172d | ||
|
|
79b7e2aaa5 | ||
|
|
3c2ade9299 | ||
|
|
f3f2dc6cec | ||
|
|
12b69bd681 | ||
|
|
8f542ff448 | ||
|
|
80c81c11fb | ||
|
|
e3809bd930 | ||
|
|
d755e29459 | ||
|
|
105eb5a9cd | ||
|
|
65f8436aa7 | ||
|
|
4afdd79252 | ||
|
|
d1e807b11f | ||
|
|
ee84690cd9 | ||
|
|
c7a27f1dc7 | ||
|
|
1fd9f8d1f8 | ||
|
|
b57d849ecd | ||
|
|
654ae4dc0b | ||
|
|
3984a623bf | ||
|
|
96619c6cec | ||
|
|
3dd92ccdb4 | ||
|
|
b111a615a9 | ||
|
|
2372958713 | ||
|
|
82a8541af1 | ||
|
|
ea162972fa | ||
|
|
094d6858d1 | ||
|
|
65398d59d4 | ||
|
|
3df9659ce2 | ||
|
|
c4f4f53fd6 | ||
|
|
b567b6a840 | ||
|
|
ab18e5f134 | ||
|
|
929115c02b | ||
|
|
e26884c099 | ||
|
|
077bcdcaf5 | ||
|
|
685ac5a94a | ||
|
|
3d1b75b591 | ||
|
|
e1bfe9b93c | ||
|
|
5b75a165ce | ||
|
|
e12fbc85d4 | ||
|
|
6bbef0a975 | ||
|
|
bc175ca438 | ||
|
|
ef15772b97 | ||
|
|
da5b913757 | ||
|
|
6b5a51f652 | ||
|
|
af2620c8b3 | ||
|
|
15fdfdc42e | ||
|
|
ce88e1f97b | ||
|
|
a67e3a5eac | ||
|
|
cc747f0690 | ||
|
|
a6d2661562 | ||
|
|
4b95b12a7b | ||
|
|
cca8554e3d | ||
|
|
28c426ca3c | ||
|
|
be83a4295a | ||
|
|
87439ee509 | ||
|
|
36ef54d541 | ||
|
|
400407358d | ||
|
|
502b121e43 | ||
|
|
61447ced4f | ||
|
|
1e107c68b4 | ||
|
|
602fb31f27 | ||
|
|
2a8531a025 | ||
|
|
980589e190 | ||
|
|
4a2d1f4a02 | ||
|
|
39e6cc4d68 | ||
|
|
e5018432cb | ||
|
|
dbf0b03bac | ||
|
|
01060035bc | ||
|
|
fa0cf5a654 | ||
|
|
4f1a1cad8e | ||
|
|
8c8aae9a1e | ||
|
|
230c53875f | ||
|
|
2e40cbc7c7 | ||
|
|
cd1ffc3e9a | ||
|
|
4db2cd7eda | ||
|
|
f230b36382 | ||
|
|
b872f2a5db | ||
|
|
c6678d16a6 | ||
|
|
b73a02048e | ||
|
|
1f2f2751e4 | ||
|
|
85998534fe | ||
|
|
8e7b8bd75f | ||
|
|
fb983f23dd | ||
|
|
7df99521c4 | ||
|
|
a8c0a1aa61 | ||
|
|
fc05350ae4 | ||
|
|
ba7de8fa01 | ||
|
|
778cf80e6b | ||
|
|
f01bb7d271 | ||
|
|
6a031e5a71 | ||
|
|
37924841e1 | ||
|
|
be90248fc7 | ||
|
|
cb38beb32c | ||
|
|
cc8500d0f4 | ||
|
|
61d4e36f1f | ||
|
|
5c5f164aa2 | ||
|
|
5275e6c732 | ||
|
|
f3ea6734a1 | ||
|
|
bb20176c76 | ||
|
|
beee44a10e | ||
|
|
43823dbda1 | ||
|
|
ff39bf365c | ||
|
|
5d69e4a8aa | ||
|
|
142db19627 | ||
|
|
7b84ecbb56 | ||
|
|
dc6de1734a | ||
|
|
1e464cef0a | ||
|
|
4decaa6789 | ||
|
|
a057088808 | ||
|
|
e46053a7b7 | ||
|
|
91d9e82d84 | ||
|
|
608f5ed3e9 | ||
|
|
9b2e209b4f | ||
|
|
bae1582631 | ||
|
|
c3fe76d78c | ||
|
|
8abab0e379 | ||
|
|
d31204188b | ||
|
|
a74f34b559 | ||
|
|
37cda348b0 | ||
|
|
38656e73c5 | ||
|
|
03ac430be4 | ||
|
|
89979d6ce4 | ||
|
|
54a3145710 | ||
|
|
7aea149b6c | ||
|
|
f50aa55e8b | ||
|
|
6c0d7c30c6 | ||
|
|
af163d597e | ||
|
|
d0c8302d21 | ||
|
|
44e2d76525 | ||
|
|
8f274bbb44 | ||
|
|
8436124cbc | ||
|
|
647fa8e212 | ||
|
|
6cc5886073 | ||
|
|
513c889926 | ||
|
|
9c6f4d59b3 | ||
|
|
a0d5768752 | ||
|
|
4f951cdf8a | ||
|
|
619e2ba1ee | ||
|
|
7d6a80eefa | ||
|
|
2403f8fb29 | ||
|
|
b485112ed3 | ||
|
|
1f5c835f8a | ||
|
|
a3d7ee63d3 | ||
|
|
a8cf67728b | ||
|
|
c830fc7841 | ||
|
|
5ef3bb9cbf | ||
|
|
b882175f36 | ||
|
|
d20215929d | ||
|
|
ea312b9986 | ||
|
|
0559341f31 | ||
|
|
1f4dc2d4a2 | ||
|
|
14ca0f5c59 | ||
|
|
e51c4843c5 | ||
|
|
32a9fac9ed | ||
|
|
de8cbf6178 | ||
|
|
33e1aea80c | ||
|
|
83589ee677 | ||
|
|
023ecdebc9 | ||
|
|
2d9cb2c0b9 | ||
|
|
5c0814ef9b | ||
|
|
28831a3b06 | ||
|
|
0d073a36a3 | ||
|
|
069600d602 | ||
|
|
d70a27f2fd | ||
|
|
e330626b03 | ||
|
|
0f4b16c194 | ||
|
|
c89bda86b7 | ||
|
|
56fa5355fd | ||
|
|
7ea52670b9 | ||
|
|
ee264e88d4 | ||
|
|
3f7db4e772 | ||
|
|
3d9fc18a83 | ||
|
|
9eeed7f992 | ||
|
|
ba0a86cbea | ||
|
|
41d8d65d82 | ||
|
|
57843b8a6f | ||
|
|
d6258d0ca1 | ||
|
|
66ccebb02b | ||
|
|
e3081e56f8 | ||
|
|
201b223813 | ||
|
|
08d534e39b | ||
|
|
4489169553 | ||
|
|
16c239716b | ||
|
|
f5913eb947 | ||
|
|
f2681af9ee | ||
|
|
66dd51d75a | ||
|
|
5f78361533 | ||
|
|
3c1192298b | ||
|
|
0bd9d79bbe | ||
|
|
a2e055f313 | ||
|
|
ca1d5c4303 | ||
|
|
e6eebc00a3 | ||
|
|
29bdf794f3 | ||
|
|
4ba81b8f03 | ||
|
|
8af7f0e797 | ||
|
|
c67fa18ad3 | ||
|
|
6c9da6537e | ||
|
|
241785b428 | ||
|
|
411166ffba | ||
|
|
203c9ebbca | ||
|
|
ede37d5d0f | ||
|
|
4f02529b15 | ||
|
|
0f6b73340e | ||
|
|
96c53cc173 | ||
|
|
7ce3bc18b2 | ||
|
|
82b47e314b | ||
|
|
9d2474c1e3 | ||
|
|
787f69fc46 | ||
|
|
054d4e52b2 | ||
|
|
0d1ef6d40e | ||
|
|
ead448b8d4 | ||
|
|
7ff10e6792 | ||
|
|
3d6c94e7c5 | ||
|
|
7673e64738 | ||
|
|
4230c53812 | ||
|
|
3198e03cc4 | ||
|
|
1e48e107fc | ||
|
|
ed7c889c4f | ||
|
|
84f4481ef0 | ||
|
|
b84997d058 | ||
|
|
3063a7c05f | ||
|
|
36fe4c9e9a | ||
|
|
5c5134b69f | ||
|
|
e7fb764158 | ||
|
|
fe624cfd1c | ||
|
|
81b8237570 | ||
|
|
a019c7dae0 | ||
|
|
552dd029fa | ||
|
|
bd5c6359fe | ||
|
|
6bd483d768 | ||
|
|
7003c0d81b | ||
|
|
b038d9a41f | ||
|
|
89c42cf7e4 | ||
|
|
cd1e5ad3ad | ||
|
|
f36c761c28 | ||
|
|
0f7d95d31b | ||
|
|
4b92f56ed7 | ||
|
|
b54fb07e84 | ||
|
|
11825191cf | ||
|
|
d719b17aec | ||
|
|
65a33922cf | ||
|
|
727ee9b014 | ||
|
|
4d51f0334f | ||
|
|
86e4866d6a | ||
|
|
e75276ed88 | ||
|
|
bfdf4c0453 | ||
|
|
f90902c5e3 | ||
|
|
d0d6844fbd | ||
|
|
cd7a724e62 | ||
|
|
1f5877460b | ||
|
|
8da77ee13b | ||
|
|
d205cd09ef | ||
|
|
b44d8505b2 | ||
|
|
9d99fe9272 | ||
|
|
431839d36d | ||
|
|
cce1f688b9 |
No files matched your search
@@ -1,19 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
## Description: Run Claude Code
|
|
||||||
## Usage: claude [args]
|
|
||||||
## Example: ddev claude
|
|
||||||
## Example: ddev claude --help
|
|
||||||
## Example: ddev claude doctor
|
|
||||||
|
|
||||||
# Ensure ~/.local/bin is in PATH
|
|
||||||
export PATH="$HOME/.local/bin:$PATH"
|
|
||||||
|
|
||||||
# Check if claude is installed
|
|
||||||
if [ ! -f "$HOME/.local/bin/claude" ]; then
|
|
||||||
echo "Claude Code is not installed. Installing now..."
|
|
||||||
curl -fsSL https://claude.ai/install.sh | bash
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Run claude with all arguments
|
|
||||||
exec "$HOME/.local/bin/claude" "$@"
|
|
||||||
@@ -40,6 +40,12 @@ MESSENGER_TRANSPORT_DSN=doctrine://default?auto_setup=0
|
|||||||
MAILER_DSN=null://null
|
MAILER_DSN=null://null
|
||||||
###< symfony/mailer ###
|
###< symfony/mailer ###
|
||||||
|
|
||||||
|
MAILJET_API_KEY=
|
||||||
|
MAILJET_API_SECRET=
|
||||||
|
MAILJET_API_BASE_URL=https://api.mailjet.com/v3/REST
|
||||||
|
MAILJET_NEWSLETTER_LIST_ID=
|
||||||
|
APP_NEWSLETTER_CONFIRMATION_TTL_HOURS=1
|
||||||
|
|
||||||
APP_BPN_USER=
|
APP_BPN_USER=
|
||||||
APP_BPN_PASSWORD=
|
APP_BPN_PASSWORD=
|
||||||
APP_BPN_IP=
|
APP_BPN_IP=
|
||||||
@@ -60,6 +66,14 @@ APP_CUSTOMER_SERVICE_EMAIL="[email protected]"
|
|||||||
# Travel Data Service Configuration
|
# Travel Data Service Configuration
|
||||||
APP_TRAVEL_PREFER_REMOTE=false
|
APP_TRAVEL_PREFER_REMOTE=false
|
||||||
APP_TRAVEL_ENABLE_FALLBACK=true
|
APP_TRAVEL_ENABLE_FALLBACK=true
|
||||||
|
APP_TRAVEL_SNAPSHOT_RETENTION_BUFFER_DAYS=14
|
||||||
|
|
||||||
|
# Feature Flags
|
||||||
|
FEATURE_TRAVEL_SNAPSHOT=true
|
||||||
|
|
||||||
|
# Emails
|
||||||
|
APP_DEFAULT_EMAIL_FROM=[email protected]
|
||||||
|
APP_DEFAULT_EMAIL_TO=[email protected]
|
||||||
|
|
||||||
# Booking Configuration
|
# Booking Configuration
|
||||||
# Status for new bookings: 'F' (Fixed/Final), 'O' (Option - requires agency confirmation)
|
# Status for new bookings: 'F' (Fixed/Final), 'O' (Option - requires agency confirmation)
|
||||||
|
|||||||
@@ -33,3 +33,7 @@ yarn-error.log
|
|||||||
###< friendsofphp/php-cs-fixer ###
|
###< friendsofphp/php-cs-fixer ###
|
||||||
|
|
||||||
/ray.php
|
/ray.php
|
||||||
|
|
||||||
|
###> phpstan/phpstan ###
|
||||||
|
phpstan.neon
|
||||||
|
###< phpstan/phpstan ###
|
||||||
@@ -60,7 +60,7 @@ Authorization: Bearer {{$auth.token("oauth2_api")}}
|
|||||||
|
|
||||||
### API travel
|
### API travel
|
||||||
# @no-cookie-jar
|
# @no-cookie-jar
|
||||||
GET {{base_url}}/api/travels/SBW131225
|
GET {{base_url}}/api/travels/DPWMP140326
|
||||||
Accept: application/json
|
Accept: application/json
|
||||||
Authorization: Bearer {{$auth.token("oauth2_api")}}
|
Authorization: Bearer {{$auth.token("oauth2_api")}}
|
||||||
|
|
||||||
|
|||||||
Binary file not shown.
|
After Width: | Height: | Size: 7.3 KiB |
@@ -1,7 +1,7 @@
|
|||||||
.button {
|
.button {
|
||||||
@apply inline-flex items-center justify-center space-x-2 h-10 leading-10 px-4 md:px-8 cursor-pointer;
|
@apply inline-flex items-center justify-center space-x-2 h-8 leading-8 md:h-10 md:leading-10 px-4 md:px-8 cursor-pointer;
|
||||||
@apply uppercase leading-none text-center;
|
@apply uppercase leading-none text-center text-sm md:text-base;
|
||||||
@apply transition-colors outline-none focus:outline-2 focus:outline-offset-2 focus:outline-primary-light;
|
@apply transition-colors outline-none focus:outline-2 focus:outline-offset-2 focus:outline-primary-dark;
|
||||||
@apply rounded-md;
|
@apply rounded-md;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -20,42 +20,47 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.button--secondary {
|
.button--secondary {
|
||||||
@apply bg-none bg-primary-dark text-white;
|
@apply bg-none bg-primary-light text-white;
|
||||||
@apply hover:bg-primary-light/80;
|
@apply hover:bg-primary-light/50;
|
||||||
|
}
|
||||||
|
|
||||||
|
.button--neutral {
|
||||||
|
@apply bg-none bg-gray-200;
|
||||||
|
@apply hover:bg-gray-200/50;
|
||||||
}
|
}
|
||||||
|
|
||||||
.sbw {
|
.sbw {
|
||||||
.button--primary {
|
.button--primary {
|
||||||
@apply bg-none bg-sbw-secondary text-white;
|
@apply bg-none bg-sbw-secondary text-white;
|
||||||
@apply hover:bg-none hover:bg-sbw-primary/80;
|
@apply hover:bg-none hover:bg-sbw-primary/50;
|
||||||
}
|
}
|
||||||
|
|
||||||
.button--secondary {
|
.button--secondary {
|
||||||
@apply bg-none bg-sbw-primary-dark text-white;
|
@apply bg-none bg-sbw-primary-dark text-white;
|
||||||
@apply hover:bg-none hover:bg-sbw-primary/80;
|
@apply hover:bg-none hover:bg-sbw-primary/50;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.snz {
|
.snz {
|
||||||
.button--primary {
|
.button--primary {
|
||||||
@apply bg-none bg-snz-secondary text-white;
|
@apply bg-none bg-snz-secondary text-white;
|
||||||
@apply hover:bg-none hover:bg-snz-primary/80;
|
@apply hover:bg-none hover:bg-snz-primary/50;
|
||||||
}
|
}
|
||||||
|
|
||||||
.button--secondary {
|
.button--secondary {
|
||||||
@apply bg-none bg-snz-primary-dark text-white;
|
@apply bg-none bg-snz-primary-dark text-white;
|
||||||
@apply hover:bg-none hover:bg-snz-primary/80;
|
@apply hover:bg-none hover:bg-snz-primary/50;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.ser {
|
.ser {
|
||||||
.button--primary {
|
.button--primary {
|
||||||
@apply bg-none bg-ser-secondary text-white;
|
@apply bg-none bg-ser-secondary text-white;
|
||||||
@apply hover:bg-none hover:bg-ser-primary/80;
|
@apply hover:bg-none hover:bg-ser-primary/50;
|
||||||
}
|
}
|
||||||
|
|
||||||
.button--secondary {
|
.button--secondary {
|
||||||
@apply bg-none bg-ser-primary text-white;
|
@apply bg-none bg-ser-primary text-white;
|
||||||
@apply hover:bg-none hover:bg-ser-primary/80;
|
@apply hover:bg-none hover:bg-ser-primary/50;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -16,6 +16,7 @@
|
|||||||
"doctrine/orm": "^3.3",
|
"doctrine/orm": "^3.3",
|
||||||
"easycorp/easyadmin-bundle": "^4.27",
|
"easycorp/easyadmin-bundle": "^4.27",
|
||||||
"fakerphp/faker": "^1.24",
|
"fakerphp/faker": "^1.24",
|
||||||
|
"flagception/flagception-bundle": "^6.1",
|
||||||
"league/flysystem-bundle": "^3.4",
|
"league/flysystem-bundle": "^3.4",
|
||||||
"league/flysystem-sftp-v3": "^3.29",
|
"league/flysystem-sftp-v3": "^3.29",
|
||||||
"league/oauth2-server-bundle": "^1.0",
|
"league/oauth2-server-bundle": "^1.0",
|
||||||
@@ -119,6 +120,9 @@
|
|||||||
"require-dev": {
|
"require-dev": {
|
||||||
"deployer/deployer": "^7.5",
|
"deployer/deployer": "^7.5",
|
||||||
"friendsofphp/php-cs-fixer": "^3.75",
|
"friendsofphp/php-cs-fixer": "^3.75",
|
||||||
|
"phpstan/phpstan": "^2.1",
|
||||||
|
"phpstan/phpstan-doctrine": "^2.0",
|
||||||
|
"phpstan/phpstan-symfony": "^2.0",
|
||||||
"phpunit/phpunit": "^9.5",
|
"phpunit/phpunit": "^9.5",
|
||||||
"spatie/ray": "^1.43",
|
"spatie/ray": "^1.43",
|
||||||
"spatie/x-ray": "^1.2",
|
"spatie/x-ray": "^1.2",
|
||||||
|
|||||||
Generated
+1277
-2438
File diff suppressed because it is too large.
Load diff
@@ -18,4 +18,5 @@ return [
|
|||||||
Zenstruck\ScheduleBundle\ZenstruckScheduleBundle::class => ['all' => true],
|
Zenstruck\ScheduleBundle\ZenstruckScheduleBundle::class => ['all' => true],
|
||||||
Symfony\UX\TwigComponent\TwigComponentBundle::class => ['all' => true],
|
Symfony\UX\TwigComponent\TwigComponentBundle::class => ['all' => true],
|
||||||
EasyCorp\Bundle\EasyAdminBundle\EasyAdminBundle::class => ['all' => true],
|
EasyCorp\Bundle\EasyAdminBundle\EasyAdminBundle::class => ['all' => true],
|
||||||
|
Flagception\Bundle\FlagceptionBundle\FlagceptionBundle::class => ['all' => true],
|
||||||
];
|
];
|
||||||
@@ -0,0 +1,2 @@
|
|||||||
|
flagception:
|
||||||
|
features: {}
|
||||||
@@ -13,7 +13,7 @@ framework:
|
|||||||
max_retries: 3
|
max_retries: 3
|
||||||
multiplier: 2
|
multiplier: 2
|
||||||
failed: 'doctrine://default?queue_name=failed'
|
failed: 'doctrine://default?queue_name=failed'
|
||||||
# sync: 'sync://'
|
sync: 'sync://'
|
||||||
|
|
||||||
default_bus: messenger.bus.default
|
default_bus: messenger.bus.default
|
||||||
|
|
||||||
@@ -21,7 +21,7 @@ framework:
|
|||||||
messenger.bus.default: []
|
messenger.bus.default: []
|
||||||
|
|
||||||
routing:
|
routing:
|
||||||
Symfony\Component\Mailer\Messenger\SendEmailMessage: async
|
Symfony\Component\Mailer\Messenger\SendEmailMessage: sync
|
||||||
Symfony\Component\Notifier\Message\ChatMessage: async
|
Symfony\Component\Notifier\Message\ChatMessage: async
|
||||||
Symfony\Component\Notifier\Message\SmsMessage: async
|
Symfony\Component\Notifier\Message\SmsMessage: async
|
||||||
|
|
||||||
|
|||||||
@@ -59,7 +59,7 @@ when@test:
|
|||||||
path: "%kernel.logs_dir%/%kernel.environment%.log"
|
path: "%kernel.logs_dir%/%kernel.environment%.log"
|
||||||
level: debug
|
level: debug
|
||||||
|
|
||||||
when@prod:
|
when@prod: &prod_config
|
||||||
monolog:
|
monolog:
|
||||||
handlers:
|
handlers:
|
||||||
database:
|
database:
|
||||||
@@ -104,4 +104,6 @@ when@prod:
|
|||||||
type: stream
|
type: stream
|
||||||
channels: [deprecation]
|
channels: [deprecation]
|
||||||
path: php://stderr
|
path: php://stderr
|
||||||
formatter: monolog.formatter.json
|
formatter: monolog.formatter.json
|
||||||
|
|
||||||
|
when@staging: *prod_config
|
||||||
@@ -1,6 +1,8 @@
|
|||||||
twig:
|
twig:
|
||||||
file_name_pattern: '*.twig'
|
file_name_pattern: '*.twig'
|
||||||
form_themes: ['forms.html.twig']
|
form_themes: ['forms.html.twig']
|
||||||
|
paths:
|
||||||
|
'%kernel.project_dir%/assets/images': images
|
||||||
globals:
|
globals:
|
||||||
htmx_change_trigger: 'change delay:100ms'
|
htmx_change_trigger: 'change delay:100ms'
|
||||||
website_base_url: '%env(APP_WEBSITE_BASE_URL)%'
|
website_base_url: '%env(APP_WEBSITE_BASE_URL)%'
|
||||||
|
|||||||
@@ -24,6 +24,22 @@ zenstruck_schedule:
|
|||||||
frequency: "30 1 * * *"
|
frequency: "30 1 * * *"
|
||||||
description: "Removes expired drafts"
|
description: "Removes expired drafts"
|
||||||
|
|
||||||
|
- task: app:cleanup:newsletter-opt-in-requests
|
||||||
|
frequency: "45 1 * * *"
|
||||||
|
description: "Removes expired pending newsletter double opt-in requests"
|
||||||
|
|
||||||
|
- task: league:oauth2-server:clear-expired-tokens
|
||||||
|
frequency: "0 * * * *"
|
||||||
|
description: "Removes expired oauth2 tokens hourly"
|
||||||
|
|
||||||
|
- task: app:bpn:refresh-travel-snapshot --refresh-after 60
|
||||||
|
frequency: "10 8-19 * * *"
|
||||||
|
description: "Syncs travel data snapshots with BusPro XML data hourly during peak hours"
|
||||||
|
|
||||||
|
- task: app:bpn:refresh-travel-snapshot --refresh-after 180
|
||||||
|
frequency: "10 20-23,0-7 * * *"
|
||||||
|
description: "Syncs travel data snapshots with BusPro XML data every 3 hours outside peak hours"
|
||||||
|
|
||||||
when@staging:
|
when@staging:
|
||||||
zenstruck_schedule:
|
zenstruck_schedule:
|
||||||
mailer:
|
mailer:
|
||||||
@@ -37,8 +53,8 @@ when@prod:
|
|||||||
tasks:
|
tasks:
|
||||||
- task: app:bpn:xml-sync
|
- task: app:bpn:xml-sync
|
||||||
frequency: "*/15 8-19 * * *"
|
frequency: "*/15 8-19 * * *"
|
||||||
description: "Sync BusPro XML data every 15 min. during peak hours"
|
description: "Syncs BusPro XML data every 15 min. during peak hours"
|
||||||
|
|
||||||
- task: app:bpn:xml-sync
|
- task: app:bpn:xml-sync
|
||||||
frequency: "0 20-23,0-7 * * *"
|
frequency: "0 20-23,0-7 * * *"
|
||||||
description: "Sync BusPro XML data hourly outside peak hours"
|
description: "Syncs BusPro XML data hourly outside peak hours"
|
||||||
+31
-7
@@ -9,6 +9,10 @@ parameters:
|
|||||||
path_to_keys: '%kernel.project_dir%/config/secret'
|
path_to_keys: '%kernel.project_dir%/config/secret'
|
||||||
bpn_debug: '%env(APP_BPN_DEBUG)%'
|
bpn_debug: '%env(APP_BPN_DEBUG)%'
|
||||||
default_booking_status: '%env(DEFAULT_BOOKING_STATUS)%'
|
default_booking_status: '%env(DEFAULT_BOOKING_STATUS)%'
|
||||||
|
newsletter_confirmation_ttl_hours: '%env(int:APP_NEWSLETTER_CONFIRMATION_TTL_HOURS)%'
|
||||||
|
travel_snapshot_retention_buffer_days: '%env(int:APP_TRAVEL_SNAPSHOT_RETENTION_BUFFER_DAYS)%'
|
||||||
|
default_email_from: '%env(APP_DEFAULT_EMAIL_FROM)%'
|
||||||
|
default_email_to: '%env(APP_DEFAULT_EMAIL_TO)%'
|
||||||
|
|
||||||
# Body dimensions choices for BodyDimensionsType
|
# Body dimensions choices for BodyDimensionsType
|
||||||
body_dimensions.height_choices:
|
body_dimensions.height_choices:
|
||||||
@@ -99,17 +103,21 @@ services:
|
|||||||
arguments:
|
arguments:
|
||||||
$path: '%path_to_keys%'
|
$path: '%path_to_keys%'
|
||||||
|
|
||||||
App\Service\TravelDataService:
|
App\Service\TravelSnapshotManager:
|
||||||
|
arguments:
|
||||||
|
$retentionBufferDays: '%travel_snapshot_retention_buffer_days%'
|
||||||
|
|
||||||
|
App\Service\TravelDataProvider:
|
||||||
arguments:
|
arguments:
|
||||||
$logger: '@monolog.logger.core'
|
$logger: '@monolog.logger.core'
|
||||||
$preferRemote: '%env(bool:APP_TRAVEL_PREFER_REMOTE)%'
|
$preferRemote: '%env(bool:APP_TRAVEL_PREFER_REMOTE)%'
|
||||||
$enableFallback: '%env(bool:APP_TRAVEL_ENABLE_FALLBACK)%'
|
$enableFallback: '%env(bool:APP_TRAVEL_ENABLE_FALLBACK)%'
|
||||||
|
|
||||||
App\Service\BookingEditDataLoaderService:
|
App\Service\BookingEditDataLoader:
|
||||||
arguments:
|
arguments:
|
||||||
$bpnCache: '@bpn.cache'
|
$bpnCache: '@bpn.cache'
|
||||||
|
|
||||||
App\Service\VoucherValidationService:
|
App\Service\VoucherValidator:
|
||||||
arguments:
|
arguments:
|
||||||
$cache: '@cache.app'
|
$cache: '@cache.app'
|
||||||
$logger: '@monolog.logger.bpn'
|
$logger: '@monolog.logger.bpn'
|
||||||
@@ -148,16 +156,16 @@ services:
|
|||||||
- '@App\Form\Service\ParticipantPurchaseVoucherFieldHandler'
|
- '@App\Form\Service\ParticipantPurchaseVoucherFieldHandler'
|
||||||
- '@App\Form\Service\ParticipantPromoVoucherFieldHandler'
|
- '@App\Form\Service\ParticipantPromoVoucherFieldHandler'
|
||||||
|
|
||||||
# Participant Status Rules
|
# Booking Status Rules
|
||||||
App\BusProNet\Service\StatusRule\ChaperonServiceStatusRule: ~
|
App\BusProNet\Service\StatusRule\ChaperonServiceStatusRule: ~
|
||||||
|
|
||||||
# Participant Status Rule Registry
|
# Booking Status Rule Registry
|
||||||
App\BusProNet\Service\ParticipantStatusRuleRegistry:
|
App\BusProNet\Service\BookingStatusRuleRegistry:
|
||||||
arguments:
|
arguments:
|
||||||
$rules:
|
$rules:
|
||||||
- '@App\BusProNet\Service\StatusRule\ChaperonServiceStatusRule'
|
- '@App\BusProNet\Service\StatusRule\ChaperonServiceStatusRule'
|
||||||
|
|
||||||
App\Service\CmsDataService:
|
App\Service\CmsDataProvider:
|
||||||
arguments:
|
arguments:
|
||||||
$httpClient: '@typo3.client'
|
$httpClient: '@typo3.client'
|
||||||
$apiKey: 'AbcAbc123'# dummy key, not yet implemented
|
$apiKey: 'AbcAbc123'# dummy key, not yet implemented
|
||||||
@@ -166,7 +174,23 @@ services:
|
|||||||
tags:
|
tags:
|
||||||
- { name: monolog.processor }
|
- { name: monolog.processor }
|
||||||
|
|
||||||
|
App\Service\NewsletterManager:
|
||||||
|
arguments:
|
||||||
|
$newsletterConfirmationTtlHours: '%newsletter_confirmation_ttl_hours%'
|
||||||
|
|
||||||
App\Service\DomainConfigProvider:
|
App\Service\DomainConfigProvider:
|
||||||
arguments:
|
arguments:
|
||||||
$domainConfig: '%domain_config%'
|
$domainConfig: '%domain_config%'
|
||||||
|
|
||||||
|
App\Email\Mailer:
|
||||||
|
arguments:
|
||||||
|
$defaults:
|
||||||
|
from: '%default_email_from%'
|
||||||
|
to: '%default_email_to%'
|
||||||
|
|
||||||
|
App\Service\MailjetApiClient:
|
||||||
|
arguments:
|
||||||
|
$mailjetApiKey: '%env(default::MAILJET_API_KEY)%'
|
||||||
|
$mailjetApiSecret: '%env(default::MAILJET_API_SECRET)%'
|
||||||
|
$mailjetApiBaseUrl: '%env(default::MAILJET_API_BASE_URL)%'
|
||||||
|
$mailjetNewsletterListId: '%env(default::MAILJET_NEWSLETTER_LIST_ID)%'
|
||||||
@@ -0,0 +1,196 @@
|
|||||||
|
# Booking Flow Reference
|
||||||
|
|
||||||
|
Last updated: 2026-04-16
|
||||||
|
|
||||||
|
This document traces the booking create and edit flows from controller entry point through to session/DTO state. It is intended as orientation for developers unfamiliar with the flow, not as a substitute for reading the code.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Shared Concepts
|
||||||
|
|
||||||
|
### `BookingDto`
|
||||||
|
|
||||||
|
The central data object for both flows. Holds room selections, participants, payment method, and travel reference. Lives in the HTTP session between requests. Has two modes: `MODE_CREATE` and `MODE_EDIT`.
|
||||||
|
|
||||||
|
### `BookingSessionManager`
|
||||||
|
|
||||||
|
Owns all reads and writes to session-stored `BookingDto` instances. Also manages the baseline room snapshot used for change detection in the create flow.
|
||||||
|
|
||||||
|
### `BookingCreateContextFactory`
|
||||||
|
|
||||||
|
Assembles the view model (`BookingCreateContext`) passed to create-flow templates. Handles room grouping (by-pax vs. by-room) and wires summary sidebar data.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Create Flow
|
||||||
|
|
||||||
|
```
|
||||||
|
Step 1 (room selection)
|
||||||
|
→ Step 2 (participants)
|
||||||
|
→ Step 2 sub-form (per-participant, HTMX)
|
||||||
|
→ Step 3 (payment + API pre-validation)
|
||||||
|
→ Step 4 (confirmation + final submission)
|
||||||
|
→ Success
|
||||||
|
```
|
||||||
|
|
||||||
|
### Entry / Bootstrap
|
||||||
|
|
||||||
|
`BookingExceptionHandlerTrait::getOrCreateBookingCreateDto()` is called by every step controller. If no DTO exists in session, it calls `BookingConfigurator::startFreshBooking()` which loads travel data and initialises a fresh `BookingDto`.
|
||||||
|
|
||||||
|
### Step 1 — Room Selection
|
||||||
|
|
||||||
|
**Controller:** `Create/Step1Controller`
|
||||||
|
**Route:** `GET|POST /bookings/create/rooms`
|
||||||
|
|
||||||
|
1. Load or create DTO via `getOrCreateBookingCreateDto()`
|
||||||
|
2. `BookingSessionManager::getOrCreateBaselineSnapshot()` — saves the current room selection as a comparison point for change detection
|
||||||
|
3. Render `BookingCreateStep1Type` form
|
||||||
|
4. On submit:
|
||||||
|
- If room selection changed from baseline: `BookingDto::resetParticipantAssignments()` — clears stale assignments
|
||||||
|
- `BookingConfigurator::updateBookingStatusFromRoomSelection()` — may switch booking to inquiry mode if capacity constraints require it
|
||||||
|
- `BookingSessionManager::saveBookingDto()`, advance `currentStep` to 2
|
||||||
|
- `BookingSessionManager::clearBaselineSnapshot()`
|
||||||
|
- Redirect to Step 2
|
||||||
|
|
||||||
|
HTMX refresh (`/bookings/create/refresh`): processes the form without validation and returns updated room selection + summary sidebar blocks.
|
||||||
|
|
||||||
|
### Step 2 — Participants (Card Overview)
|
||||||
|
|
||||||
|
**Controller:** `Create/Step2Controller`
|
||||||
|
**Route:** `GET|POST /bookings/create/participants`
|
||||||
|
|
||||||
|
1. Load DTO from session (or redirect to Step 1 if missing)
|
||||||
|
2. `TravelDataProvider::enrichWithFreshAvailabilities()` — refreshes room availability
|
||||||
|
3. `ensureCorrectNumberOfParticipants()` — syncs the `BookingDto::participants` array length with the room selections (e.g., 2× double room → 4 participants). Preserves existing participant data for slots that still exist.
|
||||||
|
4. `ParticipantDataPrefiller::shouldPrepopulateApplicant()` + `prepopulateApplicantFromUser()` — prefills participant[0] from user profile on first visit
|
||||||
|
5. `RoomAssigner::validateAndResetInvalidAssignments()` — clears any room assignments that no longer match the current room selection (handles back-navigation from Step 2 → Step 1 → Step 2)
|
||||||
|
6. `RoomAssigner::assignRoomsIfNeeded()` — auto-assigns participants to rooms
|
||||||
|
7. `BookingConfigurator::preselectDefaultServices()` — selects mandatory and auto-book services for all participants
|
||||||
|
8. `BookingConfigurator::applyCreateBookingStatusRules()` — re-evaluates booking status (book / inquiry / not-bookable)
|
||||||
|
9. `BookingSessionManager::saveBookingDto()`
|
||||||
|
10. On form submit (all participants valid): advance to Step 3, redirect
|
||||||
|
|
||||||
|
### Step 2 — Individual Participant Form (HTMX)
|
||||||
|
|
||||||
|
**Controller:** `Create/Step2ParticipantController`
|
||||||
|
**Routes:** `GET|POST /bookings/create/participants/{index}` and `/participants/{index}/refresh`
|
||||||
|
|
||||||
|
Each participant card lazy-loads its form via HTMX. The controller:
|
||||||
|
|
||||||
|
1. Verifies the participant slot exists
|
||||||
|
2. Refreshes availability
|
||||||
|
3. Handles dummy data fill (`ParticipantDataPrefiller::isDummyDataFillRequested()` / `fillDummyParticipant()`)
|
||||||
|
4. On submit: re-applies status rules, saves to session, redirects to card overview
|
||||||
|
5. `ParticipantFormSupport` is used for form creation options and notification draining
|
||||||
|
|
||||||
|
### Step 3 — Payment + API Pre-Validation
|
||||||
|
|
||||||
|
**Controller:** `Create/Step3Controller`
|
||||||
|
**Route:** `GET|POST /bookings/create/payment`
|
||||||
|
|
||||||
|
1. Load DTO from session
|
||||||
|
2. `BookingConfigurator::applyCreateBookingStatusRules()`
|
||||||
|
3. On submit:
|
||||||
|
- `ApiClient::createBookingInquiry()` — submits booking to API for validation without committing it
|
||||||
|
- If inquiry fails with "nicht möglich" + "Anfrage" in message: auto-switch to inquiry mode, advance to Step 4
|
||||||
|
- If inquiry fails otherwise: show error, stay on step
|
||||||
|
- Price verification: `BookingPriceCalculator::calculateGrandTotal()` is compared against the API response total (accounting for promotional/goodwill voucher discounts and API-applied group discounts). Mismatch triggers `BookingPriceMismatchAnalyzer` for detailed logging.
|
||||||
|
- On success: advance `currentStep` to 4, redirect
|
||||||
|
|
||||||
|
### Step 4 — Confirmation + Final Submission
|
||||||
|
|
||||||
|
**Controller:** `Create/Step4Controller`
|
||||||
|
**Route:** `GET|POST /bookings/create/confirmation`
|
||||||
|
|
||||||
|
1. Load DTO from session
|
||||||
|
2. Newsletter subscription check for opt-in display
|
||||||
|
3. On submit:
|
||||||
|
- `BookingConfigurator::applyCreateBookingStatusRules()`
|
||||||
|
- `ApiClient::createBooking()` — final booking submission (already validated in Step 3)
|
||||||
|
- Newsletter double-opt-in if selected
|
||||||
|
- On success: store booking number + total in flash (for analytics), clear travel data cache, `BookingSessionManager::clearBookingDto()`, redirect to success page
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Edit Flow
|
||||||
|
|
||||||
|
```
|
||||||
|
Entry (start)
|
||||||
|
→ Load (session or API + draft restore)
|
||||||
|
→ Participant sub-forms (HTMX, per-participant)
|
||||||
|
→ Submission
|
||||||
|
```
|
||||||
|
|
||||||
|
### Entry
|
||||||
|
|
||||||
|
**Controller:** `Edit/IndexController::start()`
|
||||||
|
**Route:** `GET /bookings/{id}/edit/start`
|
||||||
|
|
||||||
|
Clears any existing session DTO for edit mode and invalidates the API booking cache, then redirects to the edit page. This ensures a clean load from API on every intentional re-entry.
|
||||||
|
|
||||||
|
### Load
|
||||||
|
|
||||||
|
**Controller:** `Edit/IndexController::index()`
|
||||||
|
**Route:** `GET|POST /bookings/{id}/edit`
|
||||||
|
|
||||||
|
Loading is delegated entirely to `BookingEditDataLoader::loadFormData()`:
|
||||||
|
|
||||||
|
**If session DTO exists and matches the requested booking ID:**
|
||||||
|
- `TravelDataProvider::enrichWithFreshAvailabilities()` — refreshes room availability
|
||||||
|
- `TravelDataProvider::getMutabilityData()` + `patchMutability()` — applies cached mutability state to DTO
|
||||||
|
|
||||||
|
**If no session DTO (first load or after `start`):**
|
||||||
|
|
||||||
|
`initializeFromApi()`:
|
||||||
|
1. `fetchBookingData()` — `ApiClient::getBooking()` with 5-minute cache (tagged by user ID for bulk invalidation)
|
||||||
|
2. `TravelDataProvider::getTravelData()` — loads travel data (XML or snapshot)
|
||||||
|
3. `TravelDataProvider::getAvailabilityData(forceRefresh: true)` + `patchAvailabilities()` — force-refreshes availability at edit start, populates cache for subsequent loads within the session
|
||||||
|
4. `TravelDataProvider::getMutabilityData(cached: true)` + `patchMutability()` — applies which service categories are currently editable
|
||||||
|
5. `BookingDataProcessor::createBookingDtoFromBooking()` — hydrates `BookingDto` from API booking entity
|
||||||
|
6. Agency code resolved via `AgencyLoader` (used by field state conditions)
|
||||||
|
7. `BookingChangeTracker::generateFingerprint()` — sets `originalFingerprint` on DTO **before** draft is applied, so dirty detection compares against original API data
|
||||||
|
8. `BookingEditDraftManager::findDraft()` + `applyDraftToDto()` — if draft exists, merges user edits on top of fresh API data. Sets `draftWasRestored = true` if successful.
|
||||||
|
9. `BookingSessionManager::saveBookingDto()`
|
||||||
|
|
||||||
|
Back in the controller: shows "draft restored" flash if applicable, fetches booking data for surcharge/status display, renders the card overview with `BookingEditContextFactory::createOverviewContext()`.
|
||||||
|
|
||||||
|
### Individual Participant Form (HTMX)
|
||||||
|
|
||||||
|
**Controller:** `Edit/ParticipantController`
|
||||||
|
**Routes:** `GET|POST /bookings/{id}/edit/participants/{index}` and `/{index}/refresh`
|
||||||
|
|
||||||
|
Per-participant forms are lazy-loaded, matching the create flow pattern.
|
||||||
|
|
||||||
|
1. `BookingEditContextFactory::prepareBookingDto()` — refreshes availabilities on the DTO travel object
|
||||||
|
2. `ParticipantFormSupport` — form creation, notification draining
|
||||||
|
3. On submit: `BookingSessionManager::saveBookingDto()` + `BookingEditDraftManager::saveDraft()` — persists participant edits to both session and draft
|
||||||
|
|
||||||
|
### Submission
|
||||||
|
|
||||||
|
**Service:** `BookingEditSubmitter::handleSubmission()`
|
||||||
|
Called from `Edit/IndexController` on valid form submit.
|
||||||
|
|
||||||
|
1. Invalidate API cache, fetch fresh booking data
|
||||||
|
2. Force-refresh mutability data (`TravelDataProvider::getMutabilityData(forceRefresh: true)`) and patch DTO travel
|
||||||
|
3. `BookingEditSubmitGuard::reconcileImmutableCategories()` — reverts any DTO fields that have become immutable since the session was loaded. Shows flash if anything was reverted.
|
||||||
|
4. `ApiClient::updateBooking()` — submit
|
||||||
|
5. On success: invalidate cache again, `BookingSessionManager::clearBookingDto()`, `BookingEditDraftManager::deleteDraft()`
|
||||||
|
|
||||||
|
### Other Edit Routes
|
||||||
|
|
||||||
|
| Route | Action |
|
||||||
|
|-------|--------|
|
||||||
|
| `GET /bookings/{id}/edit/reload` | Shows confirmation modal |
|
||||||
|
| `POST /bookings/{id}/edit/reload` | Clears session + **deletes draft**, reloads from API |
|
||||||
|
| `GET /bookings/{id}/edit/cancel` | Clears session, **preserves draft**, redirects to booking list |
|
||||||
|
|
||||||
|
The distinction between reload and cancel is intentional: cancel keeps the draft so the user can return to their changes later; reload discards everything.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Key Invariants
|
||||||
|
|
||||||
|
- `currentStep` on the DTO gates forward navigation in create mode; controllers redirect to the current step if a higher step is requested directly.
|
||||||
|
- The original fingerprint is set before draft application in edit mode. Dirty detection (`BookingChangeTracker::isDirty()`) always compares the live session DTO against the original API state, not against the draft.
|
||||||
|
- Mutability is always patched from fresh or cached data before rendering. The DTO travel object is the authoritative source of which fields are editable at render time.
|
||||||
|
- Drafts survive cancel but not reload, and are deleted on successful submission.
|
||||||
@@ -0,0 +1,122 @@
|
|||||||
|
# Service Simplification Plan
|
||||||
|
|
||||||
|
Status: active
|
||||||
|
Last updated: 2026-04-13
|
||||||
|
|
||||||
|
## Purpose
|
||||||
|
|
||||||
|
This document tracks the next pass of service simplification work. The goal is to reduce orchestration density, make the booking flow easier to follow for a human reader, and keep responsibilities aligned with the actual boundaries in the code.
|
||||||
|
|
||||||
|
The emphasis is not on deleting services for its own sake. The emphasis is on:
|
||||||
|
- keeping one clear owner for each meaningful boundary
|
||||||
|
- removing thin wrappers and pass-through helpers
|
||||||
|
- avoiding services that mostly shuffle data between layers
|
||||||
|
- keeping presentation concerns out of calculation and orchestration code
|
||||||
|
|
||||||
|
## Current Read
|
||||||
|
|
||||||
|
The codebase is already in a better place than it was at the start of the refactor, but a few services still carry more than one responsibility:
|
||||||
|
|
||||||
|
- `BookingService` now mostly covers booking bootstrap, service preselection, and booking status rules.
|
||||||
|
- `BookingParticipantCountService` was removed — its logic lives as a private method in the one controller that needed it (`Step2Controller`).
|
||||||
|
- `BookingRoomSelectionService` was removed — its logic lives as a private method in `BookingCreateContextFactory`.
|
||||||
|
- `BookingSummaryParticipantCountService` was removed — its logic lives as a private method in `BookingSummaryDataService`.
|
||||||
|
- `ParticipantPrepopulationService` now owns applicant prefill plus the create-mode dummy-data shortcut.
|
||||||
|
- `BookingEditParticipantContextFactory` now prepares the edit participant page context directly, replacing the older pass-through participant form service.
|
||||||
|
- `BookingPriceCalculatorService` is focused on pricing, but it still sits close to display-oriented behavior in adjacent code paths.
|
||||||
|
- `TravelDataService` remains broad and is likely the next larger boundary after booking orchestration is reduced.
|
||||||
|
|
||||||
|
One registry stands out as a real orchestration boundary and should be left alone for now:
|
||||||
|
- `ParticipantFieldHandlerRegistry`
|
||||||
|
|
||||||
|
It is not just a lookup table. It owns execution order, edit-mode mutability gating, and synchronization of submitted form data back into the DTO state.
|
||||||
|
|
||||||
|
## Next Pass
|
||||||
|
|
||||||
|
### 1. Keep pricing calculation focused
|
||||||
|
|
||||||
|
Primary goal: keep pricing code about pricing, not rendering.
|
||||||
|
|
||||||
|
Concrete next steps:
|
||||||
|
- keep `BookingPriceCalculatorService` as the pricing boundary
|
||||||
|
- continue removing display formatting from pricing code paths
|
||||||
|
- keep any remaining view-specific formatting in the presentation layer or a dedicated UI helper
|
||||||
|
- avoid introducing another service that only formats values already known to the view
|
||||||
|
|
||||||
|
Decision rule:
|
||||||
|
- if a value is only needed for display, prefer exposing the raw numeric/domain value and formatting it as close to the UI as possible
|
||||||
|
|
||||||
|
### 2. Leave the field-handler registry in place
|
||||||
|
|
||||||
|
Primary goal: avoid unnecessary churn in a class that is already a meaningful orchestration layer.
|
||||||
|
|
||||||
|
Concrete next steps:
|
||||||
|
- do not refactor `ParticipantFieldHandlerRegistry` in this pass
|
||||||
|
- revisit only if a later change can split ordering, mutability, and synchronization into clear collaborators without making the flow harder to trace
|
||||||
|
|
||||||
|
Decision rule:
|
||||||
|
- if a registry owns actual workflow behavior, treat it as a boundary rather than a smell
|
||||||
|
|
||||||
|
## Follow-Up Queue
|
||||||
|
|
||||||
|
After the booking service pass, the next likely candidates are:
|
||||||
|
|
||||||
|
### `TravelDataService`
|
||||||
|
|
||||||
|
This is the largest broad service still in the codebase. It likely needs a later pass if the application should become easier to follow end to end.
|
||||||
|
|
||||||
|
Likely directions:
|
||||||
|
- separate runtime travel loading from cache/snapshot maintenance if the public API still feels too wide
|
||||||
|
- keep the read path explicit and avoid hiding maintenance work behind one large method surface
|
||||||
|
|
||||||
|
### `BookingPriceCalculatorService`
|
||||||
|
|
||||||
|
This service should stay focused on pricing logic, but it may still have room for further internal cleanup if more display or transport aggregation concerns surface.
|
||||||
|
|
||||||
|
Likely directions:
|
||||||
|
- keep calculation responsibilities together
|
||||||
|
- avoid dragging presentation behavior back into the calculator
|
||||||
|
- split only if a sub-boundary becomes obvious and reusable
|
||||||
|
|
||||||
|
### `ParticipantFieldHandlerRegistry`
|
||||||
|
|
||||||
|
This stays on the list only as a future optional refactor, not as an immediate target.
|
||||||
|
|
||||||
|
Likely directions, only if justified later:
|
||||||
|
- isolate ordering/sorting logic if it becomes independently meaningful
|
||||||
|
- split synchronization code if a clearer DTO/form boundary emerges
|
||||||
|
- otherwise leave it as the central orchestration point for participant field processing
|
||||||
|
|
||||||
|
## Current Notes
|
||||||
|
|
||||||
|
- `templates/booking/_summary_travel_info.html.twig` already renders the summary participant count directly, so the remaining work here is naming and contract clarity rather than Twig branching.
|
||||||
|
- The summary count still needs a clear name if the code should distinguish the display-oriented count from the canonical participant total in the DTO/service layer.
|
||||||
|
- `ParticipantFormSupportService` was reviewed and kept: it is shared between two controllers (`Step2ParticipantController` and `Edit/ParticipantController`) with real shared logic, not just delegation.
|
||||||
|
|
||||||
|
## Progress Tracker
|
||||||
|
|
||||||
|
| Item | Status | Notes |
|
||||||
|
|------|--------|-------|
|
||||||
|
| Participant card DTO cleanup | Done | Card data now uses typed DTOs instead of nested array payloads |
|
||||||
|
| Room label formatting cleanup | Done | Pricing labels now have a dedicated presentation helper |
|
||||||
|
| Booking service split | Done | Session lifecycle, hydration, baseline snapshot, return URL handling, room grouping, and participant count shaping moved out of `BookingService` |
|
||||||
|
| Dummy prefill extraction | Done | Moved into `ParticipantPrepopulationService` |
|
||||||
|
| Micro-service consolidation | Done | `BookingRoomSelectionService`, `BookingParticipantCountService`, `BookingSummaryParticipantCountService` inlined into their single callers |
|
||||||
|
| Pricing service review | Pending | Keep focused on calculation, not rendering |
|
||||||
|
| Travel data service review | Pending | Broad boundary, likely later pass |
|
||||||
|
| Participant field registry review | Deferred | Real orchestration boundary, intentionally left alone for now |
|
||||||
|
|
||||||
|
## Acceptance Criteria
|
||||||
|
|
||||||
|
The next booking-service pass is only worth keeping if it:
|
||||||
|
- reduces the number of unrelated responsibilities in `BookingService`
|
||||||
|
- makes the booking flow easier to trace from controller to session/DTO state
|
||||||
|
- preserves existing booking behavior and test coverage
|
||||||
|
- does not replace one large service with several generic "manager" classes
|
||||||
|
|
||||||
|
## Working Agreement
|
||||||
|
|
||||||
|
- Update this document as decisions are made.
|
||||||
|
- Record rejected simplification ideas here with a short reason.
|
||||||
|
- Keep the plan aligned with actual code, not with an abstract architecture ideal.
|
||||||
|
- If a future simplification does not clearly reduce cognitive load, do not add it.
|
||||||
@@ -886,10 +886,9 @@ Keys stored in `config/secret/` directory.
|
|||||||
|
|
||||||
**Location:** `src/Security/Voter/BookingVoter.php`
|
**Location:** `src/Security/Voter/BookingVoter.php`
|
||||||
|
|
||||||
| Operation | Requirements |
|
This voter currently exists as legacy authorization logic and is not actively invoked by booking controllers.
|
||||||
|-----------|--------------|
|
|
||||||
| `VIEW` | User owns booking (addressId match) |
|
Current booking routes (`/bookings/*`) are guarded with `ROLE_USER`, while final document access checks are enforced by BusProNet.
|
||||||
| `EDIT` | User owns booking AND booking is editable |
|
|
||||||
|
|
||||||
### 7.4 OAuth2
|
### 7.4 OAuth2
|
||||||
|
|
||||||
@@ -1154,6 +1153,19 @@ php bin/console app:cleanup:xml-dumps
|
|||||||
|
|
||||||
Removes XML debug dumps older than 3 days.
|
Removes XML debug dumps older than 3 days.
|
||||||
|
|
||||||
|
#### app:cleanup:newsletter-opt-in-requests
|
||||||
|
|
||||||
|
```bash
|
||||||
|
php bin/console app:cleanup:newsletter-opt-in-requests
|
||||||
|
```
|
||||||
|
|
||||||
|
Removes expired pending newsletter double opt-in requests.
|
||||||
|
|
||||||
|
- Request TTL is controlled by `NEWSLETTER_CONFIRMATION_TTL_HOURS` (default: 1 hour).
|
||||||
|
- Expired pending requests are removed immediately when they are encountered (new request / confirmation attempt).
|
||||||
|
- Scheduled cleanup removes all currently expired pending requests (`expires_at <= now`) as a safety net.
|
||||||
|
- Confirmed requests are retained for audit/legal traceability.
|
||||||
|
|
||||||
### 10.3 Setup Commands
|
### 10.3 Setup Commands
|
||||||
|
|
||||||
#### app:crypto:generate-keys
|
#### app:crypto:generate-keys
|
||||||
|
|||||||
+42
-7
@@ -34,7 +34,7 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"prod": {
|
"staging": {
|
||||||
"Security": {
|
"Security": {
|
||||||
"Auth": {
|
"Auth": {
|
||||||
"oauth2_email": {
|
"oauth2_email": {
|
||||||
@@ -42,8 +42,8 @@
|
|||||||
"Grant Type": "Authorization Code",
|
"Grant Type": "Authorization Code",
|
||||||
"Client ID": "{{oauth2_client_id}}",
|
"Client ID": "{{oauth2_client_id}}",
|
||||||
"Client Secret": "{{oauth2_client_secret}}",
|
"Client Secret": "{{oauth2_client_secret}}",
|
||||||
"Auth URL": "https://myep.ep-reisen.de/authorize",
|
"Auth URL": "https://my.ep-reisen.net/authorize",
|
||||||
"Token URL": "https://myep.ep-reisen.de/token",
|
"Token URL": "https://my.ep-reisen.net/token",
|
||||||
"Redirect URL": "https://myep-team.ep-reisen.de/auth/check",
|
"Redirect URL": "https://myep-team.ep-reisen.de/auth/check",
|
||||||
"Scope": "email"
|
"Scope": "email"
|
||||||
},
|
},
|
||||||
@@ -52,8 +52,8 @@
|
|||||||
"Grant Type": "Authorization Code",
|
"Grant Type": "Authorization Code",
|
||||||
"Client ID": "{{oauth2_client_id}}",
|
"Client ID": "{{oauth2_client_id}}",
|
||||||
"Client Secret": "{{oauth2_client_secret}}",
|
"Client Secret": "{{oauth2_client_secret}}",
|
||||||
"Auth URL": "https://myep.ep-reisen.de/authorize",
|
"Auth URL": "https://my.ep-reisen.net/authorize",
|
||||||
"Token URL": "https://myep.ep-reisen.de/token",
|
"Token URL": "https://my.ep-reisen.net/token",
|
||||||
"Redirect URL": "https://myep-team.ep-reisen.de/auth/check",
|
"Redirect URL": "https://myep-team.ep-reisen.de/auth/check",
|
||||||
"Scope": "email profile"
|
"Scope": "email profile"
|
||||||
},
|
},
|
||||||
@@ -62,8 +62,43 @@
|
|||||||
"Grant Type": "Client Credentials",
|
"Grant Type": "Client Credentials",
|
||||||
"Client ID": "{{oauth2_api_client_id}}",
|
"Client ID": "{{oauth2_api_client_id}}",
|
||||||
"Client Secret": "{{oauth2_api_client_secret}}",
|
"Client Secret": "{{oauth2_api_client_secret}}",
|
||||||
"Auth URL": "https://myep.ep-reisen.de/authorize",
|
"Auth URL": "https://my.ep-reisen.net/authorize",
|
||||||
"Token URL": "https://myep.ep-reisen.de/token",
|
"Token URL": "https://my.ep-reisen.net/token",
|
||||||
|
"Scope": "api"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"prod": {
|
||||||
|
"Security": {
|
||||||
|
"Auth": {
|
||||||
|
"oauth2_email": {
|
||||||
|
"Type": "OAuth2",
|
||||||
|
"Grant Type": "Authorization Code",
|
||||||
|
"Client ID": "{{oauth2_client_id}}",
|
||||||
|
"Client Secret": "{{oauth2_client_secret}}",
|
||||||
|
"Auth URL": "https://my.ep-reisen.de/authorize",
|
||||||
|
"Token URL": "https://my.ep-reisen.de/token",
|
||||||
|
"Redirect URL": "https://myep-team.ep-reisen.de/auth/check",
|
||||||
|
"Scope": "email"
|
||||||
|
},
|
||||||
|
"oauth2_profile": {
|
||||||
|
"Type": "OAuth2",
|
||||||
|
"Grant Type": "Authorization Code",
|
||||||
|
"Client ID": "{{oauth2_client_id}}",
|
||||||
|
"Client Secret": "{{oauth2_client_secret}}",
|
||||||
|
"Auth URL": "https://my.ep-reisen.de/authorize",
|
||||||
|
"Token URL": "https://my.ep-reisen.de/token",
|
||||||
|
"Redirect URL": "https://myep-team.ep-reisen.de/auth/check",
|
||||||
|
"Scope": "email profile"
|
||||||
|
},
|
||||||
|
"oauth2_api": {
|
||||||
|
"Type": "OAuth2",
|
||||||
|
"Grant Type": "Client Credentials",
|
||||||
|
"Client ID": "{{oauth2_api_client_id}}",
|
||||||
|
"Client Secret": "{{oauth2_api_client_secret}}",
|
||||||
|
"Auth URL": "https://my.ep-reisen.de/authorize",
|
||||||
|
"Token URL": "https://my.ep-reisen.de/token",
|
||||||
"Scope": "api"
|
"Scope": "api"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+191
@@ -0,0 +1,191 @@
|
|||||||
|
###
|
||||||
|
# Mailjet API test requests for IntelliJ HTTP Client
|
||||||
|
#
|
||||||
|
# 1) Fill in variables below (or move them to http-client.private.env.json).
|
||||||
|
# 2) Set `mailjet_api_key` and `mailjet_api_secret` in your env file.
|
||||||
|
# IntelliJ HTTP Client will inject them into the Authorization header below.
|
||||||
|
#
|
||||||
|
# Required variables:
|
||||||
|
# - mailjet_base_url (example: https://api.mailjet.com/v3/REST)
|
||||||
|
# - mailjet_api_key
|
||||||
|
# - mailjet_api_secret
|
||||||
|
# - mailjet_contact_email
|
||||||
|
# - mailjet_list_id
|
||||||
|
#
|
||||||
|
# @no-cookie-jar
|
||||||
|
|
||||||
|
### Mailjet health check (authenticated)
|
||||||
|
# @no-cookie-jar
|
||||||
|
GET {{mailjet_base_url}}/apikey
|
||||||
|
Accept: application/json
|
||||||
|
Authorization: Basic {{mailjet_api_key}} {{mailjet_api_secret}}
|
||||||
|
|
||||||
|
|
||||||
|
### Find contact by email
|
||||||
|
# @no-cookie-jar
|
||||||
|
GET {{mailjet_base_url}}/contact?Email={{mailjet_contact_email}}
|
||||||
|
Accept: application/json
|
||||||
|
Authorization: Basic {{mailjet_api_key}} {{mailjet_api_secret}}
|
||||||
|
|
||||||
|
> {%
|
||||||
|
if (response.body && response.body.Data && response.body.Data.length > 0) {
|
||||||
|
client.global.set("contact_id", String(response.body.Data[0].ID));
|
||||||
|
}
|
||||||
|
%}
|
||||||
|
|
||||||
|
|
||||||
|
### Create contact (run if not found)
|
||||||
|
# @no-cookie-jar
|
||||||
|
POST {{mailjet_base_url}}/contact
|
||||||
|
Accept: application/json
|
||||||
|
Content-Type: application/json
|
||||||
|
Authorization: Basic {{mailjet_api_key}} {{mailjet_api_secret}}
|
||||||
|
|
||||||
|
{
|
||||||
|
"Email": "{{mailjet_contact_email}}",
|
||||||
|
"IsExcludedFromCampaigns": false
|
||||||
|
}
|
||||||
|
|
||||||
|
> {%
|
||||||
|
if (response.body && response.body.Data && response.body.Data.length > 0) {
|
||||||
|
client.global.set("contact_id", String(response.body.Data[0].ID));
|
||||||
|
}
|
||||||
|
%}
|
||||||
|
|
||||||
|
|
||||||
|
### Get contact by ID (after find/create)
|
||||||
|
# @no-cookie-jar
|
||||||
|
GET {{mailjet_base_url}}/contact/{{contact_id}}
|
||||||
|
Accept: application/json
|
||||||
|
Authorization: Basic {{mailjet_api_key}} {{mailjet_api_secret}}
|
||||||
|
|
||||||
|
|
||||||
|
### Mark contact as subscribed (opt-in)
|
||||||
|
# @no-cookie-jar
|
||||||
|
PUT {{mailjet_base_url}}/contact/{{contact_id}}
|
||||||
|
Accept: application/json
|
||||||
|
Content-Type: application/json
|
||||||
|
Authorization: Basic {{mailjet_api_key}} {{mailjet_api_secret}}
|
||||||
|
|
||||||
|
{
|
||||||
|
"IsExcludedFromCampaigns": false
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
### Mark contact as unsubscribed (opt-out)
|
||||||
|
# @no-cookie-jar
|
||||||
|
PUT {{mailjet_base_url}}/contact/{{contact_id}}
|
||||||
|
Accept: application/json
|
||||||
|
Content-Type: application/json
|
||||||
|
Authorization: Basic {{mailjet_api_key}} {{mailjet_api_secret}}
|
||||||
|
|
||||||
|
{
|
||||||
|
"IsExcludedFromCampaigns": true
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
### Get newsletter list by ID
|
||||||
|
# @no-cookie-jar
|
||||||
|
GET {{mailjet_base_url}}/contactslist/{{mailjet_list_id}}
|
||||||
|
Accept: application/json
|
||||||
|
Authorization: Basic {{mailjet_api_key}} {{mailjet_api_secret}}
|
||||||
|
|
||||||
|
|
||||||
|
### List all available contact lists
|
||||||
|
# @no-cookie-jar
|
||||||
|
GET {{mailjet_base_url}}/contactslist?Limit=1000
|
||||||
|
Accept: application/json
|
||||||
|
Authorization: Basic {{mailjet_api_key}} {{mailjet_api_secret}}
|
||||||
|
|
||||||
|
|
||||||
|
### Check list recipient status (before actions)
|
||||||
|
# @no-cookie-jar
|
||||||
|
GET {{mailjet_base_url}}/listrecipient?ContactsList={{mailjet_list_id}}&Contact={{contact_id}}
|
||||||
|
Accept: application/json
|
||||||
|
Authorization: Basic {{mailjet_api_key}} {{mailjet_api_secret}}
|
||||||
|
|
||||||
|
> {%
|
||||||
|
if (response.body && response.body.Data && response.body.Data.length > 0) {
|
||||||
|
client.global.set("listrecipient_id", String(response.body.Data[0].ID));
|
||||||
|
}
|
||||||
|
%}
|
||||||
|
|
||||||
|
|
||||||
|
### Subscribe to list (addnoforce)
|
||||||
|
# @no-cookie-jar
|
||||||
|
POST {{mailjet_base_url}}/contactslist/{{mailjet_list_id}}/managecontact
|
||||||
|
Accept: application/json
|
||||||
|
Content-Type: application/json
|
||||||
|
Authorization: Basic {{mailjet_api_key}} {{mailjet_api_secret}}
|
||||||
|
|
||||||
|
{
|
||||||
|
"Action": "addnoforce",
|
||||||
|
"Email": "{{mailjet_contact_email}}"
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
### Verify list recipient after addnoforce
|
||||||
|
# @no-cookie-jar
|
||||||
|
GET {{mailjet_base_url}}/listrecipient?ContactsList={{mailjet_list_id}}&Contact={{contact_id}}
|
||||||
|
Accept: application/json
|
||||||
|
Authorization: Basic {{mailjet_api_key}} {{mailjet_api_secret}}
|
||||||
|
|
||||||
|
|
||||||
|
### Unsubscribe from list (unsub)
|
||||||
|
# @no-cookie-jar
|
||||||
|
POST {{mailjet_base_url}}/contactslist/{{mailjet_list_id}}/managecontact
|
||||||
|
Accept: application/json
|
||||||
|
Content-Type: application/json
|
||||||
|
Authorization: Basic {{mailjet_api_key}} {{mailjet_api_secret}}
|
||||||
|
|
||||||
|
{
|
||||||
|
"Action": "unsub",
|
||||||
|
"Email": "{{mailjet_contact_email}}"
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
### Verify list recipient after unsub
|
||||||
|
# @no-cookie-jar
|
||||||
|
GET {{mailjet_base_url}}/listrecipient?ContactsList={{mailjet_list_id}}&Contact={{contact_id}}
|
||||||
|
Accept: application/json
|
||||||
|
Authorization: Basic {{mailjet_api_key}} {{mailjet_api_secret}}
|
||||||
|
|
||||||
|
|
||||||
|
### Re-subscribe attempt with addnoforce (expected to keep unsubscribed state)
|
||||||
|
# @no-cookie-jar
|
||||||
|
POST {{mailjet_base_url}}/contactslist/{{mailjet_list_id}}/managecontact
|
||||||
|
Accept: application/json
|
||||||
|
Content-Type: application/json
|
||||||
|
Authorization: Basic {{mailjet_api_key}} {{mailjet_api_secret}}
|
||||||
|
|
||||||
|
{
|
||||||
|
"Action": "addnoforce",
|
||||||
|
"Email": "{{mailjet_contact_email}}"
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
### Verify list recipient after addnoforce re-subscribe attempt
|
||||||
|
# @no-cookie-jar
|
||||||
|
GET {{mailjet_base_url}}/listrecipient?ContactsList={{mailjet_list_id}}&Contact={{contact_id}}
|
||||||
|
Accept: application/json
|
||||||
|
Authorization: Basic {{mailjet_api_key}} {{mailjet_api_secret}}
|
||||||
|
|
||||||
|
|
||||||
|
### Re-subscribe with addforce (expected to re-subscribe)
|
||||||
|
# @no-cookie-jar
|
||||||
|
POST {{mailjet_base_url}}/contactslist/{{mailjet_list_id}}/managecontact
|
||||||
|
Accept: application/json
|
||||||
|
Content-Type: application/json
|
||||||
|
Authorization: Basic {{mailjet_api_key}} {{mailjet_api_secret}}
|
||||||
|
|
||||||
|
{
|
||||||
|
"Action": "addforce",
|
||||||
|
"Email": "{{mailjet_contact_email}}"
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
### Verify list recipient after addforce
|
||||||
|
# @no-cookie-jar
|
||||||
|
GET {{mailjet_base_url}}/listrecipient?ContactsList={{mailjet_list_id}}&Contact={{contact_id}}
|
||||||
|
Accept: application/json
|
||||||
|
Authorization: Basic {{mailjet_api_key}} {{mailjet_api_secret}}
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace DoctrineMigrations;
|
||||||
|
|
||||||
|
use Doctrine\DBAL\Schema\Schema;
|
||||||
|
use Doctrine\Migrations\AbstractMigration;
|
||||||
|
|
||||||
|
final class Version20260318113000 extends AbstractMigration
|
||||||
|
{
|
||||||
|
public function getDescription(): string
|
||||||
|
{
|
||||||
|
return 'Create newsletter_opt_in_confirmation table for double opt-in confirmations';
|
||||||
|
}
|
||||||
|
|
||||||
|
public function up(Schema $schema): void
|
||||||
|
{
|
||||||
|
$this->addSql("CREATE TABLE newsletter_opt_in_confirmation (id INT AUTO_INCREMENT NOT NULL, email VARCHAR(255) NOT NULL, token_hash VARCHAR(64) NOT NULL, expires_at DATETIME NOT NULL COMMENT '(DC2Type:datetime_immutable)', confirmed_at DATETIME DEFAULT NULL COMMENT '(DC2Type:datetime_immutable)', created_at DATETIME NOT NULL COMMENT '(DC2Type:datetime_immutable)', UNIQUE INDEX UNIQ_NEWSLETTER_OPT_IN_TOKEN_HASH (token_hash), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB");
|
||||||
|
}
|
||||||
|
|
||||||
|
public function down(Schema $schema): void
|
||||||
|
{
|
||||||
|
$this->addSql('DROP TABLE newsletter_opt_in_confirmation');
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,28 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace DoctrineMigrations;
|
||||||
|
|
||||||
|
use Doctrine\DBAL\Schema\Schema;
|
||||||
|
use Doctrine\Migrations\AbstractMigration;
|
||||||
|
|
||||||
|
final class Version20260320071724 extends AbstractMigration
|
||||||
|
{
|
||||||
|
public function getDescription(): string
|
||||||
|
{
|
||||||
|
return 'Add error_code column and index to log_entry table';
|
||||||
|
}
|
||||||
|
|
||||||
|
public function up(Schema $schema): void
|
||||||
|
{
|
||||||
|
$this->addSql('ALTER TABLE log_entry ADD error_code VARCHAR(12) DEFAULT NULL');
|
||||||
|
$this->addSql('CREATE INDEX IDX_LOG_ENTRY_ERROR_CODE ON log_entry (error_code)');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function down(Schema $schema): void
|
||||||
|
{
|
||||||
|
$this->addSql('DROP INDEX IDX_LOG_ENTRY_ERROR_CODE ON log_entry');
|
||||||
|
$this->addSql('ALTER TABLE log_entry DROP error_code');
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace DoctrineMigrations;
|
||||||
|
|
||||||
|
use Doctrine\DBAL\Schema\Schema;
|
||||||
|
use Doctrine\Migrations\AbstractMigration;
|
||||||
|
|
||||||
|
final class Version20260321120000 extends AbstractMigration
|
||||||
|
{
|
||||||
|
public function getDescription(): string
|
||||||
|
{
|
||||||
|
return 'Create travel_snapshot table for DB-primary travel persistence';
|
||||||
|
}
|
||||||
|
|
||||||
|
public function up(Schema $schema): void
|
||||||
|
{
|
||||||
|
$this->addSql('CREATE TABLE travel_snapshot (id INT AUTO_INCREMENT NOT NULL, date_id INT NOT NULL, hotel_id INT NOT NULL, date_code VARCHAR(64) DEFAULT NULL, label VARCHAR(255) DEFAULT NULL, product_id INT DEFAULT NULL, product_code VARCHAR(64) DEFAULT NULL, hotel_code VARCHAR(64) DEFAULT NULL, hotel_label VARCHAR(255) DEFAULT NULL, date_from DATE DEFAULT NULL COMMENT \'(DC2Type:date_immutable)\', date_to DATE DEFAULT NULL COMMENT \'(DC2Type:date_immutable)\', payload LONGTEXT NOT NULL, payload_hash VARCHAR(64) NOT NULL, captured_at DATETIME NOT NULL COMMENT \'(DC2Type:datetime_immutable)\', updated_at DATETIME NOT NULL COMMENT \'(DC2Type:datetime_immutable)\', extended_refreshed_at DATETIME DEFAULT NULL COMMENT \'(DC2Type:datetime_immutable)\', UNIQUE INDEX uniq_snapshot_date_hotel (date_id, hotel_id), INDEX idx_snapshot_date_code (date_code), INDEX idx_snapshot_product_id (product_id), INDEX idx_snapshot_date_to (date_to), INDEX idx_snapshot_extended_refreshed_at (extended_refreshed_at), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function down(Schema $schema): void
|
||||||
|
{
|
||||||
|
$this->addSql('DROP TABLE travel_snapshot');
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,45 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace DoctrineMigrations;
|
||||||
|
|
||||||
|
use Doctrine\DBAL\Schema\Schema;
|
||||||
|
use Doctrine\Migrations\AbstractMigration;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Auto-generated Migration: Please modify to your needs!
|
||||||
|
*/
|
||||||
|
final class Version20260323182524 extends AbstractMigration
|
||||||
|
{
|
||||||
|
public function getDescription(): string
|
||||||
|
{
|
||||||
|
return '';
|
||||||
|
}
|
||||||
|
|
||||||
|
public function up(Schema $schema): void
|
||||||
|
{
|
||||||
|
// this up() migration is auto-generated, please modify it to your needs
|
||||||
|
$this->addSql('ALTER TABLE booking_edit_draft CHANGE form_data form_data JSON NOT NULL');
|
||||||
|
$this->addSql('ALTER TABLE log_entry CHANGE context context JSON DEFAULT NULL, CHANGE extra extra JSON DEFAULT NULL');
|
||||||
|
$this->addSql('ALTER TABLE newsletter_opt_in_confirmation RENAME INDEX uniq_newsletter_opt_in_token_hash TO UNIQ_70505214B3BC57DA');
|
||||||
|
$this->addSql('ALTER TABLE user CHANGE roles roles JSON NOT NULL, CHANGE hotel_codes hotel_codes JSON NOT NULL');
|
||||||
|
$this->addSql('DROP INDEX IDX_75EA56E0FB7336F0 ON messenger_messages');
|
||||||
|
$this->addSql('DROP INDEX IDX_75EA56E0E3BD61CE ON messenger_messages');
|
||||||
|
$this->addSql('DROP INDEX IDX_75EA56E016BA31DB ON messenger_messages');
|
||||||
|
$this->addSql('CREATE INDEX IDX_75EA56E0FB7336F0E3BD61CE16BA31DBBF396750 ON messenger_messages (queue_name, available_at, delivered_at, id)');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function down(Schema $schema): void
|
||||||
|
{
|
||||||
|
// this down() migration is auto-generated, please modify it to your needs
|
||||||
|
$this->addSql('ALTER TABLE newsletter_opt_in_confirmation RENAME INDEX uniq_70505214b3bc57da TO UNIQ_NEWSLETTER_OPT_IN_TOKEN_HASH');
|
||||||
|
$this->addSql('ALTER TABLE user CHANGE roles roles JSON NOT NULL COLLATE `utf8mb4_bin`, CHANGE hotel_codes hotel_codes JSON NOT NULL COLLATE `utf8mb4_bin`');
|
||||||
|
$this->addSql('DROP INDEX IDX_75EA56E0FB7336F0E3BD61CE16BA31DBBF396750 ON messenger_messages');
|
||||||
|
$this->addSql('CREATE INDEX IDX_75EA56E0FB7336F0 ON messenger_messages (queue_name)');
|
||||||
|
$this->addSql('CREATE INDEX IDX_75EA56E0E3BD61CE ON messenger_messages (available_at)');
|
||||||
|
$this->addSql('CREATE INDEX IDX_75EA56E016BA31DB ON messenger_messages (delivered_at)');
|
||||||
|
$this->addSql('ALTER TABLE log_entry CHANGE context context JSON DEFAULT NULL COLLATE `utf8mb4_bin`, CHANGE extra extra JSON DEFAULT NULL COLLATE `utf8mb4_bin`');
|
||||||
|
$this->addSql('ALTER TABLE booking_edit_draft CHANGE form_data form_data JSON NOT NULL COLLATE `utf8mb4_bin`');
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,30 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace DoctrineMigrations;
|
||||||
|
|
||||||
|
use Doctrine\DBAL\Schema\Schema;
|
||||||
|
use Doctrine\Migrations\AbstractMigration;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Changes travel_snapshot.payload from TEXT to LONGTEXT so large
|
||||||
|
* plain JSON snapshot payloads can be stored safely.
|
||||||
|
*/
|
||||||
|
final class Version20260324120000 extends AbstractMigration
|
||||||
|
{
|
||||||
|
public function getDescription(): string
|
||||||
|
{
|
||||||
|
return 'Change travel_snapshot.payload from TEXT to LONGTEXT for plain JSON snapshot payloads';
|
||||||
|
}
|
||||||
|
|
||||||
|
public function up(Schema $schema): void
|
||||||
|
{
|
||||||
|
$this->addSql('ALTER TABLE travel_snapshot CHANGE payload payload LONGTEXT NOT NULL');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function down(Schema $schema): void
|
||||||
|
{
|
||||||
|
$this->addSql('ALTER TABLE travel_snapshot CHANGE payload payload TEXT NOT NULL');
|
||||||
|
}
|
||||||
|
}
|
||||||
Generated
+428
-881
File diff suppressed because it is too large.
Load diff
+2
-2
@@ -5,7 +5,7 @@
|
|||||||
"@babel/preset-env": "^7.16.0",
|
"@babel/preset-env": "^7.16.0",
|
||||||
"@hotwired/stimulus": "^3.0.0",
|
"@hotwired/stimulus": "^3.0.0",
|
||||||
"@symfony/stimulus-bridge": "^3.2.0",
|
"@symfony/stimulus-bridge": "^3.2.0",
|
||||||
"@symfony/webpack-encore": "^5.0.0",
|
"@symfony/webpack-encore": "^6.0.0",
|
||||||
"@tailwindcss/forms": "^0.5.9",
|
"@tailwindcss/forms": "^0.5.9",
|
||||||
"@tailwindcss/typography": "^0.5.15",
|
"@tailwindcss/typography": "^0.5.15",
|
||||||
"autoprefixer": "^10.4.20",
|
"autoprefixer": "^10.4.20",
|
||||||
@@ -20,7 +20,7 @@
|
|||||||
"tippy.js": "^6.3.7",
|
"tippy.js": "^6.3.7",
|
||||||
"toastify-js": "^1.12.0",
|
"toastify-js": "^1.12.0",
|
||||||
"webpack": "^5.74.0",
|
"webpack": "^5.74.0",
|
||||||
"webpack-cli": "^5.1.0",
|
"webpack-cli": "^6.0.1",
|
||||||
"webpack-notifier": "^1.15.0"
|
"webpack-notifier": "^1.15.0"
|
||||||
},
|
},
|
||||||
"license": "WTFPL",
|
"license": "WTFPL",
|
||||||
|
|||||||
@@ -0,0 +1,13 @@
|
|||||||
|
includes:
|
||||||
|
- vendor/phpstan/phpstan-symfony/extension.neon
|
||||||
|
- vendor/phpstan/phpstan-doctrine/extension.neon
|
||||||
|
|
||||||
|
parameters:
|
||||||
|
level: 6
|
||||||
|
paths:
|
||||||
|
- src
|
||||||
|
tmpDir: var/phpstan
|
||||||
|
symfony:
|
||||||
|
containerXmlPath: var/cache/dev/App_KernelDevDebugContainer.xml
|
||||||
|
doctrine:
|
||||||
|
objectManagerLoader: tests/doctrine-object-manager.php
|
||||||
@@ -7,11 +7,13 @@ use App\BusProNet\Exception\ApiClientException;
|
|||||||
use App\BusProNet\Exception\ImmediateConnectionCloseException;
|
use App\BusProNet\Exception\ImmediateConnectionCloseException;
|
||||||
use App\BusProNet\Exception\ResponseParserException;
|
use App\BusProNet\Exception\ResponseParserException;
|
||||||
use App\BusProNet\Exception\TimeoutException;
|
use App\BusProNet\Exception\TimeoutException;
|
||||||
|
use App\BusProNet\Model\Agency;
|
||||||
use App\BusProNet\Model\BaseData;
|
use App\BusProNet\Model\BaseData;
|
||||||
use App\BusProNet\Model\Booking;
|
use App\BusProNet\Model\Booking;
|
||||||
use App\BusProNet\Model\BookingResponse;
|
use App\BusProNet\Model\BookingResponse;
|
||||||
use App\BusProNet\Model\BookingUpdate;
|
use App\BusProNet\Model\BookingUpdate;
|
||||||
use App\BusProNet\Model\CrmAttributes;
|
use App\BusProNet\Model\CrmAttributes;
|
||||||
|
use App\BusProNet\Model\ExtendedServiceAvailabilityResponse;
|
||||||
use App\BusProNet\Model\Notification;
|
use App\BusProNet\Model\Notification;
|
||||||
use App\BusProNet\Model\PersonalData;
|
use App\BusProNet\Model\PersonalData;
|
||||||
use App\BusProNet\Model\PromoVoucher;
|
use App\BusProNet\Model\PromoVoucher;
|
||||||
@@ -38,6 +40,7 @@ class ApiClient
|
|||||||
public const TYPE_BASE_DATA_COUNTRIES = 'STAMMLAENDER';
|
public const TYPE_BASE_DATA_COUNTRIES = 'STAMMLAENDER';
|
||||||
public const TYPE_MUTABLE_DATA = 'MOEGLICHEAENDERUNGEN';
|
public const TYPE_MUTABLE_DATA = 'MOEGLICHEAENDERUNGEN';
|
||||||
public const TYPE_AVAILABILITY = 'VERFUEGBARKEIT';
|
public const TYPE_AVAILABILITY = 'VERFUEGBARKEIT';
|
||||||
|
public const TYPE_AVAILABILITY_EXTENDED = 'VERFUEGBARKEIT2';
|
||||||
public const TYPE_AVAILABILITY_HOTEL = 'VERFUEGBARKEITHOTEL';
|
public const TYPE_AVAILABILITY_HOTEL = 'VERFUEGBARKEITHOTEL';
|
||||||
public const TYPE_BOOKING_UPDATE = 'BUCHUNGAENDERUNG';
|
public const TYPE_BOOKING_UPDATE = 'BUCHUNGAENDERUNG';
|
||||||
public const TYPE_BOOKING = 'BUCHUNG';
|
public const TYPE_BOOKING = 'BUCHUNG';
|
||||||
@@ -47,11 +50,13 @@ class ApiClient
|
|||||||
public const TYPE_PURCHASE_VOUCHER = 'GUTSCHEINPRUEFUNGEINLOESUNG';
|
public const TYPE_PURCHASE_VOUCHER = 'GUTSCHEINPRUEFUNGEINLOESUNG';
|
||||||
public const TYPE_PROMO_VOUCHER = 'AKTIONSGUTSCHEIN';
|
public const TYPE_PROMO_VOUCHER = 'AKTIONSGUTSCHEIN';
|
||||||
|
|
||||||
|
/** @var array<string, mixed> */
|
||||||
private array $config;
|
private array $config;
|
||||||
private float $operationStartTime;
|
private float $operationStartTime;
|
||||||
private int $selectedPort;
|
private int $selectedPort;
|
||||||
private int $requestCounter = 0;
|
private int $requestCounter = 0;
|
||||||
|
|
||||||
|
/** @param array<string, mixed> $options */
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private readonly SerializerInterface $serializer,
|
private readonly SerializerInterface $serializer,
|
||||||
private readonly ApiResponseParser $responseParser,
|
private readonly ApiResponseParser $responseParser,
|
||||||
@@ -315,6 +320,21 @@ class ApiClient
|
|||||||
return $this->sendRequest(static::TYPE_AVAILABILITY, $data);
|
return $this->sendRequest(static::TYPE_AVAILABILITY, $data);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @throws ApiClientException
|
||||||
|
*/
|
||||||
|
public function getAvailabilitiesExtended(int $dateId): Notification|ExtendedServiceAvailabilityResponse
|
||||||
|
{
|
||||||
|
$data = [
|
||||||
|
'user' => $this->config['bpn_username'],
|
||||||
|
'key' => $this->createKey($this->config['bpn_username'], $this->config['bpn_password'], static::TYPE_AVAILABILITY_EXTENDED),
|
||||||
|
'satz' => ['@typ' => static::TYPE_AVAILABILITY_EXTENDED],
|
||||||
|
'idreise' => $dateId,
|
||||||
|
];
|
||||||
|
|
||||||
|
return $this->sendRequest(static::TYPE_AVAILABILITY_EXTENDED, $data);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @throws ApiClientException
|
* @throws ApiClientException
|
||||||
*/
|
*/
|
||||||
@@ -596,6 +616,10 @@ class ApiClient
|
|||||||
/**
|
/**
|
||||||
* @throws ApiClientException
|
* @throws ApiClientException
|
||||||
*/
|
*/
|
||||||
|
/**
|
||||||
|
* @param array<string, mixed> $data
|
||||||
|
* @param array<string, mixed> $additionalArgs
|
||||||
|
*/
|
||||||
private function sendRequest(string $type, array $data, array $additionalArgs = [], bool $debug = false): mixed
|
private function sendRequest(string $type, array $data, array $additionalArgs = [], bool $debug = false): mixed
|
||||||
{
|
{
|
||||||
return $this->executeWithRetry(fn () => $this->doSendRequest($type, $data, $additionalArgs, $debug), $type);
|
return $this->executeWithRetry(fn () => $this->doSendRequest($type, $data, $additionalArgs, $debug), $type);
|
||||||
@@ -604,6 +628,7 @@ class ApiClient
|
|||||||
/**
|
/**
|
||||||
* @throws ApiClientException
|
* @throws ApiClientException
|
||||||
*/
|
*/
|
||||||
|
/** @param array<string, mixed> $data */
|
||||||
private function sendRequestRaw(array $data): string
|
private function sendRequestRaw(array $data): string
|
||||||
{
|
{
|
||||||
return $this->executeWithRetry(fn () => $this->doSendRequestRaw($data));
|
return $this->executeWithRetry(fn () => $this->doSendRequestRaw($data));
|
||||||
@@ -659,6 +684,10 @@ class ApiClient
|
|||||||
* @throws ApiClientException
|
* @throws ApiClientException
|
||||||
* @throws ImmediateConnectionCloseException
|
* @throws ImmediateConnectionCloseException
|
||||||
*/
|
*/
|
||||||
|
/**
|
||||||
|
* @param array<string, mixed> $data
|
||||||
|
* @param array<string, mixed> $additionalArgs
|
||||||
|
*/
|
||||||
private function doSendRequest(string $type, array $data, array $additionalArgs = [], bool $debug = false): mixed
|
private function doSendRequest(string $type, array $data, array $additionalArgs = [], bool $debug = false): mixed
|
||||||
{
|
{
|
||||||
$requestId = $this->getRequestId();
|
$requestId = $this->getRequestId();
|
||||||
@@ -716,6 +745,8 @@ class ApiClient
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
* @param array<string, mixed> $data
|
||||||
|
*
|
||||||
* @throws ApiClientException
|
* @throws ApiClientException
|
||||||
* @throws ImmediateConnectionCloseException
|
* @throws ImmediateConnectionCloseException
|
||||||
*/
|
*/
|
||||||
@@ -777,6 +808,8 @@ class ApiClient
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
* @return resource
|
||||||
|
*
|
||||||
* @throws ApiClientException
|
* @throws ApiClientException
|
||||||
* @throws TimeoutException
|
* @throws TimeoutException
|
||||||
*/
|
*/
|
||||||
@@ -840,6 +873,8 @@ class ApiClient
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
* @param resource $socket
|
||||||
|
*
|
||||||
* @throws TimeoutException
|
* @throws TimeoutException
|
||||||
*/
|
*/
|
||||||
private function send($socket, string $data): void
|
private function send($socket, string $data): void
|
||||||
@@ -858,6 +893,8 @@ class ApiClient
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
* @param resource $socket
|
||||||
|
*
|
||||||
* @throws TimeoutException
|
* @throws TimeoutException
|
||||||
* @throws ImmediateConnectionCloseException
|
* @throws ImmediateConnectionCloseException
|
||||||
*/
|
*/
|
||||||
@@ -920,11 +957,17 @@ class ApiClient
|
|||||||
return $response;
|
return $response;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** @param resource $socket */
|
||||||
private function disconnect($socket): void
|
private function disconnect($socket): void
|
||||||
{
|
{
|
||||||
@fclose($socket);
|
@fclose($socket);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param array<string, mixed> $options
|
||||||
|
*
|
||||||
|
* @return array<string, mixed>
|
||||||
|
*/
|
||||||
private function resolveOptions(array $options): array
|
private function resolveOptions(array $options): array
|
||||||
{
|
{
|
||||||
$optionsResolver = new OptionsResolver();
|
$optionsResolver = new OptionsResolver();
|
||||||
|
|||||||
@@ -12,8 +12,8 @@ use App\Form\Model\BankAccountDto;
|
|||||||
use App\Form\Model\BookingDto;
|
use App\Form\Model\BookingDto;
|
||||||
use App\Form\Model\ParticipantDto;
|
use App\Form\Model\ParticipantDto;
|
||||||
use App\Form\Model\RoomSelectionDto;
|
use App\Form\Model\RoomSelectionDto;
|
||||||
use App\Service\BookingPriceCalculatorService;
|
use App\Service\BookingPriceCalculator;
|
||||||
use App\Service\InsuranceService;
|
use App\Service\InsuranceManager;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Processes booking form data and converts it into BusProNet API payload format.
|
* Processes booking form data and converts it into BusProNet API payload format.
|
||||||
@@ -25,8 +25,8 @@ use App\Service\InsuranceService;
|
|||||||
class BookingDataProcessor
|
class BookingDataProcessor
|
||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private readonly InsuranceService $insuranceService,
|
private readonly InsuranceManager $insuranceService,
|
||||||
private readonly BookingPriceCalculatorService $priceCalculatorService,
|
private readonly BookingPriceCalculator $priceCalculatorService,
|
||||||
private readonly ServiceMappingCollector $mappingCollector,
|
private readonly ServiceMappingCollector $mappingCollector,
|
||||||
private readonly ParticipantServiceProcessor $serviceProcessor,
|
private readonly ParticipantServiceProcessor $serviceProcessor,
|
||||||
private readonly BookingPayloadBuilder $payloadBuilder,
|
private readonly BookingPayloadBuilder $payloadBuilder,
|
||||||
@@ -73,14 +73,12 @@ class BookingDataProcessor
|
|||||||
if (0 === $index) {
|
if (0 === $index) {
|
||||||
// Copy address if first participant has no street (indicating empty/incomplete address)
|
// Copy address if first participant has no street (indicating empty/incomplete address)
|
||||||
// This allows applicant and first participant to be different people with different addresses
|
// This allows applicant and first participant to be different people with different addresses
|
||||||
if (null !== $booking->applicant->address) {
|
$isEmpty = null === $participantData->address
|
||||||
$isEmpty = null === $participantData->address
|
|| null === $participantData->address->street
|
||||||
|| null === $participantData->address->street
|
|| '' === trim($participantData->address->street);
|
||||||
|| '' === trim($participantData->address->street);
|
|
||||||
|
|
||||||
if ($isEmpty) {
|
if ($isEmpty) {
|
||||||
$participantData->address = clone $booking->applicant->address;
|
$participantData->address = clone $booking->applicant->address;
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Copy body dimensions from applicant if not present in participant
|
// Copy body dimensions from applicant if not present in participant
|
||||||
@@ -284,7 +282,7 @@ class BookingDataProcessor
|
|||||||
*
|
*
|
||||||
* @param BookingDto|null $formData The booking edit form data containing updated participant and service selections
|
* @param BookingDto|null $formData The booking edit form data containing updated participant and service selections
|
||||||
*
|
*
|
||||||
* @return array The structured payload array ready for BusProNet API submission
|
* @return array<string, mixed> The structured payload array ready for BusProNet API submission
|
||||||
*/
|
*/
|
||||||
public function createUpdateRequestPayload(?BookingDto $formData): array
|
public function createUpdateRequestPayload(?BookingDto $formData): array
|
||||||
{
|
{
|
||||||
@@ -345,7 +343,7 @@ class BookingDataProcessor
|
|||||||
* @param BookingDto $bookingDto The booking creation form data
|
* @param BookingDto $bookingDto The booking creation form data
|
||||||
* @param string $bookingType Either 'Anfrage' (inquiry) or 'Buchung' (final booking)
|
* @param string $bookingType Either 'Anfrage' (inquiry) or 'Buchung' (final booking)
|
||||||
*
|
*
|
||||||
* @return array The structured payload array for BusProNet API submission
|
* @return array<string, mixed> The structured payload array for BusProNet API submission
|
||||||
*/
|
*/
|
||||||
public function createBookingRequestPayload(BookingDto $bookingDto, string $bookingType): array
|
public function createBookingRequestPayload(BookingDto $bookingDto, string $bookingType): array
|
||||||
{
|
{
|
||||||
@@ -388,7 +386,7 @@ class BookingDataProcessor
|
|||||||
$participantPrices[$index] = $this->priceCalculatorService->calculateIndividualParticipantPriceExcludingInsurance($bookingDto, $index);
|
$participantPrices[$index] = $this->priceCalculatorService->calculateIndividualParticipantPriceExcludingInsurance($bookingDto, $index);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Use InsuranceService for proper type-based assignment with price tier matching
|
// Use InsuranceManager for proper type-based assignment with price tier matching
|
||||||
$assignments = $this->insuranceService->batchAssignInsuranceToParticipants(
|
$assignments = $this->insuranceService->batchAssignInsuranceToParticipants(
|
||||||
$selectableInsurances,
|
$selectableInsurances,
|
||||||
$applicant->insurance,
|
$applicant->insurance,
|
||||||
|
|||||||
@@ -6,8 +6,8 @@ namespace App\BusProNet\DataProcessor;
|
|||||||
|
|
||||||
use App\BusProNet\Constants;
|
use App\BusProNet\Constants;
|
||||||
use App\BusProNet\Model\Booking;
|
use App\BusProNet\Model\Booking;
|
||||||
use App\BusProNet\Service\ParticipantStatusRuleRegistry;
|
|
||||||
use App\Form\Model\BookingDto;
|
use App\Form\Model\BookingDto;
|
||||||
|
use App\Form\Model\ParticipantDto;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Builds API payload structures for BusProNet booking requests.
|
* Builds API payload structures for BusProNet booking requests.
|
||||||
@@ -17,9 +17,10 @@ use App\Form\Model\BookingDto;
|
|||||||
*/
|
*/
|
||||||
class BookingPayloadBuilder
|
class BookingPayloadBuilder
|
||||||
{
|
{
|
||||||
|
private const DEFAULT_PARTICIPANT_STATUS = 'F';
|
||||||
|
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private readonly ServiceMappingCollector $mappingCollector,
|
private readonly ServiceMappingCollector $mappingCollector,
|
||||||
private readonly ParticipantStatusRuleRegistry $statusRuleRegistry,
|
|
||||||
) {
|
) {
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -30,7 +31,7 @@ class BookingPayloadBuilder
|
|||||||
*
|
*
|
||||||
* @param Booking $bookingData The booking data object
|
* @param Booking $bookingData The booking data object
|
||||||
*
|
*
|
||||||
* @return array The base payload structure
|
* @return array<string, mixed> The base payload structure
|
||||||
*/
|
*/
|
||||||
public function buildBasePayload(Booking $bookingData): array
|
public function buildBasePayload(Booking $bookingData): array
|
||||||
{
|
{
|
||||||
@@ -66,8 +67,8 @@ class BookingPayloadBuilder
|
|||||||
*
|
*
|
||||||
* Bank account information is required for direct debit payments.
|
* Bank account information is required for direct debit payments.
|
||||||
*
|
*
|
||||||
* @param array $payload The payload array to modify
|
* @param array<string, mixed> $payload The payload array to modify
|
||||||
* @param Booking $bookingData The booking data object
|
* @param Booking $bookingData The booking data object
|
||||||
*/
|
*/
|
||||||
public function addBankAccountToPayload(array &$payload, Booking $bookingData): void
|
public function addBankAccountToPayload(array &$payload, Booking $bookingData): void
|
||||||
{
|
{
|
||||||
@@ -86,9 +87,9 @@ class BookingPayloadBuilder
|
|||||||
*
|
*
|
||||||
* Includes status, personal data, and wishes (room remarks, license plate) for each participant.
|
* Includes status, personal data, and wishes (room remarks, license plate) for each participant.
|
||||||
*
|
*
|
||||||
* @param array $payload The payload array to modify
|
* @param array<string, mixed> $payload The payload array to modify
|
||||||
* @param Booking $bookingData The booking data object
|
* @param Booking $bookingData The booking data object
|
||||||
* @param array $participantDtos The participant DTOs from the form (for wishes data)
|
* @param array<int, ParticipantDto> $participantDtos The participant DTOs from the form (for wishes data)
|
||||||
*/
|
*/
|
||||||
public function buildParticipantPayload(array &$payload, Booking $bookingData, array $participantDtos): void
|
public function buildParticipantPayload(array &$payload, Booking $bookingData, array $participantDtos): void
|
||||||
{
|
{
|
||||||
@@ -141,8 +142,8 @@ class BookingPayloadBuilder
|
|||||||
* Includes additional services, transportation services, and accommodation details
|
* Includes additional services, transportation services, and accommodation details
|
||||||
* with participant mappings and quantities.
|
* with participant mappings and quantities.
|
||||||
*
|
*
|
||||||
* @param array $payload The payload array to modify
|
* @param array<string, mixed> $payload The payload array to modify
|
||||||
* @param Booking $bookingData The booking data object
|
* @param Booking $bookingData The booking data object
|
||||||
*/
|
*/
|
||||||
public function buildServicesPayload(array &$payload, Booking $bookingData): void
|
public function buildServicesPayload(array &$payload, Booking $bookingData): void
|
||||||
{
|
{
|
||||||
@@ -198,8 +199,8 @@ class BookingPayloadBuilder
|
|||||||
*
|
*
|
||||||
* Only included in payload if there are actual pickup assignments for bus transportation.
|
* Only included in payload if there are actual pickup assignments for bus transportation.
|
||||||
*
|
*
|
||||||
* @param array $payload The payload array to modify
|
* @param array<string, mixed> $payload The payload array to modify
|
||||||
* @param Booking $bookingData The booking data object
|
* @param Booking $bookingData The booking data object
|
||||||
*/
|
*/
|
||||||
public function buildPickupPayload(array &$payload, Booking $bookingData): void
|
public function buildPickupPayload(array &$payload, Booking $bookingData): void
|
||||||
{
|
{
|
||||||
@@ -223,8 +224,8 @@ class BookingPayloadBuilder
|
|||||||
*
|
*
|
||||||
* Only included in payload if there are actual drop-off assignments for bus transportation.
|
* Only included in payload if there are actual drop-off assignments for bus transportation.
|
||||||
*
|
*
|
||||||
* @param array $payload The payload array to modify
|
* @param array<string, mixed> $payload The payload array to modify
|
||||||
* @param Booking $bookingData The booking data object
|
* @param Booking $bookingData The booking data object
|
||||||
*/
|
*/
|
||||||
public function buildDropOffPayload(array &$payload, Booking $bookingData): void
|
public function buildDropOffPayload(array &$payload, Booking $bookingData): void
|
||||||
{
|
{
|
||||||
@@ -249,7 +250,7 @@ class BookingPayloadBuilder
|
|||||||
* @param BookingDto $bookingDto The booking creation form data
|
* @param BookingDto $bookingDto The booking creation form data
|
||||||
* @param string $bookingType Either 'Anfrage' (inquiry) or 'Buchung' (final booking)
|
* @param string $bookingType Either 'Anfrage' (inquiry) or 'Buchung' (final booking)
|
||||||
*
|
*
|
||||||
* @return array The structured payload array for BusProNet API submission
|
* @return array<string, mixed> The structured payload array for BusProNet API submission
|
||||||
*/
|
*/
|
||||||
public function buildCreatePayload(BookingDto $bookingDto, string $bookingType): array
|
public function buildCreatePayload(BookingDto $bookingDto, string $bookingType): array
|
||||||
{
|
{
|
||||||
@@ -302,7 +303,7 @@ class BookingPayloadBuilder
|
|||||||
foreach ($bookingDto->participants as $index => $participant) {
|
foreach ($bookingDto->participants as $index => $participant) {
|
||||||
$participantData = [
|
$participantData = [
|
||||||
'@id' => $index + 1,
|
'@id' => $index + 1,
|
||||||
'status' => $this->statusRuleRegistry->evaluateStatus($participant),
|
'status' => self::DEFAULT_PARTICIPANT_STATUS,
|
||||||
'name' => $participant->lastName,
|
'name' => $participant->lastName,
|
||||||
'vorname' => $participant->firstName,
|
'vorname' => $participant->firstName,
|
||||||
'geschlecht' => $participant->gender ?? '',
|
'geschlecht' => $participant->gender ?? '',
|
||||||
@@ -439,11 +440,11 @@ class BookingPayloadBuilder
|
|||||||
* Generic helper method that converts service ID => participant IDs mappings
|
* Generic helper method that converts service ID => participant IDs mappings
|
||||||
* into XML payload structure.
|
* into XML payload structure.
|
||||||
*
|
*
|
||||||
* @param array $payload The payload array to modify
|
* @param array<string, mixed> $payload The payload array to modify
|
||||||
* @param string $sectionKey The section key (e.g., 'beförderungen', 'versicherungen')
|
* @param string $sectionKey The section key (e.g., 'beförderungen', 'versicherungen')
|
||||||
* @param string $itemKey The item key (e.g., 'beförderung', 'versicherung')
|
* @param string $itemKey The item key (e.g., 'beförderung', 'versicherung')
|
||||||
* @param string $idAttributeName The ID attribute name (e.g., '@idleistung', '@idversicherung')
|
* @param string $idAttributeName The ID attribute name (e.g., '@idleistung', '@idversicherung')
|
||||||
* @param array $serviceMap Map of service ID to participant IDs
|
* @param array<int|string, int[]> $serviceMap Map of service ID to participant IDs
|
||||||
*/
|
*/
|
||||||
public function addServicesFromMap(
|
public function addServicesFromMap(
|
||||||
array &$payload,
|
array &$payload,
|
||||||
@@ -475,9 +476,9 @@ class BookingPayloadBuilder
|
|||||||
* - abreise (departure date)
|
* - abreise (departure date)
|
||||||
* - anzahl (number of rooms of this type booked)
|
* - anzahl (number of rooms of this type booked)
|
||||||
*
|
*
|
||||||
* @param array $payload The payload array to modify
|
* @param array<string, mixed> $payload The payload array to modify
|
||||||
* @param array $roomMap Map of room ID to participant IDs
|
* @param array<int|string, int[]> $roomMap Map of room ID to participant IDs
|
||||||
* @param BookingDto $bookingDto The booking data for accessing room details and quantities
|
* @param BookingDto $bookingDto The booking data for accessing room details and quantities
|
||||||
*/
|
*/
|
||||||
public function addRoomMappingsToPayload(array &$payload, array $roomMap, BookingDto $bookingDto): void
|
public function addRoomMappingsToPayload(array &$payload, array $roomMap, BookingDto $bookingDto): void
|
||||||
{
|
{
|
||||||
@@ -520,8 +521,8 @@ class BookingPayloadBuilder
|
|||||||
/**
|
/**
|
||||||
* Adds purchase vouchers to the payload.
|
* Adds purchase vouchers to the payload.
|
||||||
*
|
*
|
||||||
* @param array $payload The payload array to modify
|
* @param array<string, mixed> $payload The payload array to modify
|
||||||
* @param BookingDto $bookingDto The booking data
|
* @param BookingDto $bookingDto The booking data
|
||||||
*/
|
*/
|
||||||
public function addPurchaseVouchersToPayload(array &$payload, BookingDto $bookingDto): void
|
public function addPurchaseVouchersToPayload(array &$payload, BookingDto $bookingDto): void
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -6,7 +6,6 @@ namespace App\BusProNet\DataProcessor;
|
|||||||
|
|
||||||
use App\BusProNet\Model\Address;
|
use App\BusProNet\Model\Address;
|
||||||
use App\BusProNet\Model\Booking;
|
use App\BusProNet\Model\Booking;
|
||||||
use App\BusProNet\Model\Communication;
|
|
||||||
use App\BusProNet\Model\PersonalData;
|
use App\BusProNet\Model\PersonalData;
|
||||||
use App\Form\Model\ParticipantDto;
|
use App\Form\Model\ParticipantDto;
|
||||||
|
|
||||||
@@ -86,9 +85,6 @@ class PersonalDataSynchronizer
|
|||||||
}
|
}
|
||||||
|
|
||||||
if ($participant->email || $participant->mobile) {
|
if ($participant->email || $participant->mobile) {
|
||||||
if (null === $bookingData->participants[$participant->index]->communication) {
|
|
||||||
$bookingData->participants[$participant->index]->communication = new Communication();
|
|
||||||
}
|
|
||||||
$bookingData->participants[$participant->index]->communication->email = $participant->email;
|
$bookingData->participants[$participant->index]->communication->email = $participant->email;
|
||||||
$bookingData->participants[$participant->index]->communication->mobile = $participant->mobile;
|
$bookingData->participants[$participant->index]->communication->mobile = $participant->mobile;
|
||||||
}
|
}
|
||||||
@@ -127,10 +123,6 @@ class PersonalDataSynchronizer
|
|||||||
$applicant->dateOfBirth = new \DateTimeImmutable('-20 years');
|
$applicant->dateOfBirth = new \DateTimeImmutable('-20 years');
|
||||||
}
|
}
|
||||||
|
|
||||||
if (null === $applicant->communication) {
|
|
||||||
$applicant->communication = new Communication();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (null === $applicant->communication->mobile || '' === $applicant->communication->mobile) {
|
if (null === $applicant->communication->mobile || '' === $applicant->communication->mobile) {
|
||||||
$applicant->communication->mobile = '12345';
|
$applicant->communication->mobile = '12345';
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ class ServiceMappingCollector
|
|||||||
*
|
*
|
||||||
* Groups participants by their assigned room ID.
|
* Groups participants by their assigned room ID.
|
||||||
*
|
*
|
||||||
* @return array<string, array<int>> Map of room ID to participant IDs
|
* @return array<int, list<int>> Map of room ID to participant IDs
|
||||||
*/
|
*/
|
||||||
public function collectRoomMappings(BookingDto $bookingDto): array
|
public function collectRoomMappings(BookingDto $bookingDto): array
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ class CountryDataProvider
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** @return array<string, Country> */
|
||||||
public function getAll(): array
|
public function getAll(): array
|
||||||
{
|
{
|
||||||
try {
|
try {
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
|
|||||||
use Symfony\Component\OptionsResolver\Options;
|
use Symfony\Component\OptionsResolver\Options;
|
||||||
use Symfony\Component\OptionsResolver\OptionsResolver;
|
use Symfony\Component\OptionsResolver\OptionsResolver;
|
||||||
|
|
||||||
|
/** @extends AbstractType<string> */
|
||||||
class CountryType extends AbstractType
|
class CountryType extends AbstractType
|
||||||
{
|
{
|
||||||
public function __construct(private readonly CountryDataProvider $countries)
|
public function __construct(private readonly CountryDataProvider $countries)
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ namespace App\BusProNet\Model;
|
|||||||
*/
|
*/
|
||||||
class AgeConstraintResult
|
class AgeConstraintResult
|
||||||
{
|
{
|
||||||
|
/** @param array<string, mixed> $metadata */
|
||||||
public function __construct(
|
public function __construct(
|
||||||
public readonly string $type,
|
public readonly string $type,
|
||||||
public readonly ?int $ageFrom = null,
|
public readonly ?int $ageFrom = null,
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ namespace App\BusProNet\Model;
|
|||||||
*/
|
*/
|
||||||
class BaseData
|
class BaseData
|
||||||
{
|
{
|
||||||
|
/** @param array<array-key, mixed> $items */
|
||||||
public function __construct(private readonly array $items)
|
public function __construct(private readonly array $items)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
@@ -19,7 +20,7 @@ class BaseData
|
|||||||
/**
|
/**
|
||||||
* Retrieves all items in the base data collection.
|
* Retrieves all items in the base data collection.
|
||||||
*
|
*
|
||||||
* @return array The complete items array
|
* @return array<array-key, mixed> The complete items array
|
||||||
*/
|
*/
|
||||||
public function getItems(): array
|
public function getItems(): array
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -36,14 +36,50 @@ class Booking
|
|||||||
public ?string $paymentType = null;
|
public ?string $paymentType = null;
|
||||||
public ?string $paymentLabel = null;
|
public ?string $paymentLabel = null;
|
||||||
public ?BankAccount $bankAccount = null;
|
public ?BankAccount $bankAccount = null;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var array<int, string>
|
||||||
|
*/
|
||||||
public array $participantsStatus = [];
|
public array $participantsStatus = [];
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var array<int, PersonalData>
|
||||||
|
*/
|
||||||
public array $participants = [];
|
public array $participants = [];
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var array<int, Service>
|
||||||
|
*/
|
||||||
public array $transportationServices = [];
|
public array $transportationServices = [];
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var array<int, Service>
|
||||||
|
*/
|
||||||
public array $additionalServices = [];
|
public array $additionalServices = [];
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var array<int, Room>
|
||||||
|
*/
|
||||||
public array $rooms = [];
|
public array $rooms = [];
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var array<int, Pickup>
|
||||||
|
*/
|
||||||
public array $pickups = [];
|
public array $pickups = [];
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var array<int, Pickup>
|
||||||
|
*/
|
||||||
public array $dropOffs = [];
|
public array $dropOffs = [];
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var array<int, Surcharge>
|
||||||
|
*/
|
||||||
public array $surcharges = [];
|
public array $surcharges = [];
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var array<string|int, Insurance>
|
||||||
|
*/
|
||||||
public array $insurances = [];
|
public array $insurances = [];
|
||||||
public ?int $invoiceNumber = null;
|
public ?int $invoiceNumber = null;
|
||||||
public ?float $totalPrice = null;
|
public ?float $totalPrice = null;
|
||||||
@@ -184,7 +220,7 @@ class Booking
|
|||||||
public function getInsuranceForParticipant(int $participantIndex): ?Insurance
|
public function getInsuranceForParticipant(int $participantIndex): ?Insurance
|
||||||
{
|
{
|
||||||
foreach ($this->insurances as $insurance) {
|
foreach ($this->insurances as $insurance) {
|
||||||
if (in_array($participantIndex, $insurance->mapping ?? [], true)) {
|
if (in_array($participantIndex, $insurance->mapping, true)) {
|
||||||
return $insurance;
|
return $insurance;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,8 +12,23 @@ namespace App\BusProNet\Model;
|
|||||||
*/
|
*/
|
||||||
class CrmAttributes
|
class CrmAttributes
|
||||||
{
|
{
|
||||||
|
/**
|
||||||
|
* @var array<int, CrmSelectionGroup>|null
|
||||||
|
*/
|
||||||
public ?array $selectionGroups = null;
|
public ?array $selectionGroups = null;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var array<int, CrmAction>|null
|
||||||
|
*/
|
||||||
public ?array $crmActions = null;
|
public ?array $crmActions = null;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var array<int, string>
|
||||||
|
*/
|
||||||
public array $hotelCodes = [];
|
public array $hotelCodes = [];
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var array<int, string>
|
||||||
|
*/
|
||||||
public array $roles = [];
|
public array $roles = [];
|
||||||
}
|
}
|
||||||
@@ -15,15 +15,15 @@ use Symfony\Component\Serializer\Attribute\Groups;
|
|||||||
*/
|
*/
|
||||||
class CrmSelection
|
class CrmSelection
|
||||||
{
|
{
|
||||||
#[Groups(['api:single'])]
|
#[Groups(['api:single', 'snapshot'])]
|
||||||
public ?int $id = null;
|
public ?int $id = null;
|
||||||
|
|
||||||
#[Groups(['api:single'])]
|
#[Groups(['api:single', 'snapshot'])]
|
||||||
public ?string $label = null;
|
public ?string $label = null;
|
||||||
|
|
||||||
#[Groups(['api:single'])]
|
#[Groups(['api:single', 'snapshot'])]
|
||||||
public bool $mutable = false;
|
public bool $mutable = false;
|
||||||
|
|
||||||
#[Groups(['api:single'])]
|
#[Groups(['api:single', 'snapshot'])]
|
||||||
public bool $selected = false;
|
public bool $selected = false;
|
||||||
}
|
}
|
||||||
@@ -19,7 +19,7 @@ class CrmSelectionGroup
|
|||||||
* Maps BusPro IDs of CRM selection groups representing
|
* Maps BusPro IDs of CRM selection groups representing
|
||||||
* included services.
|
* included services.
|
||||||
*
|
*
|
||||||
* @var array<string, string>
|
* @var array<int, string>
|
||||||
*/
|
*/
|
||||||
public static array $includedServicesMapping = [
|
public static array $includedServicesMapping = [
|
||||||
7 => 'Skipass',
|
7 => 'Skipass',
|
||||||
@@ -32,13 +32,16 @@ class CrmSelectionGroup
|
|||||||
90 => 'Transport',
|
90 => 'Transport',
|
||||||
];
|
];
|
||||||
|
|
||||||
#[Groups(['api:single'])]
|
#[Groups(['api:single', 'snapshot'])]
|
||||||
public ?int $id = null;
|
public ?int $id = null;
|
||||||
|
|
||||||
#[Groups(['api:single'])]
|
#[Groups(['api:single', 'snapshot'])]
|
||||||
public ?string $label = null;
|
public ?string $label = null;
|
||||||
|
|
||||||
#[Groups(['api:single'])]
|
/**
|
||||||
|
* @var array<int, CrmSelection>|null
|
||||||
|
*/
|
||||||
|
#[Groups(['api:single', 'snapshot'])]
|
||||||
public ?array $selections = null;
|
public ?array $selections = null;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -1,115 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
declare(strict_types=1);
|
|
||||||
|
|
||||||
namespace App\BusProNet\Model;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Represents error codes and messages for the BusProNet API.
|
|
||||||
*
|
|
||||||
* This class provides a static mapping of error codes to their corresponding
|
|
||||||
* German error messages for consistent error handling across the application.
|
|
||||||
* Error codes range from 100-999 and cover various API scenarios.
|
|
||||||
*/
|
|
||||||
class Error
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* @var array<int, string>
|
|
||||||
*/
|
|
||||||
private static array $errors = [
|
|
||||||
100 => 'Anfrageknoten fehlt',
|
|
||||||
101 => 'Satzknoten fehlt in Anfrageknoten',
|
|
||||||
102 => 'Ungültiger Satztyp [#1#]',
|
|
||||||
103 => 'User fehlt',
|
|
||||||
104 => 'User fehlerhaft',
|
|
||||||
105 => 'Key fehlt',
|
|
||||||
106 => 'Key fehlerhaft',
|
|
||||||
200 => 'Keine Einträge vorhanden',
|
|
||||||
201 => 'Keine Partner zur Auswahl gefunden',
|
|
||||||
202 => 'Keinen Partner mit der ID [#1#] gefunden',
|
|
||||||
203 => 'Ungültiger Termin',
|
|
||||||
300 => 'IDReise fehlt',
|
|
||||||
301 => 'Reise nicht gefunden',
|
|
||||||
302 => 'IDLeistung (Hin & Rück) fehlt',
|
|
||||||
303 => 'IDLeistung passt nicht zu IDReise',
|
|
||||||
304 => 'Es konnte nicht für alle Teilnehmer ein Sitzplatz ermittelt werden',
|
|
||||||
305 => 'Anzahl Personen fehlt',
|
|
||||||
306 => 'Leistungen mit ID #1# nicht gefunden',
|
|
||||||
307 => 'Leistungen mit ID #1# passen nicht zur Reise mit ID #2#',
|
|
||||||
308 => 'Keine Zahlungsarten gefunden',
|
|
||||||
400 => 'IDPartner fehlt',
|
|
||||||
401 => 'Partner nicht gefunden',
|
|
||||||
402 => 'Bis-Termin fehlt',
|
|
||||||
403 => 'Keine Unterbringungsleistungen gefunden',
|
|
||||||
500 => 'Art fehlt',
|
|
||||||
501 => 'Reise- und Buchungszeitraum fehlen',
|
|
||||||
502 => 'Keine Kunden gefunden',
|
|
||||||
600 => 'Keine Gutscheine gefunden',
|
|
||||||
601 => 'Gutschein-IDs fehlen',
|
|
||||||
602 => 'Gutscheine mit ID #1# nicht gefunden',
|
|
||||||
610 => 'Buchungsart fehlt',
|
|
||||||
611 => 'Buchungsart falsch',
|
|
||||||
612 => 'Gutscheinart fehlt',
|
|
||||||
613 => 'Gutscheinart falsch',
|
|
||||||
614 => 'Gutscheinstamm-ID fehlt',
|
|
||||||
615 => 'Gutschein (Stamm) mit ID #1# nicht gefunden',
|
|
||||||
616 => 'Kapazität beim Gutschein #1# nicht ausreichend',
|
|
||||||
617 => 'Rechnungsempfänger fehlt',
|
|
||||||
618 => 'Zahlungsart fehlt',
|
|
||||||
619 => 'Agentur-ID fehlt',
|
|
||||||
620 => 'Agentur mit ID #1# nicht gefunden',
|
|
||||||
650 => '#1#',
|
|
||||||
700 => 'Keine Agenturen gefunden',
|
|
||||||
701 => 'Agentur mit ID #1# nicht gefunden',
|
|
||||||
800 => 'Produkt-ID fehlt',
|
|
||||||
801 => 'Produkt mit ID #1# nicht gefunden',
|
|
||||||
805 => 'Es wurden keine Produkte gefunden',
|
|
||||||
810 => 'Stammdaten (#1#) nicht gefunden',
|
|
||||||
900 => 'Buchungsart fehlt',
|
|
||||||
901 => 'Buchungsart falsch',
|
|
||||||
902 => 'Status fehlt',
|
|
||||||
903 => 'Status falsch',
|
|
||||||
904 => 'Agentur-ID fehlt',
|
|
||||||
905 => 'Agentur mit ID #1# nicht gefunden',
|
|
||||||
906 => 'Reise-ID fehlt',
|
|
||||||
907 => 'Reise mit ID #1# nicht gefunden',
|
|
||||||
908 => 'Reise mit ID #1# ist storniert',
|
|
||||||
909 => 'Beförderungen fehlen',
|
|
||||||
910 => 'Leistung mit ID #1# gehört nicht zur Reise',
|
|
||||||
911 => 'Leistung mit ID #1# gehört nicht zum Produkt',
|
|
||||||
912 => 'Beförderungsleistung für die #1# fehlt',
|
|
||||||
913 => 'Unterbringungen fehlen',
|
|
||||||
914 => 'Partner-ID fehlt',
|
|
||||||
915 => 'Partner mit ID #1# nicht gefunden',
|
|
||||||
916 => 'Ferienziel-Unterbringungen fehlen',
|
|
||||||
917 => 'Ferienziel: Zimmer-IDZ fehlt',
|
|
||||||
918 => 'Ferienziel: Kategorie fehlt',
|
|
||||||
919 => 'Ferienziel: Verpflegungs-ID fehlt',
|
|
||||||
920 => 'Ferienziel: Anreise fehlt',
|
|
||||||
921 => 'Ferienziel: Anreise passt nicht zur Beförderungsleistung (Hinfahrt)',
|
|
||||||
922 => 'Ferienziel: Abreise fehlt',
|
|
||||||
923 => 'Ferienziel: Abreise passt nicht zur Beförderungsleistung (Rückfahrt)',
|
|
||||||
924 => 'Ferienziel: Keine Preise zu den Daten gefunden',
|
|
||||||
925 => 'Ferienziel: Preis zu den Daten nicht gefunden',
|
|
||||||
930 => 'Zustiege fehlen',
|
|
||||||
931 => 'Zustieg mit ID #1# nicht gefunden',
|
|
||||||
932 => 'Zustieg mit ID #1# bei Leistung #2# nicht freigegeben',
|
|
||||||
933 => 'Sitzplan mit ID #1# bei Leistung #2# nicht freigegeben',
|
|
||||||
935 => 'Versicherung mit ID #1# nicht gefunden',
|
|
||||||
940 => 'Zahlungsart fehlt',
|
|
||||||
941 => 'Zahlungsart-ID fehlt',
|
|
||||||
942 => 'Zahlungsart mit ID #1# nicht gültig',
|
|
||||||
950 => 'Anmelder fehlt',
|
|
||||||
951 => 'Teilnehmerliste fehlt',
|
|
||||||
952 => 'Teilnehmer-ID fehlt',
|
|
||||||
960 => 'Preisfehler: Struct #1# / Obj #2#',
|
|
||||||
961 => 'Buchung konnte nicht gespeichert werden',
|
|
||||||
980 => 'Reise ist fürs Internet gesperrt',
|
|
||||||
981 => 'Reise ist nicht mehr buchbar (#1#)',
|
|
||||||
982 => 'Optionsbuchungen nicht zugelassen',
|
|
||||||
983 => 'Anfragebuchung nicht zugelassen',
|
|
||||||
984 => 'Leistung mit ID #1# nicht fürs Internet buchbar',
|
|
||||||
985 => 'Zustieg mit ID #1# nicht fürs Internet buchbar',
|
|
||||||
999 => 'Systemfehler: #1#',
|
|
||||||
];
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace App\BusProNet\Model;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Extended availability details for one service from VERFUEGBARKEIT2.
|
||||||
|
*
|
||||||
|
* This model augments classic availability with optional timing/date/description
|
||||||
|
* fields used to enrich persisted travel snapshots.
|
||||||
|
*/
|
||||||
|
class ExtendedAvailability
|
||||||
|
{
|
||||||
|
public ?int $serviceId = null;
|
||||||
|
public ?string $status = null;
|
||||||
|
public ?int $available = null;
|
||||||
|
public ?float $price = null;
|
||||||
|
public ?\DateTimeImmutable $dateFrom = null;
|
||||||
|
public ?\DateTimeImmutable $dateTo = null;
|
||||||
|
public ?string $timeFrom = null;
|
||||||
|
public ?string $description = null;
|
||||||
|
public ?int $ageFrom = null;
|
||||||
|
public ?int $ageTo = null;
|
||||||
|
public ?bool $mandatory = null;
|
||||||
|
}
|
||||||
@@ -0,0 +1,30 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace App\BusProNet\Model;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Response model for extended availability endpoint payloads.
|
||||||
|
*/
|
||||||
|
class ExtendedServiceAvailabilityResponse
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* @param array<int, ExtendedAvailability> $services
|
||||||
|
* @param array<string> $allowedBookingStatus
|
||||||
|
*/
|
||||||
|
public function __construct(
|
||||||
|
private readonly array $services,
|
||||||
|
public readonly array $allowedBookingStatus = [],
|
||||||
|
public readonly ?string $travelStatus = null,
|
||||||
|
) {
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return array<int, ExtendedAvailability>
|
||||||
|
*/
|
||||||
|
public function getServices(): array
|
||||||
|
{
|
||||||
|
return $this->services;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -14,9 +14,9 @@ use Symfony\Component\Serializer\Attribute\Groups;
|
|||||||
*/
|
*/
|
||||||
class Guide
|
class Guide
|
||||||
{
|
{
|
||||||
#[Groups(['api:single'])]
|
#[Groups(['api:single', 'snapshot'])]
|
||||||
public ?string $name = null;
|
public ?string $name = null;
|
||||||
|
|
||||||
#[Groups(['api:single'])]
|
#[Groups(['api:single', 'snapshot'])]
|
||||||
public ?string $phone = null;
|
public ?string $phone = null;
|
||||||
}
|
}
|
||||||
@@ -15,24 +15,24 @@ use Symfony\Component\Serializer\Attribute\Groups;
|
|||||||
*/
|
*/
|
||||||
class Hotel
|
class Hotel
|
||||||
{
|
{
|
||||||
#[Groups(['api:list', 'api:single'])]
|
#[Groups(['api:list', 'api:single', 'snapshot'])]
|
||||||
public ?int $id = null;
|
public ?int $id = null;
|
||||||
|
|
||||||
#[Groups(['api:list', 'api:single'])]
|
#[Groups(['api:list', 'api:single', 'snapshot'])]
|
||||||
public ?string $code = null;
|
public ?string $code = null;
|
||||||
|
|
||||||
#[Groups(['api:list', 'api:single'])]
|
#[Groups(['api:list', 'api:single', 'snapshot'])]
|
||||||
public ?string $name = null;
|
public ?string $name = null;
|
||||||
|
|
||||||
#[Groups(['api:list', 'api:single'])]
|
#[Groups(['api:list', 'api:single', 'snapshot'])]
|
||||||
public ?string $city = null;
|
public ?string $city = null;
|
||||||
|
|
||||||
#[Groups(['api:list', 'api:single'])]
|
#[Groups(['api:list', 'api:single', 'snapshot'])]
|
||||||
public ?string $street = null;
|
public ?string $street = null;
|
||||||
|
|
||||||
#[Groups(['api:list', 'api:single'])]
|
#[Groups(['api:list', 'api:single', 'snapshot'])]
|
||||||
public ?string $phone = null;
|
public ?string $phone = null;
|
||||||
|
|
||||||
#[Groups(['api:list', 'api:single'])]
|
#[Groups(['api:list', 'api:single', 'snapshot'])]
|
||||||
public ?string $country = null;
|
public ?string $country = null;
|
||||||
}
|
}
|
||||||
@@ -56,7 +56,9 @@ class PersonalData
|
|||||||
#[Assert\Valid(groups: ['personal_data'])]
|
#[Assert\Valid(groups: ['personal_data'])]
|
||||||
public Communication $communication;
|
public Communication $communication;
|
||||||
|
|
||||||
|
/** @var list<string> */
|
||||||
public array $roles = [];
|
public array $roles = [];
|
||||||
|
/** @var list<string> */
|
||||||
public array $hotelCodes = [];
|
public array $hotelCodes = [];
|
||||||
|
|
||||||
public function __construct()
|
public function __construct()
|
||||||
|
|||||||
@@ -17,34 +17,35 @@ use Symfony\Component\Serializer\Normalizer\DateTimeNormalizer;
|
|||||||
*/
|
*/
|
||||||
class Pickup
|
class Pickup
|
||||||
{
|
{
|
||||||
#[Groups(['api:list'])]
|
#[Groups(['api:list', 'snapshot'])]
|
||||||
public ?int $id = null;
|
public ?int $id = null;
|
||||||
|
|
||||||
#[Groups(['api:list'])]
|
#[Groups(['api:list', 'snapshot'])]
|
||||||
public ?string $code = null;
|
public ?string $code = null;
|
||||||
|
|
||||||
#[Groups(['api:list'])]
|
#[Groups(['api:list', 'snapshot'])]
|
||||||
public ?string $city = null;
|
public ?string $city = null;
|
||||||
|
|
||||||
#[Groups(['api:list'])]
|
#[Groups(['api:list', 'snapshot'])]
|
||||||
public ?string $postalCode = null;
|
public ?string $postalCode = null;
|
||||||
|
|
||||||
#[Groups(['api:list'])]
|
#[Groups(['api:list', 'snapshot'])]
|
||||||
public ?string $street = null;
|
public ?string $street = null;
|
||||||
|
|
||||||
#[Groups(['api:single'])]
|
#[Groups(['api:single', 'snapshot'])]
|
||||||
#[Context([DateTimeNormalizer::FORMAT_KEY => 'Y-m-d H:i'])]
|
#[Context([DateTimeNormalizer::FORMAT_KEY => 'Y-m-d H:i'])]
|
||||||
public ?\DateTimeImmutable $time = null;
|
public ?\DateTimeImmutable $time = null;
|
||||||
|
|
||||||
#[Groups(['api:single'])]
|
#[Groups(['api:single', 'snapshot'])]
|
||||||
public ?float $price = null;
|
public ?float $price = null;
|
||||||
|
|
||||||
#[Groups(['api:single'])]
|
#[Groups(['api:single', 'snapshot'])]
|
||||||
public ?float $priceOutbound = null;
|
public ?float $priceOutbound = null;
|
||||||
|
|
||||||
#[Groups(['api:single'])]
|
#[Groups(['api:single', 'snapshot'])]
|
||||||
public ?float $priceInbound = null;
|
public ?float $priceInbound = null;
|
||||||
|
|
||||||
|
/** @var list<int> */
|
||||||
#[Groups(['api:booking'])]
|
#[Groups(['api:booking'])]
|
||||||
public array $mapping = [];
|
public array $mapping = [];
|
||||||
|
|
||||||
|
|||||||
@@ -20,19 +20,19 @@ class Room
|
|||||||
public const SELECTION_TYPE_BY_PAX = 'by_pax';
|
public const SELECTION_TYPE_BY_PAX = 'by_pax';
|
||||||
public const SELECTION_TYPE_BY_ROOM = 'by_room';
|
public const SELECTION_TYPE_BY_ROOM = 'by_room';
|
||||||
|
|
||||||
#[Groups(['api:list', 'api:single'])]
|
#[Groups(['api:list', 'api:single', 'snapshot'])]
|
||||||
public ?int $id = null;
|
public ?int $id = null;
|
||||||
|
|
||||||
#[Groups(['api:list', 'api:single'])]
|
#[Groups(['api:list', 'api:single', 'snapshot'])]
|
||||||
public ?string $category = null;
|
public ?string $category = null;
|
||||||
|
|
||||||
#[Groups(['api:list', 'api:single'])]
|
#[Groups(['api:list', 'api:single', 'snapshot'])]
|
||||||
public ?int $boardId = null;
|
public ?int $boardId = null;
|
||||||
|
|
||||||
#[Groups(['api:list', 'api:single'])]
|
#[Groups(['api:list', 'api:single', 'snapshot'])]
|
||||||
public ?string $code = null;
|
public ?string $code = null;
|
||||||
|
|
||||||
#[Groups(['api:list', 'api:single'])]
|
#[Groups(['api:list', 'api:single', 'snapshot'])]
|
||||||
public ?string $label = null;
|
public ?string $label = null;
|
||||||
|
|
||||||
#[Groups(['booking'])]
|
#[Groups(['booking'])]
|
||||||
@@ -46,33 +46,35 @@ class Room
|
|||||||
#[Groups(['booking'])]
|
#[Groups(['booking'])]
|
||||||
public ?int $totalCount = null;
|
public ?int $totalCount = null;
|
||||||
|
|
||||||
#[Groups(['api:list', 'api:single'])]
|
#[Groups(['api:list', 'api:single', 'snapshot'])]
|
||||||
public ?int $minPax = null;
|
public ?int $minPax = null;
|
||||||
|
|
||||||
#[Groups(['api:list', 'api:single'])]
|
#[Groups(['api:list', 'api:single', 'snapshot'])]
|
||||||
public ?int $maxPax = null;
|
public ?int $maxPax = null;
|
||||||
|
|
||||||
#[Groups(['api:list', 'api:single'])]
|
#[Groups(['api:list', 'api:single', 'snapshot'])]
|
||||||
public ?int $nights = null;
|
public ?int $nights = null;
|
||||||
|
|
||||||
#[Groups(['api:list', 'api:single'])]
|
#[Groups(['api:list', 'api:single', 'snapshot'])]
|
||||||
public ?string $status = null;
|
public ?string $status = null;
|
||||||
|
|
||||||
#[Groups(['api:list', 'api:single'])]
|
#[Groups(['api:list', 'api:single', 'snapshot'])]
|
||||||
public ?int $available = null;
|
public ?int $available = null;
|
||||||
|
|
||||||
#[Groups(['booking'])]
|
#[Groups(['booking'])]
|
||||||
public ?string $board = null;
|
public ?string $board = null;
|
||||||
|
|
||||||
|
/** @var list<int> */
|
||||||
#[Groups(['booking'])]
|
#[Groups(['booking'])]
|
||||||
public array $mapping = [];
|
public array $mapping = [];
|
||||||
|
|
||||||
#[Groups(['api:list', 'api:single'])]
|
#[Groups(['api:list', 'api:single', 'snapshot'])]
|
||||||
public ?float $price = null;
|
public ?float $price = null;
|
||||||
|
|
||||||
#[Groups(['booking'])]
|
#[Groups(['booking'])]
|
||||||
public ?float $totalPrice = null;
|
public ?float $totalPrice = null;
|
||||||
|
|
||||||
|
/** @var array<int, float|null> */
|
||||||
#[Groups(['booking'])]
|
#[Groups(['booking'])]
|
||||||
public array $individualPrice = [];
|
public array $individualPrice = [];
|
||||||
|
|
||||||
|
|||||||
@@ -17,84 +17,90 @@ use Symfony\Component\Serializer\Normalizer\DateTimeNormalizer;
|
|||||||
*/
|
*/
|
||||||
class Service
|
class Service
|
||||||
{
|
{
|
||||||
#[Groups(['api:single', 'api:list'])]
|
#[Groups(['api:single', 'api:list', 'snapshot'])]
|
||||||
public ?int $id = null;
|
public ?int $id = null;
|
||||||
|
|
||||||
#[Groups(['api:single', 'api:list'])]
|
#[Groups(['api:single', 'api:list', 'snapshot'])]
|
||||||
public ?string $category = null;
|
public ?string $category = null;
|
||||||
|
|
||||||
#[Groups(['api:single', 'api:list'])]
|
#[Groups(['api:single', 'api:list', 'snapshot'])]
|
||||||
public ?string $status = null;
|
public ?string $status = null;
|
||||||
|
|
||||||
#[Groups(['api:single', 'api:list'])]
|
#[Groups(['api:single', 'api:list', 'snapshot'])]
|
||||||
public bool $mandatory = false;
|
public bool $mandatory = false;
|
||||||
|
|
||||||
#[Groups(['api:single', 'api:list'])]
|
#[Groups(['api:single', 'api:list', 'snapshot'])]
|
||||||
|
public bool $autoBook = false;
|
||||||
|
|
||||||
|
#[Groups(['api:single', 'api:list', 'snapshot'])]
|
||||||
public ?string $label = null;
|
public ?string $label = null;
|
||||||
|
|
||||||
#[Groups(['api:single', 'api:list'])]
|
#[Groups(['api:single', 'api:list', 'snapshot'])]
|
||||||
#[Context([DateTimeNormalizer::FORMAT_KEY => 'Y-m-d'])]
|
#[Context([DateTimeNormalizer::FORMAT_KEY => 'Y-m-d'])]
|
||||||
public ?\DateTimeImmutable $dateFrom = null;
|
public ?\DateTimeImmutable $dateFrom = null;
|
||||||
|
|
||||||
#[Groups(['api:single', 'api:list'])]
|
#[Groups(['api:single', 'api:list', 'snapshot'])]
|
||||||
public ?string $timeFrom = null;
|
public ?string $timeFrom = null;
|
||||||
|
|
||||||
#[Groups(['api:single', 'api:list'])]
|
#[Groups(['api:single', 'api:list', 'snapshot'])]
|
||||||
public ?string $dayTime = null;
|
public ?string $dayTime = null;
|
||||||
|
|
||||||
#[Groups(['api:single', 'api:list'])]
|
#[Groups(['api:single', 'api:list', 'snapshot'])]
|
||||||
#[Context([DateTimeNormalizer::FORMAT_KEY => 'Y-m-d'])]
|
#[Context([DateTimeNormalizer::FORMAT_KEY => 'Y-m-d'])]
|
||||||
public ?\DateTimeImmutable $dateTo = null;
|
public ?\DateTimeImmutable $dateTo = null;
|
||||||
|
|
||||||
#[Groups(['api:single', 'api:list'])]
|
#[Groups(['api:single', 'api:list', 'snapshot'])]
|
||||||
public ?string $subType = null;
|
public ?string $subType = null;
|
||||||
|
|
||||||
#[Groups(['booking'])]
|
#[Groups(['booking'])]
|
||||||
public ?int $totalCount = null;
|
public ?int $totalCount = null;
|
||||||
|
|
||||||
#[Groups(['api:single'])]
|
/** @var list<int> */
|
||||||
|
#[Groups(['api:single', 'snapshot'])]
|
||||||
public array $mapping = [];
|
public array $mapping = [];
|
||||||
|
|
||||||
#[Groups(['api:single', 'api:list'])]
|
#[Groups(['api:single', 'api:list', 'snapshot'])]
|
||||||
public ?float $price = null;
|
public ?float $price = null;
|
||||||
|
|
||||||
#[Groups(['api:single'])]
|
#[Groups(['api:single', 'snapshot'])]
|
||||||
public ?float $totalPrice = null;
|
public ?float $totalPrice = null;
|
||||||
|
|
||||||
#[Groups(['api:single'])]
|
/** @var array<int, float|null> */
|
||||||
|
#[Groups(['api:single', 'snapshot'])]
|
||||||
public array $individualPrice = [];
|
public array $individualPrice = [];
|
||||||
|
|
||||||
#[Groups(['api:single', 'api:list'])]
|
#[Groups(['api:single', 'api:list', 'snapshot'])]
|
||||||
public ?int $available = null;
|
public ?int $available = null;
|
||||||
|
|
||||||
#[Groups(['api:single', 'api:list'])]
|
#[Groups(['api:single', 'api:list', 'snapshot'])]
|
||||||
public ?string $source = null;
|
public ?string $source = null;
|
||||||
|
|
||||||
#[Groups(['api:single', 'api:list'])]
|
#[Groups(['api:single', 'api:list', 'snapshot'])]
|
||||||
public ?string $direction = null;
|
public ?string $direction = null;
|
||||||
|
|
||||||
#[Groups(['api:single', 'api:list'])]
|
#[Groups(['api:single', 'api:list', 'snapshot'])]
|
||||||
public ?int $ageFrom = null;
|
public ?int $ageFrom = null;
|
||||||
|
|
||||||
#[Groups(['api:single', 'api:list'])]
|
#[Groups(['api:single', 'api:list', 'snapshot'])]
|
||||||
public ?int $ageTo = null;
|
public ?int $ageTo = null;
|
||||||
|
|
||||||
#[Groups(['api:single', 'api:list'])]
|
#[Groups(['api:single', 'api:list', 'snapshot'])]
|
||||||
public ?int $birthYearFrom = null;
|
public ?int $birthYearFrom = null;
|
||||||
|
|
||||||
#[Groups(['api:single', 'api:list'])]
|
#[Groups(['api:single', 'api:list', 'snapshot'])]
|
||||||
public ?int $birthYearTo = null;
|
public ?int $birthYearTo = null;
|
||||||
|
|
||||||
#[Groups(['api:single', 'api:list'])]
|
#[Groups(['api:single', 'api:list', 'snapshot'])]
|
||||||
public ?string $ageConstraintType = null;
|
public ?string $ageConstraintType = null;
|
||||||
|
|
||||||
|
/** @var array<string, mixed>|null */
|
||||||
#[Groups(['api:single'])]
|
#[Groups(['api:single'])]
|
||||||
public ?array $ageConstraintMetadata = null;
|
public ?array $ageConstraintMetadata = null;
|
||||||
|
|
||||||
#[Groups(['api:single'])]
|
#[Groups(['api:single'])]
|
||||||
public ?string $rawAgeConstraintData = null;
|
public ?string $rawAgeConstraintData = null;
|
||||||
|
|
||||||
#[Groups(['api:single', 'api:list'])]
|
#[Groups(['api:single', 'api:list', 'snapshot'])]
|
||||||
public ?string $description = null;
|
public ?string $description = null;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -104,6 +110,6 @@ class Service
|
|||||||
* When false, this service's price is excluded when determining which insurance
|
* When false, this service's price is excluded when determining which insurance
|
||||||
* tier is appropriate for a participant.
|
* tier is appropriate for a participant.
|
||||||
*/
|
*/
|
||||||
#[Groups(['api:single', 'api:list'])]
|
#[Groups(['api:single', 'api:list', 'snapshot'])]
|
||||||
public bool $includeInInsuranceCalculation = true;
|
public bool $includeInInsuranceCalculation = true;
|
||||||
}
|
}
|
||||||
@@ -13,7 +13,9 @@ namespace App\BusProNet\Model;
|
|||||||
class Surcharge
|
class Surcharge
|
||||||
{
|
{
|
||||||
public ?string $label = null;
|
public ?string $label = null;
|
||||||
|
/** @var list<int> */
|
||||||
public array $mapping = [];
|
public array $mapping = [];
|
||||||
public ?float $totalPrice = null;
|
public ?float $totalPrice = null;
|
||||||
|
/** @var array<int, float|null> */
|
||||||
public array $individualPrice = [];
|
public array $individualPrice = [];
|
||||||
}
|
}
|
||||||
@@ -20,40 +20,43 @@ use Symfony\Component\Serializer\Normalizer\DateTimeNormalizer;
|
|||||||
class Travel
|
class Travel
|
||||||
{
|
{
|
||||||
use SortByPriceTrait;
|
use SortByPriceTrait;
|
||||||
#[Groups(['api:list', 'api:single'])]
|
#[Groups(['api:list', 'api:single', 'snapshot'])]
|
||||||
public ?int $id = null;
|
public ?int $id = null;
|
||||||
|
|
||||||
#[Groups(['api:list', 'api:single'])]
|
#[Groups(['api:list', 'api:single', 'snapshot'])]
|
||||||
public ?string $code = null;
|
public ?string $code = null;
|
||||||
|
|
||||||
#[Groups(['api:list', 'api:single'])]
|
#[Groups(['api:list', 'api:single', 'snapshot'])]
|
||||||
public ?string $productCode = null;
|
public ?string $productCode = null;
|
||||||
|
|
||||||
#[Groups(['api:list', 'api:single'])]
|
#[Groups(['api:list', 'api:single', 'snapshot'])]
|
||||||
|
public ?int $productId = null;
|
||||||
|
|
||||||
|
#[Groups(['api:list', 'api:single', 'snapshot'])]
|
||||||
public ?string $label = null;
|
public ?string $label = null;
|
||||||
|
|
||||||
#[Groups(['api:list', 'api:single'])]
|
#[Groups(['api:list', 'api:single', 'snapshot'])]
|
||||||
public ?int $hotelId = null;
|
public ?int $hotelId = null;
|
||||||
|
|
||||||
#[Groups(['api:single'])]
|
#[Groups(['api:single', 'snapshot'])]
|
||||||
public ?Hotel $hotel = null;
|
public ?Hotel $hotel = null;
|
||||||
|
|
||||||
#[Groups(['api:list', 'api:single'])]
|
#[Groups(['api:list', 'api:single', 'snapshot'])]
|
||||||
#[Context([DateTimeNormalizer::FORMAT_KEY => 'Y-m-d'])]
|
#[Context([DateTimeNormalizer::FORMAT_KEY => 'Y-m-d'])]
|
||||||
public ?\DateTimeImmutable $dateFrom = null;
|
public ?\DateTimeImmutable $dateFrom = null;
|
||||||
|
|
||||||
#[Groups(['api:list', 'api:single'])]
|
#[Groups(['api:list', 'api:single', 'snapshot'])]
|
||||||
#[Context([DateTimeNormalizer::FORMAT_KEY => 'Y-m-d'])]
|
#[Context([DateTimeNormalizer::FORMAT_KEY => 'Y-m-d'])]
|
||||||
public ?\DateTimeImmutable $dateTo = null;
|
public ?\DateTimeImmutable $dateTo = null;
|
||||||
|
|
||||||
#[Groups(['api:list', 'api:single'])]
|
#[Groups(['api:list', 'api:single', 'snapshot'])]
|
||||||
public ?string $type = null;
|
public ?string $type = null;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Travel booking status from BusProNet API.
|
* Travel booking status from BusProNet API.
|
||||||
* Possible values: 'Frei', 'Anfrage', 'Buchungsstop'.
|
* Possible values: 'Frei', 'Anfrage', 'Buchungsstop'.
|
||||||
*/
|
*/
|
||||||
#[Groups(['api:single'])]
|
#[Groups(['api:single', 'snapshot'])]
|
||||||
public ?string $status = null;
|
public ?string $status = null;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -62,53 +65,71 @@ class Travel
|
|||||||
*
|
*
|
||||||
* @var array<string>
|
* @var array<string>
|
||||||
*/
|
*/
|
||||||
#[Groups(['api:single'])]
|
#[Groups(['api:single', 'snapshot'])]
|
||||||
public array $allowedBookingStatus = [];
|
public array $allowedBookingStatus = [];
|
||||||
|
|
||||||
#[Groups(['api:list', 'api:single'])]
|
#[Groups(['api:list', 'api:single', 'snapshot'])]
|
||||||
public ?float $priceFrom = null;
|
public ?float $priceFrom = null;
|
||||||
|
|
||||||
#[Groups(['api:single'])]
|
/**
|
||||||
|
* @var array<int, CrmSelectionGroup>
|
||||||
|
*/
|
||||||
|
#[Groups(['api:single', 'snapshot'])]
|
||||||
public array $selectionGroups = [];
|
public array $selectionGroups = [];
|
||||||
|
|
||||||
#[Groups(['api:single'])]
|
/**
|
||||||
|
* @var array<int, Service>
|
||||||
|
*/
|
||||||
|
#[Groups(['api:single', 'snapshot'])]
|
||||||
public array $additionalServices = [];
|
public array $additionalServices = [];
|
||||||
|
|
||||||
#[Groups(['api:single'])]
|
#[Groups(['api:single', 'snapshot'])]
|
||||||
public bool $additionalServicesMutable = true;
|
public bool $additionalServicesMutable = true;
|
||||||
|
|
||||||
#[Groups(['api:single'])]
|
/**
|
||||||
|
* @var array<int, Service>
|
||||||
|
*/
|
||||||
|
#[Groups(['api:single', 'snapshot'])]
|
||||||
public array $transportationServices = [];
|
public array $transportationServices = [];
|
||||||
|
|
||||||
#[Groups(['api:single'])]
|
#[Groups(['api:single', 'snapshot'])]
|
||||||
public bool $transportationServicesMutable = true;
|
public bool $transportationServicesMutable = true;
|
||||||
|
|
||||||
#[Groups(['api:single'])]
|
/**
|
||||||
|
* @var array<int, Pickup>
|
||||||
|
*/
|
||||||
|
#[Groups(['api:single', 'snapshot'])]
|
||||||
public array $pickups = [];
|
public array $pickups = [];
|
||||||
|
|
||||||
#[Groups(['api:single'])]
|
/**
|
||||||
|
* @var array<int, Pickup>
|
||||||
|
*/
|
||||||
|
#[Groups(['api:single', 'snapshot'])]
|
||||||
public array $dropOffs = [];
|
public array $dropOffs = [];
|
||||||
|
|
||||||
#[Groups(['api:single'])]
|
#[Groups(['api:single', 'snapshot'])]
|
||||||
public bool $pickupsMutable = true;
|
public bool $pickupsMutable = true;
|
||||||
|
|
||||||
#[Groups(['api:single'])]
|
/**
|
||||||
|
* @var array<int, Room>
|
||||||
|
*/
|
||||||
|
#[Groups(['api:single', 'snapshot'])]
|
||||||
public array $rooms = [];
|
public array $rooms = [];
|
||||||
|
|
||||||
#[Groups(['api:single'])]
|
#[Groups(['api:single', 'snapshot'])]
|
||||||
public bool $roomsMutable = true;
|
public bool $roomsMutable = true;
|
||||||
|
|
||||||
#[Groups(['api:single'])]
|
#[Groups(['api:single', 'snapshot'])]
|
||||||
public bool $participantDataMutable = true;
|
public bool $participantDataMutable = true;
|
||||||
|
|
||||||
#[Groups(['api:single'])]
|
#[Groups(['api:single', 'snapshot'])]
|
||||||
public bool $participantCountMutable = true;
|
public bool $participantCountMutable = true;
|
||||||
|
|
||||||
#[Groups(['api:single'])]
|
#[Groups(['api:single', 'snapshot'])]
|
||||||
public ?Guide $guide = null;
|
public ?Guide $guide = null;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @var array<Insurance> Available insurances for this travel package
|
* @var array<string|int, Insurance> Available insurances for this travel package
|
||||||
*/
|
*/
|
||||||
#[Groups(['api:single'])]
|
#[Groups(['api:single'])]
|
||||||
public array $insurances = [];
|
public array $insurances = [];
|
||||||
@@ -182,7 +203,7 @@ class Travel
|
|||||||
* Maps selection group IDs to their corresponding services based on
|
* Maps selection group IDs to their corresponding services based on
|
||||||
* the predefined included services mapping.
|
* the predefined included services mapping.
|
||||||
*
|
*
|
||||||
* @return array<int, Service> The included services from selection groups
|
* @return array<int, CrmSelectionGroup> The included services from selection groups
|
||||||
*/
|
*/
|
||||||
public function getIncludedServices(): array
|
public function getIncludedServices(): array
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -0,0 +1,58 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace App\BusProNet\Service;
|
||||||
|
|
||||||
|
use App\BusProNet\Service\Contract\BookingStatusRuleInterface;
|
||||||
|
use App\Form\Model\BookingDto;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Registry for booking status evaluation rules.
|
||||||
|
*
|
||||||
|
* Evaluates registered rules in priority order and returns the first matching
|
||||||
|
* status. Falls back to 'F' when no rule applies.
|
||||||
|
*/
|
||||||
|
class BookingStatusRuleRegistry
|
||||||
|
{
|
||||||
|
private const DEFAULT_STATUS = 'F';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var BookingStatusRuleInterface[]
|
||||||
|
*/
|
||||||
|
private array $sortedRules;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param BookingStatusRuleInterface[] $rules
|
||||||
|
*/
|
||||||
|
public function __construct(array $rules)
|
||||||
|
{
|
||||||
|
$this->sortedRules = $this->sortRulesByPriority($rules);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function evaluateStatus(BookingDto $bookingDto): string
|
||||||
|
{
|
||||||
|
foreach ($this->sortedRules as $rule) {
|
||||||
|
if (true === $rule->evaluate($bookingDto)) {
|
||||||
|
return $rule->getStatus();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return self::DEFAULT_STATUS;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param BookingStatusRuleInterface[] $rules
|
||||||
|
*
|
||||||
|
* @return BookingStatusRuleInterface[]
|
||||||
|
*/
|
||||||
|
private function sortRulesByPriority(array $rules): array
|
||||||
|
{
|
||||||
|
usort($rules, static fn (
|
||||||
|
BookingStatusRuleInterface $a,
|
||||||
|
BookingStatusRuleInterface $b,
|
||||||
|
): int => $b->getPriority() <=> $a->getPriority());
|
||||||
|
|
||||||
|
return $rules;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,36 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace App\BusProNet\Service\Contract;
|
||||||
|
|
||||||
|
use App\Form\Model\BookingDto;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Defines the contract for booking status evaluation rules.
|
||||||
|
*
|
||||||
|
* Rules are evaluated in priority order. The first matching rule determines
|
||||||
|
* the enforced booking status.
|
||||||
|
*/
|
||||||
|
interface BookingStatusRuleInterface
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Evaluates whether this rule applies to the given booking.
|
||||||
|
*/
|
||||||
|
public function evaluate(BookingDto $bookingDto): bool;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the status code to assign when this rule matches.
|
||||||
|
*/
|
||||||
|
public function getStatus(): string;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the rule priority (higher values evaluated first).
|
||||||
|
*/
|
||||||
|
public function getPriority(): int;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns a human-readable rule description.
|
||||||
|
*/
|
||||||
|
public function getDescription(): string;
|
||||||
|
}
|
||||||
@@ -1,52 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
declare(strict_types=1);
|
|
||||||
|
|
||||||
namespace App\BusProNet\Service\Contract;
|
|
||||||
|
|
||||||
use App\Form\Model\ParticipantDto;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Defines the contract for participant status evaluation rules.
|
|
||||||
*
|
|
||||||
* Status rules are evaluated in priority order to determine the appropriate
|
|
||||||
* status code for a participant during booking creation. The first rule that
|
|
||||||
* matches (evaluate returns true) determines the participant's status.
|
|
||||||
*/
|
|
||||||
interface ParticipantStatusRuleInterface
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* Evaluates whether this rule applies to the given participant.
|
|
||||||
*
|
|
||||||
* @param ParticipantDto $participant The participant to evaluate
|
|
||||||
*
|
|
||||||
* @return bool True if this rule applies, false otherwise
|
|
||||||
*/
|
|
||||||
public function evaluate(ParticipantDto $participant): bool;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the status code to assign when this rule matches.
|
|
||||||
*
|
|
||||||
* @return string The status code (e.g., 'O' for Option, 'F' for Final)
|
|
||||||
*/
|
|
||||||
public function getStatus(): string;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the priority of this rule.
|
|
||||||
*
|
|
||||||
* Higher priority rules are evaluated first. Rules with the same priority
|
|
||||||
* are evaluated in registration order.
|
|
||||||
*
|
|
||||||
* @return int The priority value (higher = evaluated first)
|
|
||||||
*/
|
|
||||||
public function getPriority(): int;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns a human-readable description of this rule.
|
|
||||||
*
|
|
||||||
* Used for debugging and logging purposes.
|
|
||||||
*
|
|
||||||
* @return string Description of what this rule checks
|
|
||||||
*/
|
|
||||||
public function getDescription(): string;
|
|
||||||
}
|
|
||||||
@@ -1,71 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
declare(strict_types=1);
|
|
||||||
|
|
||||||
namespace App\BusProNet\Service;
|
|
||||||
|
|
||||||
use App\BusProNet\Service\Contract\ParticipantStatusRuleInterface;
|
|
||||||
use App\Form\Model\ParticipantDto;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Registry for participant status evaluation rules.
|
|
||||||
*
|
|
||||||
* Manages a collection of status rules and evaluates them in priority order
|
|
||||||
* to determine the appropriate status code for a participant during booking
|
|
||||||
* creation. Returns a default status of 'F' (Final) when no rules match.
|
|
||||||
*/
|
|
||||||
class ParticipantStatusRuleRegistry
|
|
||||||
{
|
|
||||||
private const DEFAULT_STATUS = 'F';
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @var ParticipantStatusRuleInterface[]
|
|
||||||
*/
|
|
||||||
private array $sortedRules;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @param ParticipantStatusRuleInterface[] $rules The rules to register
|
|
||||||
*/
|
|
||||||
public function __construct(array $rules)
|
|
||||||
{
|
|
||||||
$this->sortedRules = $this->sortRulesByPriority($rules);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Evaluates all rules to determine the participant's status.
|
|
||||||
*
|
|
||||||
* Rules are evaluated in priority order (highest first). The first rule
|
|
||||||
* that matches determines the status. Returns 'F' if no rules match.
|
|
||||||
*
|
|
||||||
* @param ParticipantDto $participant The participant to evaluate
|
|
||||||
*
|
|
||||||
* @return string The determined status code
|
|
||||||
*/
|
|
||||||
public function evaluateStatus(ParticipantDto $participant): string
|
|
||||||
{
|
|
||||||
foreach ($this->sortedRules as $rule) {
|
|
||||||
if (true === $rule->evaluate($participant)) {
|
|
||||||
return $rule->getStatus();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return self::DEFAULT_STATUS;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Sorts rules by priority in descending order.
|
|
||||||
*
|
|
||||||
* @param ParticipantStatusRuleInterface[] $rules The rules to sort
|
|
||||||
*
|
|
||||||
* @return ParticipantStatusRuleInterface[] The sorted rules
|
|
||||||
*/
|
|
||||||
private function sortRulesByPriority(array $rules): array
|
|
||||||
{
|
|
||||||
usort($rules, static fn (
|
|
||||||
ParticipantStatusRuleInterface $a,
|
|
||||||
ParticipantStatusRuleInterface $b,
|
|
||||||
): int => $b->getPriority() <=> $a->getPriority());
|
|
||||||
|
|
||||||
return $rules;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -5,26 +5,37 @@ declare(strict_types=1);
|
|||||||
namespace App\BusProNet\Service\StatusRule;
|
namespace App\BusProNet\Service\StatusRule;
|
||||||
|
|
||||||
use App\BusProNet\Model\Service;
|
use App\BusProNet\Model\Service;
|
||||||
use App\BusProNet\Service\Contract\ParticipantStatusRuleInterface;
|
use App\BusProNet\Service\Contract\BookingStatusRuleInterface;
|
||||||
|
use App\Form\Model\BookingDto;
|
||||||
use App\Form\Model\ParticipantDto;
|
use App\Form\Model\ParticipantDto;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Status rule for participants with chaperon (Begleitperson) services.
|
* Status rule for bookings with chaperon (Begleitperson) services.
|
||||||
*
|
*
|
||||||
* Assigns 'Option' status to participants who have selected any service
|
* Assigns 'Option' status to bookings where any participant has selected any
|
||||||
* containing 'Begleitperson' in its label. This applies to accompanying
|
* service containing 'Begleitperson' in its label.
|
||||||
* persons whose booking confirmation may depend on the main participant.
|
|
||||||
*/
|
*/
|
||||||
class ChaperonServiceStatusRule implements ParticipantStatusRuleInterface
|
class ChaperonServiceStatusRule implements BookingStatusRuleInterface
|
||||||
{
|
{
|
||||||
private const STATUS = 'O';
|
private const STATUS = 'O';
|
||||||
private const PRIORITY = 100;
|
private const PRIORITY = 100;
|
||||||
private const SEARCH_TERM = 'begleitperson';
|
private const SEARCH_TERM = 'begleitperson';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @see ParticipantStatusRuleInterface::evaluate()
|
* @see BookingStatusRuleInterface::evaluate()
|
||||||
*/
|
*/
|
||||||
public function evaluate(ParticipantDto $participant): bool
|
public function evaluate(BookingDto $bookingDto): bool
|
||||||
|
{
|
||||||
|
foreach ($bookingDto->participants as $participant) {
|
||||||
|
if (true === $this->participantHasChaperonService($participant)) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
private function participantHasChaperonService(ParticipantDto $participant): bool
|
||||||
{
|
{
|
||||||
// Check array services
|
// Check array services
|
||||||
$arrayServices = [
|
$arrayServices = [
|
||||||
@@ -36,7 +47,7 @@ class ChaperonServiceStatusRule implements ParticipantStatusRuleInterface
|
|||||||
|
|
||||||
foreach ($arrayServices as $services) {
|
foreach ($arrayServices as $services) {
|
||||||
foreach ($services as $service) {
|
foreach ($services as $service) {
|
||||||
if ($service instanceof Service && true === $this->containsSearchTerm($service->label)) {
|
if (true === $this->containsSearchTerm($service->label)) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -58,7 +69,7 @@ class ChaperonServiceStatusRule implements ParticipantStatusRuleInterface
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @see ParticipantStatusRuleInterface::getStatus()
|
* @see BookingStatusRuleInterface::getStatus()
|
||||||
*/
|
*/
|
||||||
public function getStatus(): string
|
public function getStatus(): string
|
||||||
{
|
{
|
||||||
@@ -66,7 +77,7 @@ class ChaperonServiceStatusRule implements ParticipantStatusRuleInterface
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @see ParticipantStatusRuleInterface::getPriority()
|
* @see BookingStatusRuleInterface::getPriority()
|
||||||
*/
|
*/
|
||||||
public function getPriority(): int
|
public function getPriority(): int
|
||||||
{
|
{
|
||||||
@@ -74,7 +85,7 @@ class ChaperonServiceStatusRule implements ParticipantStatusRuleInterface
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @see ParticipantStatusRuleInterface::getDescription()
|
* @see BookingStatusRuleInterface::getDescription()
|
||||||
*/
|
*/
|
||||||
public function getDescription(): string
|
public function getDescription(): string
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -28,9 +28,9 @@ trait SortByPriceTrait
|
|||||||
* collections in the application. Items are sorted from lowest to highest price,
|
* collections in the application. Items are sorted from lowest to highest price,
|
||||||
* with null prices being treated as zero (appearing first).
|
* with null prices being treated as zero (appearing first).
|
||||||
*
|
*
|
||||||
* @param array $items Array of objects with a price property to sort
|
* @param array<array-key, object> $items Array of objects with a price property to sort
|
||||||
*
|
*
|
||||||
* @return array The sorted array of objects (ascending by price)
|
* @return array<array-key, object> The sorted array of objects (ascending by price)
|
||||||
*/
|
*/
|
||||||
protected function sortByPrice(array $items): array
|
protected function sortByPrice(array $items): array
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ use Carbon\Exceptions\InvalidFormatException;
|
|||||||
|
|
||||||
trait TypeConversionTrait
|
trait TypeConversionTrait
|
||||||
{
|
{
|
||||||
|
/** @return list<string> */
|
||||||
protected function stringToArray(?string $string, string $separator = ','): array
|
protected function stringToArray(?string $string, string $separator = ','): array
|
||||||
{
|
{
|
||||||
if (true === empty($string)) {
|
if (true === empty($string)) {
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ use Symfony\Contracts\Cache\ItemInterface;
|
|||||||
|
|
||||||
class HotelLoader extends AbstractLoader
|
class HotelLoader extends AbstractLoader
|
||||||
{
|
{
|
||||||
|
/** @return array<int, Hotel> */
|
||||||
public function loadAll(?string $filename = 'hotel.xml'): array
|
public function loadAll(?string $filename = 'hotel.xml'): array
|
||||||
{
|
{
|
||||||
try {
|
try {
|
||||||
@@ -91,6 +92,12 @@ class HotelLoader extends AbstractLoader
|
|||||||
public function patchHotelDetails(Travel $travel): void
|
public function patchHotelDetails(Travel $travel): void
|
||||||
{
|
{
|
||||||
$hotelId = $travel->hotelId;
|
$hotelId = $travel->hotelId;
|
||||||
|
if (null === $hotelId) {
|
||||||
|
$travel->hotel = null;
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
$hotel = $this->loadById($hotelId);
|
$hotel = $this->loadById($hotelId);
|
||||||
$travel->hotel = $hotel;
|
$travel->hotel = $hotel;
|
||||||
|
|||||||
@@ -22,11 +22,12 @@ class InsuranceLoader extends AbstractLoader
|
|||||||
parent::__construct($cache, $xmlExport);
|
parent::__construct($cache, $xmlExport);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** @return array<string|int, Insurance> */
|
||||||
public function loadAll(?string $filename = 'versicherungen.xml'): array
|
public function loadAll(?string $filename = 'versicherungen.xml'): array
|
||||||
{
|
{
|
||||||
try {
|
try {
|
||||||
return $this->cache->get('bpn_insurances', function (ItemInterface $item) use ($filename) {
|
return $this->cache->get('bpn_insurances', function (ItemInterface $item) use ($filename) {
|
||||||
$item->expiresAfter(3 * 60 * 60);
|
$item->expiresAfter(24 * 60 * 60);
|
||||||
|
|
||||||
$crawler = $this->loadXml($filename);
|
$crawler = $this->loadXml($filename);
|
||||||
|
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ use Symfony\Contracts\Cache\ItemInterface;
|
|||||||
|
|
||||||
class PickupLoader extends AbstractLoader
|
class PickupLoader extends AbstractLoader
|
||||||
{
|
{
|
||||||
|
/** @return array<int|string, Pickup> */
|
||||||
public function loadAll(?string $filename = 'zustiege.xml'): array
|
public function loadAll(?string $filename = 'zustiege.xml'): array
|
||||||
{
|
{
|
||||||
try {
|
try {
|
||||||
@@ -65,6 +66,11 @@ class PickupLoader extends AbstractLoader
|
|||||||
$travel->dropOffs = $this->patchAndOrderDropOffs($travel->dropOffs, $travel->pickups);
|
$travel->dropOffs = $this->patchAndOrderDropOffs($travel->dropOffs, $travel->pickups);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param array<int, Pickup> $pickups
|
||||||
|
*
|
||||||
|
* @return array<int, Pickup>
|
||||||
|
*/
|
||||||
private function patchAndSortPickups(array $pickups): array
|
private function patchAndSortPickups(array $pickups): array
|
||||||
{
|
{
|
||||||
$this->enrichPickupDetails($pickups);
|
$this->enrichPickupDetails($pickups);
|
||||||
@@ -137,6 +143,9 @@ class PickupLoader extends AbstractLoader
|
|||||||
{
|
{
|
||||||
foreach ($pickups as $pickup) {
|
foreach ($pickups as $pickup) {
|
||||||
$pickupData = $this->loadById($pickup->id);
|
$pickupData = $this->loadById($pickup->id);
|
||||||
|
if (null === $pickupData) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
$pickup->code = $pickupData->code;
|
$pickup->code = $pickupData->code;
|
||||||
$pickup->postalCode = $pickupData->postalCode;
|
$pickup->postalCode = $pickupData->postalCode;
|
||||||
|
|||||||
@@ -51,7 +51,7 @@ class TravelLoader extends AbstractLoader
|
|||||||
* including ID, code, label, dates, and associated hotels. The mapping is
|
* including ID, code, label, dates, and associated hotels. The mapping is
|
||||||
* cached for 3 hours to improve performance.
|
* cached for 3 hours to improve performance.
|
||||||
*
|
*
|
||||||
* @return array<int, array> Mapping of travel IDs to their metadata and file paths
|
* @return array<int, array<string, mixed>> Mapping of travel IDs to their metadata and file paths
|
||||||
*/
|
*/
|
||||||
public function generateFilesMap(): array
|
public function generateFilesMap(): array
|
||||||
{
|
{
|
||||||
@@ -74,7 +74,7 @@ class TravelLoader extends AbstractLoader
|
|||||||
$travelDataNodes = $crawler->filterXPath('//reisen/reise/termin');
|
$travelDataNodes = $crawler->filterXPath('//reisen/reise/termin');
|
||||||
|
|
||||||
$travelDataNodes->each(function (Crawler $node) use (&$mapping, $hotels, $file) {
|
$travelDataNodes->each(function (Crawler $node) use (&$mapping, $hotels, $file) {
|
||||||
$travelId = $node->attr('idbuspro');
|
$travelId = (int) $node->attr('idbuspro');
|
||||||
|
|
||||||
$mapping[$travelId] = [
|
$mapping[$travelId] = [
|
||||||
'id' => $travelId,
|
'id' => $travelId,
|
||||||
@@ -102,7 +102,7 @@ class TravelLoader extends AbstractLoader
|
|||||||
return $mapping;
|
return $mapping;
|
||||||
});
|
});
|
||||||
} catch (InvalidArgumentException $e) {
|
} catch (InvalidArgumentException $e) {
|
||||||
return [];
|
throw new \RuntimeException('Cache key error in generateFilesMap', 0, $e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -173,6 +173,7 @@ class TravelLoader extends AbstractLoader
|
|||||||
*
|
*
|
||||||
* @throws TravelNotFoundException When travel ID is not found
|
* @throws TravelNotFoundException When travel ID is not found
|
||||||
* @throws HotelNotInTravelException When hotel ID exists but not for this travel
|
* @throws HotelNotInTravelException When hotel ID exists but not for this travel
|
||||||
|
* @throws \RuntimeException When cached mapping generation fails unexpectedly
|
||||||
*/
|
*/
|
||||||
public function loadById(int $dateId, ?int $hotelId = null, ?string $filename = null): Travel
|
public function loadById(int $dateId, ?int $hotelId = null, ?string $filename = null): Travel
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -39,6 +39,7 @@ abstract class AbstractParser
|
|||||||
return 0 < $node->count() && $this->stringToBool($node->text());
|
return 0 < $node->count() && $this->stringToBool($node->text());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** @return list<string> */
|
||||||
protected function getArrayValue(Crawler $node, string $separator = ','): array
|
protected function getArrayValue(Crawler $node, string $separator = ','): array
|
||||||
{
|
{
|
||||||
if (0 === $node->count()) {
|
if (0 === $node->count()) {
|
||||||
@@ -47,4 +48,23 @@ abstract class AbstractParser
|
|||||||
|
|
||||||
return $this->stringToArray($node->text(), $separator);
|
return $this->stringToArray($node->text(), $separator);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected function getAttrOrNullValue(Crawler $node, string $attribute): ?string
|
||||||
|
{
|
||||||
|
if (0 === $node->count()) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return $node->attr($attribute);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected function getRequiredAttrValue(Crawler $node, string $attribute, string $context): string
|
||||||
|
{
|
||||||
|
$value = $this->getAttrOrNullValue($node, $attribute);
|
||||||
|
if (null === $value || '' === trim($value)) {
|
||||||
|
throw new \InvalidArgumentException(sprintf('Missing required attribute "%s" in %s.', $attribute, $context));
|
||||||
|
}
|
||||||
|
|
||||||
|
return $value;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -53,6 +53,7 @@ class AgeConstraintParserRegistry
|
|||||||
return $this->mergeConstraintResults($results, $constraintData);
|
return $this->mergeConstraintResults($results, $constraintData);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** @param list<AgeConstraintResult> $results */
|
||||||
private function mergeConstraintResults(array $results, string $rawData): AgeConstraintResult
|
private function mergeConstraintResults(array $results, string $rawData): AgeConstraintResult
|
||||||
{
|
{
|
||||||
if (empty($results)) {
|
if (empty($results)) {
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ class ApiResponseParser extends AbstractParser
|
|||||||
/**
|
/**
|
||||||
* @throws ResponseParserException
|
* @throws ResponseParserException
|
||||||
*/
|
*/
|
||||||
|
/** @param array<string, mixed> $additionalArgs */
|
||||||
public function parseXmlString(string $type, string $xml, array $additionalArgs = []): mixed
|
public function parseXmlString(string $type, string $xml, array $additionalArgs = []): mixed
|
||||||
{
|
{
|
||||||
$crawler = new Crawler($xml);
|
$crawler = new Crawler($xml);
|
||||||
@@ -25,56 +26,69 @@ class ApiResponseParser extends AbstractParser
|
|||||||
|
|
||||||
$resultNode = $crawler->filterXPath('//ergebnis');
|
$resultNode = $crawler->filterXPath('//ergebnis');
|
||||||
|
|
||||||
switch ($responseType) {
|
try {
|
||||||
case ApiClient::TYPE_NOTIFICATION:
|
switch ($responseType) {
|
||||||
return (new NotificationParser())->parse($crawler);
|
case ApiClient::TYPE_NOTIFICATION:
|
||||||
case ApiClient::TYPE_CUSTOMER_DATA:
|
return (new NotificationParser())->parse($crawler);
|
||||||
$subType = $resultNode->filterXPath('//art')->text();
|
case ApiClient::TYPE_CUSTOMER_DATA:
|
||||||
|
$subType = $this->getStringOrNullValue($resultNode->filterXPath('//art'));
|
||||||
|
if (null === $subType || '' === $subType) {
|
||||||
|
throw new ResponseParserException('Unable to determine customer data subtype from XML response');
|
||||||
|
}
|
||||||
|
|
||||||
switch ($subType) {
|
switch ($subType) {
|
||||||
case 'Adressdaten':
|
case 'Adressdaten':
|
||||||
case 'Adressdaten_Ändern':
|
case 'Adressdaten_Ändern':
|
||||||
case 'Newsletter':
|
case 'Newsletter':
|
||||||
return (new PersonalDataParser())->parse($resultNode);
|
return (new PersonalDataParser())->parse($resultNode);
|
||||||
case 'Adresse_Neu':
|
case 'Adresse_Neu':
|
||||||
return (new ContactFormResponseParser())->parse($resultNode);
|
return (new ContactFormResponseParser())->parse($resultNode);
|
||||||
case 'SelektionCRM':
|
case 'SelektionCRM':
|
||||||
case 'SelektionCRM_Ändern':
|
case 'SelektionCRM_Ändern':
|
||||||
return (new CrmAttributesResponseParser())->parse($resultNode);
|
return (new CrmAttributesResponseParser())->parse($resultNode);
|
||||||
case 'Vorgänge':
|
case 'Vorgänge':
|
||||||
return (new BookingsParser())->parse($resultNode);
|
return (new BookingsParser())->parse($resultNode);
|
||||||
case 'Vorgang_Details':
|
case 'Vorgang_Details':
|
||||||
return (new BookingParser())->parse($resultNode);
|
return (new BookingParser())->parse($resultNode);
|
||||||
case 'Dokumentdruck':
|
case 'Dokumentdruck':
|
||||||
return (new DocumentsParser())->parseDocuments($resultNode);
|
return (new DocumentsParser())->parseDocuments($resultNode);
|
||||||
case 'Vorgangdruck':
|
case 'Vorgangdruck':
|
||||||
return (new DocumentsParser())->parseConfirmation($resultNode);
|
return (new DocumentsParser())->parseConfirmation($resultNode);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case ApiClient::TYPE_BASE_DATA_COUNTRIES:
|
case ApiClient::TYPE_BASE_DATA_COUNTRIES:
|
||||||
return (new CountriesParser())->parse($resultNode);
|
return (new CountriesParser())->parse($resultNode);
|
||||||
case ApiClient::TYPE_MUTABLE_DATA:
|
case ApiClient::TYPE_MUTABLE_DATA:
|
||||||
return (new MutableDataParser())->parse($resultNode);
|
return (new MutableDataParser())->parse($resultNode);
|
||||||
case ApiClient::TYPE_AVAILABILITY:
|
case ApiClient::TYPE_AVAILABILITY:
|
||||||
return (new AvailabilitiesParser())->parseServices($resultNode);
|
return (new AvailabilitiesParser())->parseServices($resultNode);
|
||||||
case ApiClient::TYPE_AVAILABILITY_HOTEL:
|
case ApiClient::TYPE_AVAILABILITY_EXTENDED:
|
||||||
return (new AvailabilitiesParser())->parseRooms($resultNode);
|
return (new ExtendedAvailabilitiesParser())->parseServices($resultNode);
|
||||||
case ApiClient::TYPE_BOOKING_UPDATE:
|
case ApiClient::TYPE_AVAILABILITY_HOTEL:
|
||||||
return (new BookingUpdateParser())->parse($resultNode);
|
return (new AvailabilitiesParser())->parseRooms($resultNode);
|
||||||
case ApiClient::TYPE_BOOKING:
|
case ApiClient::TYPE_BOOKING_UPDATE:
|
||||||
return (new BookingResponseParser())->parse($resultNode);
|
return (new BookingUpdateParser())->parse($resultNode);
|
||||||
case ApiClient::TYPE_PRODUCTS:
|
case ApiClient::TYPE_BOOKING:
|
||||||
return (new ProductsParser())->parse($resultNode);
|
return (new BookingResponseParser())->parse($resultNode);
|
||||||
case ApiClient::TYPE_PRODUCT_DATA:
|
case ApiClient::TYPE_PRODUCTS:
|
||||||
$travelNode = $crawler->filterXPath('//reise/termin');
|
return (new ProductsParser())->parse($resultNode);
|
||||||
|
case ApiClient::TYPE_PRODUCT_DATA:
|
||||||
|
$travelNode = $crawler->filterXPath('//reise/termin');
|
||||||
|
|
||||||
return (new TravelParser())->parse($travelNode->first(), ...$additionalArgs);
|
if (0 === $travelNode->count()) {
|
||||||
case ApiClient::TYPE_AGENCIES:
|
throw new ResponseParserException('No travel data node found in product data response');
|
||||||
return (new AgencyParser())->parse($resultNode);
|
}
|
||||||
case ApiClient::TYPE_PURCHASE_VOUCHER:
|
|
||||||
return (new PurchaseVoucherParser())->parse($resultNode);
|
return (new TravelParser())->parse($travelNode->first(), ...$additionalArgs);
|
||||||
case ApiClient::TYPE_PROMO_VOUCHER:
|
case ApiClient::TYPE_AGENCIES:
|
||||||
return (new PromoVoucherParser())->parse($resultNode);
|
return (new AgencyParser())->parse($resultNode);
|
||||||
|
case ApiClient::TYPE_PURCHASE_VOUCHER:
|
||||||
|
return (new PurchaseVoucherParser())->parse($resultNode);
|
||||||
|
case ApiClient::TYPE_PROMO_VOUCHER:
|
||||||
|
return (new PromoVoucherParser())->parse($resultNode);
|
||||||
|
}
|
||||||
|
} catch (\InvalidArgumentException $e) {
|
||||||
|
throw new ResponseParserException('Invalid XML response structure: '.$e->getMessage(), 0, $e);
|
||||||
}
|
}
|
||||||
|
|
||||||
throw new ResponseParserException('Unable to parse XML response');
|
throw new ResponseParserException('Unable to parse XML response');
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ use Symfony\Component\DomCrawler\Crawler;
|
|||||||
*/
|
*/
|
||||||
class BookingInsurancesParser extends AbstractParser
|
class BookingInsurancesParser extends AbstractParser
|
||||||
{
|
{
|
||||||
|
/** @return array<string, Insurance> */
|
||||||
public function parse(Crawler $result): array
|
public function parse(Crawler $result): array
|
||||||
{
|
{
|
||||||
$insurances = [];
|
$insurances = [];
|
||||||
|
|||||||
@@ -40,10 +40,10 @@ class BookingParser extends AbstractParser
|
|||||||
|
|
||||||
$travelData = $node->filterXPath('//reise');
|
$travelData = $node->filterXPath('//reise');
|
||||||
|
|
||||||
$booking->travelName = $travelData->attr('bezeichnung');
|
$booking->travelName = $this->getAttrOrNullValue($travelData, 'bezeichnung');
|
||||||
$booking->dateId = $this->getIntOrNullValue($node->filterXPath('//idreise'));
|
$booking->dateId = $this->getIntOrNullValue($node->filterXPath('//idreise'));
|
||||||
$booking->travelCode = $travelData->attr('code');
|
$booking->travelCode = $this->getAttrOrNullValue($travelData, 'code');
|
||||||
$booking->travelDate = $this->stringToDate($travelData->attr('termin'));
|
$booking->travelDate = $this->stringToDate($this->getAttrOrNullValue($travelData, 'termin'));
|
||||||
|
|
||||||
$booking->hotelId = $this->getIntOrNullValue($node->filterXPath('//idpartner'));
|
$booking->hotelId = $this->getIntOrNullValue($node->filterXPath('//idpartner'));
|
||||||
$booking->hotelName = $this->getStringOrNullValue($node->filterXPath('//partner'));
|
$booking->hotelName = $this->getStringOrNullValue($node->filterXPath('//partner'));
|
||||||
@@ -56,17 +56,17 @@ class BookingParser extends AbstractParser
|
|||||||
$booking->participants = $this->parseParticipants($node->filterXPath('//teilnehmerliste/teilnehmer'));
|
$booking->participants = $this->parseParticipants($node->filterXPath('//teilnehmerliste/teilnehmer'));
|
||||||
|
|
||||||
$paymentData = $node->filterXPath('//zahlung');
|
$paymentData = $node->filterXPath('//zahlung');
|
||||||
$booking->paymentId = (int) $paymentData->attr('idzahlungsart');
|
$booking->paymentId = $this->getAttrOrNullValue($paymentData, 'idzahlungsart');
|
||||||
$booking->paymentLabel = $paymentData->attr('bezeichnung');
|
$booking->paymentLabel = $this->getAttrOrNullValue($paymentData, 'bezeichnung');
|
||||||
$booking->paymentType = $paymentData->attr('art');
|
$booking->paymentType = $this->getAttrOrNullValue($paymentData, 'art');
|
||||||
|
|
||||||
if (0 < $paymentData->children()->count()) {
|
if (0 < $paymentData->children()->count()) {
|
||||||
$bankDataNode = $paymentData->children()->first();
|
$bankDataNode = $paymentData->children()->first();
|
||||||
$bankAccount = new BankAccount();
|
$bankAccount = new BankAccount();
|
||||||
$bankAccount->iban = $bankDataNode->attr('iban');
|
$bankAccount->iban = $this->getAttrOrNullValue($bankDataNode, 'iban');
|
||||||
$bankAccount->bic = $bankDataNode->attr('bic');
|
$bankAccount->bic = $this->getAttrOrNullValue($bankDataNode, 'bic');
|
||||||
$bankAccount->bankName = $bankDataNode->attr('kreditinstitut');
|
$bankAccount->bankName = $this->getAttrOrNullValue($bankDataNode, 'kreditinstitut');
|
||||||
$bankAccount->holder = $bankDataNode->attr('kontoinhaber');
|
$bankAccount->holder = $this->getAttrOrNullValue($bankDataNode, 'kontoinhaber');
|
||||||
$booking->bankAccount = $bankAccount;
|
$booking->bankAccount = $bankAccount;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -112,12 +112,18 @@ class BookingParser extends AbstractParser
|
|||||||
return $booking;
|
return $booking;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** @return array<int, PersonalData> */
|
||||||
private function parseParticipants(Crawler $node): array
|
private function parseParticipants(Crawler $node): array
|
||||||
{
|
{
|
||||||
$participants = [];
|
$participants = [];
|
||||||
|
|
||||||
$node->each(function (Crawler $node) use (&$participants) {
|
$node->each(function (Crawler $node) use (&$participants) {
|
||||||
$id = (int) $node->attr('id');
|
$id = (int) ($this->getAttrOrNullValue($node, 'id') ?? 0);
|
||||||
|
|
||||||
|
if ($id <= 0) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
$participants[$id - 1] = $this->parsePersonalData($node);
|
$participants[$id - 1] = $this->parsePersonalData($node);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -32,7 +32,11 @@ class BookingResponseParser extends AbstractParser
|
|||||||
{
|
{
|
||||||
public function parse(Crawler $node): BookingResponse
|
public function parse(Crawler $node): BookingResponse
|
||||||
{
|
{
|
||||||
$status = $node->filterXPath('//buchung')->text();
|
$status = $this->getStringOrNullValue($node->filterXPath('//buchung'));
|
||||||
|
if (null === $status || '' === $status) {
|
||||||
|
throw new \InvalidArgumentException('Missing required booking status in booking response.');
|
||||||
|
}
|
||||||
|
|
||||||
$bookingNumber = $this->getIntOrNullValue($node->filterXPath('//vorgang'));
|
$bookingNumber = $this->getIntOrNullValue($node->filterXPath('//vorgang'));
|
||||||
$totalPrice = $this->getFloatOrNullValue($node->filterXPath('//gesamtpreis'));
|
$totalPrice = $this->getFloatOrNullValue($node->filterXPath('//gesamtpreis'));
|
||||||
$message = $this->getStringOrNullValue($node->filterXPath('//hinweis'));
|
$message = $this->getStringOrNullValue($node->filterXPath('//hinweis'));
|
||||||
@@ -60,18 +64,24 @@ class BookingResponseParser extends AbstractParser
|
|||||||
$priceItems = [];
|
$priceItems = [];
|
||||||
|
|
||||||
$node->filterXPath('//preise/preis')->each(function (Crawler $priceNode) use (&$priceItems): void {
|
$node->filterXPath('//preise/preis')->each(function (Crawler $priceNode) use (&$priceItems): void {
|
||||||
|
$position = (int) $this->getRequiredAttrValue($priceNode, 'position', 'booking response price item');
|
||||||
|
$type = $this->getRequiredAttrValue($priceNode, 'art', 'booking response price item');
|
||||||
|
$label = $this->getRequiredAttrValue($priceNode, 'bezeichnung', 'booking response price item');
|
||||||
|
$unitPrice = $this->stringToFloat($this->getRequiredAttrValue($priceNode, 'preis', 'booking response price item'));
|
||||||
|
$totalPrice = $this->stringToFloat($this->getRequiredAttrValue($priceNode, 'gesamtpreis', 'booking response price item'));
|
||||||
|
|
||||||
$priceItems[] = new PriceItem(
|
$priceItems[] = new PriceItem(
|
||||||
position: (int) $priceNode->attr('position'),
|
position: $position,
|
||||||
type: $priceNode->attr('art'),
|
type: $type,
|
||||||
subType: $priceNode->attr('unterart'),
|
subType: $this->getAttrOrNullValue($priceNode, 'unterart'),
|
||||||
label: $priceNode->attr('bezeichnung'),
|
label: $label,
|
||||||
dateFrom: $priceNode->attr('terminvon'),
|
dateFrom: $this->getAttrOrNullValue($priceNode, 'terminvon'),
|
||||||
dateTo: $priceNode->attr('terminbis'),
|
dateTo: $this->getAttrOrNullValue($priceNode, 'terminbis'),
|
||||||
quantity: (int) $priceNode->attr('anzahl'),
|
quantity: (int) ($this->getAttrOrNullValue($priceNode, 'anzahl') ?? 0),
|
||||||
assignment: $priceNode->attr('zuordnung'),
|
assignment: $this->getAttrOrNullValue($priceNode, 'zuordnung'),
|
||||||
unitPrice: $this->stringToFloat($priceNode->attr('preis')),
|
unitPrice: $unitPrice,
|
||||||
totalPrice: $this->stringToFloat($priceNode->attr('gesamtpreis')),
|
totalPrice: $totalPrice,
|
||||||
id: $priceNode->attr('id')
|
id: $this->getAttrOrNullValue($priceNode, 'id')
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -94,25 +104,26 @@ class BookingResponseParser extends AbstractParser
|
|||||||
$finalPaymentAmount = null;
|
$finalPaymentAmount = null;
|
||||||
$finalPaymentDate = null;
|
$finalPaymentDate = null;
|
||||||
|
|
||||||
$depositNode = $paymentNode->filterXPath('//anzahlung');
|
$depositNode = $paymentNode->filterXPath('.//anzahlung');
|
||||||
if ($depositNode->count() > 0) {
|
if ($depositNode->count() > 0) {
|
||||||
$depositAmount = $this->stringToFloat($depositNode->attr('betrag'));
|
$depositAmount = $this->stringToFloat($this->getAttrOrNullValue($depositNode, 'betrag'));
|
||||||
$depositDate = $depositNode->attr('termin');
|
$depositDate = $this->getAttrOrNullValue($depositNode, 'termin');
|
||||||
}
|
}
|
||||||
|
|
||||||
$finalPaymentNode = $paymentNode->filterXPath('//restzahlung');
|
$finalPaymentNode = $paymentNode->filterXPath('.//restzahlung');
|
||||||
if ($finalPaymentNode->count() > 0) {
|
if ($finalPaymentNode->count() > 0) {
|
||||||
$finalPaymentAmount = $this->stringToFloat($finalPaymentNode->attr('betrag'));
|
$finalPaymentAmount = $this->stringToFloat($this->getAttrOrNullValue($finalPaymentNode, 'betrag'));
|
||||||
$finalPaymentDate = $finalPaymentNode->attr('termin');
|
$finalPaymentDate = $this->getAttrOrNullValue($finalPaymentNode, 'termin');
|
||||||
}
|
}
|
||||||
|
|
||||||
// Parse purchase vouchers (kaufgutschein elements)
|
// Parse purchase vouchers (kaufgutschein elements)
|
||||||
$appliedPurchaseVouchers = [];
|
$appliedPurchaseVouchers = [];
|
||||||
$voucherNodes = $paymentNode->filterXPath('//kaufgutschein');
|
$voucherNodes = $paymentNode->filterXPath('.//kaufgutschein');
|
||||||
$voucherNodes->each(function (Crawler $voucherNode) use (&$appliedPurchaseVouchers): void {
|
$voucherNodes->each(function (Crawler $voucherNode) use (&$appliedPurchaseVouchers): void {
|
||||||
|
$amount = $this->getAttrOrNullValue($voucherNode, 'betrag');
|
||||||
$appliedPurchaseVouchers[] = [
|
$appliedPurchaseVouchers[] = [
|
||||||
'nummer' => $voucherNode->attr('nummer') ?? '',
|
'nummer' => $this->getAttrOrNullValue($voucherNode, 'nummer') ?? '',
|
||||||
'betrag' => $this->stringToFloat($voucherNode->attr('betrag')),
|
'betrag' => $this->stringToFloat($amount),
|
||||||
];
|
];
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -9,10 +9,12 @@ class BookingUpdateParser extends AbstractParser
|
|||||||
{
|
{
|
||||||
public function parse(Crawler $node): BookingUpdate
|
public function parse(Crawler $node): BookingUpdate
|
||||||
{
|
{
|
||||||
|
$changeStatus = $this->getStringOrNullValue($node->filterXPath('//aenderung'));
|
||||||
|
|
||||||
$bookingUpdate = new BookingUpdate();
|
$bookingUpdate = new BookingUpdate();
|
||||||
$bookingUpdate->valid = 'möglich' === $node->filterXPath('//aenderung')->text();
|
$bookingUpdate->valid = 'möglich' === $changeStatus;
|
||||||
$bookingUpdate->success = 'erfolgt' === $node->filterXPath('//aenderung')->text();
|
$bookingUpdate->success = 'erfolgt' === $changeStatus;
|
||||||
$bookingUpdate->status = $node->filterXPath('//status')->text();
|
$bookingUpdate->status = $this->getStringOrNullValue($node->filterXPath('//status'));
|
||||||
|
|
||||||
return $bookingUpdate;
|
return $bookingUpdate;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -21,7 +21,6 @@ class BookingsParser extends AbstractParser
|
|||||||
$booking = new Booking();
|
$booking = new Booking();
|
||||||
|
|
||||||
$booking->id = $this->getIntOrNullValue($node->filterXPath('//id'));
|
$booking->id = $this->getIntOrNullValue($node->filterXPath('//id'));
|
||||||
$booking->applicantId = $this->getIntOrNullValue($node->filterXPath('//idadresse_anmelder'));
|
|
||||||
$booking->bookingNumber = $this->getIntOrNullValue($node->filterXPath('//vorgangsnummer'));
|
$booking->bookingNumber = $this->getIntOrNullValue($node->filterXPath('//vorgangsnummer'));
|
||||||
$booking->status = $this->getStringOrNullValue($node->filterXPath('//status'));
|
$booking->status = $this->getStringOrNullValue($node->filterXPath('//status'));
|
||||||
$booking->participantCount = $this->getIntOrNullValue($node->filterXPath('//personen'));
|
$booking->participantCount = $this->getIntOrNullValue($node->filterXPath('//personen'));
|
||||||
|
|||||||
@@ -11,8 +11,12 @@ class ContactFormResponseParser extends AbstractParser
|
|||||||
{
|
{
|
||||||
public function parse(Crawler $node): RegistrationResponse
|
public function parse(Crawler $node): RegistrationResponse
|
||||||
{
|
{
|
||||||
$addressId = (int) $node->filterXPath('//idadresse')->text();
|
$addressId = $this->getIntOrNullValue($node->filterXPath('//idadresse'));
|
||||||
$personId = (int) $node->filterXPath('//idperson')->text();
|
$personId = $this->getIntOrNullValue($node->filterXPath('//idperson'));
|
||||||
|
if (null === $addressId || null === $personId) {
|
||||||
|
throw new \InvalidArgumentException('Missing required idadresse or idperson in contact form response.');
|
||||||
|
}
|
||||||
|
|
||||||
$isNewRecord = $this->getBoolValue($node->filterXPath('//neuanlage'));
|
$isNewRecord = $this->getBoolValue($node->filterXPath('//neuanlage'));
|
||||||
|
|
||||||
return new RegistrationResponse(
|
return new RegistrationResponse(
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ class CrmAttributesResponseParser
|
|||||||
|
|
||||||
$result
|
$result
|
||||||
->filterXPath('//selektionsmerkmale/selektionsgruppe')
|
->filterXPath('//selektionsmerkmale/selektionsgruppe')
|
||||||
->each(function (Crawler $node) use (&$groups, &$roles, &$hotelCode) {
|
->each(function (Crawler $node) use (&$groups, &$roles) {
|
||||||
$group = new CrmSelectionGroup();
|
$group = new CrmSelectionGroup();
|
||||||
$group->id = (int) $node->attr('id');
|
$group->id = (int) $node->attr('id');
|
||||||
$group->label = $node->attr('bezeichnung');
|
$group->label = $node->attr('bezeichnung');
|
||||||
@@ -47,14 +47,14 @@ class CrmAttributesResponseParser
|
|||||||
$roles[] = 'ROLE_HOUSE_MANAGER';
|
$roles[] = 'ROLE_HOUSE_MANAGER';
|
||||||
$hotelCodes[] = $matches[1];
|
$hotelCodes[] = $matches[1];
|
||||||
}
|
}
|
||||||
if (static::BPN_CRM_ID_ADMIN === $attribute->id && true === $attribute->selected) {
|
if (self::BPN_CRM_ID_ADMIN === $attribute->id && true === $attribute->selected) {
|
||||||
$roles[] = 'ROLE_ADMIN';
|
$roles[] = 'ROLE_ADMIN';
|
||||||
$roles[] = 'ROLE_HOUSE_MANAGER';
|
$roles[] = 'ROLE_HOUSE_MANAGER';
|
||||||
}
|
}
|
||||||
if (static::BPN_CRM_ID_MANAGER === $attribute->id && true === $attribute->selected) {
|
if (self::BPN_CRM_ID_MANAGER === $attribute->id && true === $attribute->selected) {
|
||||||
$roles[] = 'ROLE_MANAGER';
|
$roles[] = 'ROLE_MANAGER';
|
||||||
}
|
}
|
||||||
if (static::BPN_CRM_ID_TEAMER === $attribute->id && true === $attribute->selected) {
|
if (self::BPN_CRM_ID_TEAMER === $attribute->id && true === $attribute->selected) {
|
||||||
$roles[] = 'ROLE_TEAMER';
|
$roles[] = 'ROLE_TEAMER';
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -90,7 +90,7 @@ class CrmAttributesResponseParser
|
|||||||
;
|
;
|
||||||
|
|
||||||
if (true === in_array('ROLE_ADMIN', $roles, true)) {
|
if (true === in_array('ROLE_ADMIN', $roles, true)) {
|
||||||
$hotelCodes[] = static::BPN_DEFAULT_HOTEL_CODE;
|
$hotelCodes[] = self::BPN_DEFAULT_HOTEL_CODE;
|
||||||
}
|
}
|
||||||
|
|
||||||
$response = new CrmAttributes();
|
$response = new CrmAttributes();
|
||||||
|
|||||||
@@ -44,15 +44,30 @@ class DocumentsParser
|
|||||||
|
|
||||||
private function decode(Crawler $node): string
|
private function decode(Crawler $node): string
|
||||||
{
|
{
|
||||||
[, $pdfData] = explode(',', $node->text());
|
if (0 === $node->count()) {
|
||||||
|
throw new \InvalidArgumentException('Missing PDF node in document response.');
|
||||||
|
}
|
||||||
|
|
||||||
|
$parts = explode(',', $node->text(), 2);
|
||||||
|
if (2 !== count($parts)) {
|
||||||
|
throw new \InvalidArgumentException('Invalid PDF payload in document response.');
|
||||||
|
}
|
||||||
|
|
||||||
|
[, $pdfData] = $parts;
|
||||||
|
|
||||||
return base64_decode($pdfData);
|
return base64_decode($pdfData);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** @return array{string, string} */
|
||||||
private function getFileInfo(Crawler $node): array
|
private function getFileInfo(Crawler $node): array
|
||||||
{
|
{
|
||||||
$pdfData = $this->decode($node->filterXPath('//pdf'));
|
$pdfData = $this->decode($node->filterXPath('.//pdf'));
|
||||||
$filename = $node->filterXPath('//datei')->text();
|
$filenameNode = $node->filterXPath('.//datei');
|
||||||
|
if (0 === $filenameNode->count()) {
|
||||||
|
throw new \InvalidArgumentException('Missing filename node in document response.');
|
||||||
|
}
|
||||||
|
|
||||||
|
$filename = $filenameNode->text();
|
||||||
|
|
||||||
return [$filename, $pdfData];
|
return [$filename, $pdfData];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,75 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace App\BusProNet\XmlParser;
|
||||||
|
|
||||||
|
use App\BusProNet\Model\ExtendedAvailability;
|
||||||
|
use App\BusProNet\Model\ExtendedServiceAvailabilityResponse;
|
||||||
|
use Symfony\Component\DomCrawler\Crawler;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Parser for VERFUEGBARKEIT2 service payloads.
|
||||||
|
*
|
||||||
|
* Extracts extended service-level attributes (dates, times, hints, constraints)
|
||||||
|
* plus optional travel-level booking-status metadata.
|
||||||
|
*/
|
||||||
|
class ExtendedAvailabilitiesParser extends AbstractParser
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Parses extended availability services from API result node.
|
||||||
|
*/
|
||||||
|
public function parseServices(Crawler $result): ExtendedServiceAvailabilityResponse
|
||||||
|
{
|
||||||
|
$availabilities = [];
|
||||||
|
|
||||||
|
$result
|
||||||
|
->filterXPath('//leistungen/leistung')
|
||||||
|
->each(function (Crawler $node) use (&$availabilities) {
|
||||||
|
$serviceId = (int) $node->attr('id');
|
||||||
|
|
||||||
|
$availability = new ExtendedAvailability();
|
||||||
|
$availability->serviceId = $serviceId;
|
||||||
|
$availability->status = $node->attr('status');
|
||||||
|
$availability->available = (int) $node->attr('frei');
|
||||||
|
$availability->price = $this->stringToFloat($node->attr('preis'));
|
||||||
|
$availability->dateFrom = $this->stringToDate($node->attr('termin'));
|
||||||
|
$availability->dateTo = $this->stringToDate($node->attr('bis'));
|
||||||
|
$availability->timeFrom = $node->attr('uhrzeit_von');
|
||||||
|
$availability->description = $node->attr('hinweis');
|
||||||
|
|
||||||
|
$ageFrom = $node->attr('altervon');
|
||||||
|
if (null !== $ageFrom && '' !== trim($ageFrom)) {
|
||||||
|
$availability->ageFrom = (int) $ageFrom;
|
||||||
|
}
|
||||||
|
|
||||||
|
$ageTo = $node->attr('alterbis');
|
||||||
|
if (null !== $ageTo && '' !== trim($ageTo)) {
|
||||||
|
$availability->ageTo = (int) $ageTo;
|
||||||
|
}
|
||||||
|
|
||||||
|
$mandatory = $node->attr('pflicht');
|
||||||
|
if (null !== $mandatory && '' !== trim($mandatory)) {
|
||||||
|
$availability->mandatory = $this->stringToBool($mandatory);
|
||||||
|
}
|
||||||
|
|
||||||
|
$availabilities[$serviceId] = $availability;
|
||||||
|
})
|
||||||
|
;
|
||||||
|
|
||||||
|
$allowedBookingStatus = [];
|
||||||
|
$travelStatus = null;
|
||||||
|
$reiseNode = $result->filterXPath('//reise');
|
||||||
|
|
||||||
|
if (0 < $reiseNode->count()) {
|
||||||
|
$travelStatus = $reiseNode->attr('status');
|
||||||
|
|
||||||
|
$bookingStatusPossible = $reiseNode->attr('buchungstatusmoeglich') ?? '';
|
||||||
|
if ('' !== trim($bookingStatusPossible)) {
|
||||||
|
$allowedBookingStatus = str_split($bookingStatusPossible);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return new ExtendedServiceAvailabilityResponse($availabilities, $allowedBookingStatus, $travelStatus);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -37,7 +37,7 @@ class InsuranceParser extends AbstractParser
|
|||||||
|
|
||||||
// Parse all individual insurances for reference lookup
|
// Parse all individual insurances for reference lookup
|
||||||
$insurance = $this->parseInsuranceNode($node, false);
|
$insurance = $this->parseInsuranceNode($node, false);
|
||||||
if (null !== $insurance && null !== $insurance->id) {
|
if (null !== $insurance->id) {
|
||||||
// Set complementary flag from XML attribute
|
// Set complementary flag from XML attribute
|
||||||
$insurance->complementary = $isComplementary;
|
$insurance->complementary = $isComplementary;
|
||||||
|
|
||||||
@@ -53,7 +53,7 @@ class InsuranceParser extends AbstractParser
|
|||||||
$xmlContent->filterXPath('//versicherungspakete/versicherungspaket')
|
$xmlContent->filterXPath('//versicherungspakete/versicherungspaket')
|
||||||
->each(function (Crawler $node) use (&$insurances, $individualInsurances) {
|
->each(function (Crawler $node) use (&$insurances, $individualInsurances) {
|
||||||
$insurance = $this->parseInsuranceNode($node, true, $individualInsurances);
|
$insurance = $this->parseInsuranceNode($node, true, $individualInsurances);
|
||||||
if (null !== $insurance && null !== $insurance->id) {
|
if (null !== $insurance->id) {
|
||||||
// Parse contained insurance IDs
|
// Parse contained insurance IDs
|
||||||
$insurance->containedInsuranceIds = $this->parseContainedInsuranceIds($node);
|
$insurance->containedInsuranceIds = $this->parseContainedInsuranceIds($node);
|
||||||
|
|
||||||
@@ -75,8 +75,8 @@ class InsuranceParser extends AbstractParser
|
|||||||
/**
|
/**
|
||||||
* Determines if a package contains any family insurances.
|
* Determines if a package contains any family insurances.
|
||||||
*
|
*
|
||||||
* @param Crawler $packageNode The package XML node
|
* @param Crawler $packageNode The package XML node
|
||||||
* @param array<int, Insurance> $individualInsurances Parsed individual insurances for reference
|
* @param array<string, Insurance> $individualInsurances Parsed individual insurances for reference
|
||||||
*
|
*
|
||||||
* @return bool True if any contained insurance is a family insurance
|
* @return bool True if any contained insurance is a family insurance
|
||||||
*/
|
*/
|
||||||
@@ -96,13 +96,13 @@ class InsuranceParser extends AbstractParser
|
|||||||
/**
|
/**
|
||||||
* Parses a single insurance or package node.
|
* Parses a single insurance or package node.
|
||||||
*
|
*
|
||||||
* @param Crawler $node The XML node to parse
|
* @param Crawler $node The XML node to parse
|
||||||
* @param bool $isPackage Whether this is a package node
|
* @param bool $isPackage Whether this is a package node
|
||||||
* @param array<int, Insurance> $individualInsurances Individual insurances for package family detection
|
* @param array<string, Insurance> $individualInsurances Individual insurances for package family detection
|
||||||
*
|
*
|
||||||
* @return Insurance|null The parsed insurance object
|
* @return Insurance The parsed insurance object
|
||||||
*/
|
*/
|
||||||
private function parseInsuranceNode(Crawler $node, bool $isPackage, array $individualInsurances = []): ?Insurance
|
private function parseInsuranceNode(Crawler $node, bool $isPackage, array $individualInsurances = []): Insurance
|
||||||
{
|
{
|
||||||
$insurance = new Insurance();
|
$insurance = new Insurance();
|
||||||
$insurance->package = $isPackage;
|
$insurance->package = $isPackage;
|
||||||
@@ -159,7 +159,7 @@ class InsuranceParser extends AbstractParser
|
|||||||
*
|
*
|
||||||
* @param Crawler $xmlContent The XML content to scan
|
* @param Crawler $xmlContent The XML content to scan
|
||||||
*
|
*
|
||||||
* @return array<int> Array of referenced insurance IDs
|
* @return list<string> Array of referenced insurance IDs
|
||||||
*/
|
*/
|
||||||
private function collectReferencedInsuranceIds(Crawler $xmlContent): array
|
private function collectReferencedInsuranceIds(Crawler $xmlContent): array
|
||||||
{
|
{
|
||||||
@@ -180,7 +180,7 @@ class InsuranceParser extends AbstractParser
|
|||||||
*
|
*
|
||||||
* @param Crawler $node The package XML node
|
* @param Crawler $node The package XML node
|
||||||
*
|
*
|
||||||
* @return array<int> Array of contained insurance IDs (always int, as they reference individual insurances)
|
* @return list<string> Array of contained insurance IDs
|
||||||
*/
|
*/
|
||||||
private function parseContainedInsuranceIds(Crawler $node): array
|
private function parseContainedInsuranceIds(Crawler $node): array
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -57,7 +57,7 @@ class PersonalDataParser extends AbstractParser
|
|||||||
$remarksNode = $addressDataNode->filterXPath('//bemerkung');
|
$remarksNode = $addressDataNode->filterXPath('//bemerkung');
|
||||||
|
|
||||||
if (0 < $remarksNode->count()) {
|
if (0 < $remarksNode->count()) {
|
||||||
$personalData->remarks = $remarksNode->text();
|
$personalData->remarks = $this->getStringOrNullValue($remarksNode);
|
||||||
}
|
}
|
||||||
|
|
||||||
return $personalData;
|
return $personalData;
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ use Symfony\Component\DomCrawler\Crawler;
|
|||||||
|
|
||||||
class PickupsParser extends AbstractParser
|
class PickupsParser extends AbstractParser
|
||||||
{
|
{
|
||||||
|
/** @return array<int, Pickup> */
|
||||||
public function parse(Crawler $result): array
|
public function parse(Crawler $result): array
|
||||||
{
|
{
|
||||||
$pickups = [];
|
$pickups = [];
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ use Symfony\Component\DomCrawler\Crawler;
|
|||||||
|
|
||||||
class RoomsParser extends AbstractParser
|
class RoomsParser extends AbstractParser
|
||||||
{
|
{
|
||||||
|
/** @return array<int, Room> */
|
||||||
public function parse(Crawler $result): array
|
public function parse(Crawler $result): array
|
||||||
{
|
{
|
||||||
$rooms = [];
|
$rooms = [];
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ use Symfony\Component\DomCrawler\Crawler;
|
|||||||
|
|
||||||
class ServicesParser extends AbstractParser
|
class ServicesParser extends AbstractParser
|
||||||
{
|
{
|
||||||
|
/** @return array<int, Service> */
|
||||||
public function parse(Crawler $result, string $category, string $source): array
|
public function parse(Crawler $result, string $category, string $source): array
|
||||||
{
|
{
|
||||||
$services = [];
|
$services = [];
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ use Symfony\Component\DomCrawler\Crawler;
|
|||||||
|
|
||||||
class SurchargesParser extends AbstractParser
|
class SurchargesParser extends AbstractParser
|
||||||
{
|
{
|
||||||
|
/** @return list<Surcharge> */
|
||||||
public function parse(Crawler $result): array
|
public function parse(Crawler $result): array
|
||||||
{
|
{
|
||||||
$surcharges = [];
|
$surcharges = [];
|
||||||
|
|||||||
@@ -49,35 +49,45 @@ class TravelParser extends AbstractParser
|
|||||||
*/
|
*/
|
||||||
public function parse(Crawler $node, ?int $hotelId = null): Travel
|
public function parse(Crawler $node, ?int $hotelId = null): Travel
|
||||||
{
|
{
|
||||||
|
if (0 === $node->count()) {
|
||||||
|
throw new \InvalidArgumentException('Cannot parse travel from empty XML node.');
|
||||||
|
}
|
||||||
|
|
||||||
$hotelNode = $this->getHotelNode($node, $hotelId);
|
$hotelNode = $this->getHotelNode($node, $hotelId);
|
||||||
|
|
||||||
$dateFrom = $this->stringToDate($node->attr('termin'));
|
$dateFrom = $this->stringToDate($this->getRequiredAttrValue($node, 'termin', 'travel termin node'));
|
||||||
$dateTo = $this->stringToDate($node->attr('bis'));
|
$dateTo = $this->stringToDate($this->getRequiredAttrValue($node, 'bis', 'travel termin node'));
|
||||||
|
|
||||||
$travel = new Travel();
|
$travel = new Travel();
|
||||||
$travel->id = (int) $node->attr('idbuspro');
|
$travel->id = (int) $this->getRequiredAttrValue($node, 'idbuspro', 'travel termin node');
|
||||||
$travel->hotelId = (int) $hotelNode->attr('idbuspro');
|
$travel->hotelId = null !== $hotelNode
|
||||||
$travel->label = $this->getStringOrNullValue($node->filterXPath('//text'));
|
? (int) $this->getRequiredAttrValue($hotelNode, 'idbuspro', 'travel hotel node')
|
||||||
|
: null;
|
||||||
|
$travel->label = $this->getStringOrNullValue($node->filterXPath('.//text'));
|
||||||
$travel->dateFrom = $dateFrom;
|
$travel->dateFrom = $dateFrom;
|
||||||
$travel->dateTo = $dateTo;
|
$travel->dateTo = $dateTo;
|
||||||
$travel->code = $node->attr('code');
|
$travel->code = $this->getAttrOrNullValue($node, 'code');
|
||||||
|
$travel->productId = null !== $this->getAttrOrNullValue($node, 'idprodukt')
|
||||||
|
? (int) $this->getAttrOrNullValue($node, 'idprodukt')
|
||||||
|
: null;
|
||||||
|
|
||||||
// Parse product code from parent reise node using DOM
|
// Parse product code from parent reise node using DOM
|
||||||
$domNode = $node->getNode(0);
|
$domNode = $node->getNode(0);
|
||||||
if (null !== $domNode && null !== $domNode->parentNode) {
|
if (null !== $domNode && $domNode->parentNode instanceof \DOMElement) {
|
||||||
$travel->productCode = $domNode->parentNode->getAttribute('code');
|
$travel->productCode = $domNode->parentNode->getAttribute('code');
|
||||||
}
|
}
|
||||||
|
|
||||||
$travel->type = $node->attr('reiseart');
|
$travel->type = $this->getAttrOrNullValue($node, 'reiseart');
|
||||||
$travel->priceFrom = $this->stringToFloat($this->getStringOrNullValue($node->filterXPath('//abpreis')));
|
$travel->priceFrom = $this->stringToFloat($this->getStringOrNullValue($node->filterXPath('.//abpreis')));
|
||||||
$travel->selectionGroups = $this->getSelectionGroups($node->filterXPath('//selektiongruppe'));
|
$travel->selectionGroups = $this->getSelectionGroups($node->filterXPath('.//selektiongruppe'));
|
||||||
|
// Parse only termin-level additional services; exclude hotel-nested duplicates that can override flags.
|
||||||
$travel->additionalServices = $this
|
$travel->additionalServices = $this
|
||||||
->getAdditionalServices($node->filterXPath('//lei_sonstiges/leistung'));
|
->getAdditionalServices($node->filterXPath('.//lei_sonstiges[not(ancestor::hotel)]/leistung'));
|
||||||
$travel->transportationServices = $this
|
$travel->transportationServices = $this
|
||||||
->getTransportationServices($node->filterXPath('//lei_befoerderung/leistung'));
|
->getTransportationServices($node->filterXPath('.//lei_befoerderung/leistung'));
|
||||||
$travel->rooms = $this->getRooms($hotelNode);
|
$travel->rooms = null !== $hotelNode ? $this->getRooms($hotelNode) : [];
|
||||||
$travel->pickups = $this->getPickups($node->filterXPath('//zustiege/zustieg'), $dateFrom, true);
|
$travel->pickups = $this->getPickups($node->filterXPath('.//zustiege/zustieg'), $dateFrom, true);
|
||||||
$travel->dropOffs = $this->getPickups($node->filterXPath('//zustiege_rueck/zustieg_rueck'), $dateTo, false);
|
$travel->dropOffs = $this->getPickups($node->filterXPath('.//zustiege_rueck/zustieg_rueck'), $dateTo, false);
|
||||||
|
|
||||||
// Merge drop-off prices into pickups for split pricing support
|
// Merge drop-off prices into pickups for split pricing support
|
||||||
$this->mergeDropOffPricesIntoPickups($travel->pickups, $travel->dropOffs);
|
$this->mergeDropOffPricesIntoPickups($travel->pickups, $travel->dropOffs);
|
||||||
@@ -102,19 +112,19 @@ class TravelParser extends AbstractParser
|
|||||||
$selectionGroups = [];
|
$selectionGroups = [];
|
||||||
|
|
||||||
$node->each(function (Crawler $groupNode) use (&$selectionGroups) {
|
$node->each(function (Crawler $groupNode) use (&$selectionGroups) {
|
||||||
$groupId = (int) $groupNode->attr('idbuspro');
|
$groupId = (int) $this->getRequiredAttrValue($groupNode, 'idbuspro', 'selection group node');
|
||||||
$selectionGroup = new CrmSelectionGroup();
|
$selectionGroup = new CrmSelectionGroup();
|
||||||
$selectionGroup->id = $groupId;
|
$selectionGroup->id = $groupId;
|
||||||
$selectionGroup->label = $groupNode->attr('bezeichnung');
|
$selectionGroup->label = $this->getAttrOrNullValue($groupNode, 'bezeichnung');
|
||||||
|
|
||||||
$groupNode
|
$groupNode
|
||||||
->filterXPath('//selektion')
|
->filterXPath('.//selektion')
|
||||||
->each(function (Crawler $selectionNode) use (&$selectionGroups, &$selectionGroup, $groupId) {
|
->each(function (Crawler $selectionNode) use (&$selectionGroups, &$selectionGroup, $groupId) {
|
||||||
$selectionId = (int) $selectionNode->attr('idbuspro');
|
$selectionId = (int) $this->getRequiredAttrValue($selectionNode, 'idbuspro', 'selection node');
|
||||||
$selection = new CrmSelection();
|
$selection = new CrmSelection();
|
||||||
$selection->id = $selectionId;
|
$selection->id = $selectionId;
|
||||||
$selection->label = $selectionNode->attr('bezeichnung');
|
$selection->label = $this->getAttrOrNullValue($selectionNode, 'bezeichnung');
|
||||||
$selectionGroups[$groupId]['selections'][$selectionId] = $selectionNode->attr('bezeichnung');
|
$selectionGroups[$groupId]['selections'][$selectionId] = $this->getAttrOrNullValue($selectionNode, 'bezeichnung');
|
||||||
$selectionGroup->selections[] = $selection;
|
$selectionGroup->selections[] = $selection;
|
||||||
})
|
})
|
||||||
;
|
;
|
||||||
@@ -140,23 +150,26 @@ class TravelParser extends AbstractParser
|
|||||||
$additionalServices = [];
|
$additionalServices = [];
|
||||||
|
|
||||||
$node->each(function (Crawler $serviceNode) use (&$additionalServices) {
|
$node->each(function (Crawler $serviceNode) use (&$additionalServices) {
|
||||||
$serviceId = (int) $serviceNode->attr('idbuspro');
|
$serviceId = (int) $this->getRequiredAttrValue($serviceNode, 'idbuspro', 'additional service node');
|
||||||
|
|
||||||
$service = new Service();
|
$service = new Service();
|
||||||
$service->source = Constants::SOURCE_TRAVEL;
|
$service->source = Constants::SOURCE_TRAVEL;
|
||||||
$service->category = Constants::CATEGORY_ADDITIONAL;
|
$service->category = Constants::CATEGORY_ADDITIONAL;
|
||||||
$service->id = $serviceId;
|
$service->id = $serviceId;
|
||||||
$service->subType = $serviceNode->attr('unterart');
|
$service->subType = $this->getAttrOrNullValue($serviceNode, 'unterart');
|
||||||
$service->mandatory = $this->stringToBool($serviceNode->attr('pflicht'));
|
$service->mandatory = $this->stringToBool($this->getAttrOrNullValue($serviceNode, 'pflicht'));
|
||||||
$service->dateFrom = $this->stringToDate($serviceNode->attr('termin'));
|
$autoBookValue = $this->getAttrOrNullValue($serviceNode, 'automatisch_buchen');
|
||||||
$service->dateTo = $this->stringToDate($serviceNode->attr('bis'));
|
$service->autoBook = $this->stringToBool($autoBookValue)
|
||||||
$service->label = $this->getStringOrNullValue($serviceNode->filterXPath('//text'));
|
|| 'true' === strtolower((string) $autoBookValue);
|
||||||
|
$service->dateFrom = $this->stringToDate($this->getAttrOrNullValue($serviceNode, 'termin'));
|
||||||
|
$service->dateTo = $this->stringToDate($this->getAttrOrNullValue($serviceNode, 'bis'));
|
||||||
|
$service->label = $this->getStringOrNullValue($serviceNode->filterXPath('.//text'));
|
||||||
$service->price = $this
|
$service->price = $this
|
||||||
->stringToFloat($this->getStringOrNullValue($serviceNode->filterXPath('//preis')));
|
->stringToFloat($this->getStringOrNullValue($serviceNode->filterXPath('.//preis')));
|
||||||
$service->status = $this->getStringOrNullValue($serviceNode->filterXPath('//status'));
|
$service->status = $this->getStringOrNullValue($serviceNode->filterXPath('.//status'));
|
||||||
|
|
||||||
// Parse optional description from hinweis node
|
// Parse optional description from hinweis node
|
||||||
$description = $this->getStringOrNullValue($serviceNode->filterXPath('//hinweis'));
|
$description = $this->getStringOrNullValue($serviceNode->filterXPath('.//hinweis'));
|
||||||
if (null !== $description && '' !== trim($description)) {
|
if (null !== $description && '' !== trim($description)) {
|
||||||
$service->description = $description;
|
$service->description = $description;
|
||||||
}
|
}
|
||||||
@@ -165,7 +178,7 @@ class TravelParser extends AbstractParser
|
|||||||
$this->parseServiceAgeConstraints($serviceNode, $service);
|
$this->parseServiceAgeConstraints($serviceNode, $service);
|
||||||
|
|
||||||
// Parse insurance calculation flag
|
// Parse insurance calculation flag
|
||||||
$service->includeInInsuranceCalculation = $this->stringToBool($serviceNode->attr('versicherungsberechnung'));
|
$service->includeInInsuranceCalculation = $this->stringToBool($this->getAttrOrNullValue($serviceNode, 'versicherungsberechnung'));
|
||||||
|
|
||||||
$additionalServices[$serviceId] = $service;
|
$additionalServices[$serviceId] = $service;
|
||||||
});
|
});
|
||||||
@@ -188,34 +201,34 @@ class TravelParser extends AbstractParser
|
|||||||
$transportationServices = [];
|
$transportationServices = [];
|
||||||
|
|
||||||
$node->each(function (Crawler $serviceNode) use (&$transportationServices) {
|
$node->each(function (Crawler $serviceNode) use (&$transportationServices) {
|
||||||
$serviceId = (int) $serviceNode->attr('idbuspro');
|
$serviceId = (int) $this->getRequiredAttrValue($serviceNode, 'idbuspro', 'transportation service node');
|
||||||
|
|
||||||
$service = new Service();
|
$service = new Service();
|
||||||
$service->source = Constants::SOURCE_TRAVEL;
|
$service->source = Constants::SOURCE_TRAVEL;
|
||||||
$service->category = Constants::CATEGORY_TRANSPORTATION;
|
$service->category = Constants::CATEGORY_TRANSPORTATION;
|
||||||
$service->id = $serviceId;
|
$service->id = $serviceId;
|
||||||
$service->subType = $serviceNode->attr('unterart');
|
$service->subType = $this->getAttrOrNullValue($serviceNode, 'unterart');
|
||||||
$service->dateFrom = $this->stringToDate($serviceNode->attr('termin'));
|
$service->dateFrom = $this->stringToDate($this->getAttrOrNullValue($serviceNode, 'termin'));
|
||||||
$service->dateTo = $this->stringToDate($serviceNode->attr('bis'));
|
$service->dateTo = $this->stringToDate($this->getAttrOrNullValue($serviceNode, 'bis'));
|
||||||
$service->label = $this->getStringOrNullValue($serviceNode->filterXPath('//text'));
|
$service->label = $this->getStringOrNullValue($serviceNode->filterXPath('.//text'));
|
||||||
$service->direction = $this->getStringOrNullValue($serviceNode->filterXPath('//richtung'));
|
$service->direction = $this->getStringOrNullValue($serviceNode->filterXPath('.//richtung'));
|
||||||
$service->status = $this->getStringOrNullValue($serviceNode->filterXPath('//status'));
|
$service->status = $this->getStringOrNullValue($serviceNode->filterXPath('.//status'));
|
||||||
$service->price = $this
|
$service->price = $this
|
||||||
->stringToFloat($this->getStringOrNullValue($serviceNode->filterXPath('//preis')));
|
->stringToFloat($this->getStringOrNullValue($serviceNode->filterXPath('.//preis')));
|
||||||
|
|
||||||
// Parse optional description from hinweis node
|
// Parse optional description from hinweis node
|
||||||
$description = $this->getStringOrNullValue($serviceNode->filterXPath('//hinweis'));
|
$description = $this->getStringOrNullValue($serviceNode->filterXPath('.//hinweis'));
|
||||||
if (null !== $description && '' !== trim($description)) {
|
if (null !== $description && '' !== trim($description)) {
|
||||||
$service->description = $description;
|
$service->description = $description;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (null !== $timeFrom = $serviceNode->attr('uhrzeit_von')) {
|
if (null !== $timeFrom = $this->getAttrOrNullValue($serviceNode, 'uhrzeit_von')) {
|
||||||
$service->timeFrom = $timeFrom;
|
$service->timeFrom = $timeFrom;
|
||||||
$service->dayTime = (new DayTimeUtility())->mapTime($timeFrom);
|
$service->dayTime = (new DayTimeUtility())->mapTime($timeFrom);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Parse insurance calculation flag
|
// Parse insurance calculation flag
|
||||||
$service->includeInInsuranceCalculation = $this->stringToBool($serviceNode->attr('versicherungsberechnung'));
|
$service->includeInInsuranceCalculation = $this->stringToBool($this->getAttrOrNullValue($serviceNode, 'versicherungsberechnung'));
|
||||||
|
|
||||||
$transportationServices[$serviceId] = $service;
|
$transportationServices[$serviceId] = $service;
|
||||||
});
|
});
|
||||||
@@ -242,8 +255,8 @@ class TravelParser extends AbstractParser
|
|||||||
$guideNode = $guideNodes->first();
|
$guideNode = $guideNodes->first();
|
||||||
|
|
||||||
$guide = new Guide();
|
$guide = new Guide();
|
||||||
$guide->name = $this->getStringOrNullValue($guideNode->filterXPath('//name'));
|
$guide->name = $this->getStringOrNullValue($guideNode->filterXPath('.//name'));
|
||||||
$guide->phone = $this->getStringOrNullValue($guideNode->filterXPath('//telefon'));
|
$guide->phone = $this->getStringOrNullValue($guideNode->filterXPath('.//telefon'));
|
||||||
|
|
||||||
return $guide;
|
return $guide;
|
||||||
}
|
}
|
||||||
@@ -311,16 +324,26 @@ class TravelParser extends AbstractParser
|
|||||||
* @param Crawler $node The XML node containing hotel data
|
* @param Crawler $node The XML node containing hotel data
|
||||||
* @param int|null $hotelId Optional hotel ID to filter by
|
* @param int|null $hotelId Optional hotel ID to filter by
|
||||||
*
|
*
|
||||||
* @return Crawler The hotel XML node
|
* @return Crawler|null The hotel XML node or null if none exists and no specific hotel was requested
|
||||||
*/
|
*/
|
||||||
public function getHotelNode(Crawler $node, ?int $hotelId): Crawler
|
public function getHotelNode(Crawler $node, ?int $hotelId): ?Crawler
|
||||||
{
|
{
|
||||||
// In case not hotel id is provided, take the first hotel node (which is most probably the only one)
|
// In case not hotel id is provided, take the first hotel node (which is most probably the only one)
|
||||||
if (null === $hotelId) {
|
if (null === $hotelId) {
|
||||||
return $node->filterXPath('//hotel')->first();
|
$hotelNode = $node->filterXPath('.//hotel');
|
||||||
|
|
||||||
|
if (0 === $hotelNode->count()) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return $hotelNode->first();
|
||||||
}
|
}
|
||||||
|
|
||||||
$hotelNode = $node->filterXPath(sprintf('//hotel[@idbuspro="%d"]', $hotelId));
|
$hotelNode = $node->filterXPath(sprintf('.//hotel[@idbuspro="%d"]', $hotelId));
|
||||||
|
|
||||||
|
if (0 === $hotelNode->count()) {
|
||||||
|
throw new \InvalidArgumentException(sprintf('No hotel node found for idbuspro %d.', $hotelId));
|
||||||
|
}
|
||||||
|
|
||||||
return $hotelNode->first();
|
return $hotelNode->first();
|
||||||
}
|
}
|
||||||
@@ -337,7 +360,7 @@ class TravelParser extends AbstractParser
|
|||||||
*/
|
*/
|
||||||
public function getRooms(Crawler $node): array
|
public function getRooms(Crawler $node): array
|
||||||
{
|
{
|
||||||
$roomNodes = $node->filterXPath('//zimmer/preis');
|
$roomNodes = $node->filterXPath('.//zimmer/preis');
|
||||||
|
|
||||||
if (0 === $roomNodes->count()) {
|
if (0 === $roomNodes->count()) {
|
||||||
return [];
|
return [];
|
||||||
@@ -346,27 +369,29 @@ class TravelParser extends AbstractParser
|
|||||||
$rooms = [];
|
$rooms = [];
|
||||||
|
|
||||||
$roomNodes->each(function (Crawler $roomNode) use (&$rooms) {
|
$roomNodes->each(function (Crawler $roomNode) use (&$rooms) {
|
||||||
$roomCode = $roomNode->attr('zimmercode');
|
$roomCode = $this->getAttrOrNullValue($roomNode, 'zimmercode');
|
||||||
|
|
||||||
if (true === in_array($roomCode, $this->ignoredRoomCodes, true)) {
|
if (true === in_array($roomCode, $this->ignoredRoomCodes, true)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
$roomId = (int) $roomNode->attr('idbuspro_zimmer');
|
$roomId = (int) $this->getRequiredAttrValue($roomNode, 'idbuspro_zimmer', 'room price node');
|
||||||
|
|
||||||
$room = new Room();
|
$room = new Room();
|
||||||
$room->id = $roomId;
|
$room->id = $roomId;
|
||||||
$room->code = $roomCode;
|
$room->code = $roomCode;
|
||||||
$room->category = $roomNode->attr('kat');
|
$room->category = $this->getAttrOrNullValue($roomNode, 'kat');
|
||||||
$room->boardId = (int) $roomNode->attr('idbuspro_vp');
|
$room->boardId = (int) $this->getAttrOrNullValue($roomNode, 'idbuspro_vp');
|
||||||
$room->label = $roomNode->attr('zimmertext');
|
$room->label = $this->getAttrOrNullValue($roomNode, 'zimmertext');
|
||||||
$room->minPax = (int) $roomNode->attr('minpax');
|
$room->minPax = (int) $this->getAttrOrNullValue($roomNode, 'minpax');
|
||||||
$room->maxPax = (int) $roomNode->attr('maxpax');
|
$room->maxPax = (int) $this->getAttrOrNullValue($roomNode, 'maxpax');
|
||||||
$room->nights = (int) $roomNode->attr('naechte');
|
$room->nights = (int) $this->getAttrOrNullValue($roomNode, 'naechte');
|
||||||
$room->price = $roomNode->attr('preis') ?
|
$roomPrice = $this->getAttrOrNullValue($roomNode, 'preis');
|
||||||
$this->stringToFloat($roomNode->attr('preis')) : null;
|
$room->price = null !== $roomPrice && '' !== $roomPrice
|
||||||
$room->status = $roomNode->attr('status');
|
? $this->stringToFloat($roomPrice)
|
||||||
$room->available = (int) $roomNode->attr('verfuegbar');
|
: null;
|
||||||
|
$room->status = $this->getAttrOrNullValue($roomNode, 'status');
|
||||||
|
$room->available = (int) $this->getAttrOrNullValue($roomNode, 'verfuegbar');
|
||||||
|
|
||||||
$rooms[$roomId] = $room;
|
$rooms[$roomId] = $room;
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -0,0 +1,96 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace App\Command;
|
||||||
|
|
||||||
|
use App\BusProNet\XmlLoader\TravelLoader;
|
||||||
|
use App\Service\TravelSnapshotManager;
|
||||||
|
use Psr\Log\LoggerInterface;
|
||||||
|
use Symfony\Component\Console\Attribute\AsCommand;
|
||||||
|
use Symfony\Component\Console\Command\Command;
|
||||||
|
use Symfony\Component\Console\Command\LockableTrait;
|
||||||
|
use Symfony\Component\Console\Input\InputInterface;
|
||||||
|
use Symfony\Component\Console\Input\InputOption;
|
||||||
|
use Symfony\Component\Console\Output\OutputInterface;
|
||||||
|
use Symfony\Component\Console\Style\SymfonyStyle;
|
||||||
|
|
||||||
|
#[AsCommand(
|
||||||
|
name: 'app:bpn:refresh-travel-snapshot',
|
||||||
|
description: 'Refreshes active travel snapshots using extended availability data.',
|
||||||
|
)]
|
||||||
|
/**
|
||||||
|
* Console entrypoint for refreshing persisted travel snapshots.
|
||||||
|
*
|
||||||
|
* Runs extended availability enrichment in batch mode and triggers
|
||||||
|
* retention cleanup in the same invocation.
|
||||||
|
*/
|
||||||
|
class BpnRefreshTravelSnapshotCommand extends Command
|
||||||
|
{
|
||||||
|
use LockableTrait;
|
||||||
|
|
||||||
|
public function __construct(
|
||||||
|
private readonly TravelSnapshotManager $snapshotService,
|
||||||
|
private readonly LoggerInterface $logger,
|
||||||
|
private readonly TravelLoader $travelLoader,
|
||||||
|
) {
|
||||||
|
parent::__construct();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Configures refresh-control and cleanup options.
|
||||||
|
*/
|
||||||
|
protected function configure(): void
|
||||||
|
{
|
||||||
|
$this
|
||||||
|
->addOption('limit', null, InputOption::VALUE_REQUIRED, 'Maximum number of snapshots to process', '500')
|
||||||
|
->addOption('force', 'f', InputOption::VALUE_NONE, 'Refresh even if snapshot was refreshed recently')
|
||||||
|
->addOption('refresh-after', null, InputOption::VALUE_REQUIRED, 'Minimum minutes since last refresh before a snapshot is eligible (ignored with --force)', '360')
|
||||||
|
;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Executes snapshot refresh and purge flow.
|
||||||
|
*/
|
||||||
|
protected function execute(InputInterface $input, OutputInterface $output): int
|
||||||
|
{
|
||||||
|
$io = new SymfonyStyle($input, $output);
|
||||||
|
|
||||||
|
if (false === $this->lock('bpn_xml_sync')) {
|
||||||
|
$this->logger->info('Snapshot refresh skipped: xml-sync is running');
|
||||||
|
|
||||||
|
return Command::SUCCESS;
|
||||||
|
}
|
||||||
|
|
||||||
|
$limit = (int) $input->getOption('limit');
|
||||||
|
$force = true === $input->getOption('force');
|
||||||
|
$refreshAfterMinutes = (int) $input->getOption('refresh-after');
|
||||||
|
|
||||||
|
$xmlFileMap = null;
|
||||||
|
try {
|
||||||
|
$xmlFileMap = $this->travelLoader->generateFilesMap();
|
||||||
|
} catch (\Throwable $e) {
|
||||||
|
$this->logger->warning('Failed to load XML files map for snapshot refresh filtering; skipping all candidates', [
|
||||||
|
'error' => $e->getMessage(),
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Phase 2 — enrich non-XML-backed snapshots via extended-availability API
|
||||||
|
$xmlDateIds = null !== $xmlFileMap ? array_keys($xmlFileMap) : null;
|
||||||
|
$result = $this->snapshotService->refreshExtendedSnapshots($limit, $force, $refreshAfterMinutes, $xmlDateIds);
|
||||||
|
|
||||||
|
$io->success(sprintf(
|
||||||
|
'Snapshot refresh complete: %d processed, %d updated, %d failed',
|
||||||
|
$result['processed'],
|
||||||
|
$result['updated'],
|
||||||
|
$result['failed']
|
||||||
|
));
|
||||||
|
|
||||||
|
$this->logger->info('Travel snapshot refresh finished', $result);
|
||||||
|
|
||||||
|
$deleted = $this->snapshotService->purgeExpiredSnapshots();
|
||||||
|
$io->note(sprintf('Deleted %d expired snapshots.', $deleted));
|
||||||
|
|
||||||
|
return Command::SUCCESS;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -5,6 +5,9 @@ declare(strict_types=1);
|
|||||||
namespace App\Command;
|
namespace App\Command;
|
||||||
|
|
||||||
use App\BusProNet\Model\XmlExportInfo;
|
use App\BusProNet\Model\XmlExportInfo;
|
||||||
|
use App\BusProNet\XmlLoader\TravelLoader;
|
||||||
|
use App\Service\TravelDataProvider;
|
||||||
|
use App\Service\TravelSnapshotManager;
|
||||||
use League\Flysystem\FilesystemException;
|
use League\Flysystem\FilesystemException;
|
||||||
use League\Flysystem\FilesystemOperator;
|
use League\Flysystem\FilesystemOperator;
|
||||||
use League\Flysystem\StorageAttributes;
|
use League\Flysystem\StorageAttributes;
|
||||||
@@ -30,7 +33,6 @@ class BpnXmlSyncCommand extends Command
|
|||||||
'bpn_travels_mapping',
|
'bpn_travels_mapping',
|
||||||
'bpn_hotels',
|
'bpn_hotels',
|
||||||
'bpn_pickups',
|
'bpn_pickups',
|
||||||
'bpn_insurances',
|
|
||||||
];
|
];
|
||||||
|
|
||||||
public function __construct(
|
public function __construct(
|
||||||
@@ -38,6 +40,9 @@ class BpnXmlSyncCommand extends Command
|
|||||||
private readonly FilesystemOperator $xmlExport,
|
private readonly FilesystemOperator $xmlExport,
|
||||||
private readonly CacheInterface $cache,
|
private readonly CacheInterface $cache,
|
||||||
private readonly LoggerInterface $logger,
|
private readonly LoggerInterface $logger,
|
||||||
|
private readonly TravelLoader $travelLoader,
|
||||||
|
private readonly TravelDataProvider $travelDataService,
|
||||||
|
private readonly TravelSnapshotManager $snapshotService,
|
||||||
) {
|
) {
|
||||||
parent::__construct();
|
parent::__construct();
|
||||||
}
|
}
|
||||||
@@ -53,7 +58,7 @@ class BpnXmlSyncCommand extends Command
|
|||||||
{
|
{
|
||||||
$io = new SymfonyStyle($input, $output);
|
$io = new SymfonyStyle($input, $output);
|
||||||
|
|
||||||
if (false === $this->lock()) {
|
if (false === $this->lock('bpn_xml_sync')) {
|
||||||
$io->warning('Sync is already running in another process');
|
$io->warning('Sync is already running in another process');
|
||||||
$this->logger->info('XML sync skipped: another instance is running');
|
$this->logger->info('XML sync skipped: another instance is running');
|
||||||
|
|
||||||
@@ -71,19 +76,11 @@ class BpnXmlSyncCommand extends Command
|
|||||||
return Command::SUCCESS;
|
return Command::SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
$io->text(sprintf(
|
$io->text($this->formatInfoLine('Remote', $remoteInfo, $output));
|
||||||
'Remote: %s (%d files)',
|
|
||||||
$remoteInfo->lastTransfer->format('d.m.Y H:i:s'),
|
|
||||||
$remoteInfo->fileCount
|
|
||||||
));
|
|
||||||
|
|
||||||
$localInfo = $this->readLocalInfo();
|
$localInfo = $this->readLocalInfo();
|
||||||
if (null !== $localInfo) {
|
if (null !== $localInfo) {
|
||||||
$io->text(sprintf(
|
$io->text($this->formatInfoLine('Local', $localInfo, $output));
|
||||||
'Local: %s (%d files)',
|
|
||||||
$localInfo->lastTransfer->format('d.m.Y H:i:s'),
|
|
||||||
$localInfo->fileCount
|
|
||||||
));
|
|
||||||
} else {
|
} else {
|
||||||
$io->text('Local: no data');
|
$io->text('Local: no data');
|
||||||
}
|
}
|
||||||
@@ -106,7 +103,7 @@ class BpnXmlSyncCommand extends Command
|
|||||||
$io->section('Syncing files');
|
$io->section('Syncing files');
|
||||||
|
|
||||||
try {
|
try {
|
||||||
$syncedCount = $this->syncFiles($io);
|
$syncResult = $this->syncFiles($io);
|
||||||
} catch (FilesystemException $e) {
|
} catch (FilesystemException $e) {
|
||||||
$io->error(sprintf('Sync failed: %s', $e->getMessage()));
|
$io->error(sprintf('Sync failed: %s', $e->getMessage()));
|
||||||
$this->logger->error('XML sync failed during file transfer', ['exception' => $e]);
|
$this->logger->error('XML sync failed during file transfer', ['exception' => $e]);
|
||||||
@@ -115,11 +112,49 @@ class BpnXmlSyncCommand extends Command
|
|||||||
}
|
}
|
||||||
|
|
||||||
$this->invalidateCaches();
|
$this->invalidateCaches();
|
||||||
$io->text(sprintf('Invalidated %d cache keys', count(self::CACHE_KEYS_TO_INVALIDATE)));
|
$io->info(sprintf('Invalidated %d cache keys', count(self::CACHE_KEYS_TO_INVALIDATE)));
|
||||||
|
|
||||||
$io->success(sprintf('Synced %d files', $syncedCount));
|
$io->section('Refreshing snapshots');
|
||||||
|
|
||||||
|
$xmlFileMap = null;
|
||||||
|
$snapshotResult = null;
|
||||||
|
$orphanedDeleted = null;
|
||||||
|
try {
|
||||||
|
$xmlFileMap = $this->travelLoader->generateFilesMap();
|
||||||
|
} catch (\Throwable $e) {
|
||||||
|
$this->logger->warning('Failed to generate XML file map after sync; snapshot refresh skipped', [
|
||||||
|
'error' => $e->getMessage(),
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (null !== $xmlFileMap) {
|
||||||
|
$total = array_sum(array_map(fn ($entry) => count($entry['hotels']), $xmlFileMap));
|
||||||
|
$io->progressStart($total);
|
||||||
|
|
||||||
|
$snapshotResult = $this->travelDataService->syncSnapshotsFromXml(
|
||||||
|
$xmlFileMap,
|
||||||
|
function () use ($io): void { $io->progressAdvance(); },
|
||||||
|
);
|
||||||
|
|
||||||
|
$io->progressFinish();
|
||||||
|
|
||||||
|
$orphanedDeleted = $this->snapshotService->purgeOrphanedFutureSnapshots(array_keys($xmlFileMap));
|
||||||
|
}
|
||||||
|
|
||||||
|
$successMessage = sprintf('Sync complete: %d files updated, %d files deleted', $syncResult['updated'], $syncResult['deleted']);
|
||||||
|
if (null !== $snapshotResult) {
|
||||||
|
$successMessage .= sprintf(', snapshots: %d processed, %d failed', $snapshotResult['processed'], $snapshotResult['failed']);
|
||||||
|
}
|
||||||
|
if (null !== $orphanedDeleted) {
|
||||||
|
$successMessage .= sprintf(', orphaned deleted: %d', $orphanedDeleted);
|
||||||
|
}
|
||||||
|
$io->success($successMessage);
|
||||||
$this->logger->info('XML sync completed', [
|
$this->logger->info('XML sync completed', [
|
||||||
'files_synced' => $syncedCount,
|
'files_updated' => $syncResult['updated'],
|
||||||
|
'files_deleted' => $syncResult['deleted'],
|
||||||
|
'snapshots_processed' => $snapshotResult['processed'] ?? null,
|
||||||
|
'snapshots_failed' => $snapshotResult['failed'] ?? null,
|
||||||
|
'orphaned_deleted' => $orphanedDeleted,
|
||||||
'remote_timestamp' => $remoteInfo->lastTransfer->format('c'),
|
'remote_timestamp' => $remoteInfo->lastTransfer->format('c'),
|
||||||
]);
|
]);
|
||||||
|
|
||||||
@@ -157,19 +192,29 @@ class BpnXmlSyncCommand extends Command
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
* @return array<string, int>
|
||||||
|
*
|
||||||
* @throws FilesystemException
|
* @throws FilesystemException
|
||||||
*/
|
*/
|
||||||
private function syncFiles(SymfonyStyle $io): int
|
private function syncFiles(SymfonyStyle $io): array
|
||||||
{
|
{
|
||||||
$files = $this->xmlSource
|
$remoteFiles = $this->xmlSource
|
||||||
->listContents('.')
|
->listContents('.')
|
||||||
->filter(fn (StorageAttributes $attributes) => $attributes->isFile())
|
->filter(fn (StorageAttributes $attributes) => $attributes->isFile())
|
||||||
->map(fn (StorageAttributes $attributes) => $attributes->path())
|
->map(fn (StorageAttributes $attributes) => $attributes->path())
|
||||||
->toArray();
|
->toArray();
|
||||||
|
|
||||||
$io->progressStart(count($files));
|
$localFiles = $this->xmlExport
|
||||||
|
->listContents('.')
|
||||||
|
->filter(fn (StorageAttributes $attributes) => $attributes->isFile())
|
||||||
|
->map(fn (StorageAttributes $attributes) => $attributes->path())
|
||||||
|
->toArray();
|
||||||
|
|
||||||
foreach ($files as $path) {
|
$filesToDelete = array_diff($localFiles, $remoteFiles);
|
||||||
|
|
||||||
|
$io->progressStart(count($remoteFiles));
|
||||||
|
|
||||||
|
foreach ($remoteFiles as $path) {
|
||||||
$content = $this->xmlSource->read($path);
|
$content = $this->xmlSource->read($path);
|
||||||
$this->xmlExport->write($path, $content);
|
$this->xmlExport->write($path, $content);
|
||||||
$io->progressAdvance();
|
$io->progressAdvance();
|
||||||
@@ -177,7 +222,14 @@ class BpnXmlSyncCommand extends Command
|
|||||||
|
|
||||||
$io->progressFinish();
|
$io->progressFinish();
|
||||||
|
|
||||||
return count($files);
|
foreach ($filesToDelete as $path) {
|
||||||
|
$this->xmlExport->delete($path);
|
||||||
|
}
|
||||||
|
|
||||||
|
return [
|
||||||
|
'updated' => count($remoteFiles),
|
||||||
|
'deleted' => count($filesToDelete),
|
||||||
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
private function invalidateCaches(): void
|
private function invalidateCaches(): void
|
||||||
@@ -186,4 +238,18 @@ class BpnXmlSyncCommand extends Command
|
|||||||
$this->cache->delete($key);
|
$this->cache->delete($key);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private function formatInfoLine(string $label, XmlExportInfo $info, OutputInterface $output): string
|
||||||
|
{
|
||||||
|
if ($output->isVerbose()) {
|
||||||
|
return sprintf(
|
||||||
|
'%s: %s (%d files)',
|
||||||
|
$label,
|
||||||
|
$info->lastTransfer->format('d.m.Y H:i:s'),
|
||||||
|
$info->fileCount
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return sprintf('%s: %d files', $label, $info->fileCount);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,48 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace App\Command;
|
||||||
|
|
||||||
|
use App\Repository\NewsletterOptInConfirmationRepository;
|
||||||
|
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:newsletter-opt-in-requests',
|
||||||
|
description: 'Removes expired pending newsletter double opt-in requests',
|
||||||
|
)]
|
||||||
|
class CleanupNewsletterOptInRequestsCommand extends Command
|
||||||
|
{
|
||||||
|
public function __construct(
|
||||||
|
private readonly NewsletterOptInConfirmationRepository $confirmationRepository,
|
||||||
|
private readonly LoggerInterface $logger,
|
||||||
|
) {
|
||||||
|
parent::__construct();
|
||||||
|
}
|
||||||
|
|
||||||
|
protected function execute(InputInterface $input, OutputInterface $output): int
|
||||||
|
{
|
||||||
|
$io = new SymfonyStyle($input, $output);
|
||||||
|
|
||||||
|
$deletedCount = $this->confirmationRepository->deleteExpiredPending();
|
||||||
|
|
||||||
|
if (0 === $deletedCount) {
|
||||||
|
$io->success('No expired pending newsletter opt-in requests found.');
|
||||||
|
|
||||||
|
return Command::SUCCESS;
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->logger->info('Deleted expired pending newsletter opt-in requests', [
|
||||||
|
'count' => $deletedCount,
|
||||||
|
]);
|
||||||
|
|
||||||
|
$io->success(sprintf('Deleted %d expired pending newsletter opt-in request(s).', $deletedCount));
|
||||||
|
|
||||||
|
return Command::SUCCESS;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -6,7 +6,7 @@ namespace App\Command;
|
|||||||
|
|
||||||
use App\BusProNet\Model\Booking;
|
use App\BusProNet\Model\Booking;
|
||||||
use App\Repository\BookingEditDraftRepository;
|
use App\Repository\BookingEditDraftRepository;
|
||||||
use App\Service\BookingEditDataLoaderService;
|
use App\Service\BookingEditDataLoader;
|
||||||
use Doctrine\ORM\EntityManagerInterface;
|
use Doctrine\ORM\EntityManagerInterface;
|
||||||
use Symfony\Component\Console\Attribute\AsCommand;
|
use Symfony\Component\Console\Attribute\AsCommand;
|
||||||
use Symfony\Component\Console\Command\Command;
|
use Symfony\Component\Console\Command\Command;
|
||||||
@@ -23,7 +23,7 @@ class DraftBackfillBookingNumberCommand extends Command
|
|||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private readonly BookingEditDraftRepository $draftRepository,
|
private readonly BookingEditDraftRepository $draftRepository,
|
||||||
private readonly BookingEditDataLoaderService $dataLoader,
|
private readonly BookingEditDataLoader $dataLoader,
|
||||||
private readonly EntityManagerInterface $entityManager,
|
private readonly EntityManagerInterface $entityManager,
|
||||||
) {
|
) {
|
||||||
parent::__construct();
|
parent::__construct();
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ declare(strict_types=1);
|
|||||||
namespace App\Command;
|
namespace App\Command;
|
||||||
|
|
||||||
use App\Repository\BookingEditDraftRepository;
|
use App\Repository\BookingEditDraftRepository;
|
||||||
|
use Doctrine\ORM\EntityManagerInterface;
|
||||||
use Symfony\Component\Console\Attribute\AsCommand;
|
use Symfony\Component\Console\Attribute\AsCommand;
|
||||||
use Symfony\Component\Console\Command\Command;
|
use Symfony\Component\Console\Command\Command;
|
||||||
use Symfony\Component\Console\Input\InputInterface;
|
use Symfony\Component\Console\Input\InputInterface;
|
||||||
@@ -20,6 +21,7 @@ class DraftInspectCommand extends Command
|
|||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private readonly BookingEditDraftRepository $draftRepository,
|
private readonly BookingEditDraftRepository $draftRepository,
|
||||||
|
private readonly EntityManagerInterface $entityManager,
|
||||||
) {
|
) {
|
||||||
parent::__construct();
|
parent::__construct();
|
||||||
}
|
}
|
||||||
@@ -102,11 +104,10 @@ class DraftInspectCommand extends Command
|
|||||||
return Command::SUCCESS;
|
return Command::SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
$em = $this->draftRepository->getEntityManager();
|
|
||||||
foreach ($drafts as $draft) {
|
foreach ($drafts as $draft) {
|
||||||
$em->remove($draft);
|
$this->entityManager->remove($draft);
|
||||||
}
|
}
|
||||||
$em->flush();
|
$this->entityManager->flush();
|
||||||
|
|
||||||
$io->success(sprintf('Deleted %d draft(s).', \count($drafts)));
|
$io->success(sprintf('Deleted %d draft(s).', \count($drafts)));
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,75 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace App\Command;
|
||||||
|
|
||||||
|
use App\Entity\LogEntry;
|
||||||
|
use App\Repository\LogEntryRepository;
|
||||||
|
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\Output\OutputInterface;
|
||||||
|
use Symfony\Component\Console\Style\SymfonyStyle;
|
||||||
|
|
||||||
|
#[AsCommand(
|
||||||
|
name: 'app:log-entry:backfill-error-codes',
|
||||||
|
description: 'Backfills error_code column from extra data in existing log entries'
|
||||||
|
)]
|
||||||
|
class LogEntryBackfillErrorCodesCommand extends Command
|
||||||
|
{
|
||||||
|
private const BATCH_SIZE = 100;
|
||||||
|
|
||||||
|
public function __construct(
|
||||||
|
private readonly LogEntryRepository $logEntryRepository,
|
||||||
|
private readonly EntityManagerInterface $entityManager,
|
||||||
|
) {
|
||||||
|
parent::__construct();
|
||||||
|
}
|
||||||
|
|
||||||
|
protected function execute(InputInterface $input, OutputInterface $output): int
|
||||||
|
{
|
||||||
|
$io = new SymfonyStyle($input, $output);
|
||||||
|
|
||||||
|
$io->info('Starting backfill of error codes...');
|
||||||
|
|
||||||
|
$totalProcessed = 0;
|
||||||
|
$totalUpdated = 0;
|
||||||
|
|
||||||
|
while (true) {
|
||||||
|
$entries = $this->logEntryRepository->createQueryBuilder('l')
|
||||||
|
->where('l.errorCode IS NULL')
|
||||||
|
->andWhere('l.extra LIKE :pattern')
|
||||||
|
->setParameter('pattern', '%error_code%')
|
||||||
|
->orderBy('l.id', 'ASC')
|
||||||
|
->setMaxResults(self::BATCH_SIZE)
|
||||||
|
->getQuery()
|
||||||
|
->getResult();
|
||||||
|
|
||||||
|
if ([] === $entries) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach ($entries as $entry) {
|
||||||
|
/** @var LogEntry $entry */
|
||||||
|
$extra = $entry->getExtra();
|
||||||
|
if (isset($extra['error_code']) && null === $entry->getErrorCode()) {
|
||||||
|
$entry->setErrorCode($extra['error_code']);
|
||||||
|
++$totalUpdated;
|
||||||
|
}
|
||||||
|
++$totalProcessed;
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->entityManager->flush();
|
||||||
|
$this->entityManager->clear();
|
||||||
|
|
||||||
|
$io->writeln(sprintf('Processed %d entries, %d updated so far', $totalProcessed, $totalUpdated));
|
||||||
|
}
|
||||||
|
|
||||||
|
$message = sprintf('Backfill complete. Processed %d entries, updated %d with error codes.', $totalProcessed, $totalUpdated);
|
||||||
|
$io->success($message);
|
||||||
|
|
||||||
|
return Command::SUCCESS;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -9,9 +9,13 @@ use App\BusProNet\Exception\ApiClientException;
|
|||||||
use App\BusProNet\Model\Notification;
|
use App\BusProNet\Model\Notification;
|
||||||
use App\BusProNet\Model\PersonalData;
|
use App\BusProNet\Model\PersonalData;
|
||||||
use App\Entity\User;
|
use App\Entity\User;
|
||||||
|
use App\Exception\NewsletterProviderException;
|
||||||
use App\Form\PersonalDataType;
|
use App\Form\PersonalDataType;
|
||||||
|
use App\Repository\NewsletterOptInConfirmationRepository;
|
||||||
use App\Security\Crypt;
|
use App\Security\Crypt;
|
||||||
use App\Service\BookingEditDataLoaderService;
|
use App\Service\BookingEditDataLoader;
|
||||||
|
use App\Service\MailjetApiClient;
|
||||||
|
use App\Service\NewsletterManager;
|
||||||
use App\Service\ProfileCompletenessChecker;
|
use App\Service\ProfileCompletenessChecker;
|
||||||
use Doctrine\ORM\EntityManagerInterface;
|
use Doctrine\ORM\EntityManagerInterface;
|
||||||
use Psr\Log\LoggerInterface;
|
use Psr\Log\LoggerInterface;
|
||||||
@@ -33,19 +37,22 @@ class PersonalDataController extends AbstractController
|
|||||||
public const SESSION_REDIRECT_KEY = '_profile_completion_redirect';
|
public const SESSION_REDIRECT_KEY = '_profile_completion_redirect';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param ApiClient $apiClient BusProNet API client for data operations
|
* @param ApiClient $apiClient BusProNet API client for data operations
|
||||||
* @param Crypt $crypt Encryption service for password handling
|
* @param Crypt $crypt Encryption service for password handling
|
||||||
* @param BookingEditDataLoaderService $dataLoader Data loader for cache invalidation
|
* @param BookingEditDataLoader $dataLoader Data loader for cache invalidation
|
||||||
* @param ProfileCompletenessChecker $completenessChecker Profile validation service
|
* @param ProfileCompletenessChecker $completenessChecker Profile validation service
|
||||||
* @param EntityManagerInterface $entityManager Entity manager for persisting user changes
|
* @param EntityManagerInterface $entityManager Entity manager for persisting user changes
|
||||||
* @param LoggerInterface $logger Logger for audit trails and debugging
|
* @param LoggerInterface $logger Logger for audit trails and debugging
|
||||||
*/
|
*/
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private readonly ApiClient $apiClient,
|
private readonly ApiClient $apiClient,
|
||||||
private readonly Crypt $crypt,
|
private readonly Crypt $crypt,
|
||||||
private readonly BookingEditDataLoaderService $dataLoader,
|
private readonly BookingEditDataLoader $dataLoader,
|
||||||
private readonly ProfileCompletenessChecker $completenessChecker,
|
private readonly ProfileCompletenessChecker $completenessChecker,
|
||||||
private readonly EntityManagerInterface $entityManager,
|
private readonly EntityManagerInterface $entityManager,
|
||||||
|
private readonly MailjetApiClient $newsletterService,
|
||||||
|
private readonly NewsletterManager $doubleOptInService,
|
||||||
|
private readonly NewsletterOptInConfirmationRepository $newsletterConfirmationRepository,
|
||||||
private readonly LoggerInterface $logger,
|
private readonly LoggerInterface $logger,
|
||||||
) {
|
) {
|
||||||
}
|
}
|
||||||
@@ -130,9 +137,27 @@ class PersonalDataController extends AbstractController
|
|||||||
return $this->redirectToRoute('app_personal_data');
|
return $this->redirectToRoute('app_personal_data');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$newsletterSubscribed = false;
|
||||||
|
$newsletterPendingConfirmation = false;
|
||||||
|
try {
|
||||||
|
$newsletterSubscribed = $this->newsletterService->isSubscribed($email);
|
||||||
|
} catch (NewsletterProviderException $e) {
|
||||||
|
$this->logger->warning('Unable to read newsletter subscription status', [
|
||||||
|
'email' => $email,
|
||||||
|
'error' => $e->getMessage(),
|
||||||
|
]);
|
||||||
|
$this->addFlash('error', 'Der Newsletter-Status konnte gerade nicht geladen werden.');
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!$newsletterSubscribed) {
|
||||||
|
$newsletterPendingConfirmation = null !== $this->newsletterConfirmationRepository->findPendingByEmail($email);
|
||||||
|
}
|
||||||
|
|
||||||
return $this->render('account/personal_data.html.twig', [
|
return $this->render('account/personal_data.html.twig', [
|
||||||
'personalData' => $personalData,
|
'personalData' => $personalData,
|
||||||
'personalDataForm' => $personalDataForm->createView(),
|
'personalDataForm' => $personalDataForm->createView(),
|
||||||
|
'newsletterSubscribed' => $newsletterSubscribed,
|
||||||
|
'newsletterPendingConfirmation' => $newsletterPendingConfirmation,
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -149,43 +174,43 @@ class PersonalDataController extends AbstractController
|
|||||||
*/
|
*/
|
||||||
#[Route('/personal-data/newsletter', name: 'app_personal_data_newsletter', methods: ['POST'])]
|
#[Route('/personal-data/newsletter', name: 'app_personal_data_newsletter', methods: ['POST'])]
|
||||||
#[IsGranted('ROLE_USER')]
|
#[IsGranted('ROLE_USER')]
|
||||||
public function newsletter(): Response
|
public function newsletter(Request $request): Response
|
||||||
{
|
{
|
||||||
/** @var User $user */
|
/** @var User $user */
|
||||||
$user = $this->getUser();
|
$user = $this->getUser();
|
||||||
$email = $user->getEmail();
|
$email = $user->getEmail();
|
||||||
$password = $this->crypt->decrypt($user->getPassword());
|
|
||||||
|
$shouldSubscribe = $request->request->getBoolean('subscribed');
|
||||||
|
|
||||||
try {
|
try {
|
||||||
$personalData = $this
|
if ($shouldSubscribe) {
|
||||||
->apiClient
|
if ($this->newsletterService->isSubscribed($email)) {
|
||||||
->getPersonalData($email, $password);
|
$this->addFlash('info', 'Du bist bereits zum Newsletter angemeldet.');
|
||||||
} catch (ApiClientException $e) {
|
} else {
|
||||||
$this->addFlash('error', 'Deine persönlichen Daten konnten nicht abgerufen werden');
|
$hasPendingConfirmation = null !== $this->newsletterConfirmationRepository->findPendingByEmail($email);
|
||||||
|
$this->doubleOptInService->requestConfirmation($email);
|
||||||
|
if ($hasPendingConfirmation) {
|
||||||
|
$this->addFlash('success', 'Wir haben dir eine neue Bestätigungs-E-Mail gesendet.');
|
||||||
|
} else {
|
||||||
|
$this->addFlash('success', 'Bitte bestätige deine Newsletter-Anmeldung über den Link in der E-Mail.');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
$this->newsletterService->unsubscribe($email);
|
||||||
|
$this->addFlash('success', 'Du wurdest vom Newsletter abgemeldet.');
|
||||||
|
}
|
||||||
|
|
||||||
return $this->redirectToRoute('app_personal_data');
|
$this->logger->info('Updated newsletter registration intent', [
|
||||||
}
|
|
||||||
|
|
||||||
if ($personalData instanceof Notification) {
|
|
||||||
$this->logger->error('Unable to fetch personal data', [
|
|
||||||
'code' => $personalData->code,
|
|
||||||
'error' => $personalData->message,
|
|
||||||
]);
|
|
||||||
$this->addFlash('error', 'Deine persönlichen Daten konnten nicht abgerufen werden');
|
|
||||||
|
|
||||||
return $this->redirectToRoute('app_personal_data');
|
|
||||||
}
|
|
||||||
|
|
||||||
$personalData->communication->newsletter = !$personalData->communication->newsletter;
|
|
||||||
|
|
||||||
try {
|
|
||||||
$this->apiClient->updateNewsletterRegistration($email, $password, $personalData);
|
|
||||||
$this->addFlash('success', 'Deine Anmeldung zum Newsletter wurde aktualisiert');
|
|
||||||
$this->logger->info('Updated newsletter registration', [
|
|
||||||
'email' => $user->getEmail(),
|
'email' => $user->getEmail(),
|
||||||
|
'subscribed' => $shouldSubscribe,
|
||||||
|
]);
|
||||||
|
} catch (NewsletterProviderException|\InvalidArgumentException $e) {
|
||||||
|
$this->addFlash('error', 'Die Newsletter-Aktion konnte gerade nicht verarbeitet werden. Bitte versuche es erneut.');
|
||||||
|
$this->logger->warning('Newsletter action failed', [
|
||||||
|
'email' => $email,
|
||||||
|
'subscribed' => $shouldSubscribe,
|
||||||
|
'error' => $e->getMessage(),
|
||||||
]);
|
]);
|
||||||
} catch (ApiClientException $e) {
|
|
||||||
$this->addFlash('error', $e->getMessage());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return $this->redirectToRoute('app_personal_data');
|
return $this->redirectToRoute('app_personal_data');
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ namespace App\Controller\Admin;
|
|||||||
use App\Admin\Field\JsonDataField;
|
use App\Admin\Field\JsonDataField;
|
||||||
use App\Entity\BookingEditDraft;
|
use App\Entity\BookingEditDraft;
|
||||||
use App\Entity\User;
|
use App\Entity\User;
|
||||||
use App\Service\BookingExportService;
|
use App\Service\BookingExporter;
|
||||||
use EasyCorp\Bundle\EasyAdminBundle\Config\Action;
|
use EasyCorp\Bundle\EasyAdminBundle\Config\Action;
|
||||||
use EasyCorp\Bundle\EasyAdminBundle\Config\Actions;
|
use EasyCorp\Bundle\EasyAdminBundle\Config\Actions;
|
||||||
use EasyCorp\Bundle\EasyAdminBundle\Config\Crud;
|
use EasyCorp\Bundle\EasyAdminBundle\Config\Crud;
|
||||||
@@ -19,10 +19,11 @@ use EasyCorp\Bundle\EasyAdminBundle\Router\AdminUrlGenerator;
|
|||||||
use Symfony\Component\HttpFoundation\Response;
|
use Symfony\Component\HttpFoundation\Response;
|
||||||
use Symfony\Component\Routing\Attribute\Route;
|
use Symfony\Component\Routing\Attribute\Route;
|
||||||
|
|
||||||
|
/** @extends AbstractCrudController<BookingEditDraft> */
|
||||||
class BookingEditDraftCrudController extends AbstractCrudController
|
class BookingEditDraftCrudController extends AbstractCrudController
|
||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private readonly BookingExportService $exportService,
|
private readonly BookingExporter $exportService,
|
||||||
private readonly AdminUrlGenerator $adminUrlGenerator,
|
private readonly AdminUrlGenerator $adminUrlGenerator,
|
||||||
) {
|
) {
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,16 +4,28 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
namespace App\Controller\Admin;
|
namespace App\Controller\Admin;
|
||||||
|
|
||||||
|
use App\Admin\Field\JsonDataField;
|
||||||
use App\Entity\LogEntry;
|
use App\Entity\LogEntry;
|
||||||
|
use App\Repository\LogEntryRepository;
|
||||||
|
use App\Service\XmlDumpReader;
|
||||||
use EasyCorp\Bundle\EasyAdminBundle\Config\Action;
|
use EasyCorp\Bundle\EasyAdminBundle\Config\Action;
|
||||||
use EasyCorp\Bundle\EasyAdminBundle\Config\Actions;
|
use EasyCorp\Bundle\EasyAdminBundle\Config\Actions;
|
||||||
use EasyCorp\Bundle\EasyAdminBundle\Config\Crud;
|
use EasyCorp\Bundle\EasyAdminBundle\Config\Crud;
|
||||||
use EasyCorp\Bundle\EasyAdminBundle\Controller\AbstractCrudController;
|
use EasyCorp\Bundle\EasyAdminBundle\Controller\AbstractCrudController;
|
||||||
use EasyCorp\Bundle\EasyAdminBundle\Field\DateTimeField;
|
use EasyCorp\Bundle\EasyAdminBundle\Field\DateTimeField;
|
||||||
use EasyCorp\Bundle\EasyAdminBundle\Field\TextField;
|
use EasyCorp\Bundle\EasyAdminBundle\Field\TextField;
|
||||||
|
use League\Flysystem\FilesystemException;
|
||||||
|
use Symfony\Component\HttpFoundation\Request;
|
||||||
|
use Symfony\Component\HttpFoundation\Response;
|
||||||
|
|
||||||
|
/** @extends AbstractCrudController<LogEntry> */
|
||||||
class LogEntryCrudController extends AbstractCrudController
|
class LogEntryCrudController extends AbstractCrudController
|
||||||
{
|
{
|
||||||
|
public function __construct(
|
||||||
|
private readonly LogEntryRepository $logEntryRepository,
|
||||||
|
) {
|
||||||
|
}
|
||||||
|
|
||||||
public static function getEntityFqcn(): string
|
public static function getEntityFqcn(): string
|
||||||
{
|
{
|
||||||
return LogEntry::class;
|
return LogEntry::class;
|
||||||
@@ -22,7 +34,7 @@ class LogEntryCrudController extends AbstractCrudController
|
|||||||
public function configureActions(Actions $actions): Actions
|
public function configureActions(Actions $actions): Actions
|
||||||
{
|
{
|
||||||
$viewDumps = Action::new('viewDumps', 'XML Dumps', 'fa fa-file-code')
|
$viewDumps = Action::new('viewDumps', 'XML Dumps', 'fa fa-file-code')
|
||||||
->linkToRoute('admin_xml_dump_list', static fn (LogEntry $entity): array => ['id' => $entity->getId()])
|
->linkToCrudAction('xmlDumps')
|
||||||
->displayIf(static fn (LogEntry $entity): bool => 'bpn' === $entity->getChannel());
|
->displayIf(static fn (LogEntry $entity): bool => 'bpn' === $entity->getChannel());
|
||||||
|
|
||||||
return $actions
|
return $actions
|
||||||
@@ -42,18 +54,45 @@ class LogEntryCrudController extends AbstractCrudController
|
|||||||
return $crud
|
return $crud
|
||||||
->setEntityLabelInSingular('Logeintrag')
|
->setEntityLabelInSingular('Logeintrag')
|
||||||
->setEntityLabelInPlural('Logeinträge')
|
->setEntityLabelInPlural('Logeinträge')
|
||||||
->setDefaultSort(['createdAt' => 'DESC']);
|
->setDefaultSort(['createdAt' => 'DESC'])
|
||||||
|
->setSearchFields(['errorCode', 'message', 'channel', 'extra']);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function configureFields(string $pageName): iterable
|
public function configureFields(string $pageName): iterable
|
||||||
{
|
{
|
||||||
return [
|
yield DateTimeField::new('createdAt', 'Zeitstempel');
|
||||||
DateTimeField::new('createdAt', 'Zeitstempel'),
|
yield TextField::new('errorCode', 'Fehlercode')
|
||||||
TextField::new('errorCode', 'Fehlercode'),
|
->formatValue(static fn (?string $value): string => $value ?? '-');
|
||||||
TextField::new('username', 'Benutzer'),
|
yield TextField::new('username', 'Benutzer');
|
||||||
TextField::new('message', 'Aktion'),
|
yield TextField::new('message', 'Aktion');
|
||||||
TextField::new('requestId', 'Request ID'),
|
yield TextField::new('requestId', 'Request ID');
|
||||||
TextField::new('uri', 'URI'),
|
yield TextField::new('uri', 'URI');
|
||||||
];
|
yield JsonDataField::new('context', 'Kontext')->onlyOnDetail();
|
||||||
|
yield JsonDataField::new('extra', 'Extra')->onlyOnDetail();
|
||||||
|
}
|
||||||
|
|
||||||
|
public function xmlDumps(Request $request, XmlDumpReader $xmlDumpService): Response
|
||||||
|
{
|
||||||
|
$entityId = $request->query->getInt('entityId');
|
||||||
|
if ($entityId <= 0) {
|
||||||
|
throw $this->createNotFoundException('Log entry not found.');
|
||||||
|
}
|
||||||
|
|
||||||
|
$entity = $this->logEntryRepository->find($entityId);
|
||||||
|
if (!$entity instanceof LogEntry) {
|
||||||
|
throw $this->createNotFoundException('Log entry not found.');
|
||||||
|
}
|
||||||
|
|
||||||
|
$dumps = [];
|
||||||
|
try {
|
||||||
|
$dumps = $xmlDumpService->findDumpsForRequestId($entity->getRequestId());
|
||||||
|
} catch (FilesystemException) {
|
||||||
|
}
|
||||||
|
|
||||||
|
return $this->render('admin/xml_dump/list.html.twig', [
|
||||||
|
'logEntry' => $entity,
|
||||||
|
'requestId' => $entity->getRequestId(),
|
||||||
|
'dumps' => $dumps,
|
||||||
|
]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -10,6 +10,7 @@ use EasyCorp\Bundle\EasyAdminBundle\Controller\AbstractCrudController;
|
|||||||
use EasyCorp\Bundle\EasyAdminBundle\Field\DateTimeField;
|
use EasyCorp\Bundle\EasyAdminBundle\Field\DateTimeField;
|
||||||
use EasyCorp\Bundle\EasyAdminBundle\Field\TextField;
|
use EasyCorp\Bundle\EasyAdminBundle\Field\TextField;
|
||||||
|
|
||||||
|
/** @extends AbstractCrudController<User> */
|
||||||
class UserCrudController extends AbstractCrudController
|
class UserCrudController extends AbstractCrudController
|
||||||
{
|
{
|
||||||
public static function getEntityFqcn(): string
|
public static function getEntityFqcn(): string
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ declare(strict_types=1);
|
|||||||
namespace App\Controller\Admin;
|
namespace App\Controller\Admin;
|
||||||
|
|
||||||
use App\Repository\LogEntryRepository;
|
use App\Repository\LogEntryRepository;
|
||||||
use App\Service\XmlDumpService;
|
use App\Service\XmlDumpReader;
|
||||||
use League\Flysystem\FilesystemException;
|
use League\Flysystem\FilesystemException;
|
||||||
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
||||||
use Symfony\Component\HttpFoundation\Response;
|
use Symfony\Component\HttpFoundation\Response;
|
||||||
@@ -19,7 +19,7 @@ use Symfony\Component\Security\Http\Attribute\IsGranted;
|
|||||||
class XmlDumpController extends AbstractController
|
class XmlDumpController extends AbstractController
|
||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private readonly XmlDumpService $xmlDumpService,
|
private readonly XmlDumpReader $xmlDumpService,
|
||||||
private readonly LogEntryRepository $logEntryRepository,
|
private readonly LogEntryRepository $logEntryRepository,
|
||||||
) {
|
) {
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ use League\Flysystem\FilesystemException;
|
|||||||
use League\Flysystem\FilesystemOperator;
|
use League\Flysystem\FilesystemOperator;
|
||||||
use Psr\Log\LoggerInterface;
|
use Psr\Log\LoggerInterface;
|
||||||
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
||||||
|
use Symfony\Component\HttpFoundation\Exception\JsonException;
|
||||||
use Symfony\Component\HttpFoundation\JsonResponse;
|
use Symfony\Component\HttpFoundation\JsonResponse;
|
||||||
use Symfony\Component\HttpFoundation\Request;
|
use Symfony\Component\HttpFoundation\Request;
|
||||||
use Symfony\Component\HttpFoundation\Response;
|
use Symfony\Component\HttpFoundation\Response;
|
||||||
@@ -73,7 +74,7 @@ class PickupController extends AbstractController
|
|||||||
{
|
{
|
||||||
try {
|
try {
|
||||||
$payload = $request->toArray();
|
$payload = $request->toArray();
|
||||||
} catch (\JsonException $e) {
|
} catch (JsonException $e) {
|
||||||
$this->logger->error('Failed to update pickups planning data', [
|
$this->logger->error('Failed to update pickups planning data', [
|
||||||
'message' => $e->getMessage(),
|
'message' => $e->getMessage(),
|
||||||
'payload' => (string) $request->getContent(),
|
'payload' => (string) $request->getContent(),
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ use App\BusProNet\ApiClient;
|
|||||||
use App\BusProNet\Exception\ApiClientException;
|
use App\BusProNet\Exception\ApiClientException;
|
||||||
use App\BusProNet\Model\Travel;
|
use App\BusProNet\Model\Travel;
|
||||||
use App\BusProNet\Utility\DateCodeUtility;
|
use App\BusProNet\Utility\DateCodeUtility;
|
||||||
use App\Service\TravelDataService;
|
use App\Service\TravelDataProvider;
|
||||||
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
||||||
use Symfony\Component\HttpFoundation\JsonResponse;
|
use Symfony\Component\HttpFoundation\JsonResponse;
|
||||||
use Symfony\Component\HttpFoundation\Request;
|
use Symfony\Component\HttpFoundation\Request;
|
||||||
@@ -21,7 +21,7 @@ class TravelController extends AbstractController
|
|||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private readonly ApiClient $apiClient,
|
private readonly ApiClient $apiClient,
|
||||||
private readonly TravelDataService $travelDataService,
|
private readonly TravelDataProvider $travelDataService,
|
||||||
) {
|
) {
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -58,7 +58,7 @@ class TravelController extends AbstractController
|
|||||||
name: 'api_travel_single_code',
|
name: 'api_travel_single_code',
|
||||||
defaults: ['hotelCode' => null],
|
defaults: ['hotelCode' => null],
|
||||||
)]
|
)]
|
||||||
public function byCode(Request $request, $dateCode, ?string $hotelCode = null): JsonResponse
|
public function byCode(Request $request, string $dateCode, ?string $hotelCode = null): JsonResponse
|
||||||
{
|
{
|
||||||
// sanitize date code by removing potential dividers
|
// sanitize date code by removing potential dividers
|
||||||
$dateCode = (new DateCodeUtility())->sanitize($dateCode);
|
$dateCode = (new DateCodeUtility())->sanitize($dateCode);
|
||||||
@@ -114,7 +114,7 @@ class TravelController extends AbstractController
|
|||||||
bool $preferRemote = false,
|
bool $preferRemote = false,
|
||||||
): ?Travel {
|
): ?Travel {
|
||||||
return match ($source) {
|
return match ($source) {
|
||||||
'local' => $this->travelDataService->getTravelDataFromXml($dateId, $hotelId),
|
'local' => $this->travelDataService->getTravelDataFromLocal($dateId, $hotelId),
|
||||||
'remote' => $this->travelDataService->getTravelDataFromApi($dateId, $hotelId),
|
'remote' => $this->travelDataService->getTravelDataFromApi($dateId, $hotelId),
|
||||||
default => $this->travelDataService->getTravelData($dateId, $hotelId, $preferRemote),
|
default => $this->travelDataService->getTravelData($dateId, $hotelId, $preferRemote),
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -66,6 +66,11 @@ class UserinfoController extends AbstractController
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param list<string> $scopes
|
||||||
|
*
|
||||||
|
* @return array<string, mixed>
|
||||||
|
*/
|
||||||
private function getClaims(PersonalData $data, array $scopes): array
|
private function getClaims(PersonalData $data, array $scopes): array
|
||||||
{
|
{
|
||||||
// get all available claims
|
// get all available claims
|
||||||
|
|||||||
@@ -11,8 +11,9 @@ use App\Exception\NoRoomsAvailableException;
|
|||||||
use App\Exception\TravelNotFoundException;
|
use App\Exception\TravelNotFoundException;
|
||||||
use App\Htmx\HxTrait;
|
use App\Htmx\HxTrait;
|
||||||
use App\Model\BookingQueryParams;
|
use App\Model\BookingQueryParams;
|
||||||
use App\Service\BookingService;
|
use App\Service\BookingConfigurator;
|
||||||
use App\Service\BookingSummaryDataService;
|
use App\Service\BookingSessionManager;
|
||||||
|
use App\Service\BookingSummaryAssembler;
|
||||||
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
||||||
use Symfony\Component\HttpFoundation\Request;
|
use Symfony\Component\HttpFoundation\Request;
|
||||||
use Symfony\Component\HttpFoundation\Response;
|
use Symfony\Component\HttpFoundation\Response;
|
||||||
@@ -31,9 +32,10 @@ class IndexController extends AbstractController
|
|||||||
use HxTrait;
|
use HxTrait;
|
||||||
|
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private readonly BookingService $bookingService,
|
private readonly BookingConfigurator $bookingService,
|
||||||
|
private readonly BookingSessionManager $bookingSessionService,
|
||||||
private readonly AgencyLoader $agencyLoader,
|
private readonly AgencyLoader $agencyLoader,
|
||||||
private readonly BookingSummaryDataService $summaryDataService,
|
private readonly BookingSummaryAssembler $summaryDataService,
|
||||||
) {
|
) {
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -84,13 +86,13 @@ class IndexController extends AbstractController
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
// Clear any existing booking session to ensure fresh start
|
// Clear any existing booking session to ensure fresh start
|
||||||
$this->bookingService->clearBookingSession($request);
|
$this->bookingSessionService->clearBookingSession($request);
|
||||||
|
|
||||||
// Determine agency ID from optional query parameter
|
// Determine agency ID from optional query parameter
|
||||||
$agencyId = $this->resolveAgencyId($params->agency);
|
$agencyId = $this->resolveAgencyId($params->agency);
|
||||||
|
|
||||||
// Store optional return URL in session (defaults to main EP site)
|
// Store optional return URL in session (defaults to main EP site)
|
||||||
$this->bookingService->storeReturnUrl($request, $params->returnUrl);
|
$this->bookingSessionService->storeReturnUrl($request, $params->returnUrl);
|
||||||
|
|
||||||
// Create fresh booking session with the provided parameters
|
// Create fresh booking session with the provided parameters
|
||||||
$bookingDto = $this->bookingService->startFreshBooking($request, $dateId, $hotelId, $agencyId);
|
$bookingDto = $this->bookingService->startFreshBooking($request, $dateId, $hotelId, $agencyId);
|
||||||
@@ -154,10 +156,10 @@ class IndexController extends AbstractController
|
|||||||
{
|
{
|
||||||
if (Request::METHOD_POST === $request->getMethod()) {
|
if (Request::METHOD_POST === $request->getMethod()) {
|
||||||
// Get return URL before clearing session (for guest users)
|
// Get return URL before clearing session (for guest users)
|
||||||
$returnUrl = $this->bookingService->getReturnUrl($request);
|
$returnUrl = $this->bookingSessionService->getReturnUrl($request);
|
||||||
|
|
||||||
// Clear the booking session
|
// Clear the booking session
|
||||||
$this->bookingService->clearBookingSession($request);
|
$this->bookingSessionService->clearBookingSession($request);
|
||||||
|
|
||||||
// Clear the security target path to prevent redirect loop after login
|
// Clear the security target path to prevent redirect loop after login
|
||||||
// Without this, logging in after cancel would redirect back to a stale booking URL
|
// Without this, logging in after cancel would redirect back to a stale booking URL
|
||||||
@@ -188,7 +190,7 @@ class IndexController extends AbstractController
|
|||||||
public function error(Request $request): Response
|
public function error(Request $request): Response
|
||||||
{
|
{
|
||||||
return $this->render('booking/create/error.html.twig', [
|
return $this->render('booking/create/error.html.twig', [
|
||||||
'returnUrl' => $this->bookingService->getReturnUrl($request),
|
'returnUrl' => $this->bookingSessionService->getReturnUrl($request),
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -9,8 +9,10 @@ use App\Controller\Booking\Traits\BookingExceptionHandlerTrait;
|
|||||||
use App\Form\BookingCreateStep1Type;
|
use App\Form\BookingCreateStep1Type;
|
||||||
use App\Form\Model\BookingDto;
|
use App\Form\Model\BookingDto;
|
||||||
use App\Htmx\HxTrait;
|
use App\Htmx\HxTrait;
|
||||||
use App\Service\BookingService;
|
use App\Service\BookingConfigurator;
|
||||||
use App\Service\BookingSummaryDataService;
|
use App\Service\BookingCreateContextFactory;
|
||||||
|
use App\Service\BookingSessionManager;
|
||||||
|
use App\Service\RoomPricingCalculator;
|
||||||
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
||||||
use Symfony\Component\HttpFoundation\Request;
|
use Symfony\Component\HttpFoundation\Request;
|
||||||
use Symfony\Component\HttpFoundation\Response;
|
use Symfony\Component\HttpFoundation\Response;
|
||||||
@@ -29,8 +31,9 @@ class Step1Controller extends AbstractController
|
|||||||
use HxTrait;
|
use HxTrait;
|
||||||
|
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private readonly BookingService $bookingService,
|
private readonly BookingConfigurator $bookingService,
|
||||||
private readonly BookingSummaryDataService $summaryDataService,
|
private readonly BookingSessionManager $bookingSessionService,
|
||||||
|
private readonly BookingCreateContextFactory $createContextFactory,
|
||||||
) {
|
) {
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -40,14 +43,14 @@ class Step1Controller extends AbstractController
|
|||||||
#[Route('/bookings/create/rooms', name: 'app_booking_create_step_1')]
|
#[Route('/bookings/create/rooms', name: 'app_booking_create_step_1')]
|
||||||
public function index(Request $request): Response
|
public function index(Request $request): Response
|
||||||
{
|
{
|
||||||
$result = $this->getOrCreateBookingCreateDto($this->bookingService, $request);
|
$result = $this->getOrCreateBookingCreateDto($this->bookingSessionService, $request);
|
||||||
if ($result instanceof Response) {
|
if ($result instanceof Response) {
|
||||||
return $result;
|
return $result;
|
||||||
}
|
}
|
||||||
$bookingCreateDto = $result;
|
$bookingCreateDto = $result;
|
||||||
|
|
||||||
// Get or create baseline snapshot for change detection
|
// Get or create baseline snapshot for change detection
|
||||||
$oldRoomSelectionSnapshot = $this->bookingService->getOrCreateBaselineSnapshot($request, $bookingCreateDto);
|
$oldRoomSelectionSnapshot = $this->bookingSessionService->getOrCreateBaselineSnapshot($request, $bookingCreateDto);
|
||||||
|
|
||||||
// Validate step access - allow step 1 or redirect to current step
|
// Validate step access - allow step 1 or redirect to current step
|
||||||
if ($redirect = $this->validateStepAccess($bookingCreateDto, 1)) {
|
if ($redirect = $this->validateStepAccess($bookingCreateDto, 1)) {
|
||||||
@@ -69,25 +72,22 @@ class Step1Controller extends AbstractController
|
|||||||
$this->bookingService->updateBookingStatusFromRoomSelection($bookingCreateDto);
|
$this->bookingService->updateBookingStatusFromRoomSelection($bookingCreateDto);
|
||||||
|
|
||||||
$bookingCreateDto->currentStep = 2;
|
$bookingCreateDto->currentStep = 2;
|
||||||
$this->bookingService->saveBookingDto($request, $bookingCreateDto, BookingDto::MODE_CREATE);
|
$this->bookingSessionService->saveBookingDto($request, $bookingCreateDto, BookingDto::MODE_CREATE);
|
||||||
|
|
||||||
// Clear baseline snapshot when moving to step 2
|
// Clear baseline snapshot when moving to step 2
|
||||||
$this->bookingService->clearBaselineSnapshot($request);
|
$this->bookingSessionService->clearBaselineSnapshot($request);
|
||||||
|
|
||||||
return $this->redirectToRoute('app_booking_create_step_2');
|
return $this->redirectToRoute('app_booking_create_step_2');
|
||||||
}
|
}
|
||||||
|
|
||||||
// Get complete summary data (pricing, rooms, CMS data)
|
$context = $this->createContextFactory->create(
|
||||||
$summaryData = $this->summaryDataService->getSummaryData($bookingCreateDto);
|
$bookingCreateDto,
|
||||||
|
RoomPricingCalculator::PRICING_MODE_SELECTION
|
||||||
$availableRooms = $bookingCreateDto->travel->getAvailableRooms();
|
);
|
||||||
$groupedRooms = $this->bookingService->groupRoomsBySelectionType($availableRooms);
|
|
||||||
|
|
||||||
return $this->render('booking/create/step_1.html.twig', [
|
return $this->render('booking/create/step_1.html.twig', [
|
||||||
'bookingCreateDto' => $bookingCreateDto,
|
'bookingCreateContext' => $context,
|
||||||
'summaryData' => $summaryData,
|
|
||||||
'form' => $form->createView(),
|
'form' => $form->createView(),
|
||||||
'groupedRooms' => $groupedRooms,
|
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -98,7 +98,7 @@ class Step1Controller extends AbstractController
|
|||||||
#[Route('/bookings/create/refresh', name: 'app_booking_create_step_1_refresh', methods: ['POST'])]
|
#[Route('/bookings/create/refresh', name: 'app_booking_create_step_1_refresh', methods: ['POST'])]
|
||||||
public function refresh(Request $request): Response
|
public function refresh(Request $request): Response
|
||||||
{
|
{
|
||||||
$result = $this->getOrCreateBookingCreateDtoForHtmx($this->bookingService, $request);
|
$result = $this->getOrCreateBookingCreateDtoForHtmx($this->bookingSessionService, $request);
|
||||||
if ($result instanceof Response) {
|
if ($result instanceof Response) {
|
||||||
return $result;
|
return $result;
|
||||||
}
|
}
|
||||||
@@ -110,10 +110,10 @@ class Step1Controller extends AbstractController
|
|||||||
]);
|
]);
|
||||||
$form->handleRequest($request);
|
$form->handleRequest($request);
|
||||||
|
|
||||||
// Get complete summary data (pricing, rooms, CMS data)
|
$context = $this->createContextFactory->create(
|
||||||
$summaryData = $this->summaryDataService->getSummaryData($bookingCreateDto);
|
$bookingCreateDto,
|
||||||
$availableRooms = $bookingCreateDto->travel->getAvailableRooms();
|
RoomPricingCalculator::PRICING_MODE_SELECTION
|
||||||
$groupedRooms = $this->bookingService->groupRoomsBySelectionType($availableRooms);
|
);
|
||||||
|
|
||||||
// The DTO is now updated with the latest selection.
|
// The DTO is now updated with the latest selection.
|
||||||
// We can now render the blocks with the fresh data.
|
// We can now render the blocks with the fresh data.
|
||||||
@@ -122,9 +122,7 @@ class Step1Controller extends AbstractController
|
|||||||
['room_selection_form', 'booking_summary'],
|
['room_selection_form', 'booking_summary'],
|
||||||
[
|
[
|
||||||
'form' => $form->createView(),
|
'form' => $form->createView(),
|
||||||
'bookingCreateDto' => $bookingCreateDto,
|
'bookingCreateContext' => $context,
|
||||||
'summaryData' => $summaryData,
|
|
||||||
'groupedRooms' => $groupedRooms,
|
|
||||||
]
|
]
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,23 +4,20 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
namespace App\Controller\Booking\Create;
|
namespace App\Controller\Booking\Create;
|
||||||
|
|
||||||
use App\BusProNet\Constants;
|
use App\BusProNet\Model\Travel;
|
||||||
use App\Controller\Booking\Traits\BookingCreateTrait;
|
use App\Controller\Booking\Traits\BookingCreateTrait;
|
||||||
use App\Controller\Booking\Traits\BookingExceptionHandlerTrait;
|
use App\Controller\Booking\Traits\BookingExceptionHandlerTrait;
|
||||||
use App\Controller\Booking\Traits\ParticipantCardFlowTrait;
|
use App\Entity\User;
|
||||||
use App\Form\BookingCreateStep2Type;
|
use App\Form\BookingCreateStep2Type;
|
||||||
use App\Form\Model\BookingDto;
|
use App\Form\Model\BookingDto;
|
||||||
use App\Form\Service\DummyDataFillService;
|
use App\Form\Model\ParticipantDto;
|
||||||
use App\Form\Service\ParticipantFieldOptionsProvider;
|
use App\Service\BookingConfigurator;
|
||||||
use App\Htmx\HxTrait;
|
use App\Service\BookingCreateContextFactory;
|
||||||
use App\Service\BookingService;
|
use App\Service\BookingSessionManager;
|
||||||
use App\Service\BookingSummaryDataService;
|
use App\Service\ParticipantDataPrefiller;
|
||||||
use App\Service\ParticipantCardDataService;
|
use App\Service\RoomAssigner;
|
||||||
use App\Service\ParticipantPrepopulationService;
|
use App\Service\TravelDataProvider;
|
||||||
use App\Service\RoomAssignmentService;
|
|
||||||
use App\Service\TravelDataService;
|
|
||||||
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
||||||
use Symfony\Component\Form\FormInterface;
|
|
||||||
use Symfony\Component\HttpFoundation\Request;
|
use Symfony\Component\HttpFoundation\Request;
|
||||||
use Symfony\Component\HttpFoundation\Response;
|
use Symfony\Component\HttpFoundation\Response;
|
||||||
use Symfony\Component\Routing\Attribute\Route;
|
use Symfony\Component\Routing\Attribute\Route;
|
||||||
@@ -35,18 +32,14 @@ class Step2Controller extends AbstractController
|
|||||||
{
|
{
|
||||||
use BookingCreateTrait;
|
use BookingCreateTrait;
|
||||||
use BookingExceptionHandlerTrait;
|
use BookingExceptionHandlerTrait;
|
||||||
use HxTrait;
|
|
||||||
use ParticipantCardFlowTrait;
|
|
||||||
|
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private readonly BookingService $bookingService,
|
private readonly BookingConfigurator $bookingService,
|
||||||
private readonly BookingSummaryDataService $summaryDataService,
|
private readonly BookingSessionManager $bookingSessionService,
|
||||||
private readonly TravelDataService $travelDataService,
|
private readonly BookingCreateContextFactory $createContextFactory,
|
||||||
private readonly RoomAssignmentService $roomAssignmentService,
|
private readonly TravelDataProvider $travelDataService,
|
||||||
private readonly ParticipantCardDataService $participantCardService,
|
private readonly RoomAssigner $roomAssignmentService,
|
||||||
private readonly ParticipantFieldOptionsProvider $fieldOptionsProvider,
|
private readonly ParticipantDataPrefiller $prepopulationService,
|
||||||
private readonly ParticipantPrepopulationService $prepopulationService,
|
|
||||||
private readonly DummyDataFillService $dummyDataFillService,
|
|
||||||
) {
|
) {
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -57,7 +50,7 @@ class Step2Controller extends AbstractController
|
|||||||
public function index(Request $request): Response
|
public function index(Request $request): Response
|
||||||
{
|
{
|
||||||
// Load or create booking DTO
|
// Load or create booking DTO
|
||||||
$result = $this->getOrCreateBookingCreateDto($this->bookingService, $request);
|
$result = $this->getOrCreateBookingCreateDto($this->bookingSessionService, $request);
|
||||||
if ($result instanceof Response) {
|
if ($result instanceof Response) {
|
||||||
return $result;
|
return $result;
|
||||||
}
|
}
|
||||||
@@ -71,12 +64,18 @@ class Step2Controller extends AbstractController
|
|||||||
// Enrich with fresh availability data
|
// Enrich with fresh availability data
|
||||||
$this->travelDataService->enrichWithFreshAvailabilities($bookingCreateDto->travel);
|
$this->travelDataService->enrichWithFreshAvailabilities($bookingCreateDto->travel);
|
||||||
|
|
||||||
// Ensure correct number of participants with prepopulation callback
|
// Ensure correct number of participants first, then prepopulate the applicant if needed.
|
||||||
$this->bookingService->ensureCorrectNumberOfParticipants(
|
$this->ensureCorrectNumberOfParticipants($bookingCreateDto);
|
||||||
$bookingCreateDto,
|
|
||||||
$this->getUser(),
|
$user = $this->getUser();
|
||||||
fn ($user, $participant) => $this->prepopulationService->prepopulateApplicantFromUser($user, $participant)
|
if ($user instanceof User
|
||||||
);
|
&& 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)
|
// Validate room assignments against current selection (handles back-navigation from step 2 to step 1)
|
||||||
$this->roomAssignmentService->validateAndResetInvalidAssignments($bookingCreateDto);
|
$this->roomAssignmentService->validateAndResetInvalidAssignments($bookingCreateDto);
|
||||||
@@ -85,10 +84,11 @@ class Step2Controller extends AbstractController
|
|||||||
$this->roomAssignmentService->assignRoomsIfNeeded($bookingCreateDto);
|
$this->roomAssignmentService->assignRoomsIfNeeded($bookingCreateDto);
|
||||||
|
|
||||||
// Preselect mandatory services
|
// Preselect mandatory services
|
||||||
$this->bookingService->preselectMandatoryServices($bookingCreateDto);
|
$this->bookingService->preselectDefaultServices($bookingCreateDto);
|
||||||
|
$this->bookingService->applyCreateBookingStatusRules($bookingCreateDto);
|
||||||
|
|
||||||
// Save BookingDto to session
|
// Save BookingDto to session
|
||||||
$this->bookingService->saveBookingDto($request, $bookingCreateDto, BookingDto::MODE_CREATE);
|
$this->bookingSessionService->saveBookingDto($request, $bookingCreateDto, BookingDto::MODE_CREATE);
|
||||||
|
|
||||||
// Create validation form
|
// Create validation form
|
||||||
$form = $this->createForm(BookingCreateStep2Type::class, $bookingCreateDto);
|
$form = $this->createForm(BookingCreateStep2Type::class, $bookingCreateDto);
|
||||||
@@ -98,141 +98,51 @@ class Step2Controller extends AbstractController
|
|||||||
if (true === $form->isSubmitted() && true === $form->isValid()) {
|
if (true === $form->isSubmitted() && true === $form->isValid()) {
|
||||||
// All participants validated successfully, update current step
|
// All participants validated successfully, update current step
|
||||||
$bookingCreateDto->currentStep = 3;
|
$bookingCreateDto->currentStep = 3;
|
||||||
$this->bookingService->saveBookingDto($request, $bookingCreateDto, BookingDto::MODE_CREATE);
|
$this->bookingSessionService->saveBookingDto($request, $bookingCreateDto, BookingDto::MODE_CREATE);
|
||||||
|
|
||||||
// Proceed to Step 3
|
// Proceed to Step 3
|
||||||
return $this->redirectToRoute('app_booking_create_step_3');
|
return $this->redirectToRoute('app_booking_create_step_3');
|
||||||
}
|
}
|
||||||
|
|
||||||
// Always generate card data with validation state to show completeness
|
$context = $this->createContextFactory->createWithParticipantCards($bookingCreateDto, $form->isSubmitted());
|
||||||
$cardsData = $this->participantCardService->getAllCardsDataWithValidation($bookingCreateDto);
|
|
||||||
|
|
||||||
// Get complete summary data (pricing, rooms, CMS data)
|
|
||||||
$summaryData = $this->summaryDataService->getSummaryData($bookingCreateDto);
|
|
||||||
|
|
||||||
$templateData = [
|
$templateData = [
|
||||||
'form' => $form->createView(),
|
'form' => $form->createView(),
|
||||||
'bookingDto' => $bookingCreateDto,
|
'bookingCreateContext' => $context,
|
||||||
'cardsData' => $cardsData,
|
|
||||||
'summaryData' => $summaryData,
|
|
||||||
'isSubmitted' => $form->isSubmitted(),
|
|
||||||
];
|
];
|
||||||
|
|
||||||
return $this->render('booking/create/step_2.html.twig', $templateData);
|
return $this->render('booking/create/step_2.html.twig', $templateData);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Show or submit individual participant form.
|
* Ensures the booking DTO has the expected number of participant objects based on room selections.
|
||||||
*/
|
*/
|
||||||
#[Route(
|
private function ensureCorrectNumberOfParticipants(BookingDto $bookingDto): void
|
||||||
path: '/bookings/create/participants/{index}',
|
|
||||||
name: 'app_booking_create_step_2_participant',
|
|
||||||
requirements: ['index' => '\d+']
|
|
||||||
)]
|
|
||||||
public function editParticipant(int $index, Request $request): Response
|
|
||||||
{
|
{
|
||||||
$result = $this->loadBookingDtoOrRedirect($request, BookingDto::MODE_CREATE);
|
$participantsCount = $this->calculateParticipantsCount($bookingDto->roomSelections, $bookingDto->travel);
|
||||||
if ($result instanceof Response) {
|
|
||||||
return $result;
|
$existingParticipants = $bookingDto->participants;
|
||||||
|
$bookingDto->participants = [];
|
||||||
|
|
||||||
|
for ($i = 0; $i < $participantsCount; ++$i) {
|
||||||
|
$participant = $existingParticipants[$i] ?? new ParticipantDto();
|
||||||
|
$participant->index = $i;
|
||||||
|
|
||||||
|
$bookingDto->participants[$i] = $participant;
|
||||||
}
|
}
|
||||||
$bookingDto = $result;
|
|
||||||
|
|
||||||
// Validate participant index
|
|
||||||
if (false === isset($bookingDto->participants[$index])) {
|
|
||||||
throw $this->createNotFoundException(sprintf('Participant at index %d does not exist', $index));
|
|
||||||
}
|
|
||||||
|
|
||||||
// Use cached availability data (populated during booking init)
|
|
||||||
$this->travelDataService->enrichWithFreshAvailabilities($bookingDto->travel);
|
|
||||||
|
|
||||||
// Create form with booking_context option
|
|
||||||
$form = $this->createParticipantForm($bookingDto, $index);
|
|
||||||
|
|
||||||
$form->handleRequest($request);
|
|
||||||
|
|
||||||
// Detect dummy data fill token — render pre-filled form immediately, skipping validation
|
|
||||||
$isDummyDataFill = $this
|
|
||||||
->dummyDataFillService
|
|
||||||
->isTokenMatch($bookingDto->participants[$index], $bookingDto->getMode())
|
|
||||||
;
|
|
||||||
if (true === $form->isSubmitted() && true === $isDummyDataFill) {
|
|
||||||
$this->dummyDataFillService->fill($bookingDto->participants[$index], $index);
|
|
||||||
|
|
||||||
// Keep behavior consistent with cards view: newly filled participant data
|
|
||||||
// (especially dateOfBirth) must immediately trigger mandatory service preselection.
|
|
||||||
$this->bookingService->preselectMandatoryServices($bookingDto);
|
|
||||||
|
|
||||||
$bookingDto->bookingStatus = Constants::BOOKING_STATUS_OPEN;
|
|
||||||
$this->bookingService->saveBookingDto($request, $bookingDto, BookingDto::MODE_CREATE);
|
|
||||||
|
|
||||||
// Recreate form with filled DTO so the view shows the dummy data
|
|
||||||
$form = $this->createParticipantForm($bookingDto, $index);
|
|
||||||
|
|
||||||
return $this->renderParticipantForm($form, $index, $bookingDto);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Collect notifications from field handlers (run during PRE_SUBMIT)
|
|
||||||
$notifications = $this->collectAndClearNotifications($bookingDto);
|
|
||||||
|
|
||||||
if (true === $form->isSubmitted() && true === $form->isValid()) {
|
|
||||||
// Save BookingDto to session
|
|
||||||
$this->bookingService->saveBookingDto($request, $bookingDto, BookingDto::MODE_CREATE);
|
|
||||||
|
|
||||||
// Add notifications as flash messages (redirects destroy HTMX-triggered toasts)
|
|
||||||
$this->addNotificationsAsFlashMessages($notifications);
|
|
||||||
|
|
||||||
// HTMX redirect to cards view
|
|
||||||
return $this->redirectToRoute('app_booking_create_step_2');
|
|
||||||
}
|
|
||||||
|
|
||||||
return $this->renderParticipantForm($form, $index, $bookingDto);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/** @param array<int, \App\Form\Model\RoomSelectionDto> $roomSelections */
|
||||||
* HTMX refresh endpoint for individual participant form.
|
private function calculateParticipantsCount(array $roomSelections, Travel $travelData): int
|
||||||
*/
|
|
||||||
#[Route(
|
|
||||||
path: '/bookings/create/participants/{index}/refresh',
|
|
||||||
name: 'app_booking_create_step_2_participant_refresh',
|
|
||||||
requirements: ['index' => '\d+'],
|
|
||||||
methods: ['POST']
|
|
||||||
)]
|
|
||||||
public function refreshParticipantForm(int $index, Request $request): Response
|
|
||||||
{
|
{
|
||||||
$result = $this->loadBookingDtoOrRedirect($request, BookingDto::MODE_CREATE);
|
$participantsCount = 0;
|
||||||
if ($result instanceof Response) {
|
$rooms = $travelData->getAvailableRooms();
|
||||||
return $result;
|
|
||||||
}
|
|
||||||
$bookingDto = $result;
|
|
||||||
|
|
||||||
// Validate participant index
|
foreach ($roomSelections as $roomSelection) {
|
||||||
if (false === isset($bookingDto->participants[$index])) {
|
$room = $rooms[$roomSelection->id];
|
||||||
throw $this->createNotFoundException(sprintf('Participant at index %d does not exist', $index));
|
$participantsCount += $room->minPax * $roomSelection->quantity;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Enrich with fresh availability data
|
return $participantsCount;
|
||||||
$this->travelDataService->enrichWithFreshAvailabilities($bookingDto->travel);
|
|
||||||
|
|
||||||
// Use trait method for refresh handling
|
|
||||||
return $this->handleParticipantRefresh(
|
|
||||||
$request,
|
|
||||||
$bookingDto,
|
|
||||||
$index,
|
|
||||||
'app_booking_create_step_2_participant_refresh'
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
private function renderParticipantForm(
|
|
||||||
FormInterface $form,
|
|
||||||
int $index,
|
|
||||||
BookingDto $bookingDto,
|
|
||||||
): Response {
|
|
||||||
return $this->render('booking/create/step_2_participant.html.twig', [
|
|
||||||
'form' => $form->createView(),
|
|
||||||
'participantIndex' => $index,
|
|
||||||
'bookingDto' => $bookingDto,
|
|
||||||
'summaryData' => $this->summaryDataService->getSummaryData($bookingDto),
|
|
||||||
'refreshRouteName' => 'app_booking_create_step_2_participant_refresh',
|
|
||||||
]);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,238 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace App\Controller\Booking\Create;
|
||||||
|
|
||||||
|
use App\Form\BookingParticipantType;
|
||||||
|
use App\Form\Model\BookingDto;
|
||||||
|
use App\Htmx\HxTrait;
|
||||||
|
use App\Service\BookingConfigurator;
|
||||||
|
use App\Service\BookingCreateContextFactory;
|
||||||
|
use App\Service\BookingSessionManager;
|
||||||
|
use App\Service\ParticipantDataPrefiller;
|
||||||
|
use App\Service\ParticipantFormSupport;
|
||||||
|
use App\Service\RoomPricingCalculator;
|
||||||
|
use App\Service\TravelDataProvider;
|
||||||
|
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
||||||
|
use Symfony\Component\Form\FormInterface;
|
||||||
|
use Symfony\Component\HttpFoundation\Request;
|
||||||
|
use Symfony\Component\HttpFoundation\Response;
|
||||||
|
use Symfony\Component\Routing\Attribute\Route;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Handles participant editing and refresh actions within booking step 2.
|
||||||
|
*/
|
||||||
|
class Step2ParticipantController extends AbstractController
|
||||||
|
{
|
||||||
|
use HxTrait;
|
||||||
|
|
||||||
|
public function __construct(
|
||||||
|
private readonly BookingConfigurator $bookingService,
|
||||||
|
private readonly BookingSessionManager $bookingSessionService,
|
||||||
|
private readonly BookingCreateContextFactory $createContextFactory,
|
||||||
|
private readonly TravelDataProvider $travelDataService,
|
||||||
|
private readonly ParticipantDataPrefiller $prepopulationService,
|
||||||
|
private readonly ParticipantFormSupport $participantFormSupportService,
|
||||||
|
) {
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Show or submit individual participant form.
|
||||||
|
*/
|
||||||
|
#[Route(
|
||||||
|
path: '/bookings/create/participants/{index}',
|
||||||
|
name: 'app_booking_create_step_2_participant',
|
||||||
|
requirements: ['index' => '\d+']
|
||||||
|
)]
|
||||||
|
public function editParticipant(int $index, Request $request): Response
|
||||||
|
{
|
||||||
|
$result = $this->loadBookingDtoOrRedirect($request);
|
||||||
|
if ($result instanceof Response) {
|
||||||
|
return $result;
|
||||||
|
}
|
||||||
|
$bookingDto = $result;
|
||||||
|
|
||||||
|
$this->participantFormSupportService->ensureParticipantExists($bookingDto, $index);
|
||||||
|
|
||||||
|
$this->travelDataService->enrichWithFreshAvailabilities($bookingDto->travel);
|
||||||
|
|
||||||
|
$form = $this->createParticipantForm($bookingDto, $index);
|
||||||
|
|
||||||
|
$form->handleRequest($request);
|
||||||
|
$isSubmitted = $form->isSubmitted();
|
||||||
|
|
||||||
|
$isDummyDataFill = $this
|
||||||
|
->prepopulationService
|
||||||
|
->isDummyDataFillRequested($bookingDto->participants[$index], $bookingDto->getMode())
|
||||||
|
;
|
||||||
|
if (true === $isSubmitted && true === $isDummyDataFill) {
|
||||||
|
$this->prepopulationService->fillDummyParticipant($bookingDto->participants[$index], $index);
|
||||||
|
|
||||||
|
$this->bookingService->preselectDefaultServices($bookingDto);
|
||||||
|
$this->bookingService->applyCreateBookingStatusRules($bookingDto);
|
||||||
|
$this->bookingSessionService->saveBookingDto($request, $bookingDto, BookingDto::MODE_CREATE);
|
||||||
|
|
||||||
|
$form = $this->createParticipantForm($bookingDto, $index);
|
||||||
|
|
||||||
|
return $this->renderParticipantForm($form, $index, $bookingDto);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (true === $isSubmitted) {
|
||||||
|
$this->bookingService->preselectDefaultServices($bookingDto);
|
||||||
|
$this->bookingService->applyCreateBookingStatusRules($bookingDto);
|
||||||
|
}
|
||||||
|
|
||||||
|
$notifications = $this->participantFormSupportService->collectAndClearNotifications($bookingDto);
|
||||||
|
|
||||||
|
if (true === $isSubmitted && true === $form->isValid()) {
|
||||||
|
$this->bookingSessionService->saveBookingDto($request, $bookingDto, BookingDto::MODE_CREATE);
|
||||||
|
$this->addNotificationsAsFlashMessages($notifications);
|
||||||
|
|
||||||
|
return $this->redirectToRoute('app_booking_create_step_2');
|
||||||
|
}
|
||||||
|
|
||||||
|
return $this->renderParticipantForm($form, $index, $bookingDto);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* HTMX refresh endpoint for individual participant form.
|
||||||
|
*/
|
||||||
|
#[Route(
|
||||||
|
path: '/bookings/create/participants/{index}/refresh',
|
||||||
|
name: 'app_booking_create_step_2_participant_refresh',
|
||||||
|
requirements: ['index' => '\d+'],
|
||||||
|
methods: ['POST']
|
||||||
|
)]
|
||||||
|
public function refreshParticipantForm(int $index, Request $request): Response
|
||||||
|
{
|
||||||
|
$result = $this->loadBookingDtoOrRedirect($request);
|
||||||
|
if ($result instanceof Response) {
|
||||||
|
return $result;
|
||||||
|
}
|
||||||
|
$bookingDto = $result;
|
||||||
|
|
||||||
|
$this->participantFormSupportService->ensureParticipantExists($bookingDto, $index);
|
||||||
|
|
||||||
|
$this->travelDataService->enrichWithFreshAvailabilities($bookingDto->travel);
|
||||||
|
|
||||||
|
return $this->handleParticipantRefresh(
|
||||||
|
$request,
|
||||||
|
$bookingDto,
|
||||||
|
$index,
|
||||||
|
'app_booking_create_step_2_participant_refresh'
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @param FormInterface<mixed> $form */
|
||||||
|
private function renderParticipantForm(
|
||||||
|
FormInterface $form,
|
||||||
|
int $index,
|
||||||
|
BookingDto $bookingDto,
|
||||||
|
): Response {
|
||||||
|
$bookingCreateContext = $this->createContextFactory->create(
|
||||||
|
$bookingDto,
|
||||||
|
RoomPricingCalculator::PRICING_MODE_SELECTION
|
||||||
|
);
|
||||||
|
|
||||||
|
return $this->render('booking/create/step_2_participant.html.twig', [
|
||||||
|
'form' => $form->createView(),
|
||||||
|
'participantIndex' => $index,
|
||||||
|
'bookingCreateContext' => $bookingCreateContext,
|
||||||
|
'bookingDto' => $bookingCreateContext->bookingDto,
|
||||||
|
'summaryData' => $bookingCreateContext->summaryData,
|
||||||
|
'refreshRouteName' => 'app_booking_create_step_2_participant_refresh',
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
private function loadBookingDtoOrRedirect(Request $request): BookingDto|Response
|
||||||
|
{
|
||||||
|
$bookingDto = $this->bookingSessionService->getBookingDto($request, BookingDto::MODE_CREATE);
|
||||||
|
|
||||||
|
if (null === $bookingDto) {
|
||||||
|
$this->addFlash('info', 'Deine Sitzung ist abgelaufen. Bitte starte eine neue Buchung.');
|
||||||
|
|
||||||
|
return $this->redirectToRoute('app_login');
|
||||||
|
}
|
||||||
|
|
||||||
|
return $bookingDto;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @return FormInterface<mixed> */
|
||||||
|
private function createParticipantForm(BookingDto $bookingDto, int $index): FormInterface
|
||||||
|
{
|
||||||
|
$wrapper = $this->participantFormSupportService->createParticipantEditDto($bookingDto, $index);
|
||||||
|
|
||||||
|
return $this->createForm(
|
||||||
|
BookingParticipantType::class,
|
||||||
|
$wrapper,
|
||||||
|
$this->participantFormSupportService->getParticipantFormOptions($bookingDto)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
private function handleParticipantRefresh(
|
||||||
|
Request $request,
|
||||||
|
BookingDto $bookingDto,
|
||||||
|
int $index,
|
||||||
|
string $refreshRouteName,
|
||||||
|
): Response {
|
||||||
|
$form = $this->createForm(
|
||||||
|
BookingParticipantType::class,
|
||||||
|
$this->participantFormSupportService->createParticipantEditDto($bookingDto, $index),
|
||||||
|
$this->participantFormSupportService->getParticipantFormOptions($bookingDto, true)
|
||||||
|
);
|
||||||
|
|
||||||
|
$form->handleRequest($request);
|
||||||
|
|
||||||
|
$this->bookingService->preselectDefaultServices($bookingDto);
|
||||||
|
if (BookingDto::MODE_CREATE === $bookingDto->getMode()) {
|
||||||
|
$this->bookingService->applyCreateBookingStatusRules($bookingDto);
|
||||||
|
}
|
||||||
|
|
||||||
|
$form = $this->createForm(
|
||||||
|
BookingParticipantType::class,
|
||||||
|
$this->participantFormSupportService->createParticipantEditDto($bookingDto, $index),
|
||||||
|
$this->participantFormSupportService->getParticipantFormOptions($bookingDto, true)
|
||||||
|
);
|
||||||
|
|
||||||
|
$notifications = $this->participantFormSupportService->collectAndClearNotifications($bookingDto);
|
||||||
|
|
||||||
|
$this->bookingSessionService->saveBookingDto($request, $bookingDto, $bookingDto->getMode());
|
||||||
|
|
||||||
|
$bookingCreateContext = $this->createContextFactory->create(
|
||||||
|
$bookingDto,
|
||||||
|
RoomPricingCalculator::PRICING_MODE_SELECTION
|
||||||
|
);
|
||||||
|
|
||||||
|
$response = $this->htmxOobResponse(
|
||||||
|
'booking/_participant_form.html.twig',
|
||||||
|
['participant_form', 'booking_summary'],
|
||||||
|
[
|
||||||
|
'form' => $form->createView(),
|
||||||
|
'participantIndex' => $index,
|
||||||
|
'bookingCreateContext' => $bookingCreateContext,
|
||||||
|
'bookingDto' => $bookingCreateContext->bookingDto,
|
||||||
|
'summaryData' => $bookingCreateContext->summaryData,
|
||||||
|
'refreshRouteName' => $refreshRouteName,
|
||||||
|
]
|
||||||
|
);
|
||||||
|
|
||||||
|
if (false === empty($notifications)) {
|
||||||
|
$response->headers->set('HX-Trigger', json_encode([
|
||||||
|
'showNotifications' => $notifications,
|
||||||
|
]));
|
||||||
|
}
|
||||||
|
|
||||||
|
return $response;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param array<array{type: string, message: string}> $notifications
|
||||||
|
*/
|
||||||
|
private function addNotificationsAsFlashMessages(array $notifications): void
|
||||||
|
{
|
||||||
|
foreach ($notifications as $notification) {
|
||||||
|
$this->addFlash($notification['type'], $notification['message']);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
Loaded 100 of 305 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user