From b0cb38cf07bfbe719a86add85982aa53d1fb2b5d Mon Sep 17 00:00:00 2001 From: Celestino Bellone Date: Mon, 31 Jan 2022 15:14:58 +0100 Subject: [PATCH 001/218] [Gradle Release Plugin] - new version commit: '2.0-M5-SNAPSHOT'. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 3e28826e05..29e7944834 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ #Tue, 07 Apr 2015 22:45:24 +0200 group=alfio -version=2.0-M4 +version=2.0-M5-SNAPSHOT sourceCompatibility=11 targetCompatibility=11 From 19be24b8441dedfad80c28c99c2dc6d7ad2d7f51 Mon Sep 17 00:00:00 2001 From: Celestino Bellone Date: Mon, 31 Jan 2022 18:08:50 +0100 Subject: [PATCH 002/218] update README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d0ecd788e8..0d7717491d 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ The open source ticket reservation system. ## Warning As the work for Alf.io [v2](https://github.com/alfio-event/alf.io/milestones) has started, this branch may contain **unstable** and **untested** code. -If you want to build and deploy alf.io by yourself, we strongly suggest you to use the [2.0-M3-maintenance](https://github.com/alfio-event/alf.io/tree/2.0-M3-maintenance) branch, as it contains production-ready code. +If you want to build and deploy alf.io by yourself, we strongly suggest you to use the [2.0-M4-maintenance](https://github.com/alfio-event/alf.io/tree/2.0-M4-maintenance) branch, as it contains production-ready code. ## Prerequisites From e5e26fc606428e343b33884a4025b1fce3648c93 Mon Sep 17 00:00:00 2001 From: Celestino Bellone Date: Mon, 31 Jan 2022 18:39:02 +0100 Subject: [PATCH 003/218] update gradle and dependencies --- build.gradle | 34 ++++++++++------------- gradle/wrapper/gradle-wrapper.jar | Bin 58695 -> 59203 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 2 ++ gradlew.bat | 25 +++++------------ 5 files changed, 25 insertions(+), 38 deletions(-) diff --git a/build.gradle b/build.gradle index 3f8d227ba7..9249300a21 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,6 @@ import java.time.format.DateTimeFormatter buildscript { dependencies { - classpath 'com.opentable.components:otj-pg-embedded:0.13.3' classpath 'org.postgresql:postgresql:42.2.20' //this is for processing the index.html at compile time classpath "com.github.alfio-event:alf.io-public-frontend:$alfioPublicFrontendVersion" @@ -33,17 +32,17 @@ buildscript { } plugins { - id 'io.freefair.lombok' version '5.3.3.3' + id 'io.freefair.lombok' version '6.3.0' id 'java' id 'idea' - id 'org.kordamp.gradle.jacoco' version '0.45.0' - id 'com.github.ben-manes.versions' version '0.38.0' + id 'org.kordamp.gradle.jacoco' version '0.47.0' + id 'com.github.ben-manes.versions' version '0.41.0' id 'com.github.hierynomus.license' version '0.16.1' id 'net.researchgate.release' version '2.8.1' - id 'org.springframework.boot' version '2.4.5' + id 'org.springframework.boot' version '2.6.3' id 'org.sonarqube' version '3.3' - id 'net.ltgt.errorprone' version '2.0.1' - id 'com.github.node-gradle.node' version '3.1.0' + id 'net.ltgt.errorprone' version '2.0.2' + id 'com.github.node-gradle.node' version '3.1.1' } apply plugin: 'java' @@ -107,7 +106,7 @@ repositories { dependencies { implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310" - implementation 'com.auth0:java-jwt:3.18.2' + implementation 'com.auth0:java-jwt:3.18.3' implementation "com.fasterxml.jackson.core:jackson-core" implementation "com.fasterxml.jackson.core:jackson-databind" implementation "org.springframework.boot:spring-boot-properties-migrator", { @@ -136,7 +135,7 @@ dependencies { implementation "org.apache.logging.log4j:log4j-slf4j-impl:2.17.1" /**/ - implementation "com.stripe:stripe-java:20.50.0" + implementation 'com.stripe:stripe-java:20.97.0' implementation 'com.paypal.sdk:checkout-sdk:1.0.5' implementation 'com.google.code.gson:gson:2.8.9' implementation 'com.fatboyindustrial.gson-javatime-serialisers:gson-javatime-serialisers:1.1.1', { @@ -162,9 +161,9 @@ dependencies { compileOnly "javax.servlet:javax.servlet-api:4.0.1" testImplementation "javax.servlet:javax.servlet-api:4.0.1" - testImplementation 'org.testcontainers:testcontainers:1.16.2' - testImplementation 'org.testcontainers:postgresql:1.16.2' - testImplementation 'org.testcontainers:junit-jupiter:1.16.2' + testImplementation 'org.testcontainers:testcontainers:1.16.3' + testImplementation 'org.testcontainers:postgresql:1.16.3' + testImplementation 'org.testcontainers:junit-jupiter:1.16.3' testImplementation "org.springframework.boot:spring-boot-starter-test", { exclude module : 'spring-boot-starter-logging' } @@ -327,6 +326,9 @@ test { } } +springBoot { + mainClass = 'alfio.config.SpringBootLauncher' +} bootRun { def externalConfig = new File("./custom.jvmargs") @@ -344,13 +346,10 @@ bootRun { opts += externalConfig.readLines() } jvmArgs = opts - mainClass = 'alfio.config.SpringBootLauncher' } bootWar { - mainClassName = 'alfio.config.SpringBootLauncher' - classifier = 'boot' - + archiveClassifier.set('boot') def bowerDir = "resources/bower_components" def excludesFile = new File("./lib_exclude") if(excludesFile.exists()) { @@ -409,9 +408,6 @@ release { signTag = true } } -// see https://github.com/freefair/gradle-plugins/issues/31#issuecomment-475355674 -// since we have a custom lombok.config configuration file, we disable automatic override -generateLombokConfig.enabled = false // MJML email templates translations to HTML node { diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index f3d88b1c2faf2fc91d853cd5d4242b5547257070..e708b1c023ec8b20f512888fe07c5bd3ff77bb8f 100644 GIT binary patch delta 12842 zcmY+q1ymhDmoSOmQr324hm`&0SZbS3R18r37J8Z0F-T>@gIK` zatajf2b1lO#&E_RnGDF51uk%8Wcxm3`%Yhe7Psx?*?eZ?8M9_+G(?L=s^OG1n#S(NP3gF?2Mr2^f5E7sM~iVC`Rn;(-^MZ zZu*ZXB;XmgvPls(e#)MMTObsEx9oNz-K?AmQ8pP&P7vqx*=5zxjU+ye_1R<%KSg1? z7H&Yh))(Ke!Pa+aVuWxPKa_~Qo_IH}*;tV8n~O*Xa?t3P^9=L%=wOL1=~{LVv}mU8Q#e6s>v}iV8cDP|EdY)`dp≶7^21 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

XiM^r_M1uFTw)(UPqqUJ zed7DJQvOpplYJoNl`A3a2Zr~v)Y}K|*%d7?8;dC*Af}0=(EXrk7hP8PM4v)ZawEv0 z5j5q_6vilv4*ppZ3Wke7%8b`odJu26#YseA?$sP8?@d?TpACTX`G^?%K=Hly9Y$Tj z5`i!}-WH0lQ3yt-&Pf&Z)OxjKfAZ3X`YI2)5o@9EiOA}?kX`^rk;yaOh^Li4VHcT& zd6ztJz^`H!8>cL)a%?Lnofzo0$WPrgkNcP#u@{%~EvA7g#go z+Q4$Q^o_MJTE0G_&9@cgp)WF>2zo>AG}C|(~E^_?ijc2EQ>> zFH1Lxc@i!gDHxvEsrfc+Kiz3Q6Z*NM+U6DH6*-Fv{YDY4>U&eegGH~Xmk~!sd6fw2 z!6^4(MZWhzf(xs6BHy=oS+dir0_JW(j*AIu$9&&p@}T;&6s7(yYidEdkp6pk9}Z(F zk6lG`d!HcJWP{7X)&P5FW;XWU6;zke2e+g*#1kW4L0Auj5pVA45Bhzt{8lj)XyMHu z0p;Q}t*NLnXbGQOTC9WdOQsX;_yLThOP$mzcEbqSBifmDecV;Fqhtm#KxfJTMhY!K zw{1L9za2QtuIWXu0ZYm@Uy72(9^vYajuP$(VAKn+&Jp z!%S;#BqO;02)n~6pFYK8oRC6wXx@kyb?VENM7l?NFg)%^=q4aZ* zwVCZxA8lalF&n`vk#gxD@!9~Aktc+h2UUUax3q2XKQLuL@CpVEpx2IyiH3bALY+Oi zDydtacE1Z|$z5qsCG=%F{}8_ozwieWuM4VcDesuu+wX&YjHm^Ryx)pVtiSLpch7<` zIw9QM%I;(VG9~#Rw2JNt+;?_=O2lA#YSudpgsM`e&(}1 zGdj7U)St4`+Cj#Vn>a;Bj~Q3S1G54;gzq)`b_Hh~ip(`BK#GMkI*RUcK+6ycjl?QN zP%sH5*R$$6A&8j8O4iFJhuHMXLJm|drH+=!_{`60&+tC8*m3Z=YsR@~%eaZyWQI|W zie7;BRL6`LR+4B{%FY~;-^*1GGTCLp!U6VoS36GUAWv$Rcc#|a7DD01{QPB=VyT)? z+1ZV>P=bP1;>v-+j0;BwenO`EKcIbmB3$r*@a~=?5#KB_R$3bTg zOjEutZmWuylIJQEM?28D!4uA#0CZEJHar0TFAW|NwP;WL|EIb_L2>;}e*N!K9E61S zH&u@m!n#CH{C_j}{#ybCRU8z7`Cs{b>@bxSkp3lOm`qAYgB>npnw%V>w}t_+S_Z)s zFhGKq^e%m@=^@sD0CJdAK=`Upbr}?}N zf;snqpt#dOwhxFg82(%Tw=ND+@`O0JGeOWd7-3R8A%Yu%FhiaYXD>p?t2+o%_1CKE z{g(>=g%}X(O%M!}KZK%$7-F<34wD-24`y$WLDv6z?ty=_b)Oi*x&?v}3j0f`AV3HL zWPAYw!XNs-1EmZ9=d=$6LAJISVJ4&gQM5=bh{!f0OmFNz8oMnGgOl_RK5VPP3@87C zpLS$muCo5YTmOslSjFLb`AXIJ@1|O{pm5r z9MxUb-8HMe*|TpFa%dE?+7}MVQ-A-N8wvtq85ROU2%KYt4etC52X0%W08haQgGSU| zvw=K$djTYSLy@4My_Te_8JcZp8Oozg{-ey>*Nm7BkGrX(M~HU6N16U>DSj<`;cy`u zR?0B23zx|*o1V=#fLZ=wd6*NfWjC`pqA^mt>DTZjGBeX`0ZK>Qgxz+37Dyb#NT4WT zl@7Lmh{WdY*h%e_bo6(oXKw=`(9=mft10fOR4< zCOUungtJZPAM~qw4Ydy9PhvYTi1ZRqR5nY)?OX2O3FJ6VXy&`&H%^U|d>N>@f zQ}Cd;DV}_bNiVTW8HcUJDRvXCUwGx|(r2-KbXY>jpd!~jmt(

p*eWM!w;MI3hb2}DlKZV3$r+FsPh`1u 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 2>&1 -if "%ERRORLEVEL%" == "0" goto init +if "%ERRORLEVEL%" == "0" goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -51,7 +54,7 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute echo. echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% @@ -61,28 +64,14 @@ echo location of your Java installation. goto fail -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - :execute @rem Setup the command line set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* :end @rem End local scope for the variables with windows NT shell From 712525065c41f6560af1cacee89aea218587ca08 Mon Sep 17 00:00:00 2001 From: Celestino Bellone Date: Mon, 31 Jan 2022 19:03:44 +0100 Subject: [PATCH 004/218] update dependencies, remove deprecated properties --- build.gradle | 2 +- .../manager/payment/MollieConnectManager.java | 5 +- .../manager/payment/StripeConnectManager.java | 6 +- .../TicketReservationModification.java | 10 --- .../PollApiControllerIntegrationTest.java | 2 +- ...dminReservationManagerIntegrationTest.java | 28 ++++---- .../CheckInManagerIntegrationTest.java | 2 +- .../ConfigurationManagerIntegrationTest.java | 36 +++++------ .../manager/GroupManagerIntegrationTest.java | 8 +-- .../ReverseChargeManagerIntegrationTest.java | 6 +- ...icketReservationManagerConcurrentTest.java | 10 +-- ...cketReservationManagerIntegrationTest.java | 64 +++++++++---------- .../WaitingQueueManagerIntegrationTest.java | 50 +++++++-------- .../system/DataMigratorIntegrationTest.java | 20 +++--- 14 files changed, 118 insertions(+), 131 deletions(-) diff --git a/build.gradle b/build.gradle index 9249300a21..61220660a5 100644 --- a/build.gradle +++ b/build.gradle @@ -151,7 +151,7 @@ dependencies { implementation 'com.atlassian.commonmark:commonmark-ext-gfm-tables:0.17.0' implementation 'com.ryantenney.passkit4j:passkit4j:2.0.1' implementation 'com.github.ben-manes.caffeine:caffeine' - implementation 'com.github.scribejava:scribejava-core:5.0.0' + implementation 'com.github.scribejava:scribejava-core:8.3.1' implementation 'ch.digitalfondue.vatchecker:vatchecker:1.5.0' implementation 'ch.digitalfondue.basicxlsx:basicxlsx:0.5.1' implementation 'org.imgscalr:imgscalr-lib:4.2' diff --git a/src/main/java/alfio/manager/payment/MollieConnectManager.java b/src/main/java/alfio/manager/payment/MollieConnectManager.java index 9c4f314203..1712385c8a 100644 --- a/src/main/java/alfio/manager/payment/MollieConnectManager.java +++ b/src/main/java/alfio/manager/payment/MollieConnectManager.java @@ -27,7 +27,6 @@ import com.github.scribejava.core.builder.ServiceBuilder; import com.github.scribejava.core.builder.api.DefaultApi20; import com.github.scribejava.core.model.OAuth2AccessToken; -import com.github.scribejava.core.model.OAuthConfig; import com.github.scribejava.core.oauth.OAuth20Service; import lombok.AllArgsConstructor; import lombok.extern.log4j.Log4j2; @@ -56,8 +55,8 @@ public AuthorizationRequestDetails getConnectURL(int organizationId) { var options = configurationManager.getFor(Set.of(MOLLIE_API_KEY, MOLLIE_CONNECT_CLIENT_ID, MOLLIE_CONNECT_CALLBACK, BASE_URL), ConfigurationLevel.organization(organizationId)); String callbackURL = options.get(MOLLIE_CONNECT_CALLBACK).getValueOrDefault(options.get(BASE_URL).getRequiredValue() + MOLLIE_CONNECT_REDIRECT_PATH); String state = extensionManager.generateOAuth2StateParam(organizationId).orElse(UUID.randomUUID().toString()); - OAuthConfig config = new OAuthConfig(options.get(MOLLIE_CONNECT_CLIENT_ID).getRequiredValue(), options.get(MOLLIE_API_KEY).getRequiredValue(), callbackURL, SCOPES, null, state, "code", null, null, null); - return new AuthorizationRequestDetails(new MollieConnectApi().getAuthorizationUrl(config, Collections.emptyMap()), state); + return new AuthorizationRequestDetails(new MollieConnectApi() + .getAuthorizationUrl("code", options.get(MOLLIE_CONNECT_CLIENT_ID).getRequiredValue(), callbackURL, SCOPES, state, Collections.emptyMap()), state); } @Override diff --git a/src/main/java/alfio/manager/payment/StripeConnectManager.java b/src/main/java/alfio/manager/payment/StripeConnectManager.java index e1431134cf..86302ae041 100644 --- a/src/main/java/alfio/manager/payment/StripeConnectManager.java +++ b/src/main/java/alfio/manager/payment/StripeConnectManager.java @@ -29,7 +29,6 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.github.scribejava.core.builder.ServiceBuilder; import com.github.scribejava.core.builder.api.DefaultApi20; -import com.github.scribejava.core.model.OAuthConfig; import com.github.scribejava.core.oauth.OAuth20Service; import lombok.extern.log4j.Log4j2; import org.springframework.core.env.Environment; @@ -64,12 +63,11 @@ public StripeConnectManager(ExtensionManager extensionManager, @Override public AuthorizationRequestDetails getConnectURL(int organizationId) { var options = configurationManager.getFor(Set.of(STRIPE_SECRET_KEY, STRIPE_CONNECT_CLIENT_ID, STRIPE_CONNECT_CALLBACK, BASE_URL), ConfigurationLevel.organization(organizationId)); - String secret = options.get(STRIPE_SECRET_KEY).getRequiredValue(); String clientId = options.get(STRIPE_CONNECT_CLIENT_ID).getRequiredValue(); String callbackURL = options.get(STRIPE_CONNECT_CALLBACK).getValueOrDefault(options.get(BASE_URL).getRequiredValue() + STRIPE_CONNECT_REDIRECT_PATH); String state = extensionManager.generateOAuth2StateParam(organizationId).orElse(UUID.randomUUID().toString()); - OAuthConfig config = new OAuthConfig(clientId, secret, callbackURL, "read_write", null, state, "code", null, null, null); - return new AuthorizationRequestDetails(new StripeConnectApi().getAuthorizationUrl(config, Collections.emptyMap()), state); + return new AuthorizationRequestDetails(new StripeConnectApi() + .getAuthorizationUrl("code", clientId, callbackURL, "read_write", state, Collections.emptyMap()), state); } @Override diff --git a/src/main/java/alfio/model/modification/TicketReservationModification.java b/src/main/java/alfio/model/modification/TicketReservationModification.java index ff2afdf08e..9688f8a6d9 100644 --- a/src/main/java/alfio/model/modification/TicketReservationModification.java +++ b/src/main/java/alfio/model/modification/TicketReservationModification.java @@ -28,14 +28,4 @@ public class TicketReservationModification implements Serializable { private Integer quantity; private List> metadata; - // temporary until we replace the public front-end - @Deprecated(forRemoval = true) - public Integer getAmount() { - return quantity; - } - - @Deprecated(forRemoval = true) - public void setAmount(Integer amount) { - this.quantity = amount; - } } diff --git a/src/test/java/alfio/controller/api/v2/user/PollApiControllerIntegrationTest.java b/src/test/java/alfio/controller/api/v2/user/PollApiControllerIntegrationTest.java index 55030dfa19..52ea19df7e 100644 --- a/src/test/java/alfio/controller/api/v2/user/PollApiControllerIntegrationTest.java +++ b/src/test/java/alfio/controller/api/v2/user/PollApiControllerIntegrationTest.java @@ -119,7 +119,7 @@ void init() { pollId = rowCountAndKey.getKey(); LOGGER.info("pollId {}", pollId); TicketReservationModification tr = new TicketReservationModification(); - tr.setAmount(1); + tr.setQuantity(1); TicketCategory category = ticketCategoryRepository.findAllTicketCategories(event.getId()).get(0); tr.setTicketCategoryId(category.getId()); TicketReservationWithOptionalCodeModification mod = new TicketReservationWithOptionalCodeModification(tr, Optional.empty()); diff --git a/src/test/java/alfio/manager/AdminReservationManagerIntegrationTest.java b/src/test/java/alfio/manager/AdminReservationManagerIntegrationTest.java index 05bbc4b2ef..77e8ef28b2 100644 --- a/src/test/java/alfio/manager/AdminReservationManagerIntegrationTest.java +++ b/src/test/java/alfio/manager/AdminReservationManagerIntegrationTest.java @@ -60,7 +60,7 @@ @ContextConfiguration(classes = {DataSourceConfiguration.class, TestConfiguration.class}) @ActiveProfiles({Initializer.PROFILE_DEV, Initializer.PROFILE_DISABLE_JOBS, Initializer.PROFILE_INTEGRATION_TEST}) @Transactional -public class AdminReservationManagerIntegrationTest extends BaseIntegrationTest { +class AdminReservationManagerIntegrationTest extends BaseIntegrationTest { @Autowired private AdminReservationManager adminReservationManager; @@ -86,12 +86,12 @@ public class AdminReservationManagerIntegrationTest extends BaseIntegrationTest private ConfigurationRepository configurationRepository; @BeforeEach - public void init() { + void init() { IntegrationTestUtil.ensureMinimalConfiguration(configurationRepository); } @Test - public void testReserveFromExistingCategory() { + void testReserveFromExistingCategory() { List categories = Collections.singletonList( new TicketCategoryModification(null, "default", TicketCategory.TicketAccessType.INHERIT, AVAILABLE_SEATS, new DateTimeModification(LocalDate.now(ClockProvider.clock()), LocalTime.now(ClockProvider.clock())), @@ -101,7 +101,7 @@ public void testReserveFromExistingCategory() { } @Test - public void testReserveFromExistingMultipleCategories() { + void testReserveFromExistingMultipleCategories() { List categories = Arrays.asList( new TicketCategoryModification(null, "default", TicketCategory.TicketAccessType.INHERIT, 10, new DateTimeModification(LocalDate.now(ClockProvider.clock()), LocalTime.now(ClockProvider.clock())), @@ -115,7 +115,7 @@ public void testReserveFromExistingMultipleCategories() { } @Test - public void testReserveFromExistingCategoryNotEnoughSeatsNotBounded() { + void testReserveFromExistingCategoryNotEnoughSeatsNotBounded() { List categories = Collections.singletonList( new TicketCategoryModification(null, "default", TicketCategory.TicketAccessType.INHERIT, 1, new DateTimeModification(LocalDate.now(ClockProvider.clock()), LocalTime.now(ClockProvider.clock())), @@ -125,7 +125,7 @@ public void testReserveFromExistingCategoryNotEnoughSeatsNotBounded() { } @Test - public void testReserveExistingCategoryNotEnoughSeatsNotBoundedSoldOut() { + void testReserveExistingCategoryNotEnoughSeatsNotBoundedSoldOut() { List categories = Collections.singletonList( new TicketCategoryModification(null, "default", TicketCategory.TicketAccessType.INHERIT, 1, new DateTimeModification(LocalDate.now(ClockProvider.clock()), LocalTime.now(ClockProvider.clock())), @@ -135,7 +135,7 @@ public void testReserveExistingCategoryNotEnoughSeatsNotBoundedSoldOut() { } @Test - public void testReserveFromExistingCategoryNotEnoughSeatsBounded() { + void testReserveFromExistingCategoryNotEnoughSeatsBounded() { List categories = Collections.singletonList( new TicketCategoryModification(null, "default", TicketCategory.TicketAccessType.INHERIT, 1, new DateTimeModification(LocalDate.now(ClockProvider.clock()), LocalTime.now(ClockProvider.clock())), @@ -145,7 +145,7 @@ public void testReserveFromExistingCategoryNotEnoughSeatsBounded() { } @Test - public void testReserveFromExistingCategoryNotEnoughSeatsNoExtensionAllowedBounded() { + void testReserveFromExistingCategoryNotEnoughSeatsNoExtensionAllowedBounded() { List categories = Collections.singletonList( new TicketCategoryModification(null, "default", TicketCategory.TicketAccessType.INHERIT, AVAILABLE_SEATS, new DateTimeModification(LocalDate.now(ClockProvider.clock()), LocalTime.now(ClockProvider.clock())), @@ -155,7 +155,7 @@ public void testReserveFromExistingCategoryNotEnoughSeatsNoExtensionAllowedBound } @Test - public void testReserveFromExistingCategoryNotEnoughSeatsNoExtensionAllowedNotBounded() { + void testReserveFromExistingCategoryNotEnoughSeatsNoExtensionAllowedNotBounded() { List categories = Collections.singletonList( new TicketCategoryModification(null, "default", TicketCategory.TicketAccessType.INHERIT, AVAILABLE_SEATS, new DateTimeModification(LocalDate.now(ClockProvider.clock()), LocalTime.now(ClockProvider.clock())), @@ -165,7 +165,7 @@ public void testReserveFromExistingCategoryNotEnoughSeatsNoExtensionAllowedNotBo } @Test - public void testReserveFromNewCategory() { + void testReserveFromNewCategory() { List categories = Collections.singletonList( new TicketCategoryModification(null, "default", TicketCategory.TicketAccessType.INHERIT, 1, new DateTimeModification(LocalDate.now(ClockProvider.clock()), LocalTime.now(ClockProvider.clock())), @@ -199,7 +199,7 @@ public void testReserveFromNewCategory() { } @Test - public void testReserveMixed() { + void testReserveMixed() { List categories = Collections.singletonList( new TicketCategoryModification(null, "default", TicketCategory.TicketAccessType.INHERIT, 1, new DateTimeModification(LocalDate.now(ClockProvider.clock()), LocalTime.now(ClockProvider.clock())), @@ -245,7 +245,7 @@ public void testReserveMixed() { } @Test - public void testConfirmReservation() { + void testConfirmReservation() { List categories = Collections.singletonList( new TicketCategoryModification(null, "default", TicketCategory.TicketAccessType.INHERIT, 1, new DateTimeModification(LocalDate.now(ClockProvider.clock()), LocalTime.now(ClockProvider.clock())), @@ -266,7 +266,7 @@ public void testConfirmReservation() { } @Test - public void testConfirmReservationSendConfirmationEmail() { + void testConfirmReservationSendConfirmationEmail() { List categories = Collections.singletonList( new TicketCategoryModification(null, "default", TicketCategory.TicketAccessType.INHERIT, 1, new DateTimeModification(LocalDate.now(ClockProvider.clock()), LocalTime.now(ClockProvider.clock())), @@ -310,7 +310,7 @@ private Triple performExistingCategoryTest(Lis if(reservedTickets > 0) { TicketReservationModification trm = new TicketReservationModification(); - trm.setAmount(reservedTickets); + trm.setQuantity(reservedTickets); trm.setTicketCategoryId(existingCategories.get(0).getId()); TicketReservationWithOptionalCodeModification r = new TicketReservationWithOptionalCodeModification(trm, Optional.empty()); ticketReservationManager.createTicketReservation(event, Collections.singletonList(r), Collections.emptyList(), DateUtils.addDays(new Date(), 1), Optional.empty(), Locale.ENGLISH, false, null); diff --git a/src/test/java/alfio/manager/CheckInManagerIntegrationTest.java b/src/test/java/alfio/manager/CheckInManagerIntegrationTest.java index 63df114e00..2e4846388d 100644 --- a/src/test/java/alfio/manager/CheckInManagerIntegrationTest.java +++ b/src/test/java/alfio/manager/CheckInManagerIntegrationTest.java @@ -114,7 +114,7 @@ void testReturnOnlyOnce() { var additionalService = eventManager.insertAdditionalService(event, additionalServiceRequest); var category = ticketCategoryRepository.findAllTicketCategories(event.getId()).get(0); TicketReservationModification tr = new TicketReservationModification(); - tr.setAmount(AVAILABLE_SEATS); + tr.setQuantity(AVAILABLE_SEATS); tr.setTicketCategoryId(category.getId()); var tickets = new TicketReservationWithOptionalCodeModification(tr, Optional.empty()); diff --git a/src/test/java/alfio/manager/ConfigurationManagerIntegrationTest.java b/src/test/java/alfio/manager/ConfigurationManagerIntegrationTest.java index 9de6151764..f9098e1169 100644 --- a/src/test/java/alfio/manager/ConfigurationManagerIntegrationTest.java +++ b/src/test/java/alfio/manager/ConfigurationManagerIntegrationTest.java @@ -64,7 +64,7 @@ @ContextConfiguration(classes = {DataSourceConfiguration.class, TestConfiguration.class}) @ActiveProfiles({Initializer.PROFILE_DEV, Initializer.PROFILE_DISABLE_JOBS, Initializer.PROFILE_INTEGRATION_TEST}) @Transactional -public class ConfigurationManagerIntegrationTest extends BaseIntegrationTest { +class ConfigurationManagerIntegrationTest extends BaseIntegrationTest { public static final String USERNAME = "test"; @@ -90,10 +90,10 @@ public class ConfigurationManagerIntegrationTest extends BaseIntegrationTest { private TicketCategoryRepository ticketCategoryRepository; @BeforeEach - public void prepareEnv() { + void prepareEnv() { //setup... organizationRepository.create("org", "org", "email@example.com", null, null); - Organization organization = organizationRepository.findByName("org").get(); + Organization organization = organizationRepository.findByName("org").orElseThrow(); userManager.insertUser(organization.getId(), USERNAME, "test", "test", "test@example.com", Role.OWNER, User.Type.INTERNAL); @@ -121,33 +121,33 @@ public void prepareEnv() { } @Test - public void testPresentStringConfigValue() { + void testPresentStringConfigValue() { assertEquals(Optional.of("5"), configurationManager.getFor(MAX_AMOUNT_OF_TICKETS_BY_RESERVATION, ConfigurationLevel.event(event)).getValue()); } @Test - public void testEmptyStringConfigValue() { + void testEmptyStringConfigValue() { assertTrue(configurationManager.getFor(SMTP_PASSWORD, ConfigurationLevel.event(event)).getValue().isEmpty()); } @Test - public void testStringValueWithDefault() { + void testStringValueWithDefault() { assertEquals("5", configurationManager.getFor(MAX_AMOUNT_OF_TICKETS_BY_RESERVATION, ConfigurationLevel.event(event)).getRequiredValue()); assertEquals("-1", configurationManager.getFor(SMTP_PASSWORD, ConfigurationLevel.event(event)).getValueOrDefault("-1")); } @Test - public void testMissingConfigValue() { + void testMissingConfigValue() { assertThrows(IllegalArgumentException.class, () -> configurationManager.getFor(SMTP_PASSWORD, ConfigurationLevel.event(event)).getRequiredValue()); } @Test - public void testRequiredValue() { + void testRequiredValue() { assertEquals("5", configurationManager.getFor(MAX_AMOUNT_OF_TICKETS_BY_RESERVATION, ConfigurationLevel.event(event)).getRequiredValue()); } @Test - public void testIntValue() { + void testIntValue() { assertEquals(5, configurationManager.getFor(MAX_AMOUNT_OF_TICKETS_BY_RESERVATION, ConfigurationLevel.event(event)).getValueAsIntOrDefault(-1)); //missing value @@ -161,7 +161,7 @@ public void testIntValue() { } @Test - public void testBooleanValue() { + void testBooleanValue() { //missing value assertFalse(configurationManager.getFor(ALLOW_FREE_TICKETS_CANCELLATION, ConfigurationLevel.ticketCategory(event, ticketCategory.getId())).getValueAsBooleanOrDefault()); @@ -175,7 +175,7 @@ public void testBooleanValue() { } @Test - public void testOverrideMechanism() { + void testOverrideMechanism() { Organization organization = organizationRepository.findByName("org").orElseThrow(); @@ -208,7 +208,7 @@ public void testOverrideMechanism() { } @Test - public void testBasicConfigurationNotNeeded() { + void testBasicConfigurationNotNeeded() { configurationRepository.deleteByKey(ConfigurationKeys.BASE_URL.getValue()); configurationRepository.deleteByKey(ConfigurationKeys.SUPPORTED_LANGUAGES.getValue()); @@ -221,7 +221,7 @@ public void testBasicConfigurationNotNeeded() { } @Test - public void testSaveOnlyExistingConfiguration() { + void testSaveOnlyExistingConfiguration() { configurationRepository.insertOrganizationLevel(event.getOrganizationId(), ConfigurationKeys.BANK_ACCOUNT_NR.getValue(), "MY-ACCOUNT_NUMBER", "empty"); Configuration existing = configurationRepository.findByKeyAtOrganizationLevel(event.getOrganizationId(), ConfigurationKeys.BANK_ACCOUNT_NR.getValue()).orElseThrow(IllegalStateException::new); Map> all = configurationManager.loadOrganizationConfig(event.getOrganizationId(), USERNAME); @@ -239,7 +239,7 @@ public void testSaveOnlyExistingConfiguration() { } @Test - public void testSaveOnlyValidConfiguration() { + void testSaveOnlyValidConfiguration() { configurationRepository.insertOrganizationLevel(event.getOrganizationId(), ConfigurationKeys.BANK_ACCOUNT_NR.getValue(), "MY-ACCOUNT_NUMBER", "empty"); Configuration existing = configurationRepository.findByKeyAtOrganizationLevel(event.getOrganizationId(), ConfigurationKeys.BANK_ACCOUNT_NR.getValue()).orElseThrow(IllegalStateException::new); Map> all = configurationManager.loadOrganizationConfig(event.getOrganizationId(), USERNAME); @@ -263,7 +263,7 @@ public void testSaveOnlyValidConfiguration() { } @Test - public void testLoadOrganizationConfiguration() { + void testLoadOrganizationConfiguration() { Map> orgConf = configurationManager.loadOrganizationConfig(event.getOrganizationId(), USERNAME); assertEquals(ConfigurationKeys.byPathLevel(ConfigurationPathLevel.ORGANIZATION).size(), orgConf.values().stream().mapToLong(Collection::size).sum()); String value = "MY-ACCOUNT_NUMBER"; @@ -274,13 +274,13 @@ public void testLoadOrganizationConfiguration() { } @Test - public void testBasicConfigurationNeeded() { + void testBasicConfigurationNeeded() { configurationRepository.deleteByKey(ConfigurationKeys.BASE_URL.getValue()); assertTrue(configurationManager.isBasicConfigurationNeeded()); } @Test - public void testSaveBooleanOptions() { + void testSaveBooleanOptions() { String ftcKey = ALLOW_FREE_TICKETS_CANCELLATION.getValue(); configurationRepository.insert(ftcKey, "false", "this should be updated to true"); ConfigurationModification ftc = new ConfigurationModification(configurationRepository.findByKey(ftcKey).getId(), ftcKey, "true"); @@ -317,7 +317,7 @@ public void testSaveBooleanOptions() { } @Test - public void testBulk() { + void testBulk() { Event event = eventManager.getSingleEvent("eventShortName", "test"); var res = configurationManager.getFor(Set.of(MAX_AMOUNT_OF_TICKETS_BY_RESERVATION, ENABLE_WAITING_QUEUE, ENABLE_WAITING_QUEUE_NOTIFICATION), ConfigurationLevel.event(event)); diff --git a/src/test/java/alfio/manager/GroupManagerIntegrationTest.java b/src/test/java/alfio/manager/GroupManagerIntegrationTest.java index b53ecc60d5..648bd7d382 100644 --- a/src/test/java/alfio/manager/GroupManagerIntegrationTest.java +++ b/src/test/java/alfio/manager/GroupManagerIntegrationTest.java @@ -61,7 +61,7 @@ @ContextConfiguration(classes = {DataSourceConfiguration.class, TestConfiguration.class}) @ActiveProfiles({Initializer.PROFILE_DEV, Initializer.PROFILE_DISABLE_JOBS, Initializer.PROFILE_INTEGRATION_TEST}) @Transactional -public class GroupManagerIntegrationTest extends BaseIntegrationTest { +class GroupManagerIntegrationTest extends BaseIntegrationTest { @Autowired private EventManager eventManager; @@ -93,7 +93,7 @@ public void setup() { } @Test - public void testLinkToEvent() { + void testLinkToEvent() { List categories = Collections.singletonList( new TicketCategoryModification(null, "default", TicketCategory.TicketAccessType.INHERIT, 10, @@ -121,7 +121,7 @@ public void testLinkToEvent() { assertTrue(groupManager.isAllowed("test@test.ch", event.getId(), categoryId)); TicketReservationModification ticketReservation = new TicketReservationModification(); - ticketReservation.setAmount(1); + ticketReservation.setQuantity(1); ticketReservation.setTicketCategoryId(categoryId); String reservationId = ticketReservationManager.createTicketReservation(event, Collections.singletonList(new TicketReservationWithOptionalCodeModification(ticketReservation, Optional.empty())), @@ -142,7 +142,7 @@ public void testLinkToEvent() { } @Test - public void testDuplicates() { + void testDuplicates() { List categories = Collections.singletonList( new TicketCategoryModification(null, "default", TicketCategory.TicketAccessType.INHERIT, 10, new DateTimeModification(LocalDate.now(ClockProvider.clock()).plusDays(1), LocalTime.now(ClockProvider.clock())), diff --git a/src/test/java/alfio/manager/ReverseChargeManagerIntegrationTest.java b/src/test/java/alfio/manager/ReverseChargeManagerIntegrationTest.java index 801e550cb6..3f377f6525 100644 --- a/src/test/java/alfio/manager/ReverseChargeManagerIntegrationTest.java +++ b/src/test/java/alfio/manager/ReverseChargeManagerIntegrationTest.java @@ -74,7 +74,7 @@ @ContextConfiguration(classes = {DataSourceConfiguration.class, TestConfiguration.class, ControllerConfiguration.class}) @ActiveProfiles({Initializer.PROFILE_DEV, Initializer.PROFILE_DISABLE_JOBS, Initializer.PROFILE_INTEGRATION_TEST}) @Transactional -public class ReverseChargeManagerIntegrationTest extends BaseIntegrationTest { +class ReverseChargeManagerIntegrationTest extends BaseIntegrationTest { private final ClockProvider clockProvider; private final OrganizationRepository organizationRepository; @@ -218,11 +218,11 @@ private ReservationInfo createReservation(String id, boolean requestInvoice) { var form = new ReservationForm(); var first = new TicketReservationModification(); - first.setAmount(2); + first.setQuantity(2); first.setTicketCategoryId(categories.get(0).getId()); var second = new TicketReservationModification(); - second.setAmount(2); + second.setQuantity(2); second.setTicketCategoryId(categories.get(1).getId()); form.setReservation(List.of(first, second)); diff --git a/src/test/java/alfio/manager/TicketReservationManagerConcurrentTest.java b/src/test/java/alfio/manager/TicketReservationManagerConcurrentTest.java index e10dfba654..1b2cc2c46f 100644 --- a/src/test/java/alfio/manager/TicketReservationManagerConcurrentTest.java +++ b/src/test/java/alfio/manager/TicketReservationManagerConcurrentTest.java @@ -63,7 +63,7 @@ @SpringBootTest() @ContextConfiguration(classes = {DataSourceConfiguration.class, TestConfiguration.class}) @ActiveProfiles({Initializer.PROFILE_DEV, Initializer.PROFILE_DISABLE_JOBS, Initializer.PROFILE_INTEGRATION_TEST}) -public class TicketReservationManagerConcurrentTest { +class TicketReservationManagerConcurrentTest { private static final String ACCESS_CODE = "MY_ACCESS_CODE"; @@ -121,14 +121,14 @@ public void setUp() { } @Test - public void testConcurrentAccessCode() throws InterruptedException { + void testConcurrentAccessCode() throws InterruptedException { var pool = Executors.newFixedThreadPool(AVAILABLE_SEATS); var callableList = new ArrayList>>(); for (int i = 0; i < AVAILABLE_SEATS; i++) { callableList.add(() -> { return transactionTemplate.execute(tx -> { TicketReservationModification tr = new TicketReservationModification(); - tr.setAmount(1); + tr.setQuantity(1); tr.setTicketCategoryId(firstCategoryId); TicketReservationWithOptionalCodeModification mod = new TicketReservationWithOptionalCodeModification(tr, Optional.empty()); return ticketReservationManager.reserveTokensForAccessCode(mod, promoCodeDiscount); @@ -153,9 +153,9 @@ public void testConcurrentAccessCode() throws InterruptedException { } @Test - public void testExpirationDuringReservation() { + void testExpirationDuringReservation() { TicketReservationModification tr = new TicketReservationModification(); - tr.setAmount(1); + tr.setQuantity(1); tr.setTicketCategoryId(firstCategoryId); TicketReservationWithOptionalCodeModification mod = new TicketReservationWithOptionalCodeModification(tr, Optional.empty()); diff --git a/src/test/java/alfio/manager/TicketReservationManagerIntegrationTest.java b/src/test/java/alfio/manager/TicketReservationManagerIntegrationTest.java index bd2acd0969..f0836a0e27 100644 --- a/src/test/java/alfio/manager/TicketReservationManagerIntegrationTest.java +++ b/src/test/java/alfio/manager/TicketReservationManagerIntegrationTest.java @@ -65,7 +65,7 @@ @ContextConfiguration(classes = {DataSourceConfiguration.class, TestConfiguration.class}) @ActiveProfiles({Initializer.PROFILE_DEV, Initializer.PROFILE_DISABLE_JOBS, Initializer.PROFILE_INTEGRATION_TEST}) @Transactional -public class TicketReservationManagerIntegrationTest extends BaseIntegrationTest { +class TicketReservationManagerIntegrationTest extends BaseIntegrationTest { static final Map DESCRIPTION = Collections.singletonMap("en", "desc"); private static final String ACCESS_CODE = "MYACCESSCODE"; @@ -107,12 +107,12 @@ public class TicketReservationManagerIntegrationTest extends BaseIntegrationTest private NamedParameterJdbcTemplate jdbcTemplate; @BeforeEach - public void ensureConfiguration() { + void ensureConfiguration() { IntegrationTestUtil.ensureMinimalConfiguration(configurationRepository); } @Test - public void testPriceIsOverridden() { + void testPriceIsOverridden() { List categories = Collections.singletonList( new TicketCategoryModification(null, "default", TicketCategory.TicketAccessType.INHERIT, AVAILABLE_SEATS, new DateTimeModification(LocalDate.now(ClockProvider.clock()), LocalTime.now(ClockProvider.clock())), @@ -122,7 +122,7 @@ public void testPriceIsOverridden() { Event event = initEvent(categories, organizationRepository, userManager, eventManager, eventRepository).getKey(); TicketReservationModification tr = new TicketReservationModification(); - tr.setAmount(2); + tr.setQuantity(2); TicketCategory category = ticketCategoryRepository.findAllTicketCategories(event.getId()).get(0); tr.setTicketCategoryId(category.getId()); TicketReservationWithOptionalCodeModification mod = new TicketReservationWithOptionalCodeModification(tr, Optional.empty()); @@ -136,7 +136,7 @@ public void testPriceIsOverridden() { } @Test - public void testTicketSelection() { + void testTicketSelection() { List categories = List.of( new TicketCategoryModification(null, "default", TicketCategory.TicketAccessType.INHERIT, AVAILABLE_SEATS, new DateTimeModification(LocalDate.now(ClockProvider.clock()), LocalTime.now(ClockProvider.clock())), @@ -157,11 +157,11 @@ public void testTicketSelection() { assertEquals(0, eventStatisticsManager.loadModifiedTickets(event.getId(), unbounded.getId(), 0, null).size()); TicketReservationModification tr = new TicketReservationModification(); - tr.setAmount(10); + tr.setQuantity(10); tr.setTicketCategoryId(bounded.getId()); TicketReservationModification tr2 = new TicketReservationModification(); - tr2.setAmount(9); + tr2.setQuantity(9); tr2.setTicketCategoryId(unbounded.getId()); TicketReservationWithOptionalCodeModification mod = new TicketReservationWithOptionalCodeModification(tr, Optional.empty()); @@ -220,7 +220,7 @@ public void testTicketSelection() { //------------------- TicketReservationModification trForDelete = new TicketReservationModification(); - trForDelete.setAmount(1); + trForDelete.setQuantity(1); trForDelete.setTicketCategoryId(unbounded.getId()); TicketReservationWithOptionalCodeModification modForDelete = new TicketReservationWithOptionalCodeModification(trForDelete, Optional.empty()); String reservationId2 = ticketReservationManager.createTicketReservation(event, Collections.singletonList(modForDelete), Collections.emptyList(), DateUtils.addDays(new Date(), 1), Optional.empty(), Locale.ENGLISH, false, null); @@ -238,7 +238,7 @@ public void testTicketSelection() { } @Test - public void deferredOfflinePayment() { + void deferredOfflinePayment() { // enable deferred payment configurationRepository.insert(DEFERRED_BANK_TRANSFER_ENABLED.name(), "true", ""); @@ -254,7 +254,7 @@ public void deferredOfflinePayment() { TicketReservationModification trForDeferred = new TicketReservationModification(); - trForDeferred.setAmount(1); + trForDeferred.setQuantity(1); trForDeferred.setTicketCategoryId(unbounded.getId()); TicketReservationWithOptionalCodeModification modForDeferred = new TicketReservationWithOptionalCodeModification(trForDeferred, Optional.empty()); String reservationId = ticketReservationManager.createTicketReservation(event, Collections.singletonList(modForDeferred), Collections.emptyList(), DateUtils.addDays(new Date(), 1), Optional.empty(), Locale.ENGLISH, false, null); @@ -297,7 +297,7 @@ public void deferredOfflinePayment() { } @Test - public void testTicketWithDiscount() { + void testTicketWithDiscount() { List categories = Collections.singletonList( new TicketCategoryModification(null, "default", TicketCategory.TicketAccessType.INHERIT, AVAILABLE_SEATS, new DateTimeModification(LocalDate.now(ClockProvider.clock()), LocalTime.now(ClockProvider.clock())), @@ -314,7 +314,7 @@ public void testTicketWithDiscount() { eventManager.addPromoCode("MYFIXEDPROMO", null, event.getOrganizationId(), event.getBegin(), event.getEnd(), 5, PromoCodeDiscount.DiscountType.FIXED_AMOUNT, null, null,"description", "email@reference.ch", PromoCodeDiscount.CodeType.DISCOUNT, null); TicketReservationModification tr = new TicketReservationModification(); - tr.setAmount(3); + tr.setQuantity(3); tr.setTicketCategoryId(unbounded.getId()); TicketReservationWithOptionalCodeModification mod = new TicketReservationWithOptionalCodeModification(tr, Optional.empty()); @@ -338,7 +338,7 @@ public void testTicketWithDiscount() { TicketReservationModification trFixed = new TicketReservationModification(); - trFixed.setAmount(3); + trFixed.setQuantity(3); trFixed.setTicketCategoryId(unbounded.getId()); TicketReservationWithOptionalCodeModification modFixed = new TicketReservationWithOptionalCodeModification(trFixed, Optional.empty()); @@ -364,7 +364,7 @@ public void testTicketWithDiscount() { //check if we try to fetch more than the limit TicketReservationModification trTooMuch = new TicketReservationModification(); - trTooMuch.setAmount(4); + trTooMuch.setQuantity(4); trTooMuch.setTicketCategoryId(unbounded.getId()); TicketReservationWithOptionalCodeModification modTooMuch = new TicketReservationWithOptionalCodeModification(trTooMuch, Optional.empty()); assertThrows(TicketReservationManager.TooManyTicketsForDiscountCodeException.class, @@ -372,7 +372,7 @@ public void testTicketWithDiscount() { } @Test - public void testAdditionalServiceWithDiscount() { + void testAdditionalServiceWithDiscount() { List categories = Collections.singletonList( new TicketCategoryModification(null, "default", TicketCategory.TicketAccessType.INHERIT, AVAILABLE_SEATS, new DateTimeModification(LocalDate.now(ClockProvider.clock()), LocalTime.now(ClockProvider.clock())), @@ -389,7 +389,7 @@ public void testAdditionalServiceWithDiscount() { eventManager.addPromoCode("MYPROMOCODE", event.getId(), null, event.getBegin(), event.getEnd(), 10, PromoCodeDiscount.DiscountType.PERCENTAGE, null, 3, "description", "email@reference.ch", PromoCodeDiscount.CodeType.DISCOUNT, null); TicketReservationModification tr = new TicketReservationModification(); - tr.setAmount(3); + tr.setQuantity(3); tr.setTicketCategoryId(unbounded.getId()); TicketReservationWithOptionalCodeModification mod = new TicketReservationWithOptionalCodeModification(tr, Optional.empty()); @@ -417,7 +417,7 @@ public void testAdditionalServiceWithDiscount() { } @Test - public void testAccessCode() { + void testAccessCode() { testTicketsWithAccessCode(); } @@ -438,7 +438,7 @@ private Triple testTicketsWithAccessCode() { eventManager.addPromoCode(accessCode, event.getId(), null, event.getBegin(), event.getEnd(), 0, null, null, 3, "description", "email@reference.ch", PromoCodeDiscount.CodeType.ACCESS, category.getId()); TicketReservationModification tr = new TicketReservationModification(); - tr.setAmount(3); + tr.setQuantity(3); tr.setTicketCategoryId(category.getId()); TicketReservationWithOptionalCodeModification mod = new TicketReservationWithOptionalCodeModification(tr, Optional.empty()); @@ -466,10 +466,10 @@ private Triple testTicketsWithAccessCode() { } @Test - public void testAccessCodeLimit() { + void testAccessCodeLimit() { var triple = testTicketsWithAccessCode(); TicketReservationModification trTooMuch = new TicketReservationModification(); - trTooMuch.setAmount(1); + trTooMuch.setQuantity(1); trTooMuch.setTicketCategoryId(triple.getMiddle().getId()); TicketReservationWithOptionalCodeModification modTooMuch = new TicketReservationWithOptionalCodeModification(trTooMuch, Optional.empty()); assertThrows(TicketReservationManager.TooManyTicketsForDiscountCodeException.class, @@ -477,10 +477,10 @@ public void testAccessCodeLimit() { } @Test - public void testAccessCodeReleaseTickets() { + void testAccessCodeReleaseTickets() { var triple = testTicketsWithAccessCode(); TicketReservationModification trTooMuch = new TicketReservationModification(); - trTooMuch.setAmount(1); + trTooMuch.setQuantity(1); trTooMuch.setTicketCategoryId(triple.getMiddle().getId()); TicketReservationWithOptionalCodeModification modTooMuch = new TicketReservationWithOptionalCodeModification(trTooMuch, Optional.empty()); ticketReservationManager.cancelPendingReservation(triple.getRight(), true, null); @@ -492,7 +492,7 @@ public void testAccessCodeReleaseTickets() { } @Test - public void testWithAdditionalServices() { + void testWithAdditionalServices() { List categories = Collections.singletonList( new TicketCategoryModification(null, "default", TicketCategory.TicketAccessType.INHERIT, AVAILABLE_SEATS, new DateTimeModification(LocalDate.now(ClockProvider.clock()), LocalTime.now(ClockProvider.clock())), @@ -507,7 +507,7 @@ public void testWithAdditionalServices() { TicketCategory unbounded = ticketCategoryRepository.findAllTicketCategories(event.getId()).stream().filter(t -> !t.isBounded()).findFirst().orElseThrow(IllegalStateException::new); TicketReservationModification tr = new TicketReservationModification(); - tr.setAmount(3); + tr.setQuantity(3); tr.setTicketCategoryId(unbounded.getId()); TicketReservationWithOptionalCodeModification mod = new TicketReservationWithOptionalCodeModification(tr, Optional.empty()); @@ -540,7 +540,7 @@ public void testWithAdditionalServices() { } @Test - public void testTicketSelectionNotEnoughTicketsAvailable() { + void testTicketSelectionNotEnoughTicketsAvailable() { List categories = Collections.singletonList( new TicketCategoryModification(null, "default", TicketCategory.TicketAccessType.INHERIT, AVAILABLE_SEATS, new DateTimeModification(LocalDate.now(ClockProvider.clock()), LocalTime.now(ClockProvider.clock())), @@ -551,7 +551,7 @@ public void testTicketSelectionNotEnoughTicketsAvailable() { TicketCategory unbounded = ticketCategoryRepository.findAllTicketCategories(event.getId()).stream().filter(t -> !t.isBounded()).findFirst().orElseThrow(IllegalStateException::new); TicketReservationModification tr = new TicketReservationModification(); - tr.setAmount(AVAILABLE_SEATS + 1); + tr.setQuantity(AVAILABLE_SEATS + 1); tr.setTicketCategoryId(unbounded.getId()); TicketReservationWithOptionalCodeModification mod = new TicketReservationWithOptionalCodeModification(tr, Optional.empty()); @@ -559,7 +559,7 @@ public void testTicketSelectionNotEnoughTicketsAvailable() { } @Test - public void testDeletePendingPaymentUnboundedCategory() { + void testDeletePendingPaymentUnboundedCategory() { List categories = Collections.singletonList( new TicketCategoryModification(null, "default", TicketCategory.TicketAccessType.INHERIT, AVAILABLE_SEATS, new DateTimeModification(LocalDate.now(ClockProvider.clock()), LocalTime.now(ClockProvider.clock())), @@ -570,7 +570,7 @@ public void testDeletePendingPaymentUnboundedCategory() { TicketCategory unbounded = ticketCategoryRepository.findAllTicketCategories(event.getId()).get(0); TicketReservationModification tr = new TicketReservationModification(); - tr.setAmount(AVAILABLE_SEATS / 2 + 1); + tr.setQuantity(AVAILABLE_SEATS / 2 + 1); tr.setTicketCategoryId(unbounded.getId()); TicketReservationWithOptionalCodeModification mod = new TicketReservationWithOptionalCodeModification(tr, Optional.empty()); @@ -600,7 +600,7 @@ public void testDeletePendingPaymentUnboundedCategory() { @Test - public void testCleanupExpiredReservations() { + void testCleanupExpiredReservations() { var testCases = List.of( // 1st test case: bounded category, max 10 tickets @@ -625,7 +625,7 @@ public void testCleanupExpiredReservations() { boolean bounded = category.isBounded(); TicketReservationModification tr = new TicketReservationModification(); - tr.setAmount(10); + tr.setQuantity(10); tr.setTicketCategoryId(category.getId()); TicketReservationWithOptionalCodeModification mod = new TicketReservationWithOptionalCodeModification(tr, Optional.empty()); @@ -663,7 +663,7 @@ public void testCleanupExpiredReservations() { } @Test - public void testCleanupOfflineExpiredReservations() { + void testCleanupOfflineExpiredReservations() { List categories = List.of( new TicketCategoryModification(null, "default", TicketCategory.TicketAccessType.INHERIT, 10, new DateTimeModification(LocalDate.now(ClockProvider.clock()), LocalTime.now(ClockProvider.clock())), @@ -676,7 +676,7 @@ public void testCleanupOfflineExpiredReservations() { TicketReservationModification tr = new TicketReservationModification(); - tr.setAmount(10); + tr.setQuantity(10); tr.setTicketCategoryId(bounded.getId()); TicketReservationWithOptionalCodeModification mod = new TicketReservationWithOptionalCodeModification(tr, Optional.empty()); diff --git a/src/test/java/alfio/manager/WaitingQueueManagerIntegrationTest.java b/src/test/java/alfio/manager/WaitingQueueManagerIntegrationTest.java index 2eeebf9fa5..32cc71d23d 100644 --- a/src/test/java/alfio/manager/WaitingQueueManagerIntegrationTest.java +++ b/src/test/java/alfio/manager/WaitingQueueManagerIntegrationTest.java @@ -64,7 +64,7 @@ @ContextConfiguration(classes = {DataSourceConfiguration.class, WebSecurityConfig.class, TestConfiguration.class}) @ActiveProfiles({Initializer.PROFILE_DEV, Initializer.PROFILE_DISABLE_JOBS, Initializer.PROFILE_INTEGRATION_TEST}) @Transactional -public class WaitingQueueManagerIntegrationTest extends BaseIntegrationTest { +class WaitingQueueManagerIntegrationTest extends BaseIntegrationTest { private static final Map DESCRIPTION = Collections.singletonMap("en", "desc"); @@ -94,7 +94,7 @@ public class WaitingQueueManagerIntegrationTest extends BaseIntegrationTest { private ClockProvider clockProvider; @BeforeEach - public void init() { + void init() { ensureMinimalConfiguration(configurationRepository); } @@ -103,7 +103,7 @@ private static CustomerName customerJohnDoe(Event event) { } @Test - public void testSubscribeDenied() { + void testSubscribeDenied() { List categories = getPreSalesTicketCategoryModifications(false, AVAILABLE_SEATS, true, 10); Pair pair = initEvent(categories, organizationRepository, userManager, eventManager, eventRepository); Event event = pair.getKey(); @@ -118,7 +118,7 @@ public void testSubscribeDenied() { } @Test - public void testDistributeSeatsFirstCategoryIsUnbounded() { + void testDistributeSeatsFirstCategoryIsUnbounded() { List categories = getPreSalesTicketCategoryModifications(false, AVAILABLE_SEATS, true, 10); Pair pair = initEvent(categories, organizationRepository, userManager, eventManager, eventRepository); Event event = pair.getKey(); @@ -134,13 +134,13 @@ public void testDistributeSeatsFirstCategoryIsUnbounded() { assertEquals("john@doe.com", subscriptionDetail.getLeft().getEmailAddress()); TicketReservationWithOptionalCodeModification reservation = subscriptionDetail.getMiddle(); assertEquals(Integer.valueOf(firstCategory.getId()), reservation.getTicketCategoryId()); - assertEquals(Integer.valueOf(1), reservation.getAmount()); + assertEquals(Integer.valueOf(1), reservation.getQuantity()); assertTrue(subscriptionDetail.getRight().isAfter(ZonedDateTime.now(clockProvider.getClock()))); } @Test - public void testDistributeSeatsFirstCategoryIsBounded() { + void testDistributeSeatsFirstCategoryIsBounded() { List categories = getPreSalesTicketCategoryModifications(true, 10, true, 10); Pair pair = initEvent(categories, organizationRepository, userManager, eventManager, eventRepository); Event event = pair.getKey(); @@ -156,13 +156,13 @@ public void testDistributeSeatsFirstCategoryIsBounded() { assertEquals("john@doe.com", subscriptionDetail.getLeft().getEmailAddress()); TicketReservationWithOptionalCodeModification reservation = subscriptionDetail.getMiddle(); assertEquals(Integer.valueOf(firstCategory.getId()), reservation.getTicketCategoryId()); - assertEquals(Integer.valueOf(1), reservation.getAmount()); + assertEquals(Integer.valueOf(1), reservation.getQuantity()); assertTrue(subscriptionDetail.getRight().isAfter(ZonedDateTime.now(clockProvider.getClock()))); } @Test - public void testWaitingQueueForUnboundedCategory() { + void testWaitingQueueForUnboundedCategory() { List categories = Collections.singletonList( new TicketCategoryModification(null, "default", TicketCategory.TicketAccessType.INHERIT, AVAILABLE_SEATS, new DateTimeModification(LocalDate.now(clockProvider.getClock()), LocalTime.now(clockProvider.getClock())), @@ -172,7 +172,7 @@ public void testWaitingQueueForUnboundedCategory() { TicketCategory unbounded = ticketCategoryRepository.findAllTicketCategories(event.getId()).get(0); TicketReservationModification tr = new TicketReservationModification(); - tr.setAmount(AVAILABLE_SEATS); + tr.setQuantity(AVAILABLE_SEATS); tr.setTicketCategoryId(unbounded.getId()); TicketReservationWithOptionalCodeModification mod = new TicketReservationWithOptionalCodeModification(tr, Optional.empty()); @@ -189,7 +189,7 @@ public void testWaitingQueueForUnboundedCategory() { } @Test - public void testAssignTicketToWaitingQueueUnboundedCategory() { + void testAssignTicketToWaitingQueueUnboundedCategory() { LocalDateTime start = LocalDateTime.now(clockProvider.getClock()).minusMinutes(1); LocalDateTime end = LocalDateTime.now(clockProvider.getClock()).plusMinutes(20); List categories = Collections.singletonList( @@ -205,11 +205,11 @@ public void testAssignTicketToWaitingQueueUnboundedCategory() { TicketCategory unbounded = ticketCategoryRepository.findAllTicketCategories(event.getId()).get(0); TicketReservationModification tr = new TicketReservationModification(); - tr.setAmount(AVAILABLE_SEATS - 1); + tr.setQuantity(AVAILABLE_SEATS - 1); tr.setTicketCategoryId(unbounded.getId()); TicketReservationModification tr2 = new TicketReservationModification(); - tr2.setAmount(1); + tr2.setQuantity(1); tr2.setTicketCategoryId(unbounded.getId()); TicketReservationWithOptionalCodeModification multi = new TicketReservationWithOptionalCodeModification(tr, Optional.empty()); @@ -248,12 +248,12 @@ public void testAssignTicketToWaitingQueueUnboundedCategory() { assertEquals("john@doe.com", subscriptionDetail.getLeft().getEmailAddress()); TicketReservationWithOptionalCodeModification reservation = subscriptionDetail.getMiddle(); assertEquals(Integer.valueOf(unbounded.getId()), reservation.getTicketCategoryId()); - assertEquals(Integer.valueOf(1), reservation.getAmount()); + assertEquals(Integer.valueOf(1), reservation.getQuantity()); assertTrue(subscriptionDetail.getRight().isAfter(ZonedDateTime.now(clockProvider.getClock()))); } @Test - public void testAssignTicketToWaitingQueueBoundedCategory() { + void testAssignTicketToWaitingQueueBoundedCategory() { LocalDateTime start = LocalDateTime.now(clockProvider.getClock()).minusMinutes(2); LocalDateTime end = LocalDateTime.now(clockProvider.getClock()).plusMinutes(20); List categories = Collections.singletonList( @@ -269,11 +269,11 @@ public void testAssignTicketToWaitingQueueBoundedCategory() { TicketCategory bounded = ticketCategoryRepository.findAllTicketCategories(event.getId()).get(0); TicketReservationModification tr = new TicketReservationModification(); - tr.setAmount(AVAILABLE_SEATS - 1); + tr.setQuantity(AVAILABLE_SEATS - 1); tr.setTicketCategoryId(bounded.getId()); TicketReservationModification tr2 = new TicketReservationModification(); - tr2.setAmount(1); + tr2.setQuantity(1); tr2.setTicketCategoryId(bounded.getId()); TicketReservationWithOptionalCodeModification multi = new TicketReservationWithOptionalCodeModification(tr, Optional.empty()); @@ -310,12 +310,12 @@ public void testAssignTicketToWaitingQueueBoundedCategory() { assertEquals("john@doe.com", subscriptionDetail.getLeft().getEmailAddress()); TicketReservationWithOptionalCodeModification reservation = subscriptionDetail.getMiddle(); assertEquals(Integer.valueOf(bounded.getId()), reservation.getTicketCategoryId()); - assertEquals(Integer.valueOf(1), reservation.getAmount()); + assertEquals(Integer.valueOf(1), reservation.getQuantity()); assertTrue(subscriptionDetail.getRight().isAfter(ZonedDateTime.now(clockProvider.getClock()))); } @Test - public void testAssignTicketToWaitingQueueUnboundedCategorySelected() { + void testAssignTicketToWaitingQueueUnboundedCategorySelected() { LocalDateTime start = LocalDateTime.now(clockProvider.getClock()).minusHours(1); LocalDateTime end = LocalDateTime.now(clockProvider.getClock()).plusHours(1); @@ -338,11 +338,11 @@ public void testAssignTicketToWaitingQueueUnboundedCategorySelected() { TicketCategory second = ticketCategories.get(1); TicketReservationModification tr2 = new TicketReservationModification(); - tr2.setAmount(1); + tr2.setQuantity(1); tr2.setTicketCategoryId(second.getId()); TicketReservationModification tr3 = new TicketReservationModification(); - tr3.setAmount(1); + tr3.setQuantity(1); tr3.setTicketCategoryId(first.getId()); reserveTickets(event, first, AVAILABLE_SEATS - 2); @@ -364,20 +364,20 @@ public void testAssignTicketToWaitingQueueUnboundedCategorySelected() { assertEquals("john@doe.com", subscriptionDetail.getLeft().getEmailAddress()); TicketReservationWithOptionalCodeModification reservation = subscriptionDetail.getMiddle(); assertEquals(Integer.valueOf(first.getId()), reservation.getTicketCategoryId()); - assertEquals(Integer.valueOf(1), reservation.getAmount()); + assertEquals(Integer.valueOf(1), reservation.getQuantity()); assertTrue(subscriptionDetail.getRight().isAfter(ZonedDateTime.now(clockProvider.getClock()))); subscriptionDetail = subscriptions.get(1); assertEquals("john@doe2.com", subscriptionDetail.getLeft().getEmailAddress()); reservation = subscriptionDetail.getMiddle(); assertEquals(Integer.valueOf(second.getId()), reservation.getTicketCategoryId()); - assertEquals(Integer.valueOf(1), reservation.getAmount()); + assertEquals(Integer.valueOf(1), reservation.getQuantity()); assertTrue(subscriptionDetail.getRight().isAfter(ZonedDateTime.now(clockProvider.getClock()))); } private String reserveTickets(Event event, TicketCategory category, int num) { TicketReservationModification tr = new TicketReservationModification(); - tr.setAmount(num); + tr.setQuantity(num); tr.setTicketCategoryId(category.getId()); TicketReservationWithOptionalCodeModification tcm = new TicketReservationWithOptionalCodeModification(tr, Optional.empty()); String reservationId = ticketReservationManager.createTicketReservation(event, Collections.singletonList(tcm), Collections.emptyList(), DateUtils.addDays(new Date(), 1), Optional.empty(), Locale.ENGLISH, false, null); @@ -393,7 +393,7 @@ private String reserveTickets(Event event, TicketCategory category, int num) { } @Test - public void testNoPublicCategoryAvailable() { + void testNoPublicCategoryAvailable() { LocalDateTime start = LocalDateTime.now(clockProvider.getClock()).minusHours(1); LocalDateTime end = LocalDateTime.now(clockProvider.getClock()).plusHours(1); @@ -428,7 +428,7 @@ public void testNoPublicCategoryAvailable() { } @Test - public void testTicketBelongsToExpiredCategory() { + void testTicketBelongsToExpiredCategory() { LocalDateTime start = LocalDateTime.now(clockProvider.getClock()).minusHours(1); LocalDateTime end = LocalDateTime.now(clockProvider.getClock()).plusHours(1); diff --git a/src/test/java/alfio/manager/system/DataMigratorIntegrationTest.java b/src/test/java/alfio/manager/system/DataMigratorIntegrationTest.java index c00f12f54e..c26f8de9b2 100644 --- a/src/test/java/alfio/manager/system/DataMigratorIntegrationTest.java +++ b/src/test/java/alfio/manager/system/DataMigratorIntegrationTest.java @@ -60,7 +60,7 @@ @SpringBootTest @ContextConfiguration(classes = {DataSourceConfiguration.class, TestConfiguration.class}) @ActiveProfiles({Initializer.PROFILE_DEV, Initializer.PROFILE_DISABLE_JOBS, Initializer.PROFILE_INTEGRATION_TEST}) -public class DataMigratorIntegrationTest extends BaseIntegrationTest { +class DataMigratorIntegrationTest extends BaseIntegrationTest { private static final int AVAILABLE_SEATS = 20; private static final Map DESCRIPTION = Collections.singletonMap("en", "desc"); @@ -118,7 +118,7 @@ private Pair initEvent(List categories } @Test - public void testMigration() { + void testMigration() { List categories = Collections.singletonList( new TicketCategoryModification(null, "default", TicketCategory.TicketAccessType.INHERIT, AVAILABLE_SEATS, new DateTimeModification(LocalDate.now(ClockProvider.clock()), LocalTime.now(ClockProvider.clock())), @@ -147,7 +147,7 @@ public void testMigration() { } @Test - public void testMigrationWithExistingRecord() { + void testMigrationWithExistingRecord() { List categories = Collections.singletonList( new TicketCategoryModification(null, "default", TicketCategory.TicketAccessType.INHERIT, AVAILABLE_SEATS, new DateTimeModification(LocalDate.now(ClockProvider.clock()), LocalTime.now(ClockProvider.clock())), @@ -176,7 +176,7 @@ public void testMigrationWithExistingRecord() { } @Test - public void testAlreadyMigratedEvent() { + void testAlreadyMigratedEvent() { List categories = Collections.singletonList( new TicketCategoryModification(null, "default", TicketCategory.TicketAccessType.INHERIT, AVAILABLE_SEATS, new DateTimeModification(LocalDate.now(ClockProvider.clock()), LocalTime.now(ClockProvider.clock())), @@ -206,7 +206,7 @@ public void testAlreadyMigratedEvent() { } @Test - public void testUpdateDisplayName() { + void testUpdateDisplayName() { List categories = Collections.singletonList( new TicketCategoryModification(null, "default", TicketCategory.TicketAccessType.INHERIT, AVAILABLE_SEATS, new DateTimeModification(LocalDate.now(ClockProvider.clock()), LocalTime.now(ClockProvider.clock())), @@ -232,7 +232,7 @@ public void testUpdateDisplayName() { } @Test - public void testUpdateTicketReservation() { + void testUpdateTicketReservation() { List categories = Collections.singletonList( new TicketCategoryModification(null, "default", TicketCategory.TicketAccessType.INHERIT, AVAILABLE_SEATS, new DateTimeModification(LocalDate.now(ClockProvider.clock()), LocalTime.now(ClockProvider.clock())), @@ -242,7 +242,7 @@ public void testUpdateTicketReservation() { Event event = eventUsername.getKey(); try { TicketReservationModification trm = new TicketReservationModification(); - trm.setAmount(1); + trm.setQuantity(1); trm.setTicketCategoryId(eventManager.loadTicketCategories(event).get(0).getId()); TicketReservationWithOptionalCodeModification r = new TicketReservationWithOptionalCodeModification(trm, Optional.empty()); Date expiration = DateUtils.addDays(new Date(), 1); @@ -256,7 +256,7 @@ public void testUpdateTicketReservation() { } @Test - public void testFixCategoriesSize() { + void testFixCategoriesSize() { List categories = Arrays.asList( new TicketCategoryModification(null, "default", TicketCategory.TicketAccessType.INHERIT, AVAILABLE_SEATS -1, new DateTimeModification(LocalDate.now(ClockProvider.clock()), LocalTime.now(ClockProvider.clock())), @@ -279,7 +279,7 @@ public void testFixCategoriesSize() { } @Test - public void testFixStuckTickets() { + void testFixStuckTickets() { List categories = Collections.singletonList( new TicketCategoryModification(null, "default", TicketCategory.TicketAccessType.INHERIT, AVAILABLE_SEATS, new DateTimeModification(LocalDate.now(ClockProvider.clock()), LocalTime.now(ClockProvider.clock())), @@ -288,7 +288,7 @@ public void testFixStuckTickets() { Pair eventUsername = initEvent(categories); Event event = eventUsername.getKey(); TicketReservationModification trm = new TicketReservationModification(); - trm.setAmount(1); + trm.setQuantity(1); trm.setTicketCategoryId(eventManager.loadTicketCategories(event).get(0).getId()); TicketReservationWithOptionalCodeModification r = new TicketReservationWithOptionalCodeModification(trm, Optional.empty()); Date expiration = DateUtils.addDays(new Date(), 1); From 0fc91679148d299e3b643dd609884cf0696978f0 Mon Sep 17 00:00:00 2001 From: Celestino Bellone Date: Mon, 31 Jan 2022 19:12:40 +0100 Subject: [PATCH 005/218] update errorprone --- build.gradle | 9 ++++++--- src/main/java/alfio/manager/UploadedResourceManager.java | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 61220660a5..20ed0c6188 100644 --- a/build.gradle +++ b/build.gradle @@ -217,7 +217,7 @@ dependencies { testImplementation 'org.seleniumhq.selenium:selenium-java:4.1.1' - errorprone('com.google.errorprone:error_prone_core:2.4.0') + errorprone('com.google.errorprone:error_prone_core:2.10.0') } // -- license configuration @@ -292,7 +292,8 @@ compileTestJava { 'AlmostJavadoc', 'MissingSummary', 'EscapedEntity', - 'EmptyBlockTag' + 'EmptyBlockTag', + 'SameNameButDifferent' ) } @@ -307,7 +308,9 @@ compileJava { 'AlmostJavadoc', 'MissingSummary', 'EscapedEntity', - 'EmptyBlockTag' + 'EmptyBlockTag', + 'SameNameButDifferent', + 'ReturnValueIgnored' ) } diff --git a/src/main/java/alfio/manager/UploadedResourceManager.java b/src/main/java/alfio/manager/UploadedResourceManager.java index c31b936979..df2796e7fb 100644 --- a/src/main/java/alfio/manager/UploadedResourceManager.java +++ b/src/main/java/alfio/manager/UploadedResourceManager.java @@ -93,7 +93,7 @@ public Optional saveResource(UploadBase64FileModification file) { uploadedResourceRepository.delete(file.getName()); } - return Optional.ofNullable(uploadedResourceRepository.upload(null, null, file, getAttributes(file))); + return Optional.of(uploadedResourceRepository.upload(null, null, file, getAttributes(file))); } public Optional saveResource(int organizationId, UploadBase64FileModification file) { @@ -101,7 +101,7 @@ public Optional saveResource(int organizationId, UploadBase64FileModifi uploadedResourceRepository.delete(organizationId, file.getName()); } - return Optional.ofNullable(uploadedResourceRepository.upload(organizationId, null, file, getAttributes(file))); + return Optional.of(uploadedResourceRepository.upload(organizationId, null, file, getAttributes(file))); } public Optional saveResource(int organizationId, int eventId, UploadBase64FileModification file) { From c1937536dff6d4143f42e1e6df48eda850a69ba2 Mon Sep 17 00:00:00 2001 From: Celestino Bellone Date: Mon, 31 Jan 2022 20:31:24 +0100 Subject: [PATCH 006/218] update sourceCompatibility to 17 --- .github/workflows/build-on-push.yml | 8 ++++---- README.md | 6 +++--- build.gradle | 5 ++--- gradle.properties | 4 ++-- src/main/dist/Dockerfile | 8 ++++---- 5 files changed, 15 insertions(+), 16 deletions(-) diff --git a/.github/workflows/build-on-push.yml b/.github/workflows/build-on-push.yml index 9720316dd2..ee4d5a8ec8 100644 --- a/.github/workflows/build-on-push.yml +++ b/.github/workflows/build-on-push.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - postgresql: ['9.6','14'] + postgresql: ['10','14'] services: postgres: image: postgres:${{ matrix.postgresql }} @@ -33,10 +33,10 @@ jobs: key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradlew') }} restore-keys: | ${{ runner.os }}-gradlew- - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v1 with: - java-version: 11 + java-version: 17 - name: Set up DB run: | sudo apt-get install --yes postgresql-client @@ -58,7 +58,7 @@ jobs: # env: # COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }} - name: 'Upload Build' - if: ${{ github.repository == 'alfio-event/alf.io' && matrix.postgresql == '9.6'}} + if: ${{ github.repository == 'alfio-event/alf.io' && matrix.postgresql == '10'}} uses: actions/upload-artifact@v2 with: name: dist diff --git a/README.md b/README.md index 0d7717491d..b357407eb8 100644 --- a/README.md +++ b/README.md @@ -21,9 +21,9 @@ If you want to build and deploy alf.io by yourself, we strongly suggest you to u ## Prerequisites -You should have installed Java version **11** (e.g. [Oracle's](http://www.oracle.com/technetwork/java/javase/downloads/index.html), [OpenJDK](http://openjdk.java.net/install/), or any other distribution) to build and run alf.io. Please note that for the build process the JDK is required. +You should have installed Java version **17** (e.g. [Oracle's](http://www.oracle.com/technetwork/java/javase/downloads/index.html), [OpenJDK](http://openjdk.java.net/install/), or any other distribution) to build and run alf.io. Please note that for the build process the JDK is required. -Postgresql version 9.6 or later. +Postgresql version 10 or later. Additionally, the database user that creates and uses the tables should not be a "SUPERUSER", or else the row security policy checks will not be applied. @@ -46,7 +46,7 @@ You must specify a project property at the command line, such as ``` The local "bootRun" task has the following prerequisites: -- a PostgreSQL (version 9.6 or later) instance up and running on localhost:5432 +- a PostgreSQL (version 10 or later) instance up and running on localhost:5432 - a _postgres_ user having a password: _password_ - a database named _alfio_ diff --git a/build.gradle b/build.gradle index 20ed0c6188..0ef3599ce5 100644 --- a/build.gradle +++ b/build.gradle @@ -56,8 +56,8 @@ apply plugin: 'project-report' task validate { //check JDK version def javaVersion = JavaVersion.current() - if (!javaVersion.isJava11Compatible()) { - throw new GradleException("A Java JDK 11+ is required to build the project.") + if (!javaVersion.isCompatibleWith(JavaVersion.VERSION_17)) { + throw new GradleException("A Java JDK 17+ is required to build the project.") } } @@ -321,7 +321,6 @@ test { useJUnitPlatform() systemProperties = System.properties systemProperties.remove("java.endorsed.dirs") - jvmArgs("--illegal-access=warn") testLogging { events "failed" exceptionFormat "full" diff --git a/gradle.properties b/gradle.properties index 29e7944834..9276ed207e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,8 +2,8 @@ group=alfio version=2.0-M5-SNAPSHOT -sourceCompatibility=11 -targetCompatibility=11 +sourceCompatibility=17 +targetCompatibility=17 systemProp.jdk.tls.client.protocols="TLSv1,TLSv1.1,TLSv1.2" diff --git a/src/main/dist/Dockerfile b/src/main/dist/Dockerfile index f8713c944f..31b995f6e2 100644 --- a/src/main/dist/Dockerfile +++ b/src/main/dist/Dockerfile @@ -5,18 +5,18 @@ # - https://august.nagro.us/small-java.html # -FROM azul/zulu-openjdk-alpine:15.0.2 as zulu +FROM azul/zulu-openjdk-alpine:17 as zulu RUN $JAVA_HOME/bin/jlink --compress=1 --strip-java-debug-attributes --no-header-files --no-man-pages \ --module-path $JAVA_HOME/jmods \ - # see https://github.com/ben-manes/caffeine/issues/273 + # see https://github.com/ben-manes/caffeine/issues/273 TODO investigate if we can remove jdk.unsupported # see https://docs.oracle.com/en/java/javase/11/security/oracle-providers.html#GUID-9224B90B-7B2F-41F9-BB96-C0A1B6A0FEAA --add-modules java.desktop,java.logging,java.sql,java.management,java.naming,jdk.unsupported,jdk.crypto.ec,java.net.http,jdk.localedata \ --include-locales en,it,es,nl,fr,de,ro,pt,tr,pl,da,bg,sv \ --output /jlinked -FROM alpine:3.12 -LABEL org.opencontainers.image.source https://github.com/alfio-event/alf.io +FROM alpine:3.15 +LABEL org.opencontainers.image.source=https://github.com/alfio-event/alf.io COPY --from=zulu /jlinked /opt/jdk/ From da5e4e61d5a48b49b446d83ca02c1088c2bfa5eb Mon Sep 17 00:00:00 2001 From: Celestino Bellone Date: Mon, 31 Jan 2022 20:34:47 +0100 Subject: [PATCH 007/218] fix workflows --- .github/workflows/codeql-analysis.yml | 4 ++-- .github/workflows/e2e-test.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 0e0dee3c6c..bb0c65f875 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -31,10 +31,10 @@ jobs: # with: # languages: go, javascript, csharp, python, cpp, java - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v1 with: - java-version: 11 + java-version: 17 - name: Build with Gradle run: ./gradlew build -x test diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml index 5ed4d1caf0..f8384ce19f 100644 --- a/.github/workflows/e2e-test.yml +++ b/.github/workflows/e2e-test.yml @@ -25,10 +25,10 @@ jobs: key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradlew') }} restore-keys: | ${{ runner.os }}-gradlew- - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v1 with: - java-version: 11 + java-version: 17 - name: 'BrowserStack Env Setup' uses: 'browserstack/github-actions/setup-env@master' with: From c4c4b1b3d9934967a7fffa98bff7dbd18cfa1e52 Mon Sep 17 00:00:00 2001 From: Sylvain Jermini Date: Sat, 5 Feb 2022 17:43:50 +0100 Subject: [PATCH 008/218] revert removal of getter/setter in TicketReservationModification --- .../modification/TicketReservationModification.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/main/java/alfio/model/modification/TicketReservationModification.java b/src/main/java/alfio/model/modification/TicketReservationModification.java index 9688f8a6d9..ff2afdf08e 100644 --- a/src/main/java/alfio/model/modification/TicketReservationModification.java +++ b/src/main/java/alfio/model/modification/TicketReservationModification.java @@ -28,4 +28,14 @@ public class TicketReservationModification implements Serializable { private Integer quantity; private List> metadata; + // temporary until we replace the public front-end + @Deprecated(forRemoval = true) + public Integer getAmount() { + return quantity; + } + + @Deprecated(forRemoval = true) + public void setAmount(Integer amount) { + this.quantity = amount; + } } From 96130f43d469538f772bfb55335b953f7ad7a22a Mon Sep 17 00:00:00 2001 From: Celestino Bellone Date: Fri, 11 Mar 2022 09:22:09 +0100 Subject: [PATCH 009/218] add system-wide banner message --- gradle.properties | 2 +- src/main/java/alfio/controller/api/v2/model/AlfioInfo.java | 1 + .../java/alfio/manager/system/ConfigurationManager.java | 6 ++++-- src/main/java/alfio/model/system/ConfigurationKeys.java | 1 + 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index 9276ed207e..aafcdbe8f4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,4 +8,4 @@ targetCompatibility=17 systemProp.jdk.tls.client.protocols="TLSv1,TLSv1.1,TLSv1.2" # https://jitpack.io/#alfio-event/alf.io-public-frontend -> go to commit tab, set the version -alfioPublicFrontendVersion=908c55db5a \ No newline at end of file +alfioPublicFrontendVersion=0267c8c7cb \ No newline at end of file diff --git a/src/main/java/alfio/controller/api/v2/model/AlfioInfo.java b/src/main/java/alfio/controller/api/v2/model/AlfioInfo.java index 6524e7c273..165384e725 100644 --- a/src/main/java/alfio/controller/api/v2/model/AlfioInfo.java +++ b/src/main/java/alfio/controller/api/v2/model/AlfioInfo.java @@ -31,4 +31,5 @@ public class AlfioInfo { private final String globalPrivacyPolicyUrl; private final String globalTermsUrl; private final InvoicingConfiguration invoicingConfiguration; + private final String announcementBannerContentHTML; } diff --git a/src/main/java/alfio/manager/system/ConfigurationManager.java b/src/main/java/alfio/manager/system/ConfigurationManager.java index f9574a2384..83dc156b8e 100644 --- a/src/main/java/alfio/manager/system/ConfigurationManager.java +++ b/src/main/java/alfio/manager/system/ConfigurationManager.java @@ -689,7 +689,8 @@ public AlfioInfo getInfo(HttpSession session) { ENABLE_EU_VAT_DIRECTIVE, COUNTRY_OF_BUSINESS, ENABLE_REVERSE_CHARGE_IN_PERSON, - ENABLE_REVERSE_CHARGE_ONLINE); + ENABLE_REVERSE_CHARGE_ONLINE, + ANNOUNCEMENT_BANNER_CONTENT); var conf = getFor(options, ConfigurationLevel.system()); var analyticsConf = AnalyticsConfiguration.build(conf, session); @@ -700,7 +701,8 @@ public AlfioInfo getInfo(HttpSession session) { analyticsConf, conf.get(GLOBAL_PRIVACY_POLICY).getValueOrNull(), conf.get(GLOBAL_TERMS).getValueOrNull(), - PurchaseContextInfoBuilder.invoicingInfo(this, conf)); + PurchaseContextInfoBuilder.invoicingInfo(this, conf), + StringUtils.trimToNull(conf.get(ANNOUNCEMENT_BANNER_CONTENT).getValueOrNull())); } public Map getPublicOpenIdConfiguration() { diff --git a/src/main/java/alfio/model/system/ConfigurationKeys.java b/src/main/java/alfio/model/system/ConfigurationKeys.java index 9327b1c0b3..e516997ec8 100644 --- a/src/main/java/alfio/model/system/ConfigurationKeys.java +++ b/src/main/java/alfio/model/system/ConfigurationKeys.java @@ -42,6 +42,7 @@ public enum ConfigurationKeys { BASE_URL("Base application url", false, SettingCategory.GENERAL, ComponentType.TEXT, true, EnumSet.of(SYSTEM)), GLOBAL_PRIVACY_POLICY("Global Privacy Policy URL (to be displayed on the event list)", false, SettingCategory.GENERAL, ComponentType.TEXT, false, EnumSet.of(SYSTEM)), GLOBAL_TERMS("Global Terms And Conditions (to be displayed on the event list)", false, SettingCategory.GENERAL, ComponentType.TEXT, false, EnumSet.of(SYSTEM)), + ANNOUNCEMENT_BANNER_CONTENT("Announcement banner content", false, SettingCategory.GENERAL, ComponentType.TEXTAREA, false, EnumSet.of(SYSTEM)), MAPS_PROVIDER("Select the maps provider (None, Google, Here)", false, SettingCategory.MAP, ComponentType.TEXT, false, EnumSet.of(SYSTEM)), MAPS_CLIENT_API_KEY("Google maps' client api key", false, SettingCategory.MAP, ComponentType.TEXT, false, EnumSet.of(SYSTEM)), From a7add77606881c1c05452e018ca588c18f687f45 Mon Sep 17 00:00:00 2001 From: Celestino Bellone Date: Fri, 11 Mar 2022 11:29:01 +0100 Subject: [PATCH 010/218] update frontend version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index aafcdbe8f4..6b9b3bf7fc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,4 +8,4 @@ targetCompatibility=17 systemProp.jdk.tls.client.protocols="TLSv1,TLSv1.1,TLSv1.2" # https://jitpack.io/#alfio-event/alf.io-public-frontend -> go to commit tab, set the version -alfioPublicFrontendVersion=0267c8c7cb \ No newline at end of file +alfioPublicFrontendVersion=e2f0da47a0 \ No newline at end of file From 4cbbf9fc5c688623fc2d983c3620ee68d8ade25a Mon Sep 17 00:00:00 2001 From: Sylvain Jermini Date: Fri, 11 Mar 2022 14:16:22 +0100 Subject: [PATCH 011/218] CSP: add hash for inline script used by angular 'css optimization' --- src/main/java/alfio/controller/IndexController.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/alfio/controller/IndexController.java b/src/main/java/alfio/controller/IndexController.java index 0d90c44da3..5c798521ea 100644 --- a/src/main/java/alfio/controller/IndexController.java +++ b/src/main/java/alfio/controller/IndexController.java @@ -495,7 +495,9 @@ public String addCspHeader(HttpServletResponse response, ConfigurationLevel conf } response.addHeader("Content-Security-Policy", "object-src 'none'; "+ - "script-src 'strict-dynamic' 'nonce-" + nonce + "' 'unsafe-inline' http: https:; " + + "script-src 'strict-dynamic' 'nonce-" + nonce + "' 'unsafe-inline' http: https: " + + "'unsafe-hashes' 'sha256-MhtPZXr7+LpJUY5qtMutB+qWfQtMaPccfe7QXtCcEYc='" // see https://github.com/angular/angular-cli/issues/20864#issuecomment-983672336 + +"; " + "base-uri 'self'; " + "frame-ancestors " + frameAncestors + "; " + reportUri); From 82d2a26bc85834b0815a6f60d192c26a355f93a9 Mon Sep 17 00:00:00 2001 From: Celestino Bellone Date: Fri, 11 Mar 2022 15:15:59 +0100 Subject: [PATCH 012/218] a11y: add custom amount label --- src/main/resources/alfio/i18n/public.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/resources/alfio/i18n/public.properties b/src/main/resources/alfio/i18n/public.properties index e80240443e..02146896b4 100644 --- a/src/main/resources/alfio/i18n/public.properties +++ b/src/main/resources/alfio/i18n/public.properties @@ -37,6 +37,7 @@ show-subscription.sold-out.message=We''re sorry but currently we don''t have any show-subscription.header.title=Buy a {0} subscription show-event.tickets.left={0} left show-event.category.quantity=Quantity +show-event.additional.custom-amount=Amount show-event.by=By show-event.tickets=Tickets show-event.additional-services=Additional options From bb52c7cbf99107b76354779dde98c9a47755db1e Mon Sep 17 00:00:00 2001 From: Celestino Bellone Date: Fri, 11 Mar 2022 15:25:35 +0100 Subject: [PATCH 013/218] update italian translation --- src/main/resources/alfio/i18n/public_it.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/resources/alfio/i18n/public_it.properties b/src/main/resources/alfio/i18n/public_it.properties index 68ba8e7f9b..3e620c9e95 100644 --- a/src/main/resources/alfio/i18n/public_it.properties +++ b/src/main/resources/alfio/i18n/public_it.properties @@ -443,6 +443,7 @@ server-error = Si è verificato un errore inatteso. Per favore segnala quanto ac session-expired.header.title = Sessione scaduta show-event.add-to-calendar = Aggiungi al calendario show-event.additional-services = Opzioni aggiuntive +show-event.additional.custom-amount = Importo # show-event.ms show-event.by = Organizzato da show-event.category.quantity = Quantità From 14c1792dec78a810f112554b94d626d84e11c411 Mon Sep 17 00:00:00 2001 From: Celestino Bellone Date: Fri, 11 Mar 2022 16:52:01 +0100 Subject: [PATCH 014/218] a11y: signal that link opens in a new tab --- .../api/v2/user/EventApiV2Controller.java | 4 +-- .../api/v2/user/support/EventLoader.java | 2 +- .../alfio/controller/support/Formatters.java | 14 +++++++---- .../java/alfio/util/MustacheCustomTag.java | 20 ++++++++++++--- .../resources/alfio/i18n/public.properties | 3 ++- .../controller/support/FormattersTest.java | 25 +++++++++++++++++++ 6 files changed, 56 insertions(+), 12 deletions(-) diff --git a/src/main/java/alfio/controller/api/v2/user/EventApiV2Controller.java b/src/main/java/alfio/controller/api/v2/user/EventApiV2Controller.java index 9b1f018593..01e1f4e2cb 100644 --- a/src/main/java/alfio/controller/api/v2/user/EventApiV2Controller.java +++ b/src/main/java/alfio/controller/api/v2/user/EventApiV2Controller.java @@ -184,7 +184,7 @@ public ResponseEntity getTicketCategories(@PathVariable("eventN boolean displayTicketsLeft = configurations.get(DISPLAY_TICKETS_LEFT_INDICATOR).getValueAsBooleanOrDefault(); var categoriesByExpiredFlag = saleableTicketCategories.stream() .map(stc -> { - var description = Formatters.applyCommonMark(ticketCategoryDescriptions.getOrDefault(stc.getId(), Collections.emptyMap())); + var description = Formatters.applyCommonMark(ticketCategoryDescriptions.getOrDefault(stc.getId(), Collections.emptyMap()), messageSource); var expiration = Formatters.getFormattedDate(event, stc.getZonedExpiration(), "common.ticket-category.date-format", messageSource); var inception = Formatters.getFormattedDate(event, stc.getZonedInception(), "common.ticket-category.date-format", messageSource); return new TicketCategory(stc, description, inception, expiration, displayTicketsLeft && !stc.isAccessRestricted()); @@ -213,7 +213,7 @@ public ResponseEntity getTicketCategories(@PathVariable("eventN var expiration = Formatters.getFormattedDate(event, as.getZonedExpiration(), "common.ticket-category.date-format", messageSource); var inception = Formatters.getFormattedDate(event, as.getZonedInception(), "common.ticket-category.date-format", messageSource); var title = additionalServiceTexts.getOrDefault(as.getId(), Collections.emptyMap()).getOrDefault(AdditionalServiceText.TextType.TITLE, Collections.emptyMap()); - var description = Formatters.applyCommonMark(additionalServiceTexts.getOrDefault(as.getId(), Collections.emptyMap()).getOrDefault(AdditionalServiceText.TextType.DESCRIPTION, Collections.emptyMap())); + var description = Formatters.applyCommonMark(additionalServiceTexts.getOrDefault(as.getId(), Collections.emptyMap()).getOrDefault(AdditionalServiceText.TextType.DESCRIPTION, Collections.emptyMap()), messageSource); return new AdditionalService(as.getId(), as.getType(), as.getSupplementPolicy(), as.isFixPrice(), as.getAvailableQuantity(), as.getMaxQtyPerOrder(), as.getFree(), as.getFormattedFinalPrice(), as.getSupportsDiscount(), as.getDiscountedPrice(), as.getVatApplies(), as.getVatIncluded(), as.getVatPercentage().toString(), diff --git a/src/main/java/alfio/controller/api/v2/user/support/EventLoader.java b/src/main/java/alfio/controller/api/v2/user/support/EventLoader.java index 5fc2e85b9c..3a5d6888df 100644 --- a/src/main/java/alfio/controller/api/v2/user/support/EventLoader.java +++ b/src/main/java/alfio/controller/api/v2/user/support/EventLoader.java @@ -56,7 +56,7 @@ public Optional loadEventInfo(String eventName, HttpSes var messageSource = messageSourceAndOverride.getLeft(); var i18nOverride = messageSourceAndOverride.getRight(); - var descriptions = Formatters.applyCommonMark(eventDescriptionRepository.findDescriptionByEventIdAsMap(event.getId())); + var descriptions = Formatters.applyCommonMark(eventDescriptionRepository.findDescriptionByEventIdAsMap(event.getId()), messageSource); var organization = organizationRepository.getContactById(event.getOrganizationId()); diff --git a/src/main/java/alfio/controller/support/Formatters.java b/src/main/java/alfio/controller/support/Formatters.java index a620236884..e4f70f8c1f 100644 --- a/src/main/java/alfio/controller/support/Formatters.java +++ b/src/main/java/alfio/controller/support/Formatters.java @@ -26,16 +26,15 @@ import java.time.ZonedDateTime; import java.time.format.DateTimeFormatter; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.function.BiConsumer; @UtilityClass @Log4j2 public class Formatters { + public static final String LINK_NEW_TAB_KEY = "link.new-tab"; + public static Map getFormattedDate(LocalizedContent localizedContent, ZonedDateTime date, String code, MessageSource messageSource) { if(localizedContent != null && date != null) { return getFormattedDate(localizedContent.getContentLanguages(), date, code, messageSource); @@ -79,13 +78,18 @@ public static FormattedEventDates getFormattedDates(Event e, MessageSource messa } public static Map applyCommonMark(Map in) { + return applyCommonMark(in, null); + } + + public static Map applyCommonMark(Map in, MessageSource messageSource) { if (in == null) { return Collections.emptyMap(); } var res = new HashMap(); in.forEach((k, v) -> { - res.put(k, MustacheCustomTag.renderToHtmlCommonmarkEscaped(v)); + var targetBlankMessage = messageSource != null ? messageSource.getMessage(LINK_NEW_TAB_KEY, null, Locale.forLanguageTag(k)) : null; + res.put(k, MustacheCustomTag.renderToHtmlCommonmarkEscaped(v, targetBlankMessage)); }); return res; } diff --git a/src/main/java/alfio/util/MustacheCustomTag.java b/src/main/java/alfio/util/MustacheCustomTag.java index 063484030d..79d057f9f4 100644 --- a/src/main/java/alfio/util/MustacheCustomTag.java +++ b/src/main/java/alfio/util/MustacheCustomTag.java @@ -26,6 +26,7 @@ import org.commonmark.ext.gfm.tables.TablesExtension; import org.commonmark.node.Link; import org.commonmark.node.Node; +import org.commonmark.node.Text; import org.commonmark.parser.Parser; import org.commonmark.renderer.html.AttributeProvider; import org.commonmark.renderer.html.HtmlRenderer; @@ -140,6 +141,7 @@ private static Pair> parseParams(String r) { private static final Parser COMMONMARK_PARSER = Parser.builder().extensions(COMMONMARK_EXTENSIONS).build(); private static final HtmlRenderer COMMONMARK_RENDERER = HtmlRenderer.builder().extensions(COMMONMARK_EXTENSIONS).attributeProviderFactory((ctx) -> new TargetBlankProvider()).build(); private static final TextContentRenderer COMMONMARK_TEXT_RENDERER = TextContentRenderer.builder().extensions(COMMONMARK_EXTENSIONS).build(); + private static final ThreadLocal A11Y_NEW_TAB_LABEL = new ThreadLocal<>(); //Open in a new window if the link contains an absolute url private static class TargetBlankProvider implements AttributeProvider { @@ -151,14 +153,26 @@ public void setAttributes(Node node, String tagName, Map attribu if (UrlUtils.isAbsoluteUrl(destination)) { attributes.put("target", "_blank"); attributes.put("rel", "nofollow noopener noreferrer"); + var newTabLabel = A11Y_NEW_TAB_LABEL.get(); + if (newTabLabel != null) { + attributes.put("aria-label", ((Text)node.getFirstChild()).getLiteral() + " " + newTabLabel); + } } } } } - public static String renderToHtmlCommonmarkEscaped(String input) { - Node document = COMMONMARK_PARSER.parse(StringEscapeUtils.escapeHtml4(input)); - return COMMONMARK_RENDERER.render(document); + return renderToHtmlCommonmarkEscaped(input, null); + } + + public static String renderToHtmlCommonmarkEscaped(String input, String localizedNewWindowLabel) { + try { + A11Y_NEW_TAB_LABEL.set(localizedNewWindowLabel); + Node document = COMMONMARK_PARSER.parse(StringEscapeUtils.escapeHtml4(input)); + return COMMONMARK_RENDERER.render(document); + } finally { + A11Y_NEW_TAB_LABEL.remove(); + } } public static String renderToTextCommonmark(String input) { diff --git a/src/main/resources/alfio/i18n/public.properties b/src/main/resources/alfio/i18n/public.properties index 02146896b4..f980714b70 100644 --- a/src/main/resources/alfio/i18n/public.properties +++ b/src/main/resources/alfio/i18n/public.properties @@ -597,4 +597,5 @@ time.extended.pattern=HH:mm online.check-in.waiting-room.button=Try again online.check-in.waiting-room.event-started=The event has started but we could not let you in. online.check-in.waiting-room.event-started.contact-organizers=Please try again by clicking on the button below or contact the organizers. -online.check-in.waiting-room.event-ended=Sorry, this event has ended. \ No newline at end of file +online.check-in.waiting-room.event-ended=Sorry, this event has ended. +link.new-tab=Opens in a new tab \ No newline at end of file diff --git a/src/test/java/alfio/controller/support/FormattersTest.java b/src/test/java/alfio/controller/support/FormattersTest.java index 402ffae629..bedcb98423 100644 --- a/src/test/java/alfio/controller/support/FormattersTest.java +++ b/src/test/java/alfio/controller/support/FormattersTest.java @@ -24,6 +24,10 @@ import java.time.ZoneId; import java.time.ZonedDateTime; import java.util.List; +import java.util.Locale; +import java.util.Map; + +import static org.junit.jupiter.api.Assertions.*; /** * This test checks if all the date patterns for all defined languages are correct, in order to spot errors at build @@ -46,4 +50,25 @@ void getFormattedDates() { FORMATTER_CODES.forEach(code -> Formatters.formatDateForLocale(now, code, messageSource, (a, b) -> Assertions.assertNotNull(b), cl, true)) ); } + + @Test + void getFormattedLink() { + var messageSource = new ResourceBundleMessageSource(); + messageSource.setBasename("alfio.i18n.public"); + var rendered = Formatters.applyCommonMark(Map.of("en", "[link](https://alf.io)")); + assertFalse(rendered.isEmpty()); + assertEquals(1, rendered.size()); + assertEquals("

link

", rendered.get("en").trim()); + } + + @Test + void getFormattedLinkWithAriaLabel() { + var messageSource = new ResourceBundleMessageSource(); + messageSource.setBasename("alfio.i18n.public"); + var message = messageSource.getMessage(Formatters.LINK_NEW_TAB_KEY, null, Locale.ENGLISH); + var rendered = Formatters.applyCommonMark(Map.of("en", "[link](https://alf.io)"), messageSource); + assertFalse(rendered.isEmpty()); + assertEquals(1, rendered.size()); + assertEquals("

link

", rendered.get("en").trim()); + } } \ No newline at end of file From c2b5165fd3d05ad5a945b106e9ac8fd5db14b58b Mon Sep 17 00:00:00 2001 From: Celestino Bellone Date: Fri, 11 Mar 2022 17:00:35 +0100 Subject: [PATCH 015/218] a11y: signal that link opens in a new tab --- src/main/resources/alfio/i18n/public.properties | 2 +- src/main/resources/alfio/i18n/public_it.properties | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/resources/alfio/i18n/public.properties b/src/main/resources/alfio/i18n/public.properties index f980714b70..60d375dd51 100644 --- a/src/main/resources/alfio/i18n/public.properties +++ b/src/main/resources/alfio/i18n/public.properties @@ -598,4 +598,4 @@ online.check-in.waiting-room.button=Try again online.check-in.waiting-room.event-started=The event has started but we could not let you in. online.check-in.waiting-room.event-started.contact-organizers=Please try again by clicking on the button below or contact the organizers. online.check-in.waiting-room.event-ended=Sorry, this event has ended. -link.new-tab=Opens in a new tab \ No newline at end of file +link.new-tab=(Opens in a new tab) \ No newline at end of file diff --git a/src/main/resources/alfio/i18n/public_it.properties b/src/main/resources/alfio/i18n/public_it.properties index 3e620c9e95..47f946c4df 100644 --- a/src/main/resources/alfio/i18n/public_it.properties +++ b/src/main/resources/alfio/i18n/public_it.properties @@ -202,6 +202,7 @@ invoice.vat-invoice = Fattura # please do not translate. This is strictly related to the Italian market invoice.vat-not-added = {0} non inclusa come da direttiva sulla Scissione dei Pagamenti invoice.vat-voided = {0} omessa, come da direttive UE +link.new-tab = (si apre in un nuovo tab) locale = it my-orders.confirmation-date = Data di conferma my-orders.description = Qui puoi trovare la lista delle tue prenotazioni From 316dd8fd4bae55f1aef73609139d78d57f4e9078 Mon Sep 17 00:00:00 2001 From: Sylvain Jermini Date: Sun, 13 Mar 2022 07:54:35 +0100 Subject: [PATCH 016/218] add pdf ua support (#1057) * enable accessibility for pdf ticket * add metadata for credit-note/invoice/receipt --- .../alfio/controller/support/TemplateProcessor.java | 2 ++ src/main/resources/alfio/i18n/public.properties | 3 ++- src/main/resources/alfio/templates/credit-note.ms | 8 ++++++-- src/main/resources/alfio/templates/invoice.ms | 8 ++++++-- src/main/resources/alfio/templates/receipt.ms | 8 ++++++-- src/main/resources/alfio/templates/ticket.ms | 10 +++++++--- 6 files changed, 29 insertions(+), 10 deletions(-) diff --git a/src/main/java/alfio/controller/support/TemplateProcessor.java b/src/main/java/alfio/controller/support/TemplateProcessor.java index 795584b917..98a8ee569f 100644 --- a/src/main/java/alfio/controller/support/TemplateProcessor.java +++ b/src/main/java/alfio/controller/support/TemplateProcessor.java @@ -113,6 +113,8 @@ public static void renderToPdf(String page, OutputStream os, ExtensionManager ex builder.useProtocolsStreamImplementation(new AlfioInternalFSStreamFactory(), "alfio-internal"); builder.useProtocolsStreamImplementation(new InvalidProtocolFSStreamFactory(), "http", "https", "file", "jar"); builder.useFastMode(); + builder.usePdfUaAccessbility(true); + builder.usePdfAConformance(PdfRendererBuilder.PdfAConformance.PDFA_3_U); var parser = new Parser(); diff --git a/src/main/resources/alfio/i18n/public.properties b/src/main/resources/alfio/i18n/public.properties index 60d375dd51..d462cfb9a9 100644 --- a/src/main/resources/alfio/i18n/public.properties +++ b/src/main/resources/alfio/i18n/public.properties @@ -598,4 +598,5 @@ online.check-in.waiting-room.button=Try again online.check-in.waiting-room.event-started=The event has started but we could not let you in. online.check-in.waiting-room.event-started.contact-organizers=Please try again by clicking on the button below or contact the organizers. online.check-in.waiting-room.event-ended=Sorry, this event has ended. -link.new-tab=(Opens in a new tab) \ No newline at end of file +qr.code=QR Code +link.new-tab=(Opens in a new tab) diff --git a/src/main/resources/alfio/templates/credit-note.ms b/src/main/resources/alfio/templates/credit-note.ms index 16d4827423..63d80ebc7c 100644 --- a/src/main/resources/alfio/templates/credit-note.ms +++ b/src/main/resources/alfio/templates/credit-note.ms @@ -1,6 +1,10 @@ - + + {{#i18n}}invoice.credit-note{{/i18n}} + + + + + + + + {{#logo}} + + {{/logo}} + + +

{{title}}

+ +

{{#i18n}}reservation-page-complete.subscription{{/i18n}}

+ + + + + +
{{#i18n}}reservation-page-complete.subscription.owner{{/i18n}}:{{subscription.firstName}} {{subscription.lastName}} <{{subscription.email}}>
+

{{#subscriptionDescription}}{{/subscriptionDescription}}

+ +

{{#i18n}}reservation-page-complete.subscription.pin-description{{/i18n}}

+

{{subscription.pin}}

+ +

{{#i18n}}reservation-page-complete.subscription.id-description{{/i18n}}

+

{{subscription.id}}

+ +

+ + + + + + +
{{#i18n}}ticket.order-information{{/i18n}}{{#i18n}}ticket.order-information-values [{{reservationId}}] [{{reservation.fullName}}]{{/i18n}}
+ + \ No newline at end of file diff --git a/src/main/resources/alfio/templates/ticket.ms b/src/main/resources/alfio/templates/ticket.ms index e85fc1b03e..ddec71f930 100644 --- a/src/main/resources/alfio/templates/ticket.ms +++ b/src/main/resources/alfio/templates/ticket.ms @@ -88,6 +88,12 @@ {{#i18n}}ticket.reference-number{{/i18n}} {{ticket.uuid}} + {{#hasSubscription}} + + {{#i18n}}reservation-page.subscription{{/i18n}} + {{subscriptionTitle}} + + {{/hasSubscription}} {{#i18n}}ticket.order-information{{/i18n}} {{#i18n}}ticket.order-information-values [{{reservationId}}] [{{reservation.fullName}}]{{/i18n}} diff --git a/src/test/java/alfio/controller/api/v1/ReservationApiV1ControllerTest.java b/src/test/java/alfio/controller/api/v1/ReservationApiV1ControllerTest.java index 2479a8bf49..4ac134d20e 100644 --- a/src/test/java/alfio/controller/api/v1/ReservationApiV1ControllerTest.java +++ b/src/test/java/alfio/controller/api/v1/ReservationApiV1ControllerTest.java @@ -129,7 +129,8 @@ void createSingleTicketWithMetadata() { new ReservationConfiguration(true), null, null, - "en" + "en", + null ); var principal = new APITokenAuthentication(username, null, List.of()); var response = controller.createTicketsReservation(event.getShortName(), creationRequest, principal); @@ -167,7 +168,8 @@ void createTwoTicketsWithMetadata() { null, null, null, - "en" + "en", + null ); var principal = new APITokenAuthentication(username, null, List.of()); var response = controller.createTicketsReservation(event.getShortName(), creationRequest, principal); @@ -216,7 +218,8 @@ void createSingleTicketWithAuthenticatedUser() { null, user, null, - "en" + "en", + null ); var principal = new APITokenAuthentication(username, null, List.of()); var response = controller.createTicketsReservation(event.getShortName(), creationRequest, principal); @@ -267,7 +270,8 @@ void createSingleTicketWithAttendees() { null, user, null, - "en" + "en", + null ); var principal = new APITokenAuthentication(username, null, List.of()); var response = controller.createTicketsReservation(event.getShortName(), creationRequest, principal); @@ -319,7 +323,8 @@ void createMultipleTicketsWithAttendees() { null, user, null, - "en" + "en", + null ); var principal = new APITokenAuthentication(username, null, List.of()); var response = controller.createTicketsReservation(event.getShortName(), creationRequest, principal); @@ -350,6 +355,59 @@ void createMultipleTicketsWithAttendees() { assertFalse(createdUser.isPresent()); } + @Test + void createSingleTicketWithSubscriptionId() { + var subscriptionId = UUID.randomUUID().toString(); + var category = ticketCategoryRepository.findFirstWithAvailableTickets(event.getId()).orElseThrow(); + var firstTicketProperties = Map.of("property", "value-first"); + var ticket = new AttendeesByCategory(category.getId(), 1, List.of( + new AttendeeData("firstName", "lastName", "example@example.org", firstTicketProperties) + ), null); + var user = new ReservationUser( + "test@example.org", + "Test", + "McTest", + "test@example.org", + "EXTERNALID" + ); + var creationRequest = new TicketReservationCreationRequest( + List.of(ticket), + List.of(), + null, + user, + null, + "en", + subscriptionId + ); + var principal = new APITokenAuthentication(username, null, List.of()); + var response = controller.createTicketsReservation(event.getShortName(), creationRequest, principal); + assertTrue(response.getStatusCode().is2xxSuccessful()); + var body = response.getBody(); + assertNotNull(body); + assertNull(body.getErrors()); + assertTrue(body.isSuccess()); + var reservationId = body.getId(); + assertNotNull(reservationId); + assertFalse(reservationId.isBlank()); + var href = body.getHref(); + assertFalse(StringUtils.startsWith(href, LOGGED_IN_RESERVATION_URL_PREFIX)); + assertTrue(StringUtils.endsWith(href, "subscription="+subscriptionId)); + var tickets = ticketRepository.findTicketsInReservation(reservationId); + assertEquals(1, tickets.size()); + tickets.forEach(savedTicket -> { + assertEquals("firstName", savedTicket.getFirstName()); + assertEquals("lastName", savedTicket.getLastName()); + assertEquals("example@example.org", savedTicket.getEmail()); + var metadata = ticketRepository.getTicketMetadata(savedTicket.getId()); + assertNotNull(metadata); + var attributes = metadata.getMetadataForKey(TicketMetadataContainer.GENERAL); + assertTrue(attributes.isPresent()); + assertEquals(firstTicketProperties, attributes.get().getAttributes()); + }); + var createdUser = userManager.findOptionalEnabledUserByUsername("test@example.org"); + assertFalse(createdUser.isPresent()); + } + @Test void createSubscriptionWithMetadata() { configurationRepository.insert(ConfigurationKeys.STRIPE_PUBLIC_KEY.getValue(), "pk", ""); diff --git a/src/test/java/alfio/manager/TicketReservationManagerTest.java b/src/test/java/alfio/manager/TicketReservationManagerTest.java index c93d922c2a..5f2f95c3f9 100644 --- a/src/test/java/alfio/manager/TicketReservationManagerTest.java +++ b/src/test/java/alfio/manager/TicketReservationManagerTest.java @@ -1148,13 +1148,16 @@ void reservationUrlForExternalClients() { // OpenID active when(maybeOpenId.getValueAsBooleanOrDefault()).thenReturn(true); - Assertions.assertEquals(BASE_URL + "openid/authentication?reservation=" + RESERVATION_ID + "&contextType=" + PurchaseContext.PurchaseContextType.event + "&id=" + shortName, trm.reservationUrlForExternalClients(RESERVATION_ID, event, "en", true)); + Assertions.assertEquals(BASE_URL + "openid/authentication?reservation=" + RESERVATION_ID + "&contextType=" + PurchaseContext.PurchaseContextType.event + "&id=" + shortName, trm.reservationUrlForExternalClients(RESERVATION_ID, event, "en", true, null)); // user not specified in the request - Assertions.assertEquals(BASE_URL + "event/" + shortName + "/reservation/" + RESERVATION_ID + "?lang=en", trm.reservationUrlForExternalClients(RESERVATION_ID, event, "en", false)); + Assertions.assertEquals(BASE_URL + "event/" + shortName + "/reservation/" + RESERVATION_ID + "?lang=en", trm.reservationUrlForExternalClients(RESERVATION_ID, event, "en", false, null)); // OpenID not active when(maybeOpenId.getValueAsBooleanOrDefault()).thenReturn(false); - Assertions.assertEquals(BASE_URL + "event/" + shortName + "/reservation/" + RESERVATION_ID + "?lang=en", trm.reservationUrlForExternalClients(RESERVATION_ID, event, "en", true)); + Assertions.assertEquals(BASE_URL + "event/" + shortName + "/reservation/" + RESERVATION_ID + "?lang=en", trm.reservationUrlForExternalClients(RESERVATION_ID, event, "en", true, null)); + // SubscriptionId is present + var subscriptionId = "subscription-id"; + Assertions.assertEquals(BASE_URL + "event/" + shortName + "/reservation/" + RESERVATION_ID + "?lang=en&subscription=" + subscriptionId, trm.reservationUrlForExternalClients(RESERVATION_ID, event, "en", true, subscriptionId)); } //sendReminderForOptionalInfo From fc30659716339fc7bc828625d1eba00afdc3ec87 Mon Sep 17 00:00:00 2001 From: Celestino Bellone <3385346+cbellone@users.noreply.github.com> Date: Fri, 3 Feb 2023 16:09:18 +0100 Subject: [PATCH 143/218] fix compilation errors after cherry-pick --- .../alfio/controller/IndexController.java | 6 +- .../api/admin/ResourceController.java | 4 +- .../api/v2/user/TicketApiV2Controller.java | 4 +- .../java/alfio/util/TemplateResource.java | 6 +- src/test/resources/api/descriptor.json | 467 +++++++++--------- 5 files changed, 253 insertions(+), 234 deletions(-) diff --git a/src/main/java/alfio/controller/IndexController.java b/src/main/java/alfio/controller/IndexController.java index be10421f44..a70c37a675 100644 --- a/src/main/java/alfio/controller/IndexController.java +++ b/src/main/java/alfio/controller/IndexController.java @@ -35,6 +35,7 @@ import alfio.util.RequestUtils; import ch.digitalfondue.jfiveparse.*; import org.apache.commons.collections4.IterableUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.context.annotation.Profile; import org.springframework.core.io.ClassPathResource; import org.springframework.http.MediaType; @@ -59,6 +60,7 @@ import java.util.regex.Pattern; import static alfio.config.Initializer.PROFILE_LIVE; +import static alfio.controller.Constants.*; import static alfio.model.system.ConfigurationKeys.BASE_CUSTOM_CSS; import static java.util.Objects.requireNonNull; @@ -256,7 +258,9 @@ public void replyToIndex(@PathVariable(value = EVENT_SHORT_NAME, required = fals } @GetMapping("/event/{eventShortName}/reservation/{reservationId}") - public String redirectEventToReservation(@PathVariable(value = EVENT_SHORT_NAME) String eventShortName, @PathVariable(value = "reservationId") String reservationId) { + public String redirectEventToReservation(@PathVariable(value = EVENT_SHORT_NAME) String eventShortName, + @PathVariable(value = "reservationId") String reservationId, + @RequestParam(value = "subscription", required = false) String subscriptionId) { if (eventRepository.existsByShortName(eventShortName)) { var reservationStatusUrlSegment = ticketReservationRepository.findOptionalStatusAndValidationById(reservationId) .map(IndexController::reservationStatusToUrlMapping).orElse(NOT_FOUND); diff --git a/src/main/java/alfio/controller/api/admin/ResourceController.java b/src/main/java/alfio/controller/api/admin/ResourceController.java index 9ac756e5a9..b799234219 100644 --- a/src/main/java/alfio/controller/api/admin/ResourceController.java +++ b/src/main/java/alfio/controller/api/admin/ResourceController.java @@ -86,7 +86,8 @@ public ResourceController(UploadedResourceManager uploadedResourceManager, OrganizationRepository organizationRepository, FileUploadManager fileUploadManager, ExtensionManager extensionManager, - ClockProvider clockProvider) { + ClockProvider clockProvider, + SubscriptionManager subscriptionManager) { this.uploadedResourceManager = uploadedResourceManager; this.userManager = userManager; this.eventRepository = eventRepository; @@ -96,6 +97,7 @@ public ResourceController(UploadedResourceManager uploadedResourceManager, this.fileUploadManager = fileUploadManager; this.extensionManager = extensionManager; this.clockProvider = clockProvider; + this.subscriptionManager = subscriptionManager; } diff --git a/src/main/java/alfio/controller/api/v2/user/TicketApiV2Controller.java b/src/main/java/alfio/controller/api/v2/user/TicketApiV2Controller.java index 14bdc388a2..3710fe9c01 100644 --- a/src/main/java/alfio/controller/api/v2/user/TicketApiV2Controller.java +++ b/src/main/java/alfio/controller/api/v2/user/TicketApiV2Controller.java @@ -86,7 +86,8 @@ public TicketApiV2Controller(TicketHelper ticketHelper, TemplateManager templateManager, NotificationManager notificationManager, BookingInfoTicketLoader bookingInfoTicketLoader, - TicketRepository ticketRepository) { + TicketRepository ticketRepository, + SubscriptionManager subscriptionManager) { this.ticketHelper = ticketHelper; this.ticketReservationManager = ticketReservationManager; this.ticketCategoryRepository = ticketCategoryRepository; @@ -98,6 +99,7 @@ public TicketApiV2Controller(TicketHelper ticketHelper, this.notificationManager = notificationManager; this.bookingInfoTicketLoader = bookingInfoTicketLoader; this.ticketRepository = ticketRepository; + this.subscriptionManager = subscriptionManager; } diff --git a/src/main/java/alfio/util/TemplateResource.java b/src/main/java/alfio/util/TemplateResource.java index 67c7264786..733efaa21b 100644 --- a/src/main/java/alfio/util/TemplateResource.java +++ b/src/main/java/alfio/util/TemplateResource.java @@ -627,9 +627,9 @@ public static Map buildModelForSubscriptionPDF(Subscription subs model.put(RESERVATION_ID, reservationId); model.put(METADATA_ATTRIBUTES_KEY, metadata.getProperties()); imageData.ifPresent(iData -> { - model.put("logo", iData.getEventImage()); - model.put("imageWidth", iData.getImageWidth()); - model.put("imageHeight", iData.getImageHeight()); + model.put("logo", iData.eventImage); + model.put("imageWidth", iData.imageWidth); + model.put("imageHeight", iData.imageHeight); }); return model; } diff --git a/src/test/resources/api/descriptor.json b/src/test/resources/api/descriptor.json index 0d7eefbffb..a66f01fd08 100644 --- a/src/test/resources/api/descriptor.json +++ b/src/test/resources/api/descriptor.json @@ -7606,7 +7606,7 @@ "required" : true, "schema" : { "type" : "string", - "enum" : [ "GOOGLE_ANALYTICS", "CONFIRMATION_EMAIL_FOR_ORGANIZER", "SEND_RESERVED_CODE", "CONFIRMATION_EMAIL", "CONFIRMATION_EMAIL_SUBSCRIPTION", "OFFLINE_RESERVATION_EXPIRED_EMAIL", "CHARGE_ATTEMPT_FAILED_EMAIL", "CHARGE_ATTEMPT_FAILED_EMAIL_FOR_ORGANIZER", "CREDIT_NOTE_ISSUED_EMAIL", "OFFLINE_RESERVATION_EXPIRING_EMAIL_FOR_ORGANIZER", "OFFLINE_PAYMENT_MATCHES_FOUND", "REMINDER_EMAIL", "REMINDER_TICKET_ADDITIONAL_INFO", "REMINDER_TICKETS_ASSIGNMENT_EMAIL", "TICKET_EMAIL", "TICKET_EMAIL_FOR_ONLINE_EVENT", "TICKET_HAS_CHANGED_OWNER", "TICKET_HAS_BEEN_CANCELLED", "TICKET_HAS_BEEN_CANCELLED_ADMIN", "TICKET_PDF", "RECEIPT_PDF", "INVOICE_PDF", "CREDIT_NOTE_PDF", "WAITING_QUEUE_JOINED", "WAITING_QUEUE_RESERVATION_EMAIL" ] + "enum" : [ "GOOGLE_ANALYTICS", "CONFIRMATION_EMAIL_FOR_ORGANIZER", "SEND_RESERVED_CODE", "CONFIRMATION_EMAIL", "CONFIRMATION_EMAIL_SUBSCRIPTION", "OFFLINE_RESERVATION_EXPIRED_EMAIL", "CHARGE_ATTEMPT_FAILED_EMAIL", "CHARGE_ATTEMPT_FAILED_EMAIL_FOR_ORGANIZER", "CREDIT_NOTE_ISSUED_EMAIL", "OFFLINE_RESERVATION_EXPIRING_EMAIL_FOR_ORGANIZER", "OFFLINE_PAYMENT_MATCHES_FOUND", "REMINDER_EMAIL", "REMINDER_TICKET_ADDITIONAL_INFO", "REMINDER_TICKETS_ASSIGNMENT_EMAIL", "TICKET_EMAIL", "TICKET_EMAIL_FOR_ONLINE_EVENT", "TICKET_HAS_CHANGED_OWNER", "TICKET_HAS_BEEN_CANCELLED", "TICKET_HAS_BEEN_CANCELLED_ADMIN", "TICKET_PDF", "RECEIPT_PDF", "INVOICE_PDF", "CREDIT_NOTE_PDF", "SUBSCRIPTION_PDF", "WAITING_QUEUE_JOINED", "WAITING_QUEUE_RESERVATION_EMAIL" ] } }, { "name" : "locale", @@ -7631,6 +7631,14 @@ "type" : "integer", "format" : "int32" } + }, { + "name" : "subscriptionDescriptorId", + "in" : "query", + "required" : false, + "schema" : { + "type" : "string", + "format" : "uuid" + } } ], "requestBody" : { "content" : { @@ -18397,7 +18405,7 @@ "required" : true, "schema" : { "type" : "string", - "enum" : [ "GOOGLE_ANALYTICS", "CONFIRMATION_EMAIL_FOR_ORGANIZER", "SEND_RESERVED_CODE", "CONFIRMATION_EMAIL", "CONFIRMATION_EMAIL_SUBSCRIPTION", "OFFLINE_RESERVATION_EXPIRED_EMAIL", "CHARGE_ATTEMPT_FAILED_EMAIL", "CHARGE_ATTEMPT_FAILED_EMAIL_FOR_ORGANIZER", "CREDIT_NOTE_ISSUED_EMAIL", "OFFLINE_RESERVATION_EXPIRING_EMAIL_FOR_ORGANIZER", "OFFLINE_PAYMENT_MATCHES_FOUND", "REMINDER_EMAIL", "REMINDER_TICKET_ADDITIONAL_INFO", "REMINDER_TICKETS_ASSIGNMENT_EMAIL", "TICKET_EMAIL", "TICKET_EMAIL_FOR_ONLINE_EVENT", "TICKET_HAS_CHANGED_OWNER", "TICKET_HAS_BEEN_CANCELLED", "TICKET_HAS_BEEN_CANCELLED_ADMIN", "TICKET_PDF", "RECEIPT_PDF", "INVOICE_PDF", "CREDIT_NOTE_PDF", "WAITING_QUEUE_JOINED", "WAITING_QUEUE_RESERVATION_EMAIL" ] + "enum" : [ "GOOGLE_ANALYTICS", "CONFIRMATION_EMAIL_FOR_ORGANIZER", "SEND_RESERVED_CODE", "CONFIRMATION_EMAIL", "CONFIRMATION_EMAIL_SUBSCRIPTION", "OFFLINE_RESERVATION_EXPIRED_EMAIL", "CHARGE_ATTEMPT_FAILED_EMAIL", "CHARGE_ATTEMPT_FAILED_EMAIL_FOR_ORGANIZER", "CREDIT_NOTE_ISSUED_EMAIL", "OFFLINE_RESERVATION_EXPIRING_EMAIL_FOR_ORGANIZER", "OFFLINE_PAYMENT_MATCHES_FOUND", "REMINDER_EMAIL", "REMINDER_TICKET_ADDITIONAL_INFO", "REMINDER_TICKETS_ASSIGNMENT_EMAIL", "TICKET_EMAIL", "TICKET_EMAIL_FOR_ONLINE_EVENT", "TICKET_HAS_CHANGED_OWNER", "TICKET_HAS_BEEN_CANCELLED", "TICKET_HAS_BEEN_CANCELLED_ADMIN", "TICKET_PDF", "RECEIPT_PDF", "INVOICE_PDF", "CREDIT_NOTE_PDF", "SUBSCRIPTION_PDF", "WAITING_QUEUE_JOINED", "WAITING_QUEUE_RESERVATION_EMAIL" ] } }, { "name" : "locale", @@ -18507,7 +18515,7 @@ "type" : "array", "items" : { "type" : "string", - "enum" : [ "GOOGLE_ANALYTICS", "CONFIRMATION_EMAIL_FOR_ORGANIZER", "SEND_RESERVED_CODE", "CONFIRMATION_EMAIL", "CONFIRMATION_EMAIL_SUBSCRIPTION", "OFFLINE_RESERVATION_EXPIRED_EMAIL", "CHARGE_ATTEMPT_FAILED_EMAIL", "CHARGE_ATTEMPT_FAILED_EMAIL_FOR_ORGANIZER", "CREDIT_NOTE_ISSUED_EMAIL", "OFFLINE_RESERVATION_EXPIRING_EMAIL_FOR_ORGANIZER", "OFFLINE_PAYMENT_MATCHES_FOUND", "REMINDER_EMAIL", "REMINDER_TICKET_ADDITIONAL_INFO", "REMINDER_TICKETS_ASSIGNMENT_EMAIL", "TICKET_EMAIL", "TICKET_EMAIL_FOR_ONLINE_EVENT", "TICKET_HAS_CHANGED_OWNER", "TICKET_HAS_BEEN_CANCELLED", "TICKET_HAS_BEEN_CANCELLED_ADMIN", "TICKET_PDF", "RECEIPT_PDF", "INVOICE_PDF", "CREDIT_NOTE_PDF", "WAITING_QUEUE_JOINED", "WAITING_QUEUE_RESERVATION_EMAIL" ] + "enum" : [ "GOOGLE_ANALYTICS", "CONFIRMATION_EMAIL_FOR_ORGANIZER", "SEND_RESERVED_CODE", "CONFIRMATION_EMAIL", "CONFIRMATION_EMAIL_SUBSCRIPTION", "OFFLINE_RESERVATION_EXPIRED_EMAIL", "CHARGE_ATTEMPT_FAILED_EMAIL", "CHARGE_ATTEMPT_FAILED_EMAIL_FOR_ORGANIZER", "CREDIT_NOTE_ISSUED_EMAIL", "OFFLINE_RESERVATION_EXPIRING_EMAIL_FOR_ORGANIZER", "OFFLINE_PAYMENT_MATCHES_FOUND", "REMINDER_EMAIL", "REMINDER_TICKET_ADDITIONAL_INFO", "REMINDER_TICKETS_ASSIGNMENT_EMAIL", "TICKET_EMAIL", "TICKET_EMAIL_FOR_ONLINE_EVENT", "TICKET_HAS_CHANGED_OWNER", "TICKET_HAS_BEEN_CANCELLED", "TICKET_HAS_BEEN_CANCELLED_ADMIN", "TICKET_PDF", "RECEIPT_PDF", "INVOICE_PDF", "CREDIT_NOTE_PDF", "SUBSCRIPTION_PDF", "WAITING_QUEUE_JOINED", "WAITING_QUEUE_RESERVATION_EMAIL" ] } } } @@ -25393,15 +25401,15 @@ "location" : { "type" : "string" }, + "description" : { + "type" : "string" + }, "arguments" : { "type" : "array", "items" : { "type" : "object" } }, - "description" : { - "type" : "string" - }, "code" : { "type" : "string" } @@ -25792,7 +25800,13 @@ "refundedAmount" : { "type" : "string" }, - "ticketAmount" : { + "notYetPaid" : { + "type" : "boolean" + }, + "vatExempt" : { + "type" : "boolean" + }, + "priceInCents" : { "type" : "integer", "format" : "int32" }, @@ -25814,13 +25828,7 @@ "priceBeforeTaxes" : { "type" : "string" }, - "notYetPaid" : { - "type" : "boolean" - }, - "vatExempt" : { - "type" : "boolean" - }, - "priceInCents" : { + "ticketAmount" : { "type" : "integer", "format" : "int32" } @@ -26016,13 +26024,13 @@ "valid" : { "type" : "boolean" }, - "formattedValidityTo" : { + "pin" : { "type" : "string" }, - "formattedValidityFrom" : { + "formattedValidityTo" : { "type" : "string" }, - "pin" : { + "formattedValidityFrom" : { "type" : "string" } } @@ -26171,9 +26179,6 @@ "type" : "string", "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] }, - "formattedNetPrice" : { - "type" : "string" - }, "assigned" : { "type" : "boolean" }, @@ -26182,6 +26187,9 @@ }, "formattedFinalPrice" : { "type" : "string" + }, + "formattedNetPrice" : { + "type" : "string" } } }, @@ -26379,15 +26387,6 @@ "cancelled" : { "type" : "boolean" }, - "stuck" : { - "type" : "boolean" - }, - "hasBillingAddress" : { - "type" : "boolean" - }, - "hasVatNumber" : { - "type" : "boolean" - }, "hasInvoiceNumber" : { "type" : "boolean" }, @@ -26409,6 +26408,15 @@ "hasBeenPaid" : { "type" : "boolean" }, + "stuck" : { + "type" : "boolean" + }, + "hasBillingAddress" : { + "type" : "boolean" + }, + "hasVatNumber" : { + "type" : "boolean" + }, "finalPrice" : { "type" : "number" }, @@ -26512,36 +26520,16 @@ "type" : "string", "enum" : [ "PENDING", "IN_PAYMENT", "EXTERNAL_PROCESSING_PAYMENT", "WAITING_EXTERNAL_CONFIRMATION", "OFFLINE_PAYMENT", "DEFERRED_OFFLINE_PAYMENT", "COMPLETE", "STUCK", "CANCELLED", "CREDIT_NOTE_ISSUED" ] }, - "stuck" : { - "type" : "boolean" - }, - "reminderSent" : { - "type" : "boolean" - }, - "hasBillingAddress" : { - "type" : "boolean" - }, - "hasVatNumber" : { - "type" : "boolean" - }, - "latestReminder" : { - "type" : "string", - "format" : "date-time" - }, - "invoiceModel" : { - "type" : "string" - }, - "usedVatPercent" : { - "type" : "number" - }, - "creationTimestamp" : { - "type" : "string", - "format" : "date-time" - }, "promoCodeDiscountId" : { "type" : "integer", "format" : "int32" }, + "firstName" : { + "type" : "string" + }, + "lastName" : { + "type" : "string" + }, "hasInvoiceNumber" : { "type" : "boolean" }, @@ -26552,18 +26540,6 @@ "type" : "string", "enum" : [ "STRIPE", "ON_SITE", "OFFLINE", "NONE", "ADMIN", "PAYPAL", "MOLLIE", "SAFERPAY" ] }, - "firstName" : { - "type" : "string" - }, - "lastName" : { - "type" : "string" - }, - "email" : { - "type" : "string" - }, - "userLanguage" : { - "type" : "string" - }, "vatStatus" : { "type" : "string", "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] @@ -26617,6 +26593,12 @@ "netPrice" : { "type" : "number" }, + "email" : { + "type" : "string" + }, + "userLanguage" : { + "type" : "string" + }, "validity" : { "type" : "string", "format" : "date-time" @@ -26658,6 +26640,32 @@ }, "taxablePrice" : { "type" : "number" + }, + "stuck" : { + "type" : "boolean" + }, + "reminderSent" : { + "type" : "boolean" + }, + "hasBillingAddress" : { + "type" : "boolean" + }, + "hasVatNumber" : { + "type" : "boolean" + }, + "latestReminder" : { + "type" : "string", + "format" : "date-time" + }, + "invoiceModel" : { + "type" : "string" + }, + "usedVatPercent" : { + "type" : "number" + }, + "creationTimestamp" : { + "type" : "string", + "format" : "date-time" } } }, @@ -27995,6 +28003,9 @@ "language" : { "type" : "string" }, + "subscriptionId" : { + "type" : "string" + }, "reservationConfiguration" : { "$ref" : "#/components/schemas/ReservationConfiguration" }, @@ -28380,12 +28391,6 @@ "type" : "string", "enum" : [ "FREE", "PENDING", "TO_BE_PAID", "ACQUIRED", "CANCELLED", "CHECKED_IN", "EXPIRED", "INVALIDATED", "RELEASED", "PRE_RESERVED" ] }, - "formattedNetPrice" : { - "type" : "string" - }, - "extReference" : { - "type" : "string" - }, "tags" : { "type" : "array", "items" : { @@ -28409,19 +28414,6 @@ "type" : "string", "format" : "uuid" }, - "email" : { - "type" : "string" - }, - "userLanguage" : { - "type" : "string" - }, - "categoryId" : { - "type" : "integer", - "format" : "int32" - }, - "ticketsReservationId" : { - "type" : "string" - }, "vatStatus" : { "type" : "string", "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] @@ -28442,6 +28434,19 @@ "type" : "integer", "format" : "int32" }, + "email" : { + "type" : "string" + }, + "userLanguage" : { + "type" : "string" + }, + "categoryId" : { + "type" : "integer", + "format" : "int32" + }, + "ticketsReservationId" : { + "type" : "string" + }, "uuid" : { "type" : "string" }, @@ -28458,6 +28463,12 @@ "formattedFinalPrice" : { "type" : "string" }, + "formattedNetPrice" : { + "type" : "string" + }, + "extReference" : { + "type" : "string" + }, "categoryName" : { "type" : "string" } @@ -29703,12 +29714,6 @@ "type" : "string", "enum" : [ "FREE", "PENDING", "TO_BE_PAID", "ACQUIRED", "CANCELLED", "CHECKED_IN", "EXPIRED", "INVALIDATED", "RELEASED", "PRE_RESERVED" ] }, - "formattedNetPrice" : { - "type" : "string" - }, - "extReference" : { - "type" : "string" - }, "tags" : { "type" : "array", "items" : { @@ -29732,19 +29737,6 @@ "type" : "string", "format" : "uuid" }, - "email" : { - "type" : "string" - }, - "userLanguage" : { - "type" : "string" - }, - "categoryId" : { - "type" : "integer", - "format" : "int32" - }, - "ticketsReservationId" : { - "type" : "string" - }, "vatStatus" : { "type" : "string", "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] @@ -29765,6 +29757,19 @@ "type" : "integer", "format" : "int32" }, + "email" : { + "type" : "string" + }, + "userLanguage" : { + "type" : "string" + }, + "categoryId" : { + "type" : "integer", + "format" : "int32" + }, + "ticketsReservationId" : { + "type" : "string" + }, "uuid" : { "type" : "string" }, @@ -29780,6 +29785,12 @@ }, "formattedFinalPrice" : { "type" : "string" + }, + "formattedNetPrice" : { + "type" : "string" + }, + "extReference" : { + "type" : "string" } } }, @@ -30494,9 +30505,6 @@ "type" : "string", "enum" : [ "STANDARD", "CUSTOM", "NOT_SET" ] }, - "formattedPrice" : { - "type" : "string" - }, "assignmentConfiguration" : { "$ref" : "#/components/schemas/AssignmentConfiguration" }, @@ -30506,6 +30514,9 @@ "canApplySubscriptions" : { "type" : "boolean" }, + "formattedPrice" : { + "type" : "string" + }, "contentLanguages" : { "type" : "array", "items" : { @@ -31638,18 +31649,6 @@ "displayName" : { "type" : "string" }, - "titleAsText" : { - "type" : "object", - "additionalProperties" : { - "type" : "string" - } - }, - "descriptionAsText" : { - "type" : "object", - "additionalProperties" : { - "type" : "string" - } - }, "publicIdentifier" : { "type" : "string" }, @@ -31676,6 +31675,18 @@ "freeOfCharge" : { "type" : "boolean" }, + "titleAsText" : { + "type" : "object", + "additionalProperties" : { + "type" : "string" + } + }, + "descriptionAsText" : { + "type" : "object", + "additionalProperties" : { + "type" : "string" + } + }, "fileBlobIdIsPresent" : { "type" : "boolean" }, @@ -31780,15 +31791,6 @@ "type" : "string", "enum" : [ "FREE", "PENDING", "TO_BE_PAID", "ACQUIRED", "CANCELLED", "CHECKED_IN", "EXPIRED", "INVALIDATED", "RELEASED", "PRE_RESERVED" ] }, - "formattedNetPrice" : { - "type" : "string" - }, - "extReference" : { - "type" : "string" - }, - "stuck" : { - "type" : "boolean" - }, "tags" : { "type" : "array", "items" : { @@ -31815,19 +31817,6 @@ "type" : "string", "format" : "uuid" }, - "email" : { - "type" : "string" - }, - "userLanguage" : { - "type" : "string" - }, - "categoryId" : { - "type" : "integer", - "format" : "int32" - }, - "ticketsReservationId" : { - "type" : "string" - }, "vatStatus" : { "type" : "string", "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] @@ -31851,6 +31840,19 @@ "type" : "integer", "format" : "int32" }, + "email" : { + "type" : "string" + }, + "userLanguage" : { + "type" : "string" + }, + "categoryId" : { + "type" : "integer", + "format" : "int32" + }, + "ticketsReservationId" : { + "type" : "string" + }, "uuid" : { "type" : "string" }, @@ -31867,6 +31869,15 @@ "formattedFinalPrice" : { "type" : "string" }, + "stuck" : { + "type" : "boolean" + }, + "formattedNetPrice" : { + "type" : "string" + }, + "extReference" : { + "type" : "string" + }, "transactionTimestamp" : { "type" : "string", "format" : "date-time" @@ -31988,12 +31999,6 @@ "type" : "string", "enum" : [ "FREE", "PENDING", "TO_BE_PAID", "ACQUIRED", "CANCELLED", "CHECKED_IN", "EXPIRED", "INVALIDATED", "RELEASED", "PRE_RESERVED" ] }, - "formattedNetPrice" : { - "type" : "string" - }, - "extReference" : { - "type" : "string" - }, "tags" : { "type" : "array", "items" : { @@ -32017,19 +32022,6 @@ "type" : "string", "format" : "uuid" }, - "email" : { - "type" : "string" - }, - "userLanguage" : { - "type" : "string" - }, - "categoryId" : { - "type" : "integer", - "format" : "int32" - }, - "ticketsReservationId" : { - "type" : "string" - }, "vatStatus" : { "type" : "string", "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] @@ -32050,6 +32042,19 @@ "type" : "integer", "format" : "int32" }, + "email" : { + "type" : "string" + }, + "userLanguage" : { + "type" : "string" + }, + "categoryId" : { + "type" : "integer", + "format" : "int32" + }, + "ticketsReservationId" : { + "type" : "string" + }, "uuid" : { "type" : "string" }, @@ -32066,6 +32071,12 @@ "formattedFinalPrice" : { "type" : "string" }, + "formattedNetPrice" : { + "type" : "string" + }, + "extReference" : { + "type" : "string" + }, "additionalFields" : { "type" : "object", "additionalProperties" : { @@ -32788,15 +32799,6 @@ "description" : { "type" : "string" }, - "formattedStart" : { - "type" : "string" - }, - "formattedEnd" : { - "type" : "string" - }, - "formattedDiscountAmount" : { - "type" : "string" - }, "eventId" : { "type" : "integer", "format" : "int32" @@ -32855,6 +32857,15 @@ }, "fixedAmount" : { "type" : "boolean" + }, + "formattedStart" : { + "type" : "string" + }, + "formattedEnd" : { + "type" : "string" + }, + "formattedDiscountAmount" : { + "type" : "string" } } }, @@ -33141,32 +33152,9 @@ "type" : "string", "enum" : [ "DRAFT", "PUBLIC", "DISABLED" ] }, - "notSoldTickets" : { - "type" : "integer", - "format" : "int32" - }, - "soldTickets" : { - "type" : "integer", - "format" : "int32" - }, - "pendingTickets" : { - "type" : "integer", - "format" : "int32" - }, - "dynamicAllocation" : { - "type" : "integer", - "format" : "int32" - }, - "releasedTickets" : { - "type" : "integer", - "format" : "int32" - }, "shortName" : { "type" : "string" }, - "formattedEnd" : { - "type" : "string" - }, "organizationId" : { "type" : "integer", "format" : "int32" @@ -33196,15 +33184,38 @@ "expired" : { "type" : "boolean" }, - "warningNeeded" : { - "type" : "boolean" + "notSoldTickets" : { + "type" : "integer", + "format" : "int32" }, - "formattedBegin" : { + "soldTickets" : { + "type" : "integer", + "format" : "int32" + }, + "pendingTickets" : { + "type" : "integer", + "format" : "int32" + }, + "dynamicAllocation" : { + "type" : "integer", + "format" : "int32" + }, + "releasedTickets" : { + "type" : "integer", + "format" : "int32" + }, + "formattedEnd" : { "type" : "string" }, "visibleForCurrentUser" : { "type" : "boolean" }, + "warningNeeded" : { + "type" : "boolean" + }, + "formattedBegin" : { + "type" : "string" + }, "displayStatistics" : { "type" : "boolean" } @@ -33443,6 +33454,9 @@ "inputType" : { "type" : "string" }, + "countryField" : { + "type" : "boolean" + }, "inputField" : { "type" : "boolean" }, @@ -33463,9 +33477,6 @@ }, "minLengthDefined" : { "type" : "boolean" - }, - "countryField" : { - "type" : "boolean" } } }, @@ -33517,6 +33528,35 @@ "type" : "integer", "format" : "int32" }, + "required" : { + "type" : "boolean" + }, + "eventId" : { + "type" : "integer", + "format" : "int32" + }, + "additionalServiceId" : { + "type" : "integer", + "format" : "int32" + }, + "countryField" : { + "type" : "boolean" + }, + "restrictedValues" : { + "type" : "array", + "items" : { + "type" : "string" + } + }, + "editable" : { + "type" : "boolean" + }, + "disabledValues" : { + "type" : "array", + "items" : { + "type" : "string" + } + }, "inputField" : { "type" : "boolean" }, @@ -33544,35 +33584,6 @@ "type" : "integer", "format" : "int32" } - }, - "required" : { - "type" : "boolean" - }, - "disabledValues" : { - "type" : "array", - "items" : { - "type" : "string" - } - }, - "eventId" : { - "type" : "integer", - "format" : "int32" - }, - "additionalServiceId" : { - "type" : "integer", - "format" : "int32" - }, - "countryField" : { - "type" : "boolean" - }, - "restrictedValues" : { - "type" : "array", - "items" : { - "type" : "string" - } - }, - "editable" : { - "type" : "boolean" } } }, From e7a1fd97d99958a8b5e65306c3e51278c91c2b37 Mon Sep 17 00:00:00 2001 From: Celestino Bellone <3385346+cbellone@users.noreply.github.com> Date: Fri, 3 Feb 2023 19:49:53 +0100 Subject: [PATCH 144/218] API to retrieve check-in log (#1188) (cherry-picked from 976f88a03f1d5ab9ac239cbe64708f79941d473e) --- .../api/v1/admin/EventApiV1Controller.java | 13 +++++ .../java/alfio/manager/CheckInManager.java | 8 +++ .../model/api/v1/admin/CheckInLogEntry.java | 52 +++++++++++++++++++ .../java/alfio/model/audit/ScanAudit.java | 20 ++++--- .../repository/audit/ScanAuditRepository.java | 9 ++++ .../reservation/BaseReservationFlowTest.java | 8 ++- .../ReservationFlowIntegrationTest.java | 19 ++++++- 7 files changed, 119 insertions(+), 10 deletions(-) create mode 100644 src/main/java/alfio/model/api/v1/admin/CheckInLogEntry.java diff --git a/src/main/java/alfio/controller/api/v1/admin/EventApiV1Controller.java b/src/main/java/alfio/controller/api/v1/admin/EventApiV1Controller.java index 989899a2b0..358101e856 100644 --- a/src/main/java/alfio/controller/api/v1/admin/EventApiV1Controller.java +++ b/src/main/java/alfio/controller/api/v1/admin/EventApiV1Controller.java @@ -25,6 +25,7 @@ import alfio.manager.user.UserManager; import alfio.model.*; import alfio.model.ExtensionSupport.ExtensionMetadataValue; +import alfio.model.api.v1.admin.CheckInLogEntry; import alfio.model.api.v1.admin.EventCreationRequest; import alfio.model.api.v1.admin.LinkedSubscriptions; import alfio.model.group.Group; @@ -76,6 +77,7 @@ public class EventApiV1Controller { private final ExtensionRepository extensionRepository; private final ConfigurationManager configurationManager; private final AdminJobManager adminJobManager; + private final CheckInManager checkInManager; public EventApiV1Controller(EventManager eventManager, EventNameManager eventNameManager, @@ -223,6 +225,17 @@ public ResponseEntity generateTicketsForSubscribers(@PathVariable("slug })); } + @GetMapping("/{slug}/check-in-log") + public ResponseEntity> checkInLog(@PathVariable("slug") String slug, + Principal user) { + try { + return ResponseEntity.ok(checkInManager.retrieveLogEntries(slug, user.getName())); + } catch (Exception ex) { + log.error("Error while loading check-in log entries", ex); + return ResponseEntity.internalServerError().build(); + } + } + private LinkedSubscriptions retrieveLinkedSubscriptionsForEvent(String slug, int id, int organizationId) { var subscriptionIds = eventManager.getLinkedSubscriptionIds(id, organizationId); return new LinkedSubscriptions(slug, subscriptionIds); diff --git a/src/main/java/alfio/manager/CheckInManager.java b/src/main/java/alfio/manager/CheckInManager.java index c7fd92d9ee..80b4f72cf8 100644 --- a/src/main/java/alfio/manager/CheckInManager.java +++ b/src/main/java/alfio/manager/CheckInManager.java @@ -20,6 +20,7 @@ import alfio.manager.system.ConfigurationManager; import alfio.model.*; import alfio.model.Ticket.TicketStatus; +import alfio.model.api.v1.admin.CheckInLogEntry; import alfio.model.audit.ScanAudit; import alfio.model.checkin.AttendeeSearchResults; import alfio.model.decorator.TicketPriceContainer; @@ -565,6 +566,13 @@ public CheckInStatistics getStatistics(String eventName, String username) { .orElse(null); } + public List retrieveLogEntries(String eventName, String username) { + return eventRepository.findOptionalEventAndOrganizationIdByShortName(eventName) + .filter(EventManager.checkOwnership(username, organizationRepository)) + .map(event -> scanAuditRepository.loadEntries(event.getId())) + .orElse(List.of()); + } + private boolean areStatsEnabled(EventAndOrganizationId event) { return configurationManager.getFor(CHECK_IN_STATS, event.getConfigurationLevel()).getValueAsBooleanOrDefault(); } diff --git a/src/main/java/alfio/model/api/v1/admin/CheckInLogEntry.java b/src/main/java/alfio/model/api/v1/admin/CheckInLogEntry.java new file mode 100644 index 0000000000..85100e34df --- /dev/null +++ b/src/main/java/alfio/model/api/v1/admin/CheckInLogEntry.java @@ -0,0 +1,52 @@ +/** + * This file is part of alf.io. + * + * alf.io is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * alf.io is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with alf.io. If not, see . + */ +package alfio.model.api.v1.admin; + +import alfio.model.audit.ScanAudit; +import alfio.model.modification.AttendeeData; +import alfio.model.support.JSONData; +import alfio.util.Json; +import ch.digitalfondue.npjt.ConstructorAnnotationRowMapper.Column; +import com.fasterxml.jackson.core.type.TypeReference; + +import java.util.List; + +public class CheckInLogEntry { + private final String ticketId; + private final AttendeeData attendeeData; + private final List audit; + + public CheckInLogEntry(@Column("t_uuid") String ticketId, + @Column("attendee_data") @JSONData AttendeeData attendeeData, + @Column("scans") String scansAsString) { + this.ticketId = ticketId; + this.attendeeData = attendeeData; + this.audit = Json.fromJson(scansAsString, new TypeReference<>() {}); + } + + public String getTicketId() { + return ticketId; + } + + public AttendeeData getAttendeeData() { + return attendeeData; + } + + public List getAudit() { + return audit; + } +} diff --git a/src/main/java/alfio/model/audit/ScanAudit.java b/src/main/java/alfio/model/audit/ScanAudit.java index e8f63e8043..d0fef5e6e9 100644 --- a/src/main/java/alfio/model/audit/ScanAudit.java +++ b/src/main/java/alfio/model/audit/ScanAudit.java @@ -18,19 +18,25 @@ import alfio.manager.support.CheckInStatus; import ch.digitalfondue.npjt.ConstructorAnnotationRowMapper.Column; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; -import java.time.ZonedDateTime; +import java.time.LocalDateTime; public record ScanAudit( - @Column("ticket_uuid") String ticketUuid, - @Column("event_id_fk") int eventId, - @Column("scan_ts") ZonedDateTime scanTimestamp, - @Column("username") String username, - @Column("check_in_status") CheckInStatus checkInStatus, - @Column("operation") ScanAudit.Operation operation) { + @JsonProperty("ticketUuid") @Column("ticket_uuid") String ticketUuid, + @JsonProperty("scanTimestamp") @Column("scan_ts") LocalDateTime scanTimestamp, + @JsonProperty("username") @Column("username") String username, + @JsonProperty("checkInStatus") @Column("check_in_status") CheckInStatus checkInStatus, + @JsonProperty("operation") @Column("operation") ScanAudit.Operation operation) { public enum Operation { SCAN, REVERT } + + @JsonIgnore + public String ticketUuid() { + return ticketUuid; + } } diff --git a/src/main/java/alfio/repository/audit/ScanAuditRepository.java b/src/main/java/alfio/repository/audit/ScanAuditRepository.java index eca3813687..fce7a42d31 100644 --- a/src/main/java/alfio/repository/audit/ScanAuditRepository.java +++ b/src/main/java/alfio/repository/audit/ScanAuditRepository.java @@ -17,6 +17,7 @@ package alfio.repository.audit; import alfio.manager.support.CheckInStatus; +import alfio.model.api.v1.admin.CheckInLogEntry; import alfio.model.audit.ScanAudit; import ch.digitalfondue.npjt.Bind; import ch.digitalfondue.npjt.Query; @@ -38,4 +39,12 @@ Integer insert(@Bind("ticketUuid") String ticketUuid, @Query("select * from scan_audit where event_id_fk = :eventId") List findAllForEvent(@Bind("eventId") int eventId); + @Query("select t.uuid t_uuid, jsonb_build_object('firstName', t.first_name, 'lastName', t.last_name, 'email', t.email_address, 'metadata', coalesce(t.metadata::jsonb#>'{metadataMap, general, attributes}', '{}')) attendee_data, jsonb_agg(jsonb_build_object('ticketUuid', sa.ticket_uuid, 'scanTimestamp', sa.scan_ts, 'username', sa.username, 'checkInStatus', sa.check_in_status, 'operation', sa.operation)) scans from ticket t\n" + + " join event e on t.event_id = e.id" + + " join scan_audit sa on e.id = sa.event_id_fk and t.uuid = sa.ticket_uuid" + + " where e.id = :eventId" + + " and t.status = 'CHECKED_IN'" + + " group by 1,2") + List loadEntries(@Bind("eventId") int eventId); + } \ No newline at end of file diff --git a/src/test/java/alfio/controller/api/v2/user/reservation/BaseReservationFlowTest.java b/src/test/java/alfio/controller/api/v2/user/reservation/BaseReservationFlowTest.java index 17bc3235d8..fadf4a5de1 100644 --- a/src/test/java/alfio/controller/api/v2/user/reservation/BaseReservationFlowTest.java +++ b/src/test/java/alfio/controller/api/v2/user/reservation/BaseReservationFlowTest.java @@ -1067,7 +1067,7 @@ protected void testBasicFlow(Supplier contextSupplier) t assertEquals(CheckInStatus.OK_READY_TO_BE_CHECKED_IN, ticketAndCheckInResult.getResult().getStatus()); CheckInApiController.TicketCode tc = new CheckInApiController.TicketCode(); tc.setCode(ticketCode); - assertEquals(CheckInStatus.SUCCESS, checkInApiController.checkIn(context.event.getId(), ticketIdentifier, tc, new TestingAuthenticationToken("ciccio", "ciccio")).getResult().getStatus()); + assertEquals(CheckInStatus.SUCCESS, checkInApiController.checkIn(context.event.getId(), ticketIdentifier, tc, new TestingAuthenticationToken(context.userId + "_api", "")).getResult().getStatus()); List audits = scanAuditRepository.findAllForEvent(context.event.getId()); assertFalse(audits.isEmpty()); assertTrue(audits.stream().anyMatch(sa -> sa.ticketUuid().equals(ticketIdentifier))); @@ -1075,7 +1075,7 @@ protected void testBasicFlow(Supplier contextSupplier) t extLogs = extensionLogRepository.getPage(null, null, null, 100, 0); assertEventLogged(extLogs, TICKET_CHECKED_IN, 2); - + validateCheckInData(context); TicketAndCheckInResult ticketAndCheckInResultOk = checkInApiController.findTicketWithUUID(context.event.getId(), ticketIdentifier, ticketCode); assertEquals(CheckInStatus.ALREADY_CHECK_IN, ticketAndCheckInResultOk.getResult().getStatus()); @@ -1265,6 +1265,10 @@ protected void testBasicFlow(Supplier contextSupplier) t } + protected void validateCheckInData(ReservationFlowContext context) { + + } + protected void performAndValidatePayment(ReservationFlowContext context, String reservationId, int promoCodeId, diff --git a/src/test/java/alfio/controller/api/v2/user/reservation/ReservationFlowIntegrationTest.java b/src/test/java/alfio/controller/api/v2/user/reservation/ReservationFlowIntegrationTest.java index 4e4b0af64f..16596357d0 100644 --- a/src/test/java/alfio/controller/api/v2/user/reservation/ReservationFlowIntegrationTest.java +++ b/src/test/java/alfio/controller/api/v2/user/reservation/ReservationFlowIntegrationTest.java @@ -62,6 +62,8 @@ import java.util.List; import static alfio.test.util.IntegrationTestUtil.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; @SpringBootTest @ContextConfiguration(classes = {DataSourceConfiguration.class, TestConfiguration.class, ControllerConfiguration.class}) @@ -71,6 +73,7 @@ class ReservationFlowIntegrationTest extends BaseReservationFlowTest { private final OrganizationRepository organizationRepository; private final UserManager userManager; + private final CheckInManager checkInManager; @Autowired public ReservationFlowIntegrationTest(OrganizationRepository organizationRepository, @@ -109,7 +112,8 @@ public ReservationFlowIntegrationTest(OrganizationRepository organizationReposit UserRepository userRepository, OrganizationDeleter organizationDeleter, PromoCodeDiscountRepository promoCodeDiscountRepository, - PromoCodeRequestManager promoCodeRequestManager) { + PromoCodeRequestManager promoCodeRequestManager, + CheckInManager checkInManager) { super(configurationRepository, eventManager, eventRepository, @@ -147,6 +151,7 @@ public ReservationFlowIntegrationTest(OrganizationRepository organizationReposit promoCodeRequestManager); this.organizationRepository = organizationRepository; this.userManager = userManager; + this.checkInManager = checkInManager; } private ReservationFlowContext createContext() { @@ -174,4 +179,16 @@ protected void performAdditionalTests(ReservationFlowContext context) { var event = context.event; BaseIntegrationTest.testTransferEventToAnotherOrg(event.getId(), event.getOrganizationId(), context.userId, jdbcTemplate); } + + @Override + protected void validateCheckInData(ReservationFlowContext context) { + var entries = checkInManager.retrieveLogEntries(context.event.getShortName(), context.userId); + assertEquals(1, entries.size()); + var entry = entries.get(0); + assertNotNull(entry.getTicketId()); + assertNotNull(entry.getAttendeeData()); + assertNotNull(entry.getAttendeeData().getMetadata()); + assertNotNull(entry.getAudit()); + entry.getAudit().forEach(audit -> assertEquals(context.userId + "_api", audit.getUsername())); + } } From c7c45dab0878b56a28bdf28a8b5aa233b44d03c0 Mon Sep 17 00:00:00 2001 From: Celestino Bellone <3385346+cbellone@users.noreply.github.com> Date: Sat, 4 Feb 2023 16:51:25 +0100 Subject: [PATCH 145/218] fix compilation errors after cherry-pick --- .../api/v1/admin/EventApiV1Controller.java | 6 +- .../ReservationFlowIntegrationTest.java | 2 +- src/test/resources/api/descriptor.json | 197 ++++++++++++++---- 3 files changed, 158 insertions(+), 47 deletions(-) diff --git a/src/main/java/alfio/controller/api/v1/admin/EventApiV1Controller.java b/src/main/java/alfio/controller/api/v1/admin/EventApiV1Controller.java index 358101e856..a931cc457e 100644 --- a/src/main/java/alfio/controller/api/v1/admin/EventApiV1Controller.java +++ b/src/main/java/alfio/controller/api/v1/admin/EventApiV1Controller.java @@ -89,7 +89,8 @@ public EventApiV1Controller(EventManager eventManager, ExtensionService extensionService, ExtensionRepository extensionRepository, ConfigurationManager configurationManager, - AdminJobManager adminJobManager) { + AdminJobManager adminJobManager, + CheckInManager checkInManager) { this.eventManager = eventManager; this.eventNameManager = eventNameManager; this.fileUploadManager = fileUploadManager; @@ -101,6 +102,7 @@ public EventApiV1Controller(EventManager eventManager, this.extensionRepository = extensionRepository; this.configurationManager = configurationManager; this.adminJobManager = adminJobManager; + this.checkInManager = checkInManager; } @PostMapping("/create") @@ -338,7 +340,7 @@ private Optional insertEvent(EventCreationRequest request, Principal user return pair.getRight().isPresent(); }) .map(pair -> new ExtensionMetadataValue(pair.getRight().get().getId(), pair.getLeft().getValue())) - .collect(Collectors.toList()); + .toList(); extensionService.bulkUpdateEventSettings(organization, e, values); }); diff --git a/src/test/java/alfio/controller/api/v2/user/reservation/ReservationFlowIntegrationTest.java b/src/test/java/alfio/controller/api/v2/user/reservation/ReservationFlowIntegrationTest.java index 16596357d0..9b82d6f473 100644 --- a/src/test/java/alfio/controller/api/v2/user/reservation/ReservationFlowIntegrationTest.java +++ b/src/test/java/alfio/controller/api/v2/user/reservation/ReservationFlowIntegrationTest.java @@ -189,6 +189,6 @@ protected void validateCheckInData(ReservationFlowContext context) { assertNotNull(entry.getAttendeeData()); assertNotNull(entry.getAttendeeData().getMetadata()); assertNotNull(entry.getAudit()); - entry.getAudit().forEach(audit -> assertEquals(context.userId + "_api", audit.getUsername())); + entry.getAudit().forEach(audit -> assertEquals(context.userId + "_api", audit.username())); } } diff --git a/src/test/resources/api/descriptor.json b/src/test/resources/api/descriptor.json index a66f01fd08..a99166a4dd 100644 --- a/src/test/resources/api/descriptor.json +++ b/src/test/resources/api/descriptor.json @@ -14952,6 +14952,75 @@ } } }, + "/api/v1/admin/event/{slug}/check-in-log" : { + "get" : { + "tags" : [ "event-api-v-1-controller" ], + "operationId" : "checkInLog", + "parameters" : [ { + "name" : "slug", + "in" : "path", + "required" : true, + "schema" : { + "type" : "string" + } + } ], + "responses" : { + "500" : { + "description" : "Internal Server Error", + "content" : { + "*/*" : { + "schema" : { + "type" : "string" + } + } + } + }, + "400" : { + "description" : "Bad Request", + "content" : { + "*/*" : { + "schema" : { + "type" : "string" + } + } + } + }, + "405" : { + "description" : "Method Not Allowed", + "content" : { + "*/*" : { + "schema" : { + "type" : "string" + } + } + } + }, + "401" : { + "description" : "Unauthorized", + "content" : { + "*/*" : { + "schema" : { + "type" : "string" + } + } + } + }, + "200" : { + "description" : "OK", + "content" : { + "*/*" : { + "schema" : { + "type" : "array", + "items" : { + "$ref" : "#/components/schemas/CheckInLogEntry" + } + } + } + } + } + } + } + }, "/api/reservation/{reservationId}/payment/{method}/status" : { "get" : { "tags" : [ "payment-api-controller" ], @@ -25401,15 +25470,15 @@ "location" : { "type" : "string" }, - "description" : { - "type" : "string" - }, "arguments" : { "type" : "array", "items" : { "type" : "object" } }, + "description" : { + "type" : "string" + }, "code" : { "type" : "string" } @@ -26085,12 +26154,12 @@ "taxPercentage" : { "type" : "string" }, - "discount" : { - "type" : "boolean" - }, "descriptionForPayment" : { "type" : "string" }, + "discount" : { + "type" : "boolean" + }, "taxDetail" : { "type" : "boolean" } @@ -26524,6 +26593,10 @@ "type" : "integer", "format" : "int32" }, + "vatStatus" : { + "type" : "string", + "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] + }, "firstName" : { "type" : "string" }, @@ -26540,10 +26613,6 @@ "type" : "string", "enum" : [ "STRIPE", "ON_SITE", "OFFLINE", "NONE", "ADMIN", "PAYPAL", "MOLLIE", "SAFERPAY" ] }, - "vatStatus" : { - "type" : "string", - "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] - }, "srcPriceCts" : { "type" : "integer", "format" : "int32" @@ -28400,6 +28469,10 @@ "assigned" : { "type" : "boolean" }, + "vatStatus" : { + "type" : "string", + "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] + }, "eventId" : { "type" : "integer", "format" : "int32" @@ -28414,10 +28487,6 @@ "type" : "string", "format" : "uuid" }, - "vatStatus" : { - "type" : "string", - "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] - }, "srcPriceCts" : { "type" : "integer", "format" : "int32" @@ -29723,6 +29792,10 @@ "assigned" : { "type" : "boolean" }, + "vatStatus" : { + "type" : "string", + "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] + }, "eventId" : { "type" : "integer", "format" : "int32" @@ -29737,10 +29810,6 @@ "type" : "string", "format" : "uuid" }, - "vatStatus" : { - "type" : "string", - "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] - }, "srcPriceCts" : { "type" : "integer", "format" : "int32" @@ -31649,15 +31718,15 @@ "displayName" : { "type" : "string" }, - "publicIdentifier" : { - "type" : "string" - }, "contentLanguages" : { "type" : "array", "items" : { "$ref" : "#/components/schemas/ContentLanguage" } }, + "publicIdentifier" : { + "type" : "string" + }, "allowedPaymentProxies" : { "type" : "array", "items" : { @@ -31803,6 +31872,10 @@ "transaction" : { "$ref" : "#/components/schemas/Transaction" }, + "vatStatus" : { + "type" : "string", + "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] + }, "eventId" : { "type" : "integer", "format" : "int32" @@ -31817,10 +31890,6 @@ "type" : "string", "format" : "uuid" }, - "vatStatus" : { - "type" : "string", - "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] - }, "srcPriceCts" : { "type" : "integer", "format" : "int32" @@ -31869,18 +31938,14 @@ "formattedFinalPrice" : { "type" : "string" }, - "stuck" : { - "type" : "boolean" - }, "formattedNetPrice" : { "type" : "string" }, "extReference" : { "type" : "string" }, - "transactionTimestamp" : { - "type" : "string", - "format" : "date-time" + "stuck" : { + "type" : "boolean" }, "paid" : { "type" : "boolean" @@ -31888,6 +31953,10 @@ "pending" : { "type" : "boolean" }, + "transactionTimestamp" : { + "type" : "string", + "format" : "date-time" + }, "netPrice" : { "type" : "number" }, @@ -31959,6 +32028,46 @@ } } }, + "CheckInLogEntry" : { + "type" : "object", + "properties" : { + "ticketId" : { + "type" : "string" + }, + "attendeeData" : { + "$ref" : "#/components/schemas/AttendeeData" + }, + "audit" : { + "type" : "array", + "items" : { + "$ref" : "#/components/schemas/ScanAudit" + } + } + } + }, + "ScanAudit" : { + "type" : "object", + "properties" : { + "ticketUuid" : { + "type" : "string" + }, + "scanTimestamp" : { + "type" : "string", + "format" : "date-time" + }, + "username" : { + "type" : "string" + }, + "checkInStatus" : { + "type" : "string", + "enum" : [ "EVENT_NOT_FOUND", "TICKET_NOT_FOUND", "EMPTY_TICKET_CODE", "INVALID_TICKET_CODE", "INVALID_TICKET_STATE", "ALREADY_CHECK_IN", "MUST_PAY", "OK_READY_TO_BE_CHECKED_IN", "SUCCESS", "INVALID_TICKET_CATEGORY_CHECK_IN_DATE", "BADGE_SCAN_ALREADY_DONE", "OK_READY_FOR_BADGE_SCAN", "BADGE_SCAN_SUCCESS", "ERROR" ] + }, + "operation" : { + "type" : "string", + "enum" : [ "SCAN", "REVERT" ] + } + } + }, "ResultTicketWithAdditionalFields" : { "type" : "object", "properties" : { @@ -32008,6 +32117,10 @@ "assigned" : { "type" : "boolean" }, + "vatStatus" : { + "type" : "string", + "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] + }, "eventId" : { "type" : "integer", "format" : "int32" @@ -32022,10 +32135,6 @@ "type" : "string", "format" : "uuid" }, - "vatStatus" : { - "type" : "string", - "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] - }, "srcPriceCts" : { "type" : "integer", "format" : "int32" @@ -33207,15 +33316,15 @@ "formattedEnd" : { "type" : "string" }, - "visibleForCurrentUser" : { - "type" : "boolean" - }, "warningNeeded" : { "type" : "boolean" }, "formattedBegin" : { "type" : "string" }, + "visibleForCurrentUser" : { + "type" : "boolean" + }, "displayStatistics" : { "type" : "boolean" } @@ -33722,18 +33831,18 @@ "type" : "string" } }, - "publicIdentifier" : { - "type" : "string" - }, - "free" : { - "type" : "boolean" - }, "contentLanguages" : { "type" : "array", "items" : { "$ref" : "#/components/schemas/ContentLanguage" } }, + "publicIdentifier" : { + "type" : "string" + }, + "free" : { + "type" : "boolean" + }, "privacyPolicyLinkOrNull" : { "type" : "string" }, From f8bac1b0ece63899b42338bd5cc1631a626ff5f7 Mon Sep 17 00:00:00 2001 From: Celestino Bellone <3385346+cbellone@users.noreply.github.com> Date: Sat, 4 Feb 2023 19:21:53 +0100 Subject: [PATCH 146/218] Improve Event API (cherry-picked from e1e6b4d80b0bc403b9f9f8dd529946c0a65a7236) --- .../api/v1/admin/EventApiV1Controller.java | 78 +++++---- .../api/v1/admin/EventCreationRequest.java | 113 ++++++++----- .../api/v1/EventApiV1IntegrationTest.java | 155 ++++++++++++++++-- 3 files changed, 253 insertions(+), 93 deletions(-) diff --git a/src/main/java/alfio/controller/api/v1/admin/EventApiV1Controller.java b/src/main/java/alfio/controller/api/v1/admin/EventApiV1Controller.java index a931cc457e..7971e6b28b 100644 --- a/src/main/java/alfio/controller/api/v1/admin/EventApiV1Controller.java +++ b/src/main/java/alfio/controller/api/v1/admin/EventApiV1Controller.java @@ -23,8 +23,11 @@ import alfio.manager.system.ConfigurationLevel; import alfio.manager.system.ConfigurationManager; import alfio.manager.user.UserManager; -import alfio.model.*; +import alfio.model.Event; +import alfio.model.EventWithAdditionalInfo; +import alfio.model.ExtensionSupport; import alfio.model.ExtensionSupport.ExtensionMetadataValue; +import alfio.model.PromoCodeDiscount; import alfio.model.api.v1.admin.CheckInLogEntry; import alfio.model.api.v1.admin.EventCreationRequest; import alfio.model.api.v1.admin.LinkedSubscriptions; @@ -56,6 +59,7 @@ import static alfio.controller.api.admin.EventApiController.validateEvent; import static alfio.manager.system.AdminJobExecutor.JobName.ASSIGN_TICKETS_TO_SUBSCRIBERS; +import static alfio.model.api.v1.admin.EventCreationRequest.findExistingCategory; import static org.apache.commons.lang3.StringUtils.isBlank; import static org.apache.commons.lang3.StringUtils.isNotBlank; @@ -121,6 +125,7 @@ public ResponseEntity create(@RequestBody EventCreationRequest request, .checkPrecondition(() -> isNotBlank(request.getImageUrl()), ErrorCode.custom("invalid.imageUrl", "Invalid Image URL")) .checkPrecondition(() -> isNotBlank(request.getTimezone()), ErrorCode.custom("invalid.timezone", "Invalid Timezone")) .checkPrecondition(() -> isNotBlank(imageRef), ErrorCode.custom("invalid.image", "Image is either missing or too big (max 200kb)")) + .checkPrecondition(() -> validateCategoriesSalesPeriod(request), ErrorCode.custom("invalid.categories", "Ticket categories: sales period not compatible with event dates")) .checkPrecondition(() -> { EventModification eventModification = request.toEventModification(organization, eventNameManager::generateShortName, imageRef); errorsContainer.set(new BeanPropertyBindingResult(eventModification, "event")); @@ -133,7 +138,7 @@ public ResponseEntity create(@RequestBody EventCreationRequest request, }, ErrorCode.lazy(() -> toErrorCode(errorsContainer.get()))) //TODO all location validation //TODO language validation, for all the description the same languages - .build(() -> insertEvent(request, user, imageRef).map(Event::getShortName).orElseThrow(IllegalStateException::new)); + .build(() -> insertEvent(request, user, imageRef).orElseThrow(IllegalStateException::new)); if(result.isSuccess()) { return ResponseEntity.ok(result.getData()); @@ -143,6 +148,12 @@ public ResponseEntity create(@RequestBody EventCreationRequest request, } + private boolean validateCategoriesSalesPeriod(EventCreationRequest request) { + var eventEnd = request.getEndDate(); + return request.getTickets().getCategories().stream() + .allMatch(tc -> tc.getStartSellingDate().isBefore(tc.getEndSellingDate()) && tc.getEndSellingDate().isBefore(eventEnd)); + } + private ErrorCode toErrorCode(Errors errors) { return errors.getFieldErrors().stream() .map(e -> ErrorCode.custom(e.getField(), e.getCode())) @@ -183,7 +194,7 @@ public ResponseEntity update(@PathVariable("slug") String slug, @Request String imageRef = fetchImage(request.getImageUrl()); Result result = new Result.Builder() - .build(() -> updateEvent(slug, request, user, imageRef).map(Event::getShortName).get()); + .build(() -> updateEvent(slug, request, user, imageRef).map(Event::getShortName).orElseThrow()); if(result.isSuccess()) { return ResponseEntity.ok(result.getData()); @@ -250,18 +261,22 @@ private Optional updateEvent(String slug, EventCreationRequest request, P Event event = original.getEvent(); - EventModification em = request.toEventModificationUpdate(original,organization,imageRef); + EventModification em = request.toEventModificationUpdate(original, organization, imageRef); eventManager.updateEventHeader(event, em, user.getName()); eventManager.updateEventPrices(event, em, user.getName()); if (em.getTicketCategories() != null && !em.getTicketCategories().isEmpty()) { - em.getTicketCategories().forEach(c -> - findCategoryByName(event, c.getName()).ifPresent(originalCategory -> - eventManager.updateCategory(originalCategory.getId(), event.getId(), c, user.getName()) - ) - ); + var existingCategories = original.getTicketCategories(); + em.getTicketCategories().forEach(c -> { + var existingCategory = findExistingCategory(existingCategories, c.getName(), c.getId()); + if (existingCategory.isPresent()) { + eventManager.updateCategory(existingCategory.get().getId(), event.getId(), c, user.getName()); + } else { + eventManager.insertCategory(event.getId(), c, user.getName()); + } + }); } @@ -270,26 +285,21 @@ private Optional updateEvent(String slug, EventCreationRequest request, P return eventManager.getOptionalByName(slug,user.getName()); } - private Optional findCategoryByName(Event event, String name) { - List categories = eventManager.loadTicketCategories(event); - return categories.stream().filter( oc -> oc.getName().equals(name)).findFirst(); - } - - private Optional insertEvent(EventCreationRequest request, Principal user, String imageRef) { - Organization organization = userManager.findUserOrganizations(user.getName()).get(0); - EventModification em = request.toEventModification(organization,eventNameManager::generateShortName,imageRef); - eventManager.createEvent(em, user.getName()); - Optional event = eventManager.getOptionalByName(em.getShortName(),user.getName()); - - event.ifPresent(e -> { + private Optional insertEvent(EventCreationRequest request, Principal user, String imageRef) { + try { + Organization organization = userManager.findUserOrganizations(user.getName()).get(0); + EventModification em = request.toEventModification(organization,eventNameManager::generateShortName,imageRef); + eventManager.createEvent(em, user.getName()); + var eventWithStatistics = eventStatisticsManager.getEventWithAdditionalInfo(em.getShortName(),user.getName()); + var event = eventWithStatistics.getEvent(); Optional.ofNullable(request.getTickets().getPromoCodes()).ifPresent(promoCodes -> promoCodes.forEach(pc -> //TODO add ref to categories eventManager.addPromoCode( pc.getName(), - e.getId(), + event.getId(), organization.getId(), - ZonedDateTime.of(pc.getValidFrom(),e.getZoneId()), - ZonedDateTime.of(pc.getValidTo(),e.getZoneId()), + ZonedDateTime.of(pc.getValidFrom(),event.getZoneId()), + ZonedDateTime.of(pc.getValidTo(),event.getZoneId()), pc.getDiscount(), pc.getDiscountType(), Collections.emptyList(), @@ -298,7 +308,7 @@ private Optional insertEvent(EventCreationRequest request, Principal user null, PromoCodeDiscount.CodeType.DISCOUNT, null, - pc.getDiscountType() != PromoCodeDiscount.DiscountType.PERCENTAGE ? e.getCurrency() : null + pc.getDiscountType() != PromoCodeDiscount.DiscountType.PERCENTAGE ? event.getCurrency() : null ) ) ); @@ -310,16 +320,16 @@ private Optional insertEvent(EventCreationRequest request, Principal user if(link.getRight().isPresent()) { Group group = link.getRight().get(); EventCreationRequest.CategoryRequest categoryRequest = link.getLeft(); - findCategoryByName(e, categoryRequest.getName()).ifPresent(category -> { + findExistingCategory(eventWithStatistics.getTicketCategories(), categoryRequest.getName(), categoryRequest.getId()).ifPresent(category -> { EventCreationRequest.GroupLinkRequest groupLinkRequest = categoryRequest.getGroupLink(); LinkedGroupModification modification = new LinkedGroupModification(null, group.getId(), - e.getId(), + event.getId(), category.getId(), groupLinkRequest.getType(), groupLinkRequest.getMatchType(), groupLinkRequest.getMaxAllocation()); - groupManager.createLink(group.getId(), e.getId(), modification); + groupManager.createLink(group.getId(), event.getId(), modification); }); } }); @@ -327,7 +337,7 @@ private Optional insertEvent(EventCreationRequest request, Principal user request.getExtensionSettings().stream() .collect(Collectors.groupingBy(EventCreationRequest.ExtensionSetting::getExtensionId)) .forEach((id,settings) -> { - List metadata = extensionService.getSingle(organization, e, id) + List metadata = extensionService.getSingle(organization, event, id) .map(es -> extensionRepository.findAllParametersForExtension(es.getId())) .orElseGet(Collections::emptyList); @@ -341,13 +351,15 @@ private Optional insertEvent(EventCreationRequest request, Principal user }) .map(pair -> new ExtensionMetadataValue(pair.getRight().get().getId(), pair.getLeft().getValue())) .toList(); - extensionService.bulkUpdateEventSettings(organization, e, values); + extensionService.bulkUpdateEventSettings(organization, event, values); }); } - - }); - return event; + return Optional.of(event.getShortName()); + } catch (Exception ex) { + log.error("Error while inserting event", ex); + return Optional.empty(); + } } private String fetchImage(String url) { diff --git a/src/main/java/alfio/model/api/v1/admin/EventCreationRequest.java b/src/main/java/alfio/model/api/v1/admin/EventCreationRequest.java index 095ea22965..017aa62c3c 100644 --- a/src/main/java/alfio/model/api/v1/admin/EventCreationRequest.java +++ b/src/main/java/alfio/model/api/v1/admin/EventCreationRequest.java @@ -94,9 +94,9 @@ public EventCreationRequest(@JsonProperty("title") String title, } public EventModification toEventModification(Organization organization, UnaryOperator slugGenerator, String imageRef) { - String slug = this.slug; - if(StringUtils.isBlank(slug)) { - slug = slugGenerator.apply(title); + String eventSlug = this.slug; + if(StringUtils.isBlank(eventSlug)) { + eventSlug = slugGenerator.apply(title); } int locales = description.stream() @@ -114,7 +114,7 @@ public EventModification toEventModification(Organization organization, UnaryOpe StringUtils.trimToNull(privacyPolicyUrl), null, imageRef, - slug, + eventSlug, title, organization.getId(), location.getFullAddress(), @@ -124,13 +124,13 @@ public EventModification toEventModification(Organization organization, UnaryOpe description.stream().collect(Collectors.toMap(DescriptionRequest::getLang,DescriptionRequest::getBody)), new DateTimeModification(startDate.toLocalDate(),startDate.toLocalTime()), new DateTimeModification(endDate.toLocalDate(),endDate.toLocalTime()), - tickets.freeOfCharge ? BigDecimal.ZERO : tickets.categories.stream().map(x -> x.price).max(BigDecimal::compareTo).orElse(BigDecimal.ONE).max(BigDecimal.ONE), + Boolean.TRUE.equals(tickets.freeOfCharge) ? BigDecimal.ZERO : tickets.categories.stream().map(x -> x.price).max(BigDecimal::compareTo).orElse(BigDecimal.ONE).max(BigDecimal.ONE), tickets.currency, tickets.max, tickets.taxPercentage, tickets.taxIncludedInPrice, tickets.paymentMethods, - tickets.categories.stream().map(CategoryRequest::toTicketCategoryModification).collect(Collectors.toList()), + getTicketCategoryModificationList(), tickets.freeOfCharge, new LocationDescriptor(timezone, location.getCoordinate().getLatitude(), location.getCoordinate().getLongitude(), null), locales, @@ -141,6 +141,14 @@ public EventModification toEventModification(Organization organization, UnaryOpe ); } + private List getTicketCategoryModificationList() { + var result = new ArrayList(); + for (int c = 0; c < tickets.categories.size(); c++) { + result.add(tickets.categories.get(c).toNewTicketCategoryModification(c + 1 )); + } + return List.copyOf(result); + } + private static T first(T value,T other) { return Optional.ofNullable(value).orElse(other); } @@ -183,7 +191,7 @@ public EventModification toEventModificationUpdate(EventWithAdditionalInfo origi tickets != null ? first(tickets.taxPercentage,original.getVat()) : original.getVat(), tickets != null ? first(tickets.taxIncludedInPrice,original.isVatIncluded()) : original.isVatIncluded(), tickets != null ? first(tickets.paymentMethods, original.getAllowedPaymentProxies()) : original.getAllowedPaymentProxies(), - tickets != null && tickets.categories != null ? tickets.categories.stream().map(tc -> tc.toTicketCategoryModification(findCategoryId(original, tc))).collect(Collectors.toList()) : null, + tickets != null && tickets.categories != null ? createFromExistingCategories(original) : null, tickets != null ? first(tickets.freeOfCharge,original.isFreeOfCharge()) : original.isFreeOfCharge(), null, locales, @@ -194,12 +202,28 @@ public EventModification toEventModificationUpdate(EventWithAdditionalInfo origi ); } - private static Integer findCategoryId(EventWithAdditionalInfo event, CategoryRequest categoryRequest) { - return event.getTicketCategories().stream() - .filter(tc -> tc.getName().equals(categoryRequest.getName())) - .map(TicketCategoryWithAdditionalInfo::getId) - .findFirst() - .orElse(null); + private List createFromExistingCategories(EventWithAdditionalInfo event) { + var result = new ArrayList(tickets.categories.size()); + for(int c = 0; c < tickets.categories.size(); c++) { + var categoryRequest = tickets.categories.get(c); + var existing = findExistingCategory(event.getTicketCategories(), categoryRequest.getName(), categoryRequest.getId()); + if (existing.isPresent()) { + var category = existing.get(); + result.add(categoryRequest.toExistingTicketCategoryModification(category.getId(), category.getOrdinal())); + } else { + result.add(categoryRequest.toNewTicketCategoryModification(c + 1)); + } + } + return List.copyOf(result); + } + + public static Optional findExistingCategory(List categories, + String name, + Integer id) { + return categories.stream() + // if specified, ID takes precedence over name + .filter(oc -> id != null ? id == oc.getId() : oc.getName().equals(name)) + .findFirst(); } @@ -272,6 +296,7 @@ public CoordinateRequest(@JsonProperty("latitude") String latitude, @JsonPropert @Getter public static class CategoryRequest { + private final Integer id; private final String name; private final List description; private final Integer maxTickets; @@ -285,7 +310,8 @@ public static class CategoryRequest { private final TicketCategory.TicketAccessType ticketAccessType; @JsonCreator - public CategoryRequest(@JsonProperty("name") String name, + public CategoryRequest(@JsonProperty("id") Integer id, + @JsonProperty("name") String name, @JsonProperty("description") List description, @JsonProperty("maxTickets") Integer maxTickets, @JsonProperty("accessRestricted") boolean accessRestricted, @@ -296,6 +322,7 @@ public CategoryRequest(@JsonProperty("name") String name, @JsonProperty("customValidity") CustomTicketValidityRequest customValidity, @JsonProperty("groupLink") GroupLinkRequest groupLink, @JsonProperty("ticketAccessType") TicketCategory.TicketAccessType ticketAccessType) { + this.id = id; this.name = name; this.description = description; this.maxTickets = maxTickets; @@ -309,11 +336,11 @@ public CategoryRequest(@JsonProperty("name") String name, this.ticketAccessType = ticketAccessType; } - TicketCategoryModification toTicketCategoryModification() { - return toTicketCategoryModification(null); + TicketCategoryModification toNewTicketCategoryModification(int ordinal) { + return toExistingTicketCategoryModification(null, ordinal); } - TicketCategoryModification toTicketCategoryModification(Integer categoryId) { + TicketCategoryModification toExistingTicketCategoryModification(Integer categoryId, int ordinal) { int capacity = Optional.ofNullable(maxTickets).orElse(0); Optional customValidityOpt = Optional.ofNullable(customValidity); @@ -335,7 +362,7 @@ TicketCategoryModification toTicketCategoryModification(Integer categoryId) { customValidityOpt.flatMap(x -> Optional.ofNullable(x.checkInTo)).map(x -> new DateTimeModification(x.toLocalDate(),x.toLocalTime())).orElse(null), customValidityOpt.flatMap(x -> Optional.ofNullable(x.validityStart)).map(x -> new DateTimeModification(x.toLocalDate(),x.toLocalTime())).orElse(null), customValidityOpt.flatMap(x -> Optional.ofNullable(x.validityEnd)).map(x -> new DateTimeModification(x.toLocalDate(),x.toLocalTime())).orElse(null), - 0, + ordinal, null, null, AlfioMetadata.empty()); @@ -455,9 +482,9 @@ private EventModification.AdditionalField toAdditionalField(int ordinal) { String code = type != null ? type.code : AdditionalInfoType.GENERIC_TEXT.code; Integer minLength = contentLength != null ? contentLength.min : null; Integer maxLength = contentLength != null ? contentLength.max : null; - List restrictedValues = null; + List cleanRestrictedValues = null; if(!isEmpty(this.restrictedValues)) { - restrictedValues = this.restrictedValues.stream().map(rv -> new EventModification.RestrictedValue(rv.value, rv.enabled)).collect(Collectors.toList()); + cleanRestrictedValues = this.restrictedValues.stream().map(rv -> new EventModification.RestrictedValue(rv.value, rv.enabled)).toList(); } return new EventModification.AdditionalField( @@ -469,45 +496,45 @@ private EventModification.AdditionalField toAdditionalField(int ordinal) { false, minLength, maxLength, - restrictedValues, + cleanRestrictedValues, toDescriptionMap(orEmpty(label), orEmpty(placeholder), orEmpty(this.restrictedValues)), null,//TODO: linkedAdditionalService null);//TODO: linkedCategoryIds } + + private static Map toDescriptionMap(List label, + List placeholder, + List restrictedValues) { + Map labelsByLang = label.stream().collect(Collectors.toMap(DescriptionRequest::getLang, DescriptionRequest::getBody)); + Map placeholdersByLang = placeholder.stream().collect(Collectors.toMap(DescriptionRequest::getLang, DescriptionRequest::getBody)); + Map>> valuesByLang = restrictedValues.stream() + .flatMap(rv -> rv.descriptions.stream().map(rvd -> Triple.of(rvd.lang, rv.value, rvd.body))) + .collect(Collectors.groupingBy(Triple::getLeft)); + + + Set keys = new HashSet<>(labelsByLang.keySet()); + keys.addAll(placeholdersByLang.keySet()); + keys.addAll(valuesByLang.keySet()); + + return keys.stream() + .map(lang -> { + Map rvsMap = valuesByLang.getOrDefault(lang, emptyList()).stream().collect(Collectors.toMap(Triple::getMiddle, Triple::getRight)); + return Pair.of(lang, new EventModification.Description(labelsByLang.get(lang), placeholdersByLang.get(lang), rvsMap)); + }).collect(Collectors.toMap(Pair::getLeft, Pair::getRight)); + } } private static List orEmpty(List input) { return isEmpty(input) ? emptyList() : input; } - private static Map toDescriptionMap(List label, - List placeholder, - List restrictedValues) { - Map labelsByLang = label.stream().collect(Collectors.toMap(DescriptionRequest::getLang, DescriptionRequest::getBody)); - Map placeholdersByLang = placeholder.stream().collect(Collectors.toMap(DescriptionRequest::getLang, DescriptionRequest::getBody)); - Map>> valuesByLang = restrictedValues.stream() - .flatMap(rv -> rv.descriptions.stream().map(rvd -> Triple.of(rvd.lang, rv.value, rvd.body))) - .collect(Collectors.groupingBy(Triple::getLeft)); - - - Set keys = new HashSet<>(labelsByLang.keySet()); - keys.addAll(placeholdersByLang.keySet()); - keys.addAll(valuesByLang.keySet()); - - return keys.stream() - .map(lang -> { - Map rvsMap = valuesByLang.getOrDefault(lang, emptyList()).stream().collect(Collectors.toMap(Triple::getMiddle, Triple::getRight)); - return Pair.of(lang, new EventModification.Description(labelsByLang.get(lang), placeholdersByLang.get(lang), rvsMap)); - }).collect(Collectors.toMap(Pair::getLeft, Pair::getRight)); - } - private static List toAdditionalFields(List additionalInfoRequests) { if(isEmpty(additionalInfoRequests)) { return emptyList(); } AtomicInteger counter = new AtomicInteger(1); - return additionalInfoRequests.stream().map(air -> air.toAdditionalField(counter.getAndIncrement())).collect(Collectors.toList()); + return additionalInfoRequests.stream().map(air -> air.toAdditionalField(counter.getAndIncrement())).toList(); } @Getter diff --git a/src/test/java/alfio/controller/api/v1/EventApiV1IntegrationTest.java b/src/test/java/alfio/controller/api/v1/EventApiV1IntegrationTest.java index 1fe8f364c8..edbaa7a575 100644 --- a/src/test/java/alfio/controller/api/v1/EventApiV1IntegrationTest.java +++ b/src/test/java/alfio/controller/api/v1/EventApiV1IntegrationTest.java @@ -25,6 +25,7 @@ import alfio.manager.user.UserManager; import alfio.model.Event; import alfio.model.TicketCategory; +import alfio.model.TicketCategoryWithAdditionalInfo; import alfio.model.api.v1.admin.EventCreationRequest; import alfio.model.modification.OrganizationModification; import alfio.model.transaction.PaymentProxy; @@ -36,6 +37,7 @@ import alfio.repository.user.OrganizationRepository; import alfio.test.util.IntegrationTestUtil; import alfio.util.BaseIntegrationTest; +import alfio.util.ClockProvider; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -54,6 +56,7 @@ import java.util.List; import java.util.UUID; +import static java.util.Objects.requireNonNull; import static org.junit.jupiter.api.Assertions.*; @@ -92,7 +95,7 @@ public static void initEnv() { private Organization organization; private Principal mockPrincipal; - private String shortName = "test"; + private final String slug = "test"; @BeforeEach public void ensureConfiguration() { @@ -123,8 +126,8 @@ static EventCreationRequest creationRequest(String shortName) { new EventCreationRequest.CoordinateRequest("45.5","9.00") ), "Europe/Zurich", - LocalDateTime.of(2020,1,10,12,0), - LocalDateTime.of(2020,1,10,18,0), + LocalDateTime.now(ClockProvider.clock()).plusDays(30), + LocalDateTime.now(ClockProvider.clock()).plusDays(30).plusHours(2), "https://alf.io", "https://alf.io", "https://alf.io", @@ -138,6 +141,7 @@ static EventCreationRequest creationRequest(String shortName) { Arrays.asList(PaymentProxy.OFFLINE,PaymentProxy.STRIPE), Collections.singletonList( new EventCreationRequest.CategoryRequest( + null, // forces new category "standard", Collections.singletonList(new EventCreationRequest.DescriptionRequest("en", "desc")), 10, @@ -164,14 +168,11 @@ static EventCreationRequest creationRequest(String shortName) { @Test void createTest() { - EventCreationRequest eventCreationRequest = creationRequest(shortName); + EventCreationRequest eventCreationRequest = creationRequest(slug); - String shortName = controller.create(eventCreationRequest,mockPrincipal).getBody(); - Event event = eventManager.getSingleEvent(shortName,username); + String slug = controller.create(eventCreationRequest,mockPrincipal).getBody(); + Event event = eventManager.getSingleEvent(slug,username); List tickets = ticketCategoryRepository.findAllTicketCategories(event.getId()); - - - assertEquals(eventCreationRequest.getTitle(),event.getDisplayName()); assertEquals(eventCreationRequest.getSlug(),event.getShortName()); assertEquals(eventCreationRequest.getTickets().getCurrency(),event.getCurrency()); @@ -183,39 +184,159 @@ void createTest() { List requestCategories = eventCreationRequest.getTickets().getCategories().stream().filter((rt) -> rt.getName().equals(t.getName())).toList(); assertEquals(1,requestCategories.size()); requestCategories.forEach((rtc) -> { + assertNotEquals(0, t.getOrdinal()); assertEquals(t.getMaxTickets(), rtc.getMaxTickets().intValue()); assertEquals(0, t.getPrice().compareTo(rtc.getPrice())); } ); } ); + } + @Test + void stats() { + controller.create(creationRequest(slug), mockPrincipal); + var statsResponse = controller.stats(slug, mockPrincipal); + assertTrue(statsResponse.getStatusCode().is2xxSuccessful()); + var stats = requireNonNull(statsResponse.getBody()); + int lastOrdinal = -1; + for (TicketCategoryWithAdditionalInfo ticketCategory : stats.getTicketCategories()) { + assertTrue(ticketCategory.getOrdinal() > 0); + assertTrue(ticketCategory.getOrdinal() > lastOrdinal); + lastOrdinal = ticketCategory.getOrdinal(); + } } @Test void updateTest() { - controller.create(creationRequest(shortName),mockPrincipal); - - + controller.create(creationRequest(slug), mockPrincipal); String newTitle = "new title"; EventCreationRequest updateRequest = new EventCreationRequest(newTitle,null,null,null, null,null,null,null,null,null, null,null, new EventCreationRequest.TicketRequest(null,10,null,null,null,null,null,null), null, null ); - controller.update(shortName,updateRequest,mockPrincipal); - Event event = eventManager.getSingleEvent(shortName,username); + controller.update(slug, updateRequest, mockPrincipal); + Event event = eventManager.getSingleEvent(slug,username); assertEquals(newTitle,event.getDisplayName()); + } + + @Test + void updateExistingCategoryUsingId() { + controller.create(creationRequest(slug), mockPrincipal); + var existing = requireNonNull(controller.stats(slug, mockPrincipal).getBody()); + var existingCategory = existing.getTicketCategories().get(0); + var categoriesRequest = List.of( + new EventCreationRequest.CategoryRequest( + existingCategory.getId(), + existingCategory.getName() + "_1", + List.of(new EventCreationRequest.DescriptionRequest("en", "desc")), + existingCategory.getMaxTickets(), + existingCategory.isAccessRestricted(), + existingCategory.getPrice(), + LocalDateTime.now(ClockProvider.clock()), + LocalDateTime.now(ClockProvider.clock()).plusHours(1), + existingCategory.getCode(), + null, + null, + existingCategory.getTicketAccessType() + ) + ); + var ticketRequest = new EventCreationRequest.TicketRequest(null,10,null,null,null,null, categoriesRequest,null); + EventCreationRequest updateRequest = new EventCreationRequest(null,null,null,null, null,null,null,null,null,null, null,null, + ticketRequest, null, null + ); + assertTrue(controller.update(slug, updateRequest, mockPrincipal).getStatusCode().is2xxSuccessful()); + var modifiedCategories = ticketCategoryRepository.findAllTicketCategories(existing.getId()); + assertEquals(1, modifiedCategories.size()); + assertEquals(existingCategory.getName() + "_1", modifiedCategories.get(0).getName()); + } + @Test + void updateExistingCategoryAndAddNewUsingId() { + controller.create(creationRequest(slug), mockPrincipal); + var existing = requireNonNull(controller.stats(slug, mockPrincipal).getBody()); + var existingCategory = existing.getTicketCategories().get(0); + var categoriesRequest = List.of( + new EventCreationRequest.CategoryRequest( + existingCategory.getId(), + existingCategory.getName() + "_1", + List.of(new EventCreationRequest.DescriptionRequest("en", "desc")), + existingCategory.getMaxTickets() - 5, + existingCategory.isAccessRestricted(), + existingCategory.getPrice(), + LocalDateTime.now(ClockProvider.clock()), + LocalDateTime.now(ClockProvider.clock()).plusHours(1), + existingCategory.getCode(), + null, + null, + existingCategory.getTicketAccessType() + ), + new EventCreationRequest.CategoryRequest( + null, + existingCategory.getName() + "_2", + List.of(new EventCreationRequest.DescriptionRequest("en", "desc")), + existingCategory.getMaxTickets() - 5, + existingCategory.isAccessRestricted(), + existingCategory.getPrice(), + LocalDateTime.now(ClockProvider.clock()), + LocalDateTime.now(ClockProvider.clock()).plusHours(1), + existingCategory.getCode(), + null, + null, + existingCategory.getTicketAccessType() + ) + ); + var ticketRequest = new EventCreationRequest.TicketRequest(null,10,null,null,null,null, categoriesRequest,null); + EventCreationRequest updateRequest = new EventCreationRequest(null,null,null,null, null,null,null,null,null,null, null,null, + ticketRequest, null, null + ); + assertTrue(controller.update(slug, updateRequest, mockPrincipal).getStatusCode().is2xxSuccessful()); + var modifiedCategories = ticketCategoryRepository.findAllTicketCategories(existing.getId()); + assertEquals(2, modifiedCategories.size()); + assertEquals(existingCategory.getName() + "_1", modifiedCategories.get(0).getName()); + assertEquals(existingCategory.getOrdinal(), modifiedCategories.get(0).getOrdinal()); + assertEquals(existingCategory.getName() + "_2", modifiedCategories.get(1).getName()); + assertEquals(existingCategory.getOrdinal() + 1, modifiedCategories.get(1).getOrdinal()); + } + + @Test + void updateExistingCategoryUsingName() { + controller.create(creationRequest(slug), mockPrincipal); + var existing = requireNonNull(controller.stats(slug, mockPrincipal).getBody()); + var existingCategory = existing.getTicketCategories().get(0); + var categoriesRequest = List.of( + new EventCreationRequest.CategoryRequest(null, + existingCategory.getName(), + List.of(new EventCreationRequest.DescriptionRequest("en", "desc")), + existingCategory.getMaxTickets() - 1, + existingCategory.isAccessRestricted(), + existingCategory.getPrice(), + LocalDateTime.now(ClockProvider.clock()), + LocalDateTime.now(ClockProvider.clock()).plusHours(1), + existingCategory.getCode(), + null, + null, + existingCategory.getTicketAccessType() + ) + ); + var ticketRequest = new EventCreationRequest.TicketRequest(null,10,null,null,null,null, categoriesRequest,null); + EventCreationRequest updateRequest = new EventCreationRequest(null,null,null,null, null,null,null,null,null,null, null,null, + ticketRequest, null, null + ); + assertTrue(controller.update(slug, updateRequest, mockPrincipal).getStatusCode().is2xxSuccessful()); + var modifiedCategories = ticketCategoryRepository.findAllTicketCategories(existing.getId()); + assertEquals(1, modifiedCategories.size()); + assertEquals(existingCategory.getMaxTickets() - 1, modifiedCategories.get(0).getMaxTickets()); } @Test void retrieveLinkedSubscriptions() { - controller.create(creationRequest(shortName),mockPrincipal); - var response = controller.getLinkedSubscriptions(shortName, mockPrincipal); + controller.create(creationRequest(slug),mockPrincipal); + var response = controller.getLinkedSubscriptions(slug, mockPrincipal); assertTrue(response.getStatusCode().is2xxSuccessful()); var linkedSubscriptions = response.getBody(); assertNotNull(linkedSubscriptions); assertTrue(linkedSubscriptions.getSubscriptions().isEmpty()); - assertEquals(shortName, linkedSubscriptions.getEventSlug()); + assertEquals(slug, linkedSubscriptions.getEventSlug()); } From 07ed478681dabbc059513d8b389793704ccdf8dc Mon Sep 17 00:00:00 2001 From: Celestino Bellone <3385346+cbellone@users.noreply.github.com> Date: Sun, 5 Feb 2023 18:00:25 +0100 Subject: [PATCH 147/218] update API descriptor.json --- src/test/resources/api/descriptor.json | 184 +++++++++++++------------ 1 file changed, 94 insertions(+), 90 deletions(-) diff --git a/src/test/resources/api/descriptor.json b/src/test/resources/api/descriptor.json index a99166a4dd..9b8e1ac60d 100644 --- a/src/test/resources/api/descriptor.json +++ b/src/test/resources/api/descriptor.json @@ -25470,15 +25470,15 @@ "location" : { "type" : "string" }, + "description" : { + "type" : "string" + }, "arguments" : { "type" : "array", "items" : { "type" : "object" } }, - "description" : { - "type" : "string" - }, "code" : { "type" : "string" } @@ -25879,6 +25879,10 @@ "type" : "integer", "format" : "int32" }, + "ticketAmount" : { + "type" : "integer", + "format" : "int32" + }, "singleTicketOrder" : { "type" : "boolean" }, @@ -25896,10 +25900,6 @@ }, "priceBeforeTaxes" : { "type" : "string" - }, - "ticketAmount" : { - "type" : "integer", - "format" : "int32" } } }, @@ -26154,12 +26154,12 @@ "taxPercentage" : { "type" : "string" }, - "descriptionForPayment" : { - "type" : "string" - }, "discount" : { "type" : "boolean" }, + "descriptionForPayment" : { + "type" : "string" + }, "taxDetail" : { "type" : "boolean" } @@ -26593,15 +26593,9 @@ "type" : "integer", "format" : "int32" }, - "vatStatus" : { + "paymentMethod" : { "type" : "string", - "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] - }, - "firstName" : { - "type" : "string" - }, - "lastName" : { - "type" : "string" + "enum" : [ "STRIPE", "ON_SITE", "OFFLINE", "NONE", "ADMIN", "PAYPAL", "MOLLIE", "SAFERPAY" ] }, "hasInvoiceNumber" : { "type" : "boolean" @@ -26609,22 +26603,11 @@ "invoiceNumber" : { "type" : "string" }, - "paymentMethod" : { - "type" : "string", - "enum" : [ "STRIPE", "ON_SITE", "OFFLINE", "NONE", "ADMIN", "PAYPAL", "MOLLIE", "SAFERPAY" ] - }, - "srcPriceCts" : { - "type" : "integer", - "format" : "int32" - }, - "finalPrice" : { - "type" : "number" - }, - "vat" : { - "type" : "number" + "firstName" : { + "type" : "string" }, - "appliedDiscount" : { - "type" : "number" + "lastName" : { + "type" : "string" }, "finalPriceCts" : { "type" : "integer", @@ -26647,6 +26630,23 @@ "invoiceRequested" : { "type" : "boolean" }, + "vatStatus" : { + "type" : "string", + "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] + }, + "srcPriceCts" : { + "type" : "integer", + "format" : "int32" + }, + "finalPrice" : { + "type" : "number" + }, + "vat" : { + "type" : "number" + }, + "appliedDiscount" : { + "type" : "number" + }, "pendingOfflinePayment" : { "type" : "boolean" }, @@ -28126,6 +28126,10 @@ "CategoryRequest" : { "type" : "object", "properties" : { + "id" : { + "type" : "integer", + "format" : "int32" + }, "name" : { "type" : "string" }, @@ -28469,10 +28473,6 @@ "assigned" : { "type" : "boolean" }, - "vatStatus" : { - "type" : "string", - "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] - }, "eventId" : { "type" : "integer", "format" : "int32" @@ -28487,10 +28487,6 @@ "type" : "string", "format" : "uuid" }, - "srcPriceCts" : { - "type" : "integer", - "format" : "int32" - }, "finalPriceCts" : { "type" : "integer", "format" : "int32" @@ -28503,6 +28499,14 @@ "type" : "integer", "format" : "int32" }, + "vatStatus" : { + "type" : "string", + "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] + }, + "srcPriceCts" : { + "type" : "integer", + "format" : "int32" + }, "email" : { "type" : "string" }, @@ -29021,12 +29025,12 @@ "type" : "string", "format" : "date-time" }, - "overlap" : { - "type" : "boolean" - }, "instant" : { "type" : "string", "format" : "date-time" + }, + "overlap" : { + "type" : "boolean" } } } @@ -29792,10 +29796,6 @@ "assigned" : { "type" : "boolean" }, - "vatStatus" : { - "type" : "string", - "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] - }, "eventId" : { "type" : "integer", "format" : "int32" @@ -29810,10 +29810,6 @@ "type" : "string", "format" : "uuid" }, - "srcPriceCts" : { - "type" : "integer", - "format" : "int32" - }, "finalPriceCts" : { "type" : "integer", "format" : "int32" @@ -29826,6 +29822,14 @@ "type" : "integer", "format" : "int32" }, + "vatStatus" : { + "type" : "string", + "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] + }, + "srcPriceCts" : { + "type" : "integer", + "format" : "int32" + }, "email" : { "type" : "string" }, @@ -30175,12 +30179,12 @@ "type" : "string", "format" : "date-time" }, - "overlap" : { - "type" : "boolean" - }, "instant" : { "type" : "string", "format" : "date-time" + }, + "overlap" : { + "type" : "boolean" } } } @@ -31718,15 +31722,15 @@ "displayName" : { "type" : "string" }, + "publicIdentifier" : { + "type" : "string" + }, "contentLanguages" : { "type" : "array", "items" : { "$ref" : "#/components/schemas/ContentLanguage" } }, - "publicIdentifier" : { - "type" : "string" - }, "allowedPaymentProxies" : { "type" : "array", "items" : { @@ -31872,10 +31876,6 @@ "transaction" : { "$ref" : "#/components/schemas/Transaction" }, - "vatStatus" : { - "type" : "string", - "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] - }, "eventId" : { "type" : "integer", "format" : "int32" @@ -31890,13 +31890,6 @@ "type" : "string", "format" : "uuid" }, - "srcPriceCts" : { - "type" : "integer", - "format" : "int32" - }, - "finalPrice" : { - "type" : "number" - }, "finalPriceCts" : { "type" : "integer", "format" : "int32" @@ -31909,6 +31902,17 @@ "type" : "integer", "format" : "int32" }, + "vatStatus" : { + "type" : "string", + "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] + }, + "srcPriceCts" : { + "type" : "integer", + "format" : "int32" + }, + "finalPrice" : { + "type" : "number" + }, "email" : { "type" : "string" }, @@ -31947,16 +31951,16 @@ "stuck" : { "type" : "boolean" }, + "transactionTimestamp" : { + "type" : "string", + "format" : "date-time" + }, "paid" : { "type" : "boolean" }, "pending" : { "type" : "boolean" }, - "transactionTimestamp" : { - "type" : "string", - "format" : "date-time" - }, "netPrice" : { "type" : "number" }, @@ -32117,10 +32121,6 @@ "assigned" : { "type" : "boolean" }, - "vatStatus" : { - "type" : "string", - "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] - }, "eventId" : { "type" : "integer", "format" : "int32" @@ -32135,10 +32135,6 @@ "type" : "string", "format" : "uuid" }, - "srcPriceCts" : { - "type" : "integer", - "format" : "int32" - }, "finalPriceCts" : { "type" : "integer", "format" : "int32" @@ -32151,6 +32147,14 @@ "type" : "integer", "format" : "int32" }, + "vatStatus" : { + "type" : "string", + "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] + }, + "srcPriceCts" : { + "type" : "integer", + "format" : "int32" + }, "email" : { "type" : "string" }, @@ -33293,6 +33297,9 @@ "expired" : { "type" : "boolean" }, + "formattedEnd" : { + "type" : "string" + }, "notSoldTickets" : { "type" : "integer", "format" : "int32" @@ -33313,9 +33320,6 @@ "type" : "integer", "format" : "int32" }, - "formattedEnd" : { - "type" : "string" - }, "warningNeeded" : { "type" : "boolean" }, @@ -33831,18 +33835,18 @@ "type" : "string" } }, - "contentLanguages" : { - "type" : "array", - "items" : { - "$ref" : "#/components/schemas/ContentLanguage" - } - }, "publicIdentifier" : { "type" : "string" }, "free" : { "type" : "boolean" }, + "contentLanguages" : { + "type" : "array", + "items" : { + "$ref" : "#/components/schemas/ContentLanguage" + } + }, "privacyPolicyLinkOrNull" : { "type" : "string" }, From 9d2945a93813255550ea1ed87d4ad020eadb2b15 Mon Sep 17 00:00:00 2001 From: Celestino Bellone <3385346+cbellone@users.noreply.github.com> Date: Sun, 5 Feb 2023 18:15:25 +0100 Subject: [PATCH 148/218] add docs for SUBSCRIPTION_ASSIGNED_GENERATE_METADATA --- .../Extensions/reference/subscription.md | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 website/content/en/docs/Reference/Extensions/reference/subscription.md diff --git a/website/content/en/docs/Reference/Extensions/reference/subscription.md b/website/content/en/docs/Reference/Extensions/reference/subscription.md new file mode 100644 index 0000000000..ae98ba3220 --- /dev/null +++ b/website/content/en/docs/Reference/Extensions/reference/subscription.md @@ -0,0 +1,43 @@ +--- +title: "Subscription" +linkTitle: "Subscription" +weight: 4 +date: 2023-02-05 +description: > + Compatible Application Events for the "Subscription" entity +--- + +### Customize subscription metadata +`SUBSCRIPTION_ASSIGNED_GENERATE_METADATA` + +Fired **synchronously** before marking a subscription as "acquired". The purpose of this extension is to allow metadata customization. + +A result of type [`SubscriptionMetadata`](https://github.com/alfio-event/alf.io/blob/master/src/main/java/alfio/model/metadata/SubscriptionMetadata.java) is expected. Return `null` if you don't need to modify the current metadata. +
+ + + + + + + + + + + + + + + + + + + + + + + + + +
VariableTypeAbout
`subscription`[`Subscription`](https://github.com/alfio-event/alf.io/blob/master/src/main/java/alfio/model/Subscription.java)Details about the subscription to be acquired
`subscriptionDescriptor`[`SubscriptionDescriptor`](https://github.com/alfio-event/alf.io/blob/master/src/main/java/alfio/model/SubscriptionDescriptor.java)Subscription configuration (template)
`metadata`[`SubscriptionMetadata`](https://github.com/alfio-event/alf.io/blob/master/src/main/java/alfio/model/metadata/SubscriptionMetadata.java)Existing metadata for subscription.
+
\ No newline at end of file From a0cea27739bbf4c40d8eb3975abc83ca8d88393c Mon Sep 17 00:00:00 2001 From: Celestino Bellone <3385346+cbellone@users.noreply.github.com> Date: Tue, 7 Feb 2023 18:40:08 +0100 Subject: [PATCH 149/218] fix broken links --- .../en/docs/Reference/Extensions/reference/subscription.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/content/en/docs/Reference/Extensions/reference/subscription.md b/website/content/en/docs/Reference/Extensions/reference/subscription.md index ae98ba3220..5f70955aa2 100644 --- a/website/content/en/docs/Reference/Extensions/reference/subscription.md +++ b/website/content/en/docs/Reference/Extensions/reference/subscription.md @@ -25,12 +25,12 @@ A result of type [`SubscriptionMetadata`](https://github.com/alfio-event/alf.io/ `subscription` - [`Subscription`](https://github.com/alfio-event/alf.io/blob/master/src/main/java/alfio/model/Subscription.java) + [`Subscription`](https://github.com/alfio-event/alf.io/blob/master/src/main/java/alfio/model/subscription/Subscription.java) Details about the subscription to be acquired `subscriptionDescriptor` - [`SubscriptionDescriptor`](https://github.com/alfio-event/alf.io/blob/master/src/main/java/alfio/model/SubscriptionDescriptor.java) + [`SubscriptionDescriptor`](https://github.com/alfio-event/alf.io/blob/master/src/main/java/alfio/model/subscription/SubscriptionDescriptor.java) Subscription configuration (template) From f3415c50b1c034e2363818fe8aa904b277053bc7 Mon Sep 17 00:00:00 2001 From: Celestino Bellone <3385346+cbellone@users.noreply.github.com> Date: Fri, 10 Feb 2023 17:05:40 +0100 Subject: [PATCH 150/218] Custom vat application (#1193) - cherry-picked from 4f7f5ca62bbfd0969876332dab359741ac7d69e0 --- .../v2/user/ReservationApiV2Controller.java | 14 +- .../java/alfio/manager/ExtensionManager.java | 30 ++- .../alfio/manager/ReverseChargeManager.java | 122 +++++++-- .../manager/TicketReservationManager.java | 18 +- .../support/extension/ExtensionEvent.java | 1 + .../system/ReservationPriceCalculator.java | 2 +- src/main/java/alfio/model/Audit.java | 1 + src/main/java/alfio/model/OrderSummary.java | 3 +- src/main/java/alfio/model/PriceContainer.java | 12 +- src/main/java/alfio/model/SummaryRow.java | 3 +- src/main/java/alfio/model/Ticket.java | 27 ++ src/main/java/alfio/model/TicketInfo.java | 8 +- .../model/decorator/TicketPriceContainer.java | 4 +- .../model/extension/CustomTaxPolicy.java | 78 ++++++ .../alfio/repository/TicketRepository.java | 20 +- .../java/alfio/util/TemplateResource.java | 2 +- ...V204_2.0.0.49.3__ADDITIONAL_VAT_STATUS.sql | 19 ++ .../reservation/BaseReservationFlowTest.java | 25 +- .../CustomTaxPolicyIntegrationTest.java | 253 ++++++++++++++++++ .../StripeReservationFlowIntegrationTest.java | 3 +- .../alfio/manager/ExtensionManagerTest.java | 2 +- .../alfio/test/util/IntegrationTestUtil.java | 21 +- .../resources/custom-tax-policy-extension.js | 56 ++++ 23 files changed, 655 insertions(+), 69 deletions(-) create mode 100644 src/main/java/alfio/model/extension/CustomTaxPolicy.java create mode 100644 src/main/resources/alfio/db/PGSQL/V204_2.0.0.49.3__ADDITIONAL_VAT_STATUS.sql create mode 100644 src/test/java/alfio/controller/api/v2/user/reservation/CustomTaxPolicyIntegrationTest.java create mode 100644 src/test/resources/custom-tax-policy-extension.js diff --git a/src/main/java/alfio/controller/api/v2/user/ReservationApiV2Controller.java b/src/main/java/alfio/controller/api/v2/user/ReservationApiV2Controller.java index f22254d225..41da144c66 100644 --- a/src/main/java/alfio/controller/api/v2/user/ReservationApiV2Controller.java +++ b/src/main/java/alfio/controller/api/v2/user/ReservationApiV2Controller.java @@ -16,13 +16,13 @@ */ package alfio.controller.api.v2.user; +import alfio.controller.api.support.BookingInfoTicketLoader; import alfio.controller.api.support.TicketHelper; import alfio.controller.api.v2.model.PaymentProxyWithParameters; import alfio.controller.api.v2.model.ReservationInfo; import alfio.controller.api.v2.model.ReservationInfo.TicketsByTicketCategory; import alfio.controller.api.v2.model.ReservationPaymentResult; import alfio.controller.api.v2.model.ReservationStatusInfo; -import alfio.controller.api.support.BookingInfoTicketLoader; import alfio.controller.api.v2.user.support.ReservationAccessDenied; import alfio.controller.form.ContactAndTicketsForm; import alfio.controller.form.PaymentForm; @@ -434,7 +434,17 @@ public ResponseEntity> validateToOverview(@PathVariab ticketReservationRepository.resetVat(reservationId, contactAndTicketsForm.isInvoiceRequested(), purchaseContext.getVatStatus(), reservation.getSrcPriceCts(), reservationCost.priceWithVAT(), reservationCost.VAT(), Math.abs(reservationCost.discount()), reservation.getCurrencyCode()); - if(contactAndTicketsForm.isBusiness()) { + + var optionalCustomTaxPolicy = extensionManager.handleCustomTaxPolicy(purchaseContext, reservationId, contactAndTicketsForm, reservationCost); + if (optionalCustomTaxPolicy.isPresent()) { + log.debug("Custom tax policy returned for reservation {}. Applying it.", reservationId); + reverseChargeManager.applyCustomTaxPolicy( + purchaseContext, + optionalCustomTaxPolicy.get(), + reservationId, + contactAndTicketsForm, + bindingResult); + } else if(contactAndTicketsForm.isBusiness()) { reverseChargeManager.checkAndApplyVATRules(purchaseContext, reservationId, contactAndTicketsForm, bindingResult); } else if(reservationCost.priceWithVAT() > 0) { reverseChargeManager.resetVat(purchaseContext, reservationId); diff --git a/src/main/java/alfio/manager/ExtensionManager.java b/src/main/java/alfio/manager/ExtensionManager.java index cbeacab233..f0269234d7 100644 --- a/src/main/java/alfio/manager/ExtensionManager.java +++ b/src/main/java/alfio/manager/ExtensionManager.java @@ -18,6 +18,7 @@ package alfio.manager; import alfio.config.authentication.support.OpenIdAlfioAuthentication; +import alfio.controller.form.ContactAndTicketsForm; import alfio.extension.ExtensionService; import alfio.extension.exception.AlfioScriptingException; import alfio.manager.payment.PaymentSpecification; @@ -39,10 +40,7 @@ import alfio.model.user.Organization; import alfio.model.user.PublicUserProfile; import alfio.model.user.User; -import alfio.repository.EventRepository; -import alfio.repository.TicketRepository; -import alfio.repository.TicketReservationRepository; -import alfio.repository.TransactionRepository; +import alfio.repository.*; import alfio.util.ClockProvider; import alfio.util.EventUtil; import alfio.util.MonetaryUtil; @@ -58,6 +56,8 @@ import java.nio.file.Paths; import java.time.ZonedDateTime; import java.util.*; +import java.util.function.Function; +import java.util.stream.Collectors; import static alfio.extension.ExtensionService.toPath; import static alfio.manager.support.extension.ExtensionEvent.*; @@ -86,6 +86,7 @@ public class ExtensionManager { private final TicketRepository ticketRepository; private final ConfigurationManager configurationManager; private final TransactionRepository transactionRepository; + private final TicketCategoryRepository ticketCategoryRepository; public ExtensionManager(ExtensionService extensionService, EventRepository eventRepository, @@ -551,4 +552,25 @@ public Optional handleSubscriptionAssignmentMetadata(Subsc context.put("subscriptionDescriptor", descriptor); return Optional.ofNullable(syncCall(ExtensionEvent.SUBSCRIPTION_ASSIGNED_GENERATE_METADATA, descriptor, context, SubscriptionMetadata.class, false)); } + + public Optional handleCustomTaxPolicy(PurchaseContext purchaseContext, + String reservationId, + ContactAndTicketsForm form, + TotalPrice reservationCost) { + if (!purchaseContext.ofType(PurchaseContext.PurchaseContextType.event) || !reservationCost.requiresPayment()) { + return Optional.empty(); + } + var event = (Event) purchaseContext; + var categoriesById = ticketCategoryRepository.findCategoriesInReservation(reservationId).stream() + .collect(Collectors.toMap(TicketCategory::getId, Function.identity())); + var ticketInfoById = ticketRepository.findBasicTicketInfoForReservation(event.getId(), reservationId).stream() + .collect(Collectors.toMap(TicketInfo::getTicketUuid, Function.identity())); + var context = new HashMap(); + context.put(EVENT, event); + context.put(RESERVATION_ID, reservationId); + context.put("reservationForm", form); + context.put("categoriesById", categoriesById); + context.put("ticketInfoByUuid", ticketInfoById); + return Optional.ofNullable(syncCall(CUSTOM_TAX_POLICY_APPLICATION, event, context, CustomTaxPolicy.class, false)); + } } diff --git a/src/main/java/alfio/manager/ReverseChargeManager.java b/src/main/java/alfio/manager/ReverseChargeManager.java index 799eba30bc..993c875356 100644 --- a/src/main/java/alfio/manager/ReverseChargeManager.java +++ b/src/main/java/alfio/manager/ReverseChargeManager.java @@ -17,10 +17,17 @@ package alfio.manager; import alfio.controller.form.ContactAndTicketsForm; +import alfio.controller.support.CustomBindingResult; import alfio.manager.system.ConfigurationManager; import alfio.manager.system.ReservationPriceCalculator; import alfio.model.*; +import alfio.model.decorator.TicketPriceContainer; +import alfio.model.extension.CustomTaxPolicy; import alfio.repository.*; +import alfio.util.MonetaryUtil; +import org.apache.commons.lang3.Validate; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.jdbc.core.namedparam.MapSqlParameterSource; import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; import org.springframework.stereotype.Component; @@ -28,14 +35,14 @@ import org.springframework.validation.ValidationUtils; import java.math.BigDecimal; -import java.util.List; -import java.util.Map; -import java.util.Optional; +import java.util.*; import java.util.function.Function; import java.util.function.Predicate; +import java.util.function.UnaryOperator; +import java.util.stream.Collectors; +import static alfio.model.Audit.EntityType.RESERVATION; import static alfio.model.PriceContainer.VatStatus.*; -import static alfio.model.PriceContainer.VatStatus.NOT_INCLUDED_NOT_CHARGED; import static alfio.model.system.ConfigurationKeys.*; import static alfio.util.MonetaryUtil.unitToCents; import static java.util.stream.Collectors.toMap; @@ -44,6 +51,7 @@ @Component public class ReverseChargeManager { + private static final Logger log = LoggerFactory.getLogger(ReverseChargeManager.class); private final PromoCodeDiscountRepository promoCodeDiscountRepository; private final AdditionalServiceItemRepository additionalServiceItemRepository; private final AdditionalServiceRepository additionalServiceRepository; @@ -55,6 +63,7 @@ public class ReverseChargeManager { private final TicketReservationManager ticketReservationManager; private final TicketRepository ticketRepository; private final SubscriptionRepository subscriptionRepository; + private final AuditingRepository auditingRepository; public ReverseChargeManager(PromoCodeDiscountRepository promoCodeDiscountRepository, AdditionalServiceItemRepository additionalServiceItemRepository, @@ -66,7 +75,8 @@ public ReverseChargeManager(PromoCodeDiscountRepository promoCodeDiscountReposit EuVatChecker vatChecker, TicketReservationManager ticketReservationManager, TicketRepository ticketRepository, - SubscriptionRepository subscriptionRepository) { + SubscriptionRepository subscriptionRepository, + AuditingRepository auditingRepository) { this.promoCodeDiscountRepository = promoCodeDiscountRepository; this.additionalServiceItemRepository = additionalServiceItemRepository; this.additionalServiceRepository = additionalServiceRepository; @@ -78,6 +88,7 @@ public ReverseChargeManager(PromoCodeDiscountRepository promoCodeDiscountReposit this.ticketReservationManager = ticketReservationManager; this.ticketRepository = ticketRepository; this.subscriptionRepository = subscriptionRepository; + this.auditingRepository = auditingRepository; } @@ -131,7 +142,7 @@ public void checkAndApplyVATRules(PurchaseContext purchaseContext, var currencyCode = reservation.getCurrencyCode(); PriceContainer.VatStatus vatStatus = determineVatStatus(purchaseContext.getVatStatus(), vatValidation.isVatExempt()); // standard case: Reverse Charge is applied to the entire reservation - var discount = reservation.getPromoCodeDiscountId() != null ? promoCodeDiscountRepository.findById(reservation.getPromoCodeDiscountId()) : null; + var discount = getDiscountOrNull(reservation); if(!isEvent || (reverseChargeOnline && reverseChargeInPerson)) { if(isEvent) { var event = purchaseContext.event().orElseThrow(); @@ -172,11 +183,63 @@ public void checkAndApplyVATRules(PurchaseContext purchaseContext, } } + private PromoCodeDiscount getDiscountOrNull(TicketReservation reservation) { + if (reservation.getPromoCodeDiscountId() != null) { + return promoCodeDiscountRepository.findById(reservation.getPromoCodeDiscountId()); + } + return null; + } + + public void applyCustomTaxPolicy(PurchaseContext purchaseContext, + CustomTaxPolicy customTaxPolicy, + String reservationId, + ContactAndTicketsForm contactAndTicketsForm, + CustomBindingResult bindingResult) { + + if (!purchaseContext.ofType(PurchaseContext.PurchaseContextType.event)) { + throw new IllegalStateException("Custom tax policy is only supported for events"); + } + + var event = (Event) purchaseContext; + // first, validate that categories in CustomTaxPolicy are actually present in the form + var reservation = ticketReservationManager.findById(reservationId).orElseThrow(); + var currencyCode = reservation.getCurrencyCode(); + var ticketsInReservation = ticketRepository.findTicketsInReservation(reservationId).stream() + .collect(toMap(Ticket::getUuid, Function.identity())); + var ticketIds = ticketsInReservation.keySet(); + if (customTaxPolicy.getTicketPolicies().stream().anyMatch(tp -> !ticketIds.contains(tp.getUuid()))) { + log.warn("Error in custom tax policy: some tickets are not included in reservation {}", reservationId); + bindingResult.reject("error.generic"); + } else { + // log the received policy to the auditing + auditingRepository.insert(reservationId, null, purchaseContext, Audit.EventType.VAT_CUSTOM_CONFIGURATION_APPLIED, new Date(), RESERVATION, reservationId, List.of(Map.of("policy", customTaxPolicy))); + var priceMapping = customTaxPolicy.getTicketPolicies().stream() + .map(tcp -> toTicketPriceContainer(ticketsInReservation.get(tcp.getUuid()), tcp, getDiscountOrNull(reservation), event)) + .collect(Collectors.toList()); + updateTicketPrices(priceMapping, currencyCode, event); + // update billing data for the reservation, using the original VatStatus from reservation + updateBillingData(reservationId, contactAndTicketsForm, purchaseContext, reservation.getVatCountryCode(), trimToNull(reservation.getVatNr()), reservation, reservation.getVatStatus()); + } + } + + private static TicketPriceContainer toTicketPriceContainer(Ticket ticket, + CustomTaxPolicy.TicketTaxPolicy categoryTaxPolicy, + PromoCodeDiscount discount, + Event event) { + return TicketPriceContainer.from( + ticket.withVatStatus(categoryTaxPolicy.getTaxPolicy()), + categoryTaxPolicy.getTaxPolicy(), + event.getVat(), + event.getVatStatus(), + discount + ); + } + public void resetVat(PurchaseContext purchaseContext, String reservationId) { if(purchaseContext.ofType(PurchaseContext.PurchaseContextType.event)) { var reservation = ticketReservationRepository.findReservationById(reservationId); var categoriesList = ticketCategoryRepository.findCategoriesInReservation(reservationId); - var discount = reservation.getPromoCodeDiscountId() != null ? promoCodeDiscountRepository.findById(reservation.getPromoCodeDiscountId()) : null; + var discount = getDiscountOrNull(reservation); var event = purchaseContext.event().orElseThrow(); var priceContainers = mapPriceContainersByCategoryId(categoriesList, (a) -> true, @@ -208,23 +271,38 @@ private void updateTicketPricesByCategory(String reservationId, Event event, Map matchingCategories) { MapSqlParameterSource[] parameterSources = matchingCategories.entrySet().stream() - .map(entry -> { - var value = entry.getValue(); - return new MapSqlParameterSource() - .addValue("reservationId", reservationId) - .addValue("categoryId", entry.getKey()) - .addValue("eventId", event.getId()) - .addValue("srcPriceCts", value.getSrcPriceCts()) - .addValue("finalPriceCts", value.getFinalPriceCts()) - .addValue("vatCts", value.getVatCts()) - .addValue("discountCts", value.getDiscountCts()) - .addValue("currencyCode", currencyCode) - .addValue("vatStatus", vatStatus.name()); - } - ).toArray(MapSqlParameterSource[]::new); + .map(entry -> buildParameterSourceForPriceUpdate(entry.getValue(), event.getId(), entry.getKey(), currencyCode, vatStatus, + m -> m.addValue("reservationId", reservationId))) + .toArray(MapSqlParameterSource[]::new); jdbcTemplate.batchUpdate(ticketRepository.updateTicketPriceForCategoryInReservation(), parameterSources); } + private void updateTicketPrices(List ticketPrices, String currencyCode, Event event) { + MapSqlParameterSource[] parameterSources = ticketPrices.stream() + .map(entry -> buildParameterSourceForPriceUpdate(entry, event.getId(), entry.getCategoryId(), currencyCode, entry.getVatStatus(), + m -> m.addValue("uuid", entry.getUuid()))) + .toArray(MapSqlParameterSource[]::new); + var updateResult = jdbcTemplate.batchUpdate(ticketRepository.bulkUpdateTicketPrice(), parameterSources); + Validate.isTrue(Arrays.stream(updateResult).allMatch(i -> i == 1), "Error while updating ticket prices"); + } + + private static MapSqlParameterSource buildParameterSourceForPriceUpdate(PriceContainer value, + int eventId, + int categoryId, + String currencyCode, + PriceContainer.VatStatus vatStatus, + UnaryOperator modifier) { + return modifier.apply(new MapSqlParameterSource() + .addValue("categoryId", categoryId) + .addValue("eventId", eventId) + .addValue("srcPriceCts", value.getSrcPriceCts()) + .addValue("finalPriceCts", MonetaryUtil.unitToCents(value.getFinalPrice(), currencyCode)) + .addValue("vatCts", MonetaryUtil.unitToCents(value.getVAT(), currencyCode)) + .addValue("discountCts", MonetaryUtil.unitToCents(value.getAppliedDiscount(), currencyCode)) + .addValue("currencyCode", currencyCode) + .addValue("vatStatus", vatStatus.name())); + } + private Predicate findReverseChargeCategory(boolean reverseChargeInPerson, boolean reverseChargeOnline, Event.EventFormat eventFormat) { return tc -> { if (eventFormat == Event.EventFormat.HYBRID) { @@ -236,7 +314,7 @@ private Predicate findReverseChargeCategory(boolean reverseCharg } private void updateBillingData(String reservationId, ContactAndTicketsForm contactAndTicketsForm, PurchaseContext purchaseContext, String country, String vatNr, TicketReservation reservation, PriceContainer.VatStatus vatStatus) { - var discount = reservation.getPromoCodeDiscountId() != null ? promoCodeDiscountRepository.findById(reservation.getPromoCodeDiscountId()) : null; + var discount = getDiscountOrNull(reservation); var additionalServiceItems = additionalServiceItemRepository.findByReservationUuid(reservation.getId()); var tickets = ticketReservationManager.findTicketsInReservation(reservation.getId()); var additionalServices = purchaseContext.event().map(event -> additionalServiceRepository.loadAllForEvent(event.getId())).orElse(List.of()); diff --git a/src/main/java/alfio/manager/TicketReservationManager.java b/src/main/java/alfio/manager/TicketReservationManager.java index 57a07e9a39..f8e0b36b92 100644 --- a/src/main/java/alfio/manager/TicketReservationManager.java +++ b/src/main/java/alfio/manager/TicketReservationManager.java @@ -1052,7 +1052,7 @@ void issueCreditNoteForRefund(PurchaseContext purchaseContext, TicketReservation var cost = new TotalPrice(priceContainer.getSrcPriceCts(), unitToCents(priceContainer.getVAT(), currencyCode), 0, 0, currencyCode); var orderSummary = new OrderSummary( cost, - List.of(new SummaryRow(summaryRowTitle, formattedAmount, formattedPriceBeforeVat, 1, formattedAmount, formattedPriceBeforeVat, unitToCents(refundAmount, currencyCode), SummaryType.TICKET, null)), + List.of(new SummaryRow(summaryRowTitle, formattedAmount, formattedPriceBeforeVat, 1, formattedAmount, formattedPriceBeforeVat, unitToCents(refundAmount, currencyCode), SummaryType.TICKET, null, priceContainer.getVatStatus())), false, formattedAmount, formatUnit(priceContainer.getVAT(), currencyCode), @@ -1743,8 +1743,8 @@ List extractSummary(VatStatus reservationVatStatus, final int ticketPriceCts = firstTicket.getSummarySrcPriceCts(); final int priceBeforeVat = SummaryPriceContainer.getSummaryPriceBeforeVatCts(singletonList(firstTicket)); String categoryName = categoriesById.get(categoryWithTickets.getKey()).getName(); - summary.add(new SummaryRow(categoryName, formatCents(ticketPriceCts, currencyCode), formatCents(priceBeforeVat, currencyCode), categoryTickets.size(), formatCents(subTotal, currencyCode), formatCents(subTotalBeforeVat, currencyCode), subTotal, SummaryType.TICKET, null)); var ticketVatStatus = firstTicket.getVatStatus(); + summary.add(new SummaryRow(categoryName, formatCents(ticketPriceCts, currencyCode), formatCents(priceBeforeVat, currencyCode), categoryTickets.size(), formatCents(subTotal, currencyCode), formatCents(subTotalBeforeVat, currencyCode), subTotal, SummaryType.TICKET, null, ticketVatStatus)); if (VatStatus.isVatExempt(ticketVatStatus) && ticketVatStatus != reservationVatStatus) { summary.add(new SummaryRow(null, "", @@ -1754,7 +1754,7 @@ List extractSummary(VatStatus reservationVatStatus, formatCents(0, currencyCode, true), 0, SummaryType.TAX_DETAIL, - "0")); + "0", ticketVatStatus)); } } }); @@ -1770,7 +1770,7 @@ List extractSummary(VatStatus reservationVatStatus, AdditionalServiceItemPriceContainer first = prices.get(0); final int subtotal = prices.stream().mapToInt(AdditionalServiceItemPriceContainer::getSrcPriceCts).sum(); final int subtotalBeforeVat = SummaryPriceContainer.getSummaryPriceBeforeVatCts(prices); - return new SummaryRow(title.value(), formatCents(first.getSrcPriceCts(), currencyCode), formatCents(SummaryPriceContainer.getSummaryPriceBeforeVatCts(singletonList(first)), currencyCode), prices.size(), formatCents(subtotal, currencyCode), formatCents(subtotalBeforeVat, currencyCode), subtotal, SummaryType.ADDITIONAL_SERVICE, null); + return new SummaryRow(title.value(), formatCents(first.getSrcPriceCts(), currencyCode), formatCents(SummaryPriceContainer.getSummaryPriceBeforeVatCts(singletonList(first)), currencyCode), prices.size(), formatCents(subtotal, currencyCode), formatCents(subtotalBeforeVat, currencyCode), subtotal, SummaryType.ADDITIONAL_SERVICE, null, first.getVatStatus()); }).toList()); Optional.ofNullable(promoCodeDiscount).ifPresent(promo -> { @@ -1781,7 +1781,7 @@ List extractSummary(VatStatus reservationVatStatus, reservationCost.discountAppliedCount(), formatCents(reservationCost.discount(), currencyCode), formatCents(reservationCost.discount(), currencyCode), reservationCost.discount(), promo.isDynamic() ? SummaryType.DYNAMIC_DISCOUNT : SummaryType.PROMOTION_CODE, - null)); + null, reservationVatStatus)); }); // if(purchaseContext instanceof SubscriptionDescriptor subscriptionDescriptor) { @@ -1797,8 +1797,8 @@ List extractSummary(VatStatus reservationVatStatus, formatUnit(priceContainer.getNetPrice().multiply(new BigDecimal(subscriptionsToInclude.size())), currencyCode), priceContainer.getSummarySrcPriceCts(), SummaryType.SUBSCRIPTION, - null - )); + null, + reservationVatStatus)); } } else if(CollectionUtils.isNotEmpty(subscriptionsToInclude)) { log.trace("subscriptions to include is not empty"); @@ -1817,8 +1817,8 @@ List extractSummary(VatStatus reservationVatStatus, "-" + formatCents(priceBeforeVat, currencyCode), ticketPriceCts, SummaryType.APPLIED_SUBSCRIPTION, - null - )); + null, + reservationVatStatus)); }); } diff --git a/src/main/java/alfio/manager/support/extension/ExtensionEvent.java b/src/main/java/alfio/manager/support/extension/ExtensionEvent.java index 6718fd553c..c668fa83ef 100644 --- a/src/main/java/alfio/manager/support/extension/ExtensionEvent.java +++ b/src/main/java/alfio/manager/support/extension/ExtensionEvent.java @@ -29,6 +29,7 @@ public enum ExtensionEvent { CREDIT_NOTE_GENERATION, CREDIT_NOTE_GENERATED, TAX_ID_NUMBER_VALIDATION, + CUSTOM_TAX_POLICY_APPLICATION, RESERVATION_VALIDATION, EVENT_METADATA_UPDATE, // diff --git a/src/main/java/alfio/manager/system/ReservationPriceCalculator.java b/src/main/java/alfio/manager/system/ReservationPriceCalculator.java index d09ab79822..b2dafa26ef 100644 --- a/src/main/java/alfio/manager/system/ReservationPriceCalculator.java +++ b/src/main/java/alfio/manager/system/ReservationPriceCalculator.java @@ -135,7 +135,7 @@ public static ReservationPriceCalculator from(TicketReservation reservation, Pro } private int getTicketSrcPriceCts(Ticket t) { - if(t.getVatStatus() == VatStatus.INCLUDED_EXEMPT || t.getVatStatus() == VatStatus.NOT_INCLUDED_EXEMPT) { + if(VatStatus.isVatExempt(t.getVatStatus())) { return t.getSrcPriceCts() - Math.abs(t.getVatCts()); // VAT can be negative in some cases } return t.getSrcPriceCts(); diff --git a/src/main/java/alfio/model/Audit.java b/src/main/java/alfio/model/Audit.java index be0b20135c..bcdf4b3c85 100644 --- a/src/main/java/alfio/model/Audit.java +++ b/src/main/java/alfio/model/Audit.java @@ -63,6 +63,7 @@ public enum EventType { VAT_VALIDATION_SUCCESSFUL, VAT_FORMAL_VALIDATION_SUCCESSFUL, VAT_VALIDATION_SKIPPED, + VAT_CUSTOM_CONFIGURATION_APPLIED, GROUP_MEMBER_ACQUIRED, CREDIT_NOTE_ISSUED, BILLING_DATA_UPDATED, diff --git a/src/main/java/alfio/model/OrderSummary.java b/src/main/java/alfio/model/OrderSummary.java index b2536c8a9f..12d58dafcf 100644 --- a/src/main/java/alfio/model/OrderSummary.java +++ b/src/main/java/alfio/model/OrderSummary.java @@ -98,7 +98,8 @@ public int getPriceInCents() { } public String getDescriptionForPayment() { - return summary.stream().filter(r -> !r.isDiscount()).map(SummaryRow::getDescriptionForPayment).collect(Collectors.joining(", ")); + return summary.stream().filter(r -> !r.isDiscount() && !r.getTaxDetail()) + .map(SummaryRow::getDescriptionForPayment).collect(Collectors.joining(", ")); } public boolean getDisplaySplitPaymentNote() { diff --git a/src/main/java/alfio/model/PriceContainer.java b/src/main/java/alfio/model/PriceContainer.java index 63fe64b388..2320017ad3 100644 --- a/src/main/java/alfio/model/PriceContainer.java +++ b/src/main/java/alfio/model/PriceContainer.java @@ -39,6 +39,9 @@ enum VatStatus { NOT_INCLUDED(notIncludedVatCalculator, UnaryOperator.identity()), INCLUDED_EXEMPT(includedVatExtractor, BigDecimal::negate), NOT_INCLUDED_EXEMPT((price, vatPercentage) -> BigDecimal.ZERO, UnaryOperator.identity()), + // tax exemption was granted by custom rules (extension CUSTOM_TAX_POLICY_APPLICATION) + CUSTOM_INCLUDED_EXEMPT(includedVatExtractor, BigDecimal::negate), + CUSTOM_NOT_INCLUDED_EXEMPT((price, vatPercentage) -> BigDecimal.ZERO, UnaryOperator.identity()), // The following two are dedicated for handling italian-specific cases, "split payment" // VAT has to be shown on the invoice, but not charged INCLUDED_NOT_CHARGED(includedVatExtractor, UnaryOperator.identity()), @@ -62,11 +65,12 @@ public BigDecimal extractRawVAT(BigDecimal price, BigDecimal vatPercentage) { } public static boolean isVatExempt(VatStatus vatStatus) { - return vatStatus == INCLUDED_EXEMPT || vatStatus == NOT_INCLUDED_EXEMPT; + return vatStatus == INCLUDED_EXEMPT || vatStatus == NOT_INCLUDED_EXEMPT + || vatStatus == CUSTOM_INCLUDED_EXEMPT || vatStatus == CUSTOM_NOT_INCLUDED_EXEMPT; } public static boolean isVatIncluded(VatStatus vatStatus) { - return vatStatus == INCLUDED || vatStatus == INCLUDED_EXEMPT; + return vatStatus == INCLUDED || vatStatus == INCLUDED_EXEMPT || vatStatus == CUSTOM_INCLUDED_EXEMPT; } } @@ -172,9 +176,9 @@ default BigDecimal getAppliedDiscount() { default BigDecimal getNetPrice() { var vatStatus = getVatStatus(); var currencyCode = getCurrencyCode(); - if(vatStatus == VatStatus.NOT_INCLUDED_EXEMPT) { + if(vatStatus == VatStatus.NOT_INCLUDED_EXEMPT || vatStatus == VatStatus.CUSTOM_NOT_INCLUDED_EXEMPT) { return MonetaryUtil.centsToUnit(getSrcPriceCts(), currencyCode); - } else if(vatStatus == VatStatus.INCLUDED_EXEMPT) { + } else if(vatStatus == VatStatus.INCLUDED_EXEMPT || vatStatus == VatStatus.CUSTOM_INCLUDED_EXEMPT) { var rawVat = vatStatus.extractRawVAT(centsToUnit(getSrcPriceCts(), getCurrencyCode()), getVatPercentageOrZero()); return MonetaryUtil.centsToUnit(getSrcPriceCts(), currencyCode).add(rawVat); } else if(vatStatus == VatStatus.INCLUDED || vatStatus == VatStatus.INCLUDED_NOT_CHARGED) { diff --git a/src/main/java/alfio/model/SummaryRow.java b/src/main/java/alfio/model/SummaryRow.java index 43064d3848..49ff0f5690 100644 --- a/src/main/java/alfio/model/SummaryRow.java +++ b/src/main/java/alfio/model/SummaryRow.java @@ -24,7 +24,8 @@ public record SummaryRow(String name, String subTotalBeforeVat, int originalSubTotal, SummaryType type, - String taxPercentage) { + String taxPercentage, + PriceContainer.VatStatus vatStatus) { public enum SummaryType { TICKET, SUBSCRIPTION, PROMOTION_CODE, DYNAMIC_DISCOUNT, ADDITIONAL_SERVICE, APPLIED_SUBSCRIPTION, TAX_DETAIL } diff --git a/src/main/java/alfio/model/Ticket.java b/src/main/java/alfio/model/Ticket.java index e02d9576da..ce4db455dd 100644 --- a/src/main/java/alfio/model/Ticket.java +++ b/src/main/java/alfio/model/Ticket.java @@ -158,4 +158,31 @@ public String getFormattedFinalPrice() { public String getFormattedNetPrice() { return MonetaryUtil.formatCents(finalPriceCts - vatCts, currencyCode); } + + public Ticket withVatStatus(PriceContainer.VatStatus newVatStatus) { + return new Ticket( + id, + uuid, + creation, + categoryId, + status.name(), + eventId, + ticketsReservationId, + fullName, + firstName, + lastName, + email, + lockedAssignment, + userLanguage, + srcPriceCts, + finalPriceCts, + vatCts, + discountCts, + extReference, + currencyCode, + tags, + subscriptionId, + newVatStatus + ); + } } diff --git a/src/main/java/alfio/model/TicketInfo.java b/src/main/java/alfio/model/TicketInfo.java index 29ee8f536a..0209b5c51f 100644 --- a/src/main/java/alfio/model/TicketInfo.java +++ b/src/main/java/alfio/model/TicketInfo.java @@ -23,15 +23,21 @@ public class TicketInfo { private final int ticketId; + private final String ticketUuid; private final int ticketCategoryId; private final boolean ticketCategoryBounded; + private final PriceContainer.VatStatus taxPolicy; public TicketInfo(@Column("t_id") int id, + @Column("t_uuid") String ticketUuid, @Column("tc_id") int tcId, - @Column("tc_bounded") boolean bounded) { + @Column("tc_bounded") boolean bounded, + @Column("t_vat_status") PriceContainer.VatStatus taxPolicy) { this.ticketId = id; + this.ticketUuid = ticketUuid; this.ticketCategoryId = tcId; this.ticketCategoryBounded = bounded; + this.taxPolicy = taxPolicy; } } diff --git a/src/main/java/alfio/model/decorator/TicketPriceContainer.java b/src/main/java/alfio/model/decorator/TicketPriceContainer.java index aef70f57bf..3d76ebce6e 100644 --- a/src/main/java/alfio/model/decorator/TicketPriceContainer.java +++ b/src/main/java/alfio/model/decorator/TicketPriceContainer.java @@ -73,7 +73,9 @@ public static TicketPriceContainer from(Ticket t, VatStatus reservationVatStatus @Override public BigDecimal getTaxablePrice() { - if(vatStatus != VatStatus.INCLUDED_EXEMPT && vatStatus != VatStatus.NOT_INCLUDED_EXEMPT) { + if(vatStatus != VatStatus.INCLUDED_EXEMPT + && vatStatus != VatStatus.NOT_INCLUDED_EXEMPT + && vatStatus != VatStatus.CUSTOM_NOT_INCLUDED_EXEMPT) { return SummaryPriceContainer.super.getTaxablePrice(); } return BigDecimal.ZERO; diff --git a/src/main/java/alfio/model/extension/CustomTaxPolicy.java b/src/main/java/alfio/model/extension/CustomTaxPolicy.java new file mode 100644 index 0000000000..955baec5fc --- /dev/null +++ b/src/main/java/alfio/model/extension/CustomTaxPolicy.java @@ -0,0 +1,78 @@ +/** + * This file is part of alf.io. + * + * alf.io is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * alf.io is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with alf.io. If not, see . + */ +package alfio.model.extension; + +import alfio.model.PriceContainer; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; + +import java.util.HashSet; +import java.util.List; +import java.util.Objects; +import java.util.Set; + +public class CustomTaxPolicy { + + private final Set ticketPolicies; + + @JsonCreator + public CustomTaxPolicy(@JsonProperty("ticketPolicies") List ticketPolicies) { + this.ticketPolicies = new HashSet<>(ticketPolicies); + } + + public Set getTicketPolicies() { + return ticketPolicies; + } + + public static class TicketTaxPolicy implements Comparable { + private final String uuid; + private final PriceContainer.VatStatus taxPolicy; + + @JsonCreator + public TicketTaxPolicy(@JsonProperty("uuid") String uuid, + @JsonProperty("taxPolicy") PriceContainer.VatStatus taxPolicy) { + this.uuid = Objects.requireNonNull(uuid); + this.taxPolicy = taxPolicy; + } + + public PriceContainer.VatStatus getTaxPolicy() { + return taxPolicy; + } + + public String getUuid() { + return uuid; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (!(o instanceof TicketTaxPolicy)) return false; + TicketTaxPolicy that = (TicketTaxPolicy) o; + return Objects.equals(this.uuid, that.uuid); + } + + @Override + public int hashCode() { + return Objects.hash(uuid); + } + + @Override + public int compareTo(TicketTaxPolicy o) { + return this.equals(o) ? 0 : this.uuid.compareTo(o.uuid); + } + } +} diff --git a/src/main/java/alfio/repository/TicketRepository.java b/src/main/java/alfio/repository/TicketRepository.java index 92204bb542..aec894377d 100644 --- a/src/main/java/alfio/repository/TicketRepository.java +++ b/src/main/java/alfio/repository/TicketRepository.java @@ -51,6 +51,8 @@ public interface TicketRepository { String RESET_TICKET = " TICKETS_RESERVATION_ID = null, FULL_NAME = null, EMAIL_ADDRESS = null, SPECIAL_PRICE_ID_FK = null, LOCKED_ASSIGNMENT = false, USER_LANGUAGE = null, REMINDER_SENT = false, SRC_PRICE_CTS = 0, FINAL_PRICE_CTS = 0, VAT_CTS = 0, DISCOUNT_CTS = 0, FIRST_NAME = null, LAST_NAME = null, EXT_REFERENCE = null, TAGS = array[]::text[], VAT_STATUS = null, METADATA = '{}'::jsonb "; String RELEASE_TICKET_QUERY = "update ticket set status = 'RELEASED', uuid = :newUuid, " + RESET_TICKET + " where id = :ticketId and status in('ACQUIRED', 'PENDING', 'TO_BE_PAID') and tickets_reservation_id = :reservationId and event_id = :eventId"; + String FIND_BASIC_TICKET_INFO_BY_EVENT_ID = "select t.id t_id, t.uuid t_uuid, tc.id tc_id, tc.bounded tc_bounded, t.vat_status t_vat_status from ticket t inner join ticket_category tc on t.category_id = tc.id where t.event_id = :eventId"; + String UPDATE_TICKET_PRICE = "update ticket set src_price_cts = :srcPriceCts, final_price_cts = :finalPriceCts, vat_cts = :vatCts, discount_cts = :discountCts, currency_code = :currencyCode, vat_status = :vatStatus::VAT_STATUS where event_id = :eventId and category_id = :categoryId"; //TODO: refactor, try to move the MapSqlParameterSource inside the default method! @@ -203,11 +205,13 @@ int updateTicketPrice(@Bind("ids") List ids, @Bind("currencyCode") String currencyCode, @Bind("vatStatus") @EnumTypeAsString PriceContainer.VatStatus vatStatus); - @Query(type = QueryType.TEMPLATE, value = "update ticket set src_price_cts = :srcPriceCts, final_price_cts = :finalPriceCts," + - " vat_cts = :vatCts, discount_cts = :discountCts, currency_code = :currencyCode," + - " vat_status = :vatStatus::VAT_STATUS where event_id = :eventId and category_id = :categoryId and tickets_reservation_id = :reservationId") + @Query(type = QueryType.TEMPLATE, value = UPDATE_TICKET_PRICE + + " and tickets_reservation_id = :reservationId") String updateTicketPriceForCategoryInReservation(); + @Query(type = QueryType.TEMPLATE, value = UPDATE_TICKET_PRICE + " and uuid = :uuid") + String bulkUpdateTicketPrice(); + @Query("update ticket set tags = :tags::text[] where id in(:ids)") int updateTicketTags(@Bind("ids") List ticketIds, @Bind("tags") @Array List tags); @@ -378,14 +382,12 @@ default void resetTickets(List ticketIds) { @Query("select count(*) from ticket where status = 'RELEASED' and event_id = :eventId") Integer countWaiting(@Bind("eventId") int eventId); - @Query("select " + - " t.id t_id, " + - " tc.id tc_id, tc.bounded tc_bounded " + - " from ticket t " + - " inner join ticket_category tc on t.category_id = tc.id "+ - " where t.event_id = :eventId and t.status = 'RELEASED' and tc.expiration <= :currentTs") + @Query(FIND_BASIC_TICKET_INFO_BY_EVENT_ID + " and t.status = 'RELEASED' and tc.expiration <= :currentTs") List findReleasedBelongingToExpiredCategories(@Bind("eventId") int eventId, @Bind("currentTs") ZonedDateTime now); + @Query(FIND_BASIC_TICKET_INFO_BY_EVENT_ID + " and t.tickets_reservation_id = :reservationId") + List findBasicTicketInfoForReservation(@Bind("eventId") int eventId, @Bind("reservationId") String reservationId); + @Query(REVERT_TO_FREE) int revertToFree(@Bind("eventId") int eventId); diff --git a/src/main/java/alfio/util/TemplateResource.java b/src/main/java/alfio/util/TemplateResource.java index 733efaa21b..4c634ac4bd 100644 --- a/src/main/java/alfio/util/TemplateResource.java +++ b/src/main/java/alfio/util/TemplateResource.java @@ -366,7 +366,7 @@ private static Map prepareSampleDataForConfirmationEmail(Organiz Optional vat = Optional.of("VAT-NR"); List tickets = Collections.singletonList(new TicketWithCategory(sampleTicket(event.getZoneId()), sampleCategory(event.getZoneId()))); OrderSummary orderSummary = new OrderSummary(new TotalPrice(1000, 80, 0, 0, "CHF"), - List.of(new SummaryRow("Ticket", "10.00", "9.20", 1, "9.20", "9.20", 1000, SummaryRow.SummaryType.TICKET, null)), false, "10.00", "0.80", false, false, false, "8", PriceContainer.VatStatus.INCLUDED, "1.00"); + List.of(new SummaryRow("Ticket", "10.00", "9.20", 1, "9.20", "9.20", 1000, SummaryRow.SummaryType.TICKET, null, PriceContainer.VatStatus.INCLUDED)), false, "10.00", "0.80", false, false, false, "8", PriceContainer.VatStatus.INCLUDED, "1.00"); String baseUrl = "http://your-domain.tld"; String reservationUrl = baseUrl + "/reservation-url/"; String reservationShortId = "597e7e7b"; diff --git a/src/main/resources/alfio/db/PGSQL/V204_2.0.0.49.3__ADDITIONAL_VAT_STATUS.sql b/src/main/resources/alfio/db/PGSQL/V204_2.0.0.49.3__ADDITIONAL_VAT_STATUS.sql new file mode 100644 index 0000000000..7ee84de81d --- /dev/null +++ b/src/main/resources/alfio/db/PGSQL/V204_2.0.0.49.3__ADDITIONAL_VAT_STATUS.sql @@ -0,0 +1,19 @@ +-- +-- This file is part of alf.io. +-- +-- alf.io is free software: you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as published by +-- the Free Software Foundation, either version 3 of the License, or +-- (at your option) any later version. +-- +-- alf.io is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with alf.io. If not, see . +-- + +alter type VAT_STATUS ADD VALUE 'CUSTOM_NOT_INCLUDED_EXEMPT'; +alter type VAT_STATUS ADD VALUE 'CUSTOM_INCLUDED_EXEMPT'; \ No newline at end of file diff --git a/src/test/java/alfio/controller/api/v2/user/reservation/BaseReservationFlowTest.java b/src/test/java/alfio/controller/api/v2/user/reservation/BaseReservationFlowTest.java index fadf4a5de1..ae101a4ddd 100644 --- a/src/test/java/alfio/controller/api/v2/user/reservation/BaseReservationFlowTest.java +++ b/src/test/java/alfio/controller/api/v2/user/reservation/BaseReservationFlowTest.java @@ -83,6 +83,7 @@ import javax.imageio.ImageIO; import java.io.ByteArrayInputStream; +import java.io.IOException; import java.io.InputStreamReader; import java.io.StringReader; import java.math.BigDecimal; @@ -279,12 +280,7 @@ private void ensureConfiguration(ReservationFlowContext context) { protected void testBasicFlow(Supplier contextSupplier) throws Exception { // as soon as the test starts, insert the extension in the database (prepare the environment) - try (var extensionInputStream = requireNonNull(getClass().getResourceAsStream("/extension.js"))) { - List extensionStream = IOUtils.readLines(new InputStreamReader(extensionInputStream, StandardCharsets.UTF_8)); - String concatenation = String.join("\n", extensionStream).replace("EVENTS", Arrays.stream(ExtensionEvent.values()).map(ee -> "'"+ee.name()+"'").collect(Collectors.joining(","))); - extensionService.createOrUpdate(null, null, new Extension("-", "syncName", concatenation.replace("placeHolder", "false"), true)); - extensionService.createOrUpdate(null, null, new Extension("-", "asyncName", concatenation.replace("placeHolder", "true"), true)); - } + insertExtension(extensionService, "/extension.js"); List body = eventApiV2Controller.listEvents(SearchOptions.empty()).getBody(); assertNotNull(body); assertTrue(body.isEmpty()); @@ -1265,6 +1261,23 @@ protected void testBasicFlow(Supplier contextSupplier) t } + static void insertExtension(ExtensionService extensionService, String path) throws IOException { + insertExtension(extensionService, path, true, true); + } + + static void insertExtension(ExtensionService extensionService, String path, boolean async, boolean sync) throws IOException { + try (var extensionInputStream = requireNonNull(BaseReservationFlowTest.class.getResourceAsStream(path))) { + List extensionStream = IOUtils.readLines(new InputStreamReader(extensionInputStream, StandardCharsets.UTF_8)); + String concatenation = String.join("\n", extensionStream).replace("EVENTS", Arrays.stream(ExtensionEvent.values()).map(ee -> "'"+ee.name()+"'").collect(Collectors.joining(","))); + if (sync) { + extensionService.createOrUpdate(null, null, new Extension("-", "syncName", concatenation.replace("placeHolder", "false"), true)); + } + if (async) { + extensionService.createOrUpdate(null, null, new Extension("-", "asyncName", concatenation.replace("placeHolder", "true"), true)); + } + } + } + protected void validateCheckInData(ReservationFlowContext context) { } diff --git a/src/test/java/alfio/controller/api/v2/user/reservation/CustomTaxPolicyIntegrationTest.java b/src/test/java/alfio/controller/api/v2/user/reservation/CustomTaxPolicyIntegrationTest.java new file mode 100644 index 0000000000..a22d0b39cb --- /dev/null +++ b/src/test/java/alfio/controller/api/v2/user/reservation/CustomTaxPolicyIntegrationTest.java @@ -0,0 +1,253 @@ +/** + * This file is part of alf.io. + * + * alf.io is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * alf.io is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with alf.io. If not, see . + */ +package alfio.controller.api.v2.user.reservation; + +import alfio.TestConfiguration; +import alfio.config.DataSourceConfiguration; +import alfio.config.Initializer; +import alfio.controller.IndexController; +import alfio.controller.api.ControllerConfiguration; +import alfio.controller.api.admin.AdditionalServiceApiController; +import alfio.controller.api.admin.CheckInApiController; +import alfio.controller.api.admin.EventApiController; +import alfio.controller.api.admin.UsersApiController; +import alfio.controller.api.v1.AttendeeApiController; +import alfio.controller.api.v2.InfoApiController; +import alfio.controller.api.v2.TranslationsApiController; +import alfio.controller.api.v2.user.EventApiV2Controller; +import alfio.controller.api.v2.user.ReservationApiV2Controller; +import alfio.controller.api.v2.user.TicketApiV2Controller; +import alfio.controller.form.ContactAndTicketsForm; +import alfio.controller.form.UpdateTicketOwnerForm; +import alfio.extension.ExtensionService; +import alfio.manager.*; +import alfio.manager.user.UserManager; +import alfio.model.Event; +import alfio.model.PriceContainer; +import alfio.model.TicketCategory; +import alfio.model.metadata.AlfioMetadata; +import alfio.model.modification.DateTimeModification; +import alfio.model.modification.TicketCategoryModification; +import alfio.model.modification.TicketReservationModification; +import alfio.model.modification.TicketReservationWithOptionalCodeModification; +import alfio.repository.*; +import alfio.repository.audit.ScanAuditRepository; +import alfio.repository.system.ConfigurationRepository; +import alfio.repository.user.OrganizationRepository; +import alfio.repository.user.UserRepository; +import alfio.test.util.IntegrationTestUtil; +import alfio.util.ClockProvider; +import org.apache.commons.lang3.tuple.Pair; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; +import org.springframework.test.context.ActiveProfiles; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.validation.BeanPropertyBindingResult; +import org.testcontainers.shaded.org.apache.commons.lang.time.DateUtils; + +import java.io.IOException; +import java.math.BigDecimal; +import java.time.LocalDate; +import java.time.LocalTime; +import java.util.*; + +import static alfio.controller.api.v2.user.reservation.BaseReservationFlowTest.URL_CODE_HIDDEN; +import static alfio.controller.api.v2.user.reservation.BaseReservationFlowTest.insertExtension; +import static alfio.test.util.IntegrationTestUtil.*; +import static org.junit.jupiter.api.Assertions.*; + +@SpringBootTest +@ContextConfiguration(classes = {DataSourceConfiguration.class, TestConfiguration.class, ControllerConfiguration.class}) +@ActiveProfiles({Initializer.PROFILE_DEV, Initializer.PROFILE_DISABLE_JOBS, Initializer.PROFILE_INTEGRATION_TEST}) +@Transactional +class CustomTaxPolicyIntegrationTest { + + private final OrganizationRepository organizationRepository; + private final UserManager userManager; + private final ExtensionService extensionService; + private final ClockProvider clockProvider; + private final EventManager eventManager; + private final EventRepository eventRepository; + private final ConfigurationRepository configurationRepository; + private final TicketReservationManager ticketReservationManager; + private final TicketCategoryRepository ticketCategoryRepository; + private final ReservationApiV2Controller reservationApiV2Controller; + private final TicketRepository ticketRepository; + + @Autowired + public CustomTaxPolicyIntegrationTest(OrganizationRepository organizationRepository, + EventManager eventManager, + EventRepository eventRepository, + UserManager userManager, + ClockProvider clockProvider, + ConfigurationRepository configurationRepository, + EventStatisticsManager eventStatisticsManager, + TicketCategoryRepository ticketCategoryRepository, + TicketReservationRepository ticketReservationRepository, + EventApiController eventApiController, + TicketRepository ticketRepository, + TicketFieldRepository ticketFieldRepository, + AdditionalServiceApiController additionalServiceApiController, + SpecialPriceTokenGenerator specialPriceTokenGenerator, + SpecialPriceRepository specialPriceRepository, + CheckInApiController checkInApiController, + AttendeeApiController attendeeApiController, + UsersApiController usersApiController, + ScanAuditRepository scanAuditRepository, + AuditingRepository auditingRepository, + AdminReservationManager adminReservationManager, + TicketReservationManager ticketReservationManager, + InfoApiController infoApiController, + TranslationsApiController translationsApiController, + EventApiV2Controller eventApiV2Controller, + ReservationApiV2Controller reservationApiV2Controller, + TicketApiV2Controller ticketApiV2Controller, + IndexController indexController, + NamedParameterJdbcTemplate jdbcTemplate, + ExtensionLogRepository extensionLogRepository, + ExtensionService extensionService, + PollRepository pollRepository, + NotificationManager notificationManager, + UserRepository userRepository, + OrganizationDeleter organizationDeleter, + PromoCodeDiscountRepository promoCodeDiscountRepository, + PromoCodeRequestManager promoCodeRequestManager, + CheckInManager checkInManager) { + this.organizationRepository = organizationRepository; + this.userManager = userManager; + this.extensionService = extensionService; + this.clockProvider = clockProvider; + this.eventManager = eventManager; + this.eventRepository = eventRepository; + this.configurationRepository = configurationRepository; + this.ticketReservationManager = ticketReservationManager; + this.ticketCategoryRepository = ticketCategoryRepository; + this.reservationApiV2Controller = reservationApiV2Controller; + this.ticketRepository = ticketRepository; + } + + private ReservationFlowContext createContext(PriceContainer.VatStatus vatStatus) { + try { + IntegrationTestUtil.ensureMinimalConfiguration(configurationRepository); + insertExtension(extensionService, "/custom-tax-policy-extension.js", false, true); + List categories = Arrays.asList( + new TicketCategoryModification(null, "default", TicketCategory.TicketAccessType.INHERIT, AVAILABLE_SEATS, + new DateTimeModification(LocalDate.now(clockProvider.getClock()).minusDays(1), LocalTime.now(clockProvider.getClock())), + new DateTimeModification(LocalDate.now(clockProvider.getClock()).plusDays(1), LocalTime.now(clockProvider.getClock())), + DESCRIPTION, new BigDecimal("100.00"), false, "", false, null, null, null, null, null, 0, null, null, AlfioMetadata.empty()), + new TicketCategoryModification(null, "hidden", TicketCategory.TicketAccessType.INHERIT, 2, + new DateTimeModification(LocalDate.now(clockProvider.getClock()).minusDays(1), LocalTime.now(clockProvider.getClock())), + new DateTimeModification(LocalDate.now(clockProvider.getClock()).plusDays(1), LocalTime.now(clockProvider.getClock())), + DESCRIPTION, new BigDecimal("10.00"), true, "", true, URL_CODE_HIDDEN, null, null, null, null, 0, null, null, AlfioMetadata.empty()) + ); + Pair eventAndUser = initEvent(categories, organizationRepository, userManager, eventManager, eventRepository, List.of(), Event.EventFormat.IN_PERSON, vatStatus); + return new ReservationFlowContext(eventAndUser.getLeft(), eventAndUser.getRight() + "_owner"); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + @Test + void triggerCustomTaxPolicyTaxIncluded() { + var context = createContext(PriceContainer.VatStatus.INCLUDED); + var categories = ticketCategoryRepository.findAllTicketCategories(context.event.getId()); + assertEquals(2, categories.size()); + var ticketRequest = new TicketReservationModification(); + ticketRequest.setQuantity(2); + ticketRequest.setTicketCategoryId(categories.get(0).getId()); + + var request = List.of(new TicketReservationWithOptionalCodeModification(ticketRequest, Optional.empty())); + var reservationId = ticketReservationManager.createTicketReservation(context.event, request, List.of(), DateUtils.addDays(new Date(), 1), Optional.empty(), Locale.ENGLISH, false, null); + + var totalPrice = ticketReservationManager.totalReservationCostWithVAT(reservationId).getLeft(); + assertEquals(20000, totalPrice.getPriceWithVAT()); + + var tickets = ticketRepository.findTicketsInReservation(reservationId); + assertEquals(2, tickets.size()); + var firstUuid = tickets.get(0).getUuid(); + var secondUuid = tickets.get(1).getUuid(); + var contactAndTicketsForm = new ContactAndTicketsForm(); + contactAndTicketsForm.setFirstName("The"); + contactAndTicketsForm.setLastName("Customer"); + contactAndTicketsForm.setEmail("email@customer.com"); + contactAndTicketsForm.setTickets(Map.of( + firstUuid, updateTicketOwnerForm("example@example.org"), + secondUuid, updateTicketOwnerForm("example@example1.org") + )); + var bindingResult = new BeanPropertyBindingResult(contactAndTicketsForm, "form"); + var response = reservationApiV2Controller.validateToOverview(reservationId, "en", false, contactAndTicketsForm, bindingResult, null); + assertTrue(response.getStatusCode().is2xxSuccessful()); + assertNotNull(response.getBody()); + assertTrue(response.getBody().isSuccess()); + // verify that first ticket has the expected tax settings + assertEquals(PriceContainer.VatStatus.CUSTOM_INCLUDED_EXEMPT, ticketRepository.findByUUID(firstUuid).getVatStatus()); + assertEquals(PriceContainer.VatStatus.INCLUDED, ticketRepository.findByUUID(secondUuid).getVatStatus()); + totalPrice = ticketReservationManager.totalReservationCostWithVAT(reservationId).getLeft(); + assertEquals(19901, totalPrice.getPriceWithVAT()); + } + + @Test + void triggerCustomTaxPolicyTaxNotIncluded() { + var context = createContext(PriceContainer.VatStatus.NOT_INCLUDED); + var categories = ticketCategoryRepository.findAllTicketCategories(context.event.getId()); + assertEquals(2, categories.size()); + var ticketRequest = new TicketReservationModification(); + ticketRequest.setQuantity(2); + ticketRequest.setTicketCategoryId(categories.get(0).getId()); + + var request = List.of(new TicketReservationWithOptionalCodeModification(ticketRequest, Optional.empty())); + var reservationId = ticketReservationManager.createTicketReservation(context.event, request, List.of(), DateUtils.addDays(new Date(), 1), Optional.empty(), Locale.ENGLISH, false, null); + + var totalPrice = ticketReservationManager.totalReservationCostWithVAT(reservationId).getLeft(); + assertEquals(20200, totalPrice.getPriceWithVAT()); + + var tickets = ticketRepository.findTicketsInReservation(reservationId); + assertEquals(2, tickets.size()); + var firstUuid = tickets.get(0).getUuid(); + var secondUuid = tickets.get(1).getUuid(); + var contactAndTicketsForm = new ContactAndTicketsForm(); + contactAndTicketsForm.setFirstName("The"); + contactAndTicketsForm.setLastName("Customer"); + contactAndTicketsForm.setEmail("email@customer.com"); + contactAndTicketsForm.setTickets(Map.of( + firstUuid, updateTicketOwnerForm("example@example.org"), + secondUuid, updateTicketOwnerForm("example@example1.org") + )); + var bindingResult = new BeanPropertyBindingResult(contactAndTicketsForm, "form"); + var response = reservationApiV2Controller.validateToOverview(reservationId, "en", false, contactAndTicketsForm, bindingResult, null); + assertTrue(response.getStatusCode().is2xxSuccessful()); + assertNotNull(response.getBody()); + assertTrue(response.getBody().isSuccess()); + // verify that first ticket has the expected tax settings + assertEquals(PriceContainer.VatStatus.CUSTOM_NOT_INCLUDED_EXEMPT, ticketRepository.findByUUID(firstUuid).getVatStatus()); + assertEquals(PriceContainer.VatStatus.NOT_INCLUDED, ticketRepository.findByUUID(secondUuid).getVatStatus()); + totalPrice = ticketReservationManager.totalReservationCostWithVAT(reservationId).getLeft(); + assertEquals(20100, totalPrice.getPriceWithVAT()); + } + + private static UpdateTicketOwnerForm updateTicketOwnerForm(String email) { + var form = new UpdateTicketOwnerForm(); + form.setFirstName("first"); + form.setLastName("last"); + form.setEmail(email); + form.setUserLanguage("en"); + return form; + } +} diff --git a/src/test/java/alfio/controller/api/v2/user/reservation/StripeReservationFlowIntegrationTest.java b/src/test/java/alfio/controller/api/v2/user/reservation/StripeReservationFlowIntegrationTest.java index 77e4cc683d..81e5d2736c 100644 --- a/src/test/java/alfio/controller/api/v2/user/reservation/StripeReservationFlowIntegrationTest.java +++ b/src/test/java/alfio/controller/api/v2/user/reservation/StripeReservationFlowIntegrationTest.java @@ -77,6 +77,7 @@ import java.util.Arrays; import java.util.List; import java.util.Map; +import java.util.Objects; import static alfio.manager.support.extension.ExtensionEvent.*; import static alfio.test.util.IntegrationTestUtil.*; @@ -289,7 +290,7 @@ private void processWebHook(String filename, String reservationId) { var response = stripePaymentWebhookController.receivePaymentConfirmation(signedHeader, httpRequest); assertNotNull(response); assertEquals(HttpStatus.OK, response.getStatusCode()); - assertEquals(APPLICATION_JSON_UTF8, response.getHeaders().getContentType().toString()); + assertEquals(APPLICATION_JSON_UTF8, Objects.requireNonNull(response.getHeaders().getContentType()).toString()); } catch (Exception ex) { throw new IllegalStateException(ex); } diff --git a/src/test/java/alfio/manager/ExtensionManagerTest.java b/src/test/java/alfio/manager/ExtensionManagerTest.java index 02fb2716b2..03d40bb093 100644 --- a/src/test/java/alfio/manager/ExtensionManagerTest.java +++ b/src/test/java/alfio/manager/ExtensionManagerTest.java @@ -50,7 +50,7 @@ void setUp() { when(eventRepository.findOrganizationIdByEventId(1)).thenReturn(1); when(eventRepository.findById(1)).thenReturn(event); extensionService = mock(ExtensionService.class); - extensionManager = new ExtensionManager(extensionService, eventRepository, null, null, mock(ConfigurationManager.class), null); + extensionManager = new ExtensionManager(extensionService, eventRepository, null, null, mock(ConfigurationManager.class), null, null); } @Test diff --git a/src/test/java/alfio/test/util/IntegrationTestUtil.java b/src/test/java/alfio/test/util/IntegrationTestUtil.java index 6cc799c695..3dd79133d6 100644 --- a/src/test/java/alfio/test/util/IntegrationTestUtil.java +++ b/src/test/java/alfio/test/util/IntegrationTestUtil.java @@ -102,6 +102,17 @@ public static Pair initEvent(List cat List additionalServices, Event.EventFormat eventFormat) { + return initEvent(categories, organizationRepository, userManager, eventManager, eventRepository, additionalServices, eventFormat, PriceContainer.VatStatus.INCLUDED); + } + + public static Pair initEvent(List categories, + OrganizationRepository organizationRepository, + UserManager userManager, + EventManager eventManager, + EventRepository eventRepository, + List additionalServices, + Event.EventFormat eventFormat, + PriceContainer.VatStatus eventVatStatus) { String organizationName = UUID.randomUUID().toString(); String username = UUID.randomUUID().toString(); String eventName = UUID.randomUUID().toString(); @@ -120,11 +131,11 @@ public static Pair initEvent(List cat desc.put("de", "muh description"); EventModification em = new EventModification(null, eventFormat, "url", "url", "url", "privacy","url", null, - eventName, "event display name", organization.getId(), - "muh location", "0.0", "0.0", ClockProvider.clock().getZone().getId(), desc, - new DateTimeModification(LocalDate.now(ClockProvider.clock()).plusDays(5), LocalTime.now(ClockProvider.clock())), - new DateTimeModification(expiration.toLocalDate(), expiration.toLocalTime()), - BigDecimal.TEN, "CHF", AVAILABLE_SEATS, BigDecimal.ONE, true, Collections.singletonList(PaymentProxy.OFFLINE), categories, false, new LocationDescriptor("","","",""), 7, null, additionalServices, AlfioMetadata.empty(), List.of()); + eventName, "event display name", organization.getId(), + "muh location", "0.0", "0.0", ClockProvider.clock().getZone().getId(), desc, + new DateTimeModification(LocalDate.now(ClockProvider.clock()).plusDays(5), LocalTime.now(ClockProvider.clock())), + new DateTimeModification(expiration.toLocalDate(), expiration.toLocalTime()), + BigDecimal.TEN, "CHF", AVAILABLE_SEATS, BigDecimal.ONE, PriceContainer.VatStatus.isVatIncluded(eventVatStatus), Collections.singletonList(PaymentProxy.OFFLINE), categories, false, new LocationDescriptor("","","",""), 7, null, additionalServices, AlfioMetadata.empty(), List.of()); eventManager.createEvent(em, username); Event event = eventManager.getSingleEvent(eventName, username); Assertions.assertEquals(AVAILABLE_SEATS, eventRepository.countExistingTickets(event.getId()).intValue()); diff --git a/src/test/resources/custom-tax-policy-extension.js b/src/test/resources/custom-tax-policy-extension.js new file mode 100644 index 0000000000..04118780e0 --- /dev/null +++ b/src/test/resources/custom-tax-policy-extension.js @@ -0,0 +1,56 @@ +/** + * The script metadata object describes whether your extension should be invoked asynchronously, and which events it supports + * @returns {{ async: boolean, events: string[] }} + */ +function getScriptMetadata() { + return { + id: 'customTaxPolicyApplicationExample', // optional: id and version will be used later as a mechanism for checking if the script has a newer version + displayName: 'Custom Tax Policy Application Example', //mandatory: the name displayed in the configuration page + version: 0, // optional + async: false, + events: [ + 'CUSTOM_TAX_POLICY_APPLICATION' + ] + }; +} +/** + * Executes the extension. + * @param scriptEvent + * @returns Object + */ +function executeScript(scriptEvent) { + console.log('entering customTaxPolicyApplicationExample for reservation', reservationId); + // in this simple example we need to remove taxes if the attendee email ends with "@example.org" + var keys = Object.keys(reservationForm.tickets); + var containsModifiedElements = false; + var out = []; + for (i = 0; i < keys.length; i++) { + var uuid = keys[i]; + var attendee = reservationForm.tickets[uuid]; + var ticketInfo = ticketInfoByUuid[uuid]; + var category = categoriesById[ticketInfo.ticketCategoryId]; + var originalTaxPolicy = ticketInfo.taxPolicy; + if (!category.free && attendee.email.endsWith('@example.org')) { + console.log('found attendee with matching email!'); + out.push({ + uuid: uuid, + taxPolicy: originalTaxPolicy == 'INCLUDED' ? 'CUSTOM_INCLUDED_EXEMPT' : 'CUSTOM_NOT_INCLUDED_EXEMPT' + }); + containsModifiedElements = true; + } else { + out.push({ + uuid: uuid, + taxPolicy: originalTaxPolicy + }); + } + } + + if (!containsModifiedElements) { + // since nothing was modified, we return "null" to continue with the original validation process + return null; + } + + return { + ticketPolicies: out + }; +} From f09bfe8300a171afb1f71ce71aa4f1920e5957b7 Mon Sep 17 00:00:00 2001 From: Celestino Bellone <3385346+cbellone@users.noreply.github.com> Date: Sun, 12 Feb 2023 16:31:53 +0100 Subject: [PATCH 151/218] fix errors after cherry-pick --- .../java/alfio/manager/ExtensionManager.java | 4 +- .../CustomTaxPolicyIntegrationTest.java | 10 +- src/test/resources/api/descriptor.json | 294 +++++++++--------- 3 files changed, 157 insertions(+), 151 deletions(-) diff --git a/src/main/java/alfio/manager/ExtensionManager.java b/src/main/java/alfio/manager/ExtensionManager.java index f0269234d7..f81d7e5818 100644 --- a/src/main/java/alfio/manager/ExtensionManager.java +++ b/src/main/java/alfio/manager/ExtensionManager.java @@ -93,13 +93,15 @@ public ExtensionManager(ExtensionService extensionService, TicketReservationRepository ticketReservationRepository, TicketRepository ticketRepository, ConfigurationManager configurationManager, - TransactionRepository transactionRepository) { + TransactionRepository transactionRepository, + TicketCategoryRepository ticketCategoryRepository) { this.extensionService = extensionService; this.eventRepository = eventRepository; this.ticketReservationRepository = ticketReservationRepository; this.ticketRepository = ticketRepository; this.configurationManager = configurationManager; this.transactionRepository = transactionRepository; + this.ticketCategoryRepository = ticketCategoryRepository; } diff --git a/src/test/java/alfio/controller/api/v2/user/reservation/CustomTaxPolicyIntegrationTest.java b/src/test/java/alfio/controller/api/v2/user/reservation/CustomTaxPolicyIntegrationTest.java index a22d0b39cb..eead9b8f04 100644 --- a/src/test/java/alfio/controller/api/v2/user/reservation/CustomTaxPolicyIntegrationTest.java +++ b/src/test/java/alfio/controller/api/v2/user/reservation/CustomTaxPolicyIntegrationTest.java @@ -51,6 +51,7 @@ import alfio.repository.user.UserRepository; import alfio.test.util.IntegrationTestUtil; import alfio.util.ClockProvider; +import org.apache.commons.lang3.time.DateUtils; import org.apache.commons.lang3.tuple.Pair; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -60,7 +61,6 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.BeanPropertyBindingResult; -import org.testcontainers.shaded.org.apache.commons.lang.time.DateUtils; import java.io.IOException; import java.math.BigDecimal; @@ -177,7 +177,7 @@ void triggerCustomTaxPolicyTaxIncluded() { var reservationId = ticketReservationManager.createTicketReservation(context.event, request, List.of(), DateUtils.addDays(new Date(), 1), Optional.empty(), Locale.ENGLISH, false, null); var totalPrice = ticketReservationManager.totalReservationCostWithVAT(reservationId).getLeft(); - assertEquals(20000, totalPrice.getPriceWithVAT()); + assertEquals(20000, totalPrice.priceWithVAT()); var tickets = ticketRepository.findTicketsInReservation(reservationId); assertEquals(2, tickets.size()); @@ -200,7 +200,7 @@ secondUuid, updateTicketOwnerForm("example@example1.org") assertEquals(PriceContainer.VatStatus.CUSTOM_INCLUDED_EXEMPT, ticketRepository.findByUUID(firstUuid).getVatStatus()); assertEquals(PriceContainer.VatStatus.INCLUDED, ticketRepository.findByUUID(secondUuid).getVatStatus()); totalPrice = ticketReservationManager.totalReservationCostWithVAT(reservationId).getLeft(); - assertEquals(19901, totalPrice.getPriceWithVAT()); + assertEquals(19901, totalPrice.priceWithVAT()); } @Test @@ -216,7 +216,7 @@ void triggerCustomTaxPolicyTaxNotIncluded() { var reservationId = ticketReservationManager.createTicketReservation(context.event, request, List.of(), DateUtils.addDays(new Date(), 1), Optional.empty(), Locale.ENGLISH, false, null); var totalPrice = ticketReservationManager.totalReservationCostWithVAT(reservationId).getLeft(); - assertEquals(20200, totalPrice.getPriceWithVAT()); + assertEquals(20200, totalPrice.priceWithVAT()); var tickets = ticketRepository.findTicketsInReservation(reservationId); assertEquals(2, tickets.size()); @@ -239,7 +239,7 @@ secondUuid, updateTicketOwnerForm("example@example1.org") assertEquals(PriceContainer.VatStatus.CUSTOM_NOT_INCLUDED_EXEMPT, ticketRepository.findByUUID(firstUuid).getVatStatus()); assertEquals(PriceContainer.VatStatus.NOT_INCLUDED, ticketRepository.findByUUID(secondUuid).getVatStatus()); totalPrice = ticketReservationManager.totalReservationCostWithVAT(reservationId).getLeft(); - assertEquals(20100, totalPrice.getPriceWithVAT()); + assertEquals(20100, totalPrice.priceWithVAT()); } private static UpdateTicketOwnerForm updateTicketOwnerForm(String email) { diff --git a/src/test/resources/api/descriptor.json b/src/test/resources/api/descriptor.json index 9b8e1ac60d..c0b32be673 100644 --- a/src/test/resources/api/descriptor.json +++ b/src/test/resources/api/descriptor.json @@ -25864,7 +25864,7 @@ }, "vatStatus" : { "type" : "string", - "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] + "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "CUSTOM_INCLUDED_EXEMPT", "CUSTOM_NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] }, "refundedAmount" : { "type" : "string" @@ -26093,13 +26093,13 @@ "valid" : { "type" : "boolean" }, - "pin" : { + "formattedValidityFrom" : { "type" : "string" }, - "formattedValidityTo" : { + "pin" : { "type" : "string" }, - "formattedValidityFrom" : { + "formattedValidityTo" : { "type" : "string" } } @@ -26154,14 +26154,18 @@ "taxPercentage" : { "type" : "string" }, + "vatStatus" : { + "type" : "string", + "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "CUSTOM_INCLUDED_EXEMPT", "CUSTOM_NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] + }, "discount" : { "type" : "boolean" }, - "descriptionForPayment" : { - "type" : "string" - }, "taxDetail" : { "type" : "boolean" + }, + "descriptionForPayment" : { + "type" : "string" } } }, @@ -26246,7 +26250,10 @@ }, "vatStatus" : { "type" : "string", - "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] + "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "CUSTOM_INCLUDED_EXEMPT", "CUSTOM_NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] + }, + "formattedNetPrice" : { + "type" : "string" }, "assigned" : { "type" : "boolean" @@ -26256,9 +26263,6 @@ }, "formattedFinalPrice" : { "type" : "string" - }, - "formattedNetPrice" : { - "type" : "string" } } }, @@ -26406,7 +26410,7 @@ }, "vatStatus" : { "type" : "string", - "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] + "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "CUSTOM_INCLUDED_EXEMPT", "CUSTOM_NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] }, "vatNr" : { "type" : "string" @@ -26456,6 +26460,15 @@ "cancelled" : { "type" : "boolean" }, + "stuck" : { + "type" : "boolean" + }, + "hasBillingAddress" : { + "type" : "boolean" + }, + "hasVatNumber" : { + "type" : "boolean" + }, "hasInvoiceNumber" : { "type" : "boolean" }, @@ -26477,15 +26490,6 @@ "hasBeenPaid" : { "type" : "boolean" }, - "stuck" : { - "type" : "boolean" - }, - "hasBillingAddress" : { - "type" : "boolean" - }, - "hasVatNumber" : { - "type" : "boolean" - }, "finalPrice" : { "type" : "number" }, @@ -26585,6 +26589,32 @@ "currencyCode" : { "type" : "string" }, + "stuck" : { + "type" : "boolean" + }, + "reminderSent" : { + "type" : "boolean" + }, + "hasBillingAddress" : { + "type" : "boolean" + }, + "hasVatNumber" : { + "type" : "boolean" + }, + "latestReminder" : { + "type" : "string", + "format" : "date-time" + }, + "invoiceModel" : { + "type" : "string" + }, + "usedVatPercent" : { + "type" : "number" + }, + "creationTimestamp" : { + "type" : "string", + "format" : "date-time" + }, "status" : { "type" : "string", "enum" : [ "PENDING", "IN_PAYMENT", "EXTERNAL_PROCESSING_PAYMENT", "WAITING_EXTERNAL_CONFIRMATION", "OFFLINE_PAYMENT", "DEFERRED_OFFLINE_PAYMENT", "COMPLETE", "STUCK", "CANCELLED", "CREDIT_NOTE_ISSUED" ] @@ -26597,18 +26627,16 @@ "type" : "string", "enum" : [ "STRIPE", "ON_SITE", "OFFLINE", "NONE", "ADMIN", "PAYPAL", "MOLLIE", "SAFERPAY" ] }, + "vatStatus" : { + "type" : "string", + "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "CUSTOM_INCLUDED_EXEMPT", "CUSTOM_NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] + }, "hasInvoiceNumber" : { "type" : "boolean" }, "invoiceNumber" : { "type" : "string" }, - "firstName" : { - "type" : "string" - }, - "lastName" : { - "type" : "string" - }, "finalPriceCts" : { "type" : "integer", "format" : "int32" @@ -26630,9 +26658,11 @@ "invoiceRequested" : { "type" : "boolean" }, - "vatStatus" : { - "type" : "string", - "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] + "firstName" : { + "type" : "string" + }, + "lastName" : { + "type" : "string" }, "srcPriceCts" : { "type" : "integer", @@ -26709,32 +26739,6 @@ }, "taxablePrice" : { "type" : "number" - }, - "stuck" : { - "type" : "boolean" - }, - "reminderSent" : { - "type" : "boolean" - }, - "hasBillingAddress" : { - "type" : "boolean" - }, - "hasVatNumber" : { - "type" : "boolean" - }, - "latestReminder" : { - "type" : "string", - "format" : "date-time" - }, - "invoiceModel" : { - "type" : "string" - }, - "usedVatPercent" : { - "type" : "number" - }, - "creationTimestamp" : { - "type" : "string", - "format" : "date-time" } } }, @@ -27871,7 +27875,7 @@ "taxPolicy" : { "type" : "string", "writeOnly" : true, - "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] + "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "CUSTOM_INCLUDED_EXEMPT", "CUSTOM_NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] }, "currencyCode" : { "type" : "string", @@ -28460,6 +28464,12 @@ "currencyCode" : { "type" : "string" }, + "formattedNetPrice" : { + "type" : "string" + }, + "extReference" : { + "type" : "string" + }, "status" : { "type" : "string", "enum" : [ "FREE", "PENDING", "TO_BE_PAID", "ACQUIRED", "CANCELLED", "CHECKED_IN", "EXPIRED", "INVALIDATED", "RELEASED", "PRE_RESERVED" ] @@ -28477,15 +28487,9 @@ "type" : "integer", "format" : "int32" }, - "firstName" : { - "type" : "string" - }, - "lastName" : { - "type" : "string" - }, - "subscriptionId" : { + "vatStatus" : { "type" : "string", - "format" : "uuid" + "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "CUSTOM_INCLUDED_EXEMPT", "CUSTOM_NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] }, "finalPriceCts" : { "type" : "integer", @@ -28499,9 +28503,15 @@ "type" : "integer", "format" : "int32" }, - "vatStatus" : { + "firstName" : { + "type" : "string" + }, + "lastName" : { + "type" : "string" + }, + "subscriptionId" : { "type" : "string", - "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] + "format" : "uuid" }, "srcPriceCts" : { "type" : "integer", @@ -28536,12 +28546,6 @@ "formattedFinalPrice" : { "type" : "string" }, - "formattedNetPrice" : { - "type" : "string" - }, - "extReference" : { - "type" : "string" - }, "categoryName" : { "type" : "string" } @@ -28881,7 +28885,7 @@ }, "vatStatus" : { "type" : "string", - "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] + "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "CUSTOM_INCLUDED_EXEMPT", "CUSTOM_NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] }, "currency" : { "type" : "string" @@ -29025,12 +29029,12 @@ "type" : "string", "format" : "date-time" }, + "overlap" : { + "type" : "boolean" + }, "instant" : { "type" : "string", "format" : "date-time" - }, - "overlap" : { - "type" : "boolean" } } } @@ -29419,7 +29423,7 @@ }, "vatStatus" : { "type" : "string", - "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] + "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "CUSTOM_INCLUDED_EXEMPT", "CUSTOM_NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] }, "priceInCents" : { "type" : "integer", @@ -29783,6 +29787,12 @@ "currencyCode" : { "type" : "string" }, + "formattedNetPrice" : { + "type" : "string" + }, + "extReference" : { + "type" : "string" + }, "status" : { "type" : "string", "enum" : [ "FREE", "PENDING", "TO_BE_PAID", "ACQUIRED", "CANCELLED", "CHECKED_IN", "EXPIRED", "INVALIDATED", "RELEASED", "PRE_RESERVED" ] @@ -29800,15 +29810,9 @@ "type" : "integer", "format" : "int32" }, - "firstName" : { - "type" : "string" - }, - "lastName" : { - "type" : "string" - }, - "subscriptionId" : { + "vatStatus" : { "type" : "string", - "format" : "uuid" + "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "CUSTOM_INCLUDED_EXEMPT", "CUSTOM_NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] }, "finalPriceCts" : { "type" : "integer", @@ -29822,9 +29826,15 @@ "type" : "integer", "format" : "int32" }, - "vatStatus" : { + "firstName" : { + "type" : "string" + }, + "lastName" : { + "type" : "string" + }, + "subscriptionId" : { "type" : "string", - "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] + "format" : "uuid" }, "srcPriceCts" : { "type" : "integer", @@ -29858,12 +29868,6 @@ }, "formattedFinalPrice" : { "type" : "string" - }, - "formattedNetPrice" : { - "type" : "string" - }, - "extReference" : { - "type" : "string" } } }, @@ -30020,7 +30024,7 @@ }, "vatStatus" : { "type" : "string", - "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] + "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "CUSTOM_INCLUDED_EXEMPT", "CUSTOM_NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] }, "items" : { "type" : "array", @@ -30179,12 +30183,12 @@ "type" : "string", "format" : "date-time" }, + "overlap" : { + "type" : "boolean" + }, "instant" : { "type" : "string", "format" : "date-time" - }, - "overlap" : { - "type" : "boolean" } } } @@ -31657,7 +31661,7 @@ }, "vatStatus" : { "type" : "string", - "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] + "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "CUSTOM_INCLUDED_EXEMPT", "CUSTOM_NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] }, "currency" : { "type" : "string" @@ -31860,6 +31864,15 @@ "currencyCode" : { "type" : "string" }, + "formattedNetPrice" : { + "type" : "string" + }, + "extReference" : { + "type" : "string" + }, + "stuck" : { + "type" : "boolean" + }, "status" : { "type" : "string", "enum" : [ "FREE", "PENDING", "TO_BE_PAID", "ACQUIRED", "CANCELLED", "CHECKED_IN", "EXPIRED", "INVALIDATED", "RELEASED", "PRE_RESERVED" ] @@ -31880,15 +31893,9 @@ "type" : "integer", "format" : "int32" }, - "firstName" : { - "type" : "string" - }, - "lastName" : { - "type" : "string" - }, - "subscriptionId" : { + "vatStatus" : { "type" : "string", - "format" : "uuid" + "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "CUSTOM_INCLUDED_EXEMPT", "CUSTOM_NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] }, "finalPriceCts" : { "type" : "integer", @@ -31902,9 +31909,15 @@ "type" : "integer", "format" : "int32" }, - "vatStatus" : { + "firstName" : { + "type" : "string" + }, + "lastName" : { + "type" : "string" + }, + "subscriptionId" : { "type" : "string", - "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] + "format" : "uuid" }, "srcPriceCts" : { "type" : "integer", @@ -31942,15 +31955,6 @@ "formattedFinalPrice" : { "type" : "string" }, - "formattedNetPrice" : { - "type" : "string" - }, - "extReference" : { - "type" : "string" - }, - "stuck" : { - "type" : "boolean" - }, "transactionTimestamp" : { "type" : "string", "format" : "date-time" @@ -32108,6 +32112,12 @@ "currencyCode" : { "type" : "string" }, + "formattedNetPrice" : { + "type" : "string" + }, + "extReference" : { + "type" : "string" + }, "status" : { "type" : "string", "enum" : [ "FREE", "PENDING", "TO_BE_PAID", "ACQUIRED", "CANCELLED", "CHECKED_IN", "EXPIRED", "INVALIDATED", "RELEASED", "PRE_RESERVED" ] @@ -32125,15 +32135,9 @@ "type" : "integer", "format" : "int32" }, - "firstName" : { - "type" : "string" - }, - "lastName" : { - "type" : "string" - }, - "subscriptionId" : { + "vatStatus" : { "type" : "string", - "format" : "uuid" + "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "CUSTOM_INCLUDED_EXEMPT", "CUSTOM_NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] }, "finalPriceCts" : { "type" : "integer", @@ -32147,9 +32151,15 @@ "type" : "integer", "format" : "int32" }, - "vatStatus" : { + "firstName" : { + "type" : "string" + }, + "lastName" : { + "type" : "string" + }, + "subscriptionId" : { "type" : "string", - "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] + "format" : "uuid" }, "srcPriceCts" : { "type" : "integer", @@ -32184,12 +32194,6 @@ "formattedFinalPrice" : { "type" : "string" }, - "formattedNetPrice" : { - "type" : "string" - }, - "extReference" : { - "type" : "string" - }, "additionalFields" : { "type" : "object", "additionalProperties" : { @@ -32721,7 +32725,7 @@ }, "eventType" : { "type" : "string", - "enum" : [ "RESERVATION_CREATE", "RESERVATION_COMPLETE", "RESERVATION_OFFLINE_PAYMENT_CONFIRMED", "CANCEL_RESERVATION_EXPIRED", "CANCEL_RESERVATION", "RESET_PAYMENT", "INIT_PAYMENT", "UPDATE_EVENT", "CANCEL_TICKET", "PAYMENT_CONFIRMED", "PAYMENT_ALREADY_CONFIRMED", "REFUND", "REFUND_ATTEMPT_FAILED", "CHECK_IN", "MANUAL_CHECK_IN", "REVERT_CHECK_IN", "BADGE_SCAN", "UPDATE_TICKET", "TAG_TICKET", "UNTAG_TICKET", "UPDATE_TICKET_CATEGORY", "UPDATE_INVOICE", "FORCED_UPDATE_INVOICE", "TERMS_CONDITION_ACCEPTED", "PRIVACY_POLICY_ACCEPTED", "EXTERNAL_INVOICE_NUMBER", "EXTERNAL_CREDIT_NOTE_NUMBER", "VAT_VALIDATION_SUCCESSFUL", "VAT_FORMAL_VALIDATION_SUCCESSFUL", "VAT_VALIDATION_SKIPPED", "GROUP_MEMBER_ACQUIRED", "CREDIT_NOTE_ISSUED", "BILLING_DATA_UPDATED", "BILLING_DOCUMENT_GENERATED", "BILLING_DOCUMENT_INVALIDATED", "BILLING_DOCUMENT_RESTORED", "FORCE_VAT_APPLICATION", "PAYMENT_FAILED", "MATCHING_PAYMENT_FOUND", "MATCHING_PAYMENT_DISCARDED", "AUTOMATIC_PAYMENT_CONFIRMATION", "AUTOMATIC_PAYMENT_CONFIRMATION_FAILED", "DYNAMIC_DISCOUNT_CODE_CREATED", "SUBSCRIPTION_ACQUIRED", "UPDATE_TICKET_METADATA", "WARNING_IGNORED" ] + "enum" : [ "RESERVATION_CREATE", "RESERVATION_COMPLETE", "RESERVATION_OFFLINE_PAYMENT_CONFIRMED", "CANCEL_RESERVATION_EXPIRED", "CANCEL_RESERVATION", "RESET_PAYMENT", "INIT_PAYMENT", "UPDATE_EVENT", "CANCEL_TICKET", "PAYMENT_CONFIRMED", "PAYMENT_ALREADY_CONFIRMED", "REFUND", "REFUND_ATTEMPT_FAILED", "CHECK_IN", "MANUAL_CHECK_IN", "REVERT_CHECK_IN", "BADGE_SCAN", "UPDATE_TICKET", "TAG_TICKET", "UNTAG_TICKET", "UPDATE_TICKET_CATEGORY", "UPDATE_INVOICE", "FORCED_UPDATE_INVOICE", "TERMS_CONDITION_ACCEPTED", "PRIVACY_POLICY_ACCEPTED", "EXTERNAL_INVOICE_NUMBER", "EXTERNAL_CREDIT_NOTE_NUMBER", "VAT_VALIDATION_SUCCESSFUL", "VAT_FORMAL_VALIDATION_SUCCESSFUL", "VAT_VALIDATION_SKIPPED", "VAT_CUSTOM_CONFIGURATION_APPLIED", "GROUP_MEMBER_ACQUIRED", "CREDIT_NOTE_ISSUED", "BILLING_DATA_UPDATED", "BILLING_DOCUMENT_GENERATED", "BILLING_DOCUMENT_INVALIDATED", "BILLING_DOCUMENT_RESTORED", "FORCE_VAT_APPLICATION", "PAYMENT_FAILED", "MATCHING_PAYMENT_FOUND", "MATCHING_PAYMENT_DISCARDED", "AUTOMATIC_PAYMENT_CONFIRMATION", "AUTOMATIC_PAYMENT_CONFIRMATION_FAILED", "DYNAMIC_DISCOUNT_CODE_CREATED", "SUBSCRIPTION_ACQUIRED", "UPDATE_TICKET_METADATA", "WARNING_IGNORED" ] }, "eventTime" : { "type" : "string", @@ -33297,9 +33301,6 @@ "expired" : { "type" : "boolean" }, - "formattedEnd" : { - "type" : "string" - }, "notSoldTickets" : { "type" : "integer", "format" : "int32" @@ -33320,6 +33321,9 @@ "type" : "integer", "format" : "int32" }, + "formattedEnd" : { + "type" : "string" + }, "warningNeeded" : { "type" : "boolean" }, @@ -33664,12 +33668,6 @@ "editable" : { "type" : "boolean" }, - "disabledValues" : { - "type" : "array", - "items" : { - "type" : "string" - } - }, "inputField" : { "type" : "boolean" }, @@ -33697,6 +33695,12 @@ "type" : "integer", "format" : "int32" } + }, + "disabledValues" : { + "type" : "array", + "items" : { + "type" : "string" + } } } }, @@ -33816,7 +33820,7 @@ }, "vatStatus" : { "type" : "string", - "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] + "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "CUSTOM_INCLUDED_EXEMPT", "CUSTOM_NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] }, "version" : { "type" : "string" From 0ea5d7b9357b69e718dd6ab0eba6146311869183 Mon Sep 17 00:00:00 2001 From: Celestino Bellone <3385346+cbellone@users.noreply.github.com> Date: Sat, 11 Feb 2023 21:41:56 +0100 Subject: [PATCH 152/218] implement reservation export (#1194) - cherry-picked from 1e9bedf25c3c626f750c5ccf3531004acaa9ee5a --- .../api/admin/EventApiController.java | 6 + .../api/admin/ExportApiController.java | 111 +++++++++++++ src/main/java/alfio/manager/EventManager.java | 4 + .../java/alfio/manager/ExportManager.java | 48 ++++++ .../alfio/model/PromoCodeUsageResult.java | 148 +----------------- .../java/alfio/model/ReservationsByEvent.java | 58 +++++++ .../alfio/model/support/EventBasicInfo.java | 44 ++++++ .../alfio/model/support/ReservationInfo.java | 103 ++++++++++++ .../java/alfio/model/support/TicketInfo.java | 61 ++++++++ .../alfio/repository/EventRepository.java | 2 + .../alfio/repository/ExportRepository.java | 65 ++++++++ src/main/java/alfio/util/ExportUtils.java | 26 ++- ...rate__016_VIEW_promocode_usage_details.sql | 3 +- .../alfio/web-templates/admin-index.ms | 1 + .../export-reservations-button.html | 5 + .../export-reservations-form.html | 43 +++++ .../export-reservations.js | 60 +++++++ .../js/admin/ng-app/admin-application.js | 1 + .../resources/js/admin/service/service.js | 3 + .../reservation/BaseReservationFlowTest.java | 22 +++ .../CustomTaxPolicyIntegrationTest.java | 49 +----- ...countedReservationFlowIntegrationTest.java | 6 +- ...idEventReservationFlowIntegrationTest.java | 6 +- ...neEventReservationFlowIntegrationTest.java | 6 +- ...nFlowAuthenticatedUserIntegrationTest.java | 6 +- .../ReservationFlowIntegrationTest.java | 6 +- ...onFlowWithSubscriptionIntegrationTest.java | 6 +- .../StripeReservationFlowIntegrationTest.java | 6 +- 28 files changed, 701 insertions(+), 204 deletions(-) create mode 100644 src/main/java/alfio/controller/api/admin/ExportApiController.java create mode 100644 src/main/java/alfio/manager/ExportManager.java create mode 100644 src/main/java/alfio/model/ReservationsByEvent.java create mode 100644 src/main/java/alfio/model/support/EventBasicInfo.java create mode 100644 src/main/java/alfio/model/support/ReservationInfo.java create mode 100644 src/main/java/alfio/model/support/TicketInfo.java create mode 100644 src/main/java/alfio/repository/ExportRepository.java create mode 100644 src/main/webapp/resources/js/admin/feature/export-reservations/export-reservations-button.html create mode 100644 src/main/webapp/resources/js/admin/feature/export-reservations/export-reservations-form.html create mode 100644 src/main/webapp/resources/js/admin/feature/export-reservations/export-reservations.js diff --git a/src/main/java/alfio/controller/api/admin/EventApiController.java b/src/main/java/alfio/controller/api/admin/EventApiController.java index a7df9e638a..03d405ebda 100644 --- a/src/main/java/alfio/controller/api/admin/EventApiController.java +++ b/src/main/java/alfio/controller/api/admin/EventApiController.java @@ -188,6 +188,12 @@ public List getAllEvents(Principal principal) { return eventStatisticsManager.getAllEventsWithStatistics(principal.getName()); } + @GetMapping("/events-count") + public ResponseEntity getEventsCount() { + return ResponseEntity.ok(eventManager.getEventsCount()); + } + + @GetMapping("/active-events") public List getAllActiveEvents(Principal principal) { return eventStatisticsManager.getAllEventsWithStatisticsFilteredBy(principal.getName(), event -> !event.expiredSince(14)); diff --git a/src/main/java/alfio/controller/api/admin/ExportApiController.java b/src/main/java/alfio/controller/api/admin/ExportApiController.java new file mode 100644 index 0000000000..1025d8b3a2 --- /dev/null +++ b/src/main/java/alfio/controller/api/admin/ExportApiController.java @@ -0,0 +1,111 @@ +/** + * This file is part of alf.io. + * + * alf.io is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * alf.io is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with alf.io. If not, see . + */ +package alfio.controller.api.admin; + +import alfio.manager.ExportManager; +import alfio.model.ReservationsByEvent; +import alfio.model.support.ReservationInfo; +import ch.digitalfondue.basicxlsx.StreamingWorkbook; +import ch.digitalfondue.basicxlsx.Style; +import org.springframework.http.HttpStatus; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.time.LocalDate; +import java.util.Comparator; +import java.util.List; +import java.util.stream.Stream; + +import static alfio.util.ExportUtils.addSheetToWorkbook; +import static alfio.util.ExportUtils.exportExcel; +import static java.util.Objects.requireNonNull; + +@RestController +@RequestMapping("/admin/api/export") +public class ExportApiController { + + private final ExportManager exportManager; + + public ExportApiController(ExportManager exportManager) { + this.exportManager = exportManager; + } + + @GetMapping("/reservations") + public void downloadAllEvents(@RequestParam(name = "from") String from, + @RequestParam(name = "to") String to, + HttpServletResponse response) throws IOException { + var allEvents = exportManager.reservationsForInterval(LocalDate.parse(requireNonNull(from)), LocalDate.parse(requireNonNull(to))); + if (allEvents.isEmpty()) { + response.setContentType("text/plain"); + response.setStatus(HttpStatus.PRECONDITION_REQUIRED.value()); + response.getWriter().write("No reservations found for the selected period"); + } else { + exportExcel("all-reservations.xlsx", response, workbook -> writeSheets(allEvents, workbook)); + } + } + + private static void writeSheets(List allEvents, StreamingWorkbook workbook) { + var header = new String[] { + "Event Name", + "Reservation ID", + "Date", + "Invoice #", + "Contact First Name", + "Contact Last Name", + "Payment Type", + "Amount", + "Currency", + "Ticket Type", + "Attendee First Name", + "Attendee Last Name", + "Status" + }; + var headerStyle = workbook.defineStyle().font().bold(true).build(); + allEvents.stream().sorted(Comparator.comparing(ReservationsByEvent::getEventShortName)) + .forEach(e -> addSheet(workbook, header, headerStyle, e)); + } + + private static void addSheet(StreamingWorkbook workbook, String[] header, Style headerStyle, ReservationsByEvent eventWithReservations) { + var rowData = eventWithReservations.getReservations().stream() + .sorted(Comparator.comparing(ReservationInfo::getConfirmationTimestamp)) + .flatMap(r -> ticketRows(eventWithReservations, r)); + addSheetToWorkbook(eventWithReservations.getEventShortName(), header, rowData, workbook, headerStyle); + } + + private static Stream ticketRows(ReservationsByEvent eventWithReservations, ReservationInfo r) { + return r.getTickets().stream() + .map(t -> new String[] { + eventWithReservations.getDisplayName(), + r.getId(), + r.getConfirmationTimestamp(), + r.getInvoiceNumber(), + r.getFirstName(), + r.getLastName(), + r.getPaymentType().name(), + r.getFormattedAmount(), + r.getCurrency(), + t.getType(), + t.getFirstName(), + t.getLastName(), + t.getStatus() + }); + } +} diff --git a/src/main/java/alfio/manager/EventManager.java b/src/main/java/alfio/manager/EventManager.java index d4a1bace2f..97a2b9b3b0 100644 --- a/src/main/java/alfio/manager/EventManager.java +++ b/src/main/java/alfio/manager/EventManager.java @@ -1240,5 +1240,9 @@ public List getLinkedSubscriptionIds(int eventId, int organizationId) { return subscriptionRepository.findLinkedSubscriptionIds(eventId, organizationId); } + public int getEventsCount() { + return eventRepository.countEvents(); + } + } diff --git a/src/main/java/alfio/manager/ExportManager.java b/src/main/java/alfio/manager/ExportManager.java new file mode 100644 index 0000000000..98f2e8401a --- /dev/null +++ b/src/main/java/alfio/manager/ExportManager.java @@ -0,0 +1,48 @@ +/** + * This file is part of alf.io. + * + * alf.io is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * alf.io is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with alf.io. If not, see . + */ +package alfio.manager; + +import alfio.model.ReservationsByEvent; +import alfio.repository.ExportRepository; +import alfio.util.ClockProvider; +import org.springframework.stereotype.Component; + +import java.time.LocalDate; +import java.util.List; + +@Component +public class ExportManager { + + private final ExportRepository exportRepository; + private final ClockProvider clockProvider; + + public ExportManager(ExportRepository exportRepository, + ClockProvider clockProvider) { + this.exportRepository = exportRepository; + this.clockProvider = clockProvider; + } + + public List reservationsForInterval(LocalDate from, LocalDate to) { + if (from.isAfter(to)) { + throw new IllegalArgumentException("Wrong interval"); + } + var zoneId = clockProvider.getClock().getZone(); + var zonedFrom = from.atStartOfDay().atZone(zoneId); + var zonedTo = to.plusDays(1).atStartOfDay().minusSeconds(1).atZone(zoneId); + return exportRepository.allReservationsForInterval(zonedFrom, zonedTo); + } +} diff --git a/src/main/java/alfio/model/PromoCodeUsageResult.java b/src/main/java/alfio/model/PromoCodeUsageResult.java index 1bcd272990..db052d5b01 100644 --- a/src/main/java/alfio/model/PromoCodeUsageResult.java +++ b/src/main/java/alfio/model/PromoCodeUsageResult.java @@ -16,12 +16,10 @@ */ package alfio.model; -import alfio.model.transaction.PaymentProxy; +import alfio.model.support.EventBasicInfo; +import alfio.model.support.ReservationInfo; import alfio.util.Json; -import alfio.util.MonetaryUtil; import ch.digitalfondue.npjt.ConstructorAnnotationRowMapper.Column; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.type.TypeReference; import java.util.Comparator; @@ -31,7 +29,7 @@ public class PromoCodeUsageResult { private final String promoCode; - private final EventInfo event; + private final EventBasicInfo event; private final List reservations; public PromoCodeUsageResult(@Column("promo_code") String promoCode, @@ -39,7 +37,7 @@ public PromoCodeUsageResult(@Column("promo_code") String promoCode, @Column("event_display_name") String eventDisplayName, @Column("reservations") String reservationsJson) { this.promoCode = promoCode; - this.event = new EventInfo(eventShortName, eventDisplayName); + this.event = new EventBasicInfo(eventShortName, eventDisplayName); List parsed = Json.fromJson(reservationsJson, new TypeReference<>() {}); this.reservations = parsed.stream() .sorted(Comparator.comparing(ReservationInfo::getConfirmationTimestamp)) @@ -50,7 +48,7 @@ public String getPromoCode() { return promoCode; } - public EventInfo getEvent() { + public EventBasicInfo getEvent() { return event; } @@ -58,140 +56,4 @@ public List getReservations() { return reservations; } - public static class ReservationInfo { - private final String id; - private final String invoiceNumber; - private final String firstName; - private final String lastName; - private final String email; - private final PaymentProxy paymentType; - private final Integer finalPriceCts; - private final String currency; - private final String confirmationTimestamp; - private final List tickets; - - @JsonCreator - ReservationInfo(@JsonProperty("id") String id, - @JsonProperty("invoiceNumber") String invoiceNumber, - @JsonProperty("firstName") String firstName, - @JsonProperty("lastName") String lastName, - @JsonProperty("email") String email, - @JsonProperty("paymentType") PaymentProxy paymentType, - @JsonProperty("finalPriceCts") Integer finalPriceCts, - @JsonProperty("currency") String currency, - @JsonProperty("confirmationTimestamp") String confirmationTimestamp, - @JsonProperty("tickets") List tickets) { - this.id = id; - this.invoiceNumber = invoiceNumber; - this.firstName = firstName; - this.lastName = lastName; - this.email = email; - this.paymentType = paymentType; - this.finalPriceCts = finalPriceCts; - this.currency = currency; - this.confirmationTimestamp = confirmationTimestamp; - this.tickets = tickets; - } - - public String getId() { - return id; - } - - public String getInvoiceNumber() { - return invoiceNumber; - } - - public String getFirstName() { - return firstName; - } - - public String getLastName() { - return lastName; - } - - public String getEmail() { - return email; - } - - public PaymentProxy getPaymentType() { - return paymentType; - } - - public String getFormattedAmount() { - if (finalPriceCts == null) { - return ""; - } - return MonetaryUtil.formatCents(finalPriceCts, currency); - } - - public String getCurrency() { - return currency; - } - - public String getConfirmationTimestamp() { - return confirmationTimestamp; - } - - public List getTickets() { - return tickets; - } - } - - public static class EventInfo { - private final String shortName; - private final String displayName; - - @JsonCreator - private EventInfo(@JsonProperty("shortName") String shortName, - @JsonProperty("displayName") String displayName) { - this.shortName = shortName; - this.displayName = displayName; - } - - public String getShortName() { - return shortName; - } - - public String getDisplayName() { - return displayName; - } - - public String getPublicIdentifier() { - return getShortName(); - } - } - - public static class TicketInfo { - private final String id; - private final String firstName; - private final String lastName; - private final String type; - - @JsonCreator - private TicketInfo(@JsonProperty("id") String id, - @JsonProperty("firstName") String firstName, - @JsonProperty("lastName") String lastName, - @JsonProperty("type") String type) { - this.id = id; - this.firstName = firstName; - this.lastName = lastName; - this.type = type; - } - - public String getId() { - return id; - } - - public String getFirstName() { - return firstName; - } - - public String getLastName() { - return lastName; - } - - public String getType() { - return type; - } - } } diff --git a/src/main/java/alfio/model/ReservationsByEvent.java b/src/main/java/alfio/model/ReservationsByEvent.java new file mode 100644 index 0000000000..30380d1e36 --- /dev/null +++ b/src/main/java/alfio/model/ReservationsByEvent.java @@ -0,0 +1,58 @@ +/** + * This file is part of alf.io. + * + * alf.io is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * alf.io is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with alf.io. If not, see . + */ +package alfio.model; + +import alfio.model.support.ReservationInfo; +import alfio.util.Json; +import ch.digitalfondue.npjt.ConstructorAnnotationRowMapper.Column; +import com.fasterxml.jackson.core.type.TypeReference; + +import java.util.List; + +public class ReservationsByEvent { + + private final int eventId; + private final String eventShortName; + private final String displayName; + private final List reservations; + + public ReservationsByEvent(@Column("event_id") int eventId, + @Column("event_short_name") String eventShortName, + @Column("event_display_name") String displayName, + @Column("reservations") String reservations) { + this.eventId = eventId; + this.eventShortName = eventShortName; + this.displayName = displayName; + this.reservations = Json.fromJson(reservations, new TypeReference<>() {}); + } + + public int getEventId() { + return eventId; + } + + public String getEventShortName() { + return eventShortName; + } + + public String getDisplayName() { + return displayName; + } + + public List getReservations() { + return reservations; + } +} diff --git a/src/main/java/alfio/model/support/EventBasicInfo.java b/src/main/java/alfio/model/support/EventBasicInfo.java new file mode 100644 index 0000000000..0d1947dc0b --- /dev/null +++ b/src/main/java/alfio/model/support/EventBasicInfo.java @@ -0,0 +1,44 @@ +/** + * This file is part of alf.io. + * + * alf.io is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * alf.io is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with alf.io. If not, see . + */ +package alfio.model.support; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; + +public class EventBasicInfo { + private final String shortName; + private final String displayName; + + @JsonCreator + public EventBasicInfo(@JsonProperty("shortName") String shortName, + @JsonProperty("displayName") String displayName) { + this.shortName = shortName; + this.displayName = displayName; + } + + public String getShortName() { + return shortName; + } + + public String getDisplayName() { + return displayName; + } + + public String getPublicIdentifier() { + return getShortName(); + } +} diff --git a/src/main/java/alfio/model/support/ReservationInfo.java b/src/main/java/alfio/model/support/ReservationInfo.java new file mode 100644 index 0000000000..742238fe4b --- /dev/null +++ b/src/main/java/alfio/model/support/ReservationInfo.java @@ -0,0 +1,103 @@ +/** + * This file is part of alf.io. + * + * alf.io is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * alf.io is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with alf.io. If not, see . + */ +package alfio.model.support; + +import alfio.model.transaction.PaymentProxy; +import alfio.util.MonetaryUtil; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; + +import java.util.List; + +public class ReservationInfo { + private final String id; + private final String invoiceNumber; + private final String firstName; + private final String lastName; + private final String email; + private final PaymentProxy paymentType; + private final Integer finalPriceCts; + private final String currency; + private final String confirmationTimestamp; + private final List tickets; + + @JsonCreator + ReservationInfo(@JsonProperty("id") String id, + @JsonProperty("invoiceNumber") String invoiceNumber, + @JsonProperty("firstName") String firstName, + @JsonProperty("lastName") String lastName, + @JsonProperty("email") String email, + @JsonProperty("paymentType") PaymentProxy paymentType, + @JsonProperty("finalPriceCts") Integer finalPriceCts, + @JsonProperty("currency") String currency, + @JsonProperty("confirmationTimestamp") String confirmationTimestamp, + @JsonProperty("tickets") List tickets) { + this.id = id; + this.invoiceNumber = invoiceNumber; + this.firstName = firstName; + this.lastName = lastName; + this.email = email; + this.paymentType = paymentType; + this.finalPriceCts = finalPriceCts; + this.currency = currency; + this.confirmationTimestamp = confirmationTimestamp; + this.tickets = tickets; + } + + public String getId() { + return id; + } + + public String getInvoiceNumber() { + return invoiceNumber; + } + + public String getFirstName() { + return firstName; + } + + public String getLastName() { + return lastName; + } + + public String getEmail() { + return email; + } + + public PaymentProxy getPaymentType() { + return paymentType; + } + + public String getFormattedAmount() { + if (finalPriceCts == null) { + return ""; + } + return MonetaryUtil.formatCents(finalPriceCts, currency); + } + + public String getCurrency() { + return currency; + } + + public String getConfirmationTimestamp() { + return confirmationTimestamp; + } + + public List getTickets() { + return tickets; + } +} diff --git a/src/main/java/alfio/model/support/TicketInfo.java b/src/main/java/alfio/model/support/TicketInfo.java new file mode 100644 index 0000000000..ecd553f106 --- /dev/null +++ b/src/main/java/alfio/model/support/TicketInfo.java @@ -0,0 +1,61 @@ +/** + * This file is part of alf.io. + * + * alf.io is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * alf.io is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with alf.io. If not, see . + */ +package alfio.model.support; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; + +public class TicketInfo { + private final String id; + private final String firstName; + private final String lastName; + private final String type; + private final String status; + + @JsonCreator + private TicketInfo(@JsonProperty("id") String id, + @JsonProperty("firstName") String firstName, + @JsonProperty("lastName") String lastName, + @JsonProperty("type") String type, + @JsonProperty("status") String status) { + this.id = id; + this.firstName = firstName; + this.lastName = lastName; + this.type = type; + this.status = status; + } + + public String getId() { + return id; + } + + public String getFirstName() { + return firstName; + } + + public String getLastName() { + return lastName; + } + + public String getType() { + return type; + } + + public String getStatus() { + return status; + } +} diff --git a/src/main/java/alfio/repository/EventRepository.java b/src/main/java/alfio/repository/EventRepository.java index ced06d8839..50cef66a80 100644 --- a/src/main/java/alfio/repository/EventRepository.java +++ b/src/main/java/alfio/repository/EventRepository.java @@ -177,6 +177,8 @@ int updatePrices(@Bind("currency") String currency, @Query("select available_seats from events_statistics where id = :eventId") Integer countExistingTickets(@Bind("eventId") int eventId); + @Query("select count(*) from event") + Integer countEvents(); @Query(value = "update event set status = 'DISABLED' where org_id in (select org_id from j_user_organization where user_id in (:userIds)) returning id", type = QueryType.MODIFYING_WITH_RETURN) List disableEventsForUsers(@Bind("userIds") Collection userIds); diff --git a/src/main/java/alfio/repository/ExportRepository.java b/src/main/java/alfio/repository/ExportRepository.java new file mode 100644 index 0000000000..8d4cbafc35 --- /dev/null +++ b/src/main/java/alfio/repository/ExportRepository.java @@ -0,0 +1,65 @@ +/** + * This file is part of alf.io. + * + * alf.io is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * alf.io is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with alf.io. If not, see . + */ +package alfio.repository; + +import alfio.model.ReservationsByEvent; +import ch.digitalfondue.npjt.Bind; +import ch.digitalfondue.npjt.Query; +import ch.digitalfondue.npjt.QueryRepository; +import ch.digitalfondue.npjt.QueryType; + +import java.time.ZonedDateTime; +import java.util.List; + +@QueryRepository +public interface ExportRepository { + @Query(type = QueryType.SELECT, value = "with tickets as (" + + " select tr_id, json_agg(jsonb_build_object(" + + " 'id', t_uuid," + + " 'firstName', t_first_name," + + " 'lastName', t_last_name," + + " 'type', tc_name," + + " 'status', t_status" + + " )) items" + + " from checkin_ticket_event_and_category_info" + + " group by 1" + + ")," + + "reservations as (" + + " select e_id," + + " jsonb_agg(jsonb_build_object(" + + " 'id', tr.tr_id," + + " 'invoiceNumber', tr.tr_invoice_number," + + " 'firstName', tr.tr_first_name," + + " 'lastName', tr.tr_last_name," + + " 'email', tr.tr_email_address," + + " 'paymentType', tr.tr_payment_method," + + " 'finalPriceCts', tr.tr_final_price_cts," + + " 'currency', tr.tr_currency_code," + + " 'confirmationTimestamp', to_char(tr.tr_confirmation_ts at time zone 'UTC', 'YYYY-MM-DD') || 'T' || to_char(tr.tr_confirmation_ts at time zone 'UTC', 'HH24:MI:SS.MSZ')," + + " 'tickets', t.items" + + " )) as agg" + + " from checkin_ticket_event_and_category_info tr" + + " join tickets t on tr.tr_id = t.tr_id" + + " where tr_status in ('OFFLINE_PAYMENT', 'DEFERRED_OFFLINE_PAYMENT', 'COMPLETE', 'CANCELLED')" + + " group by 1" + + " )" + + " select distinct c.e_id as event_id, c.e_short_name event_short_name, c.e_display_name event_display_name, r.agg reservations" + + " from checkin_ticket_event_and_category_info c join reservations r on r.e_id = c.e_id" + + " where tr_confirmation_ts between :startTs and :endTs" + + " order by 1") + List allReservationsForInterval(@Bind("startTs") ZonedDateTime from, @Bind("endTs") ZonedDateTime to); +} diff --git a/src/main/java/alfio/util/ExportUtils.java b/src/main/java/alfio/util/ExportUtils.java index 457c4fc520..2cbd66ffb5 100644 --- a/src/main/java/alfio/util/ExportUtils.java +++ b/src/main/java/alfio/util/ExportUtils.java @@ -18,6 +18,7 @@ import ch.digitalfondue.basicxlsx.Cell; import ch.digitalfondue.basicxlsx.StreamingWorkbook; +import ch.digitalfondue.basicxlsx.Style; import com.opencsv.CSVWriter; import javax.servlet.ServletOutputStream; @@ -25,6 +26,7 @@ import java.io.IOException; import java.io.OutputStreamWriter; import java.util.Arrays; +import java.util.function.Consumer; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -34,16 +36,31 @@ public class ExportUtils { private static final int[] BOM_MARKERS = new int[] {0xEF, 0xBB, 0xBF}; + private ExportUtils() {} + public static void exportExcel(String fileName, String sheetName, String[] header, Stream data, HttpServletResponse response) throws IOException { + exportExcel(fileName, response, workbook -> addSheetToWorkbook(sheetName, header, data, workbook, workbook.defineStyle().font().bold(true).build())); + } + + public static void exportExcel(String fileName, + HttpServletResponse response, + Consumer workbookConsumer) throws IOException { response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); response.setHeader("Content-Disposition", "attachment; filename=" + fileName); - try (ServletOutputStream out = response.getOutputStream(); StreamingWorkbook workbook = new StreamingWorkbook(out)) { - var boldFont = workbook.defineStyle().font().bold(true).build(); + workbookConsumer.accept(workbook); + } + } + public static void addSheetToWorkbook(String sheetName, + String[] header, + Stream data, + StreamingWorkbook workbook, + Style headerStyle) { + try { var headerRow = StreamingWorkbook.row(Arrays.stream(header) - .map(v -> Cell.cell(v).withStyle(boldFont)) + .map(v -> Cell.cell(v).withStyle(headerStyle)) .collect(Collectors.toList())); var dataStream = data @@ -51,6 +68,9 @@ public static void exportExcel(String fileName, String sheetName, String[] heade .map(StreamingWorkbook::row); workbook.withSheet(sheetName, Stream.concat(Stream.of(headerRow), dataStream)); + + } catch (IOException e) { + throw new IllegalStateException(e); } } diff --git a/src/main/resources/alfio/db/PGSQL/afterMigrate__016_VIEW_promocode_usage_details.sql b/src/main/resources/alfio/db/PGSQL/afterMigrate__016_VIEW_promocode_usage_details.sql index 5ca84a9b90..7efa613da2 100644 --- a/src/main/resources/alfio/db/PGSQL/afterMigrate__016_VIEW_promocode_usage_details.sql +++ b/src/main/resources/alfio/db/PGSQL/afterMigrate__016_VIEW_promocode_usage_details.sql @@ -21,7 +21,8 @@ with tickets as ( 'id', t.uuid, 'firstName', t.first_name, 'lastName', t.last_name, - 'type', tc.name + 'type', tc.name, + 'status', t.status )) items from ticket t join ticket_category tc on t.category_id = tc.id diff --git a/src/main/resources/alfio/web-templates/admin-index.ms b/src/main/resources/alfio/web-templates/admin-index.ms index 507d1b1043..717f1272ad 100644 --- a/src/main/resources/alfio/web-templates/admin-index.ms +++ b/src/main/resources/alfio/web-templates/admin-index.ms @@ -105,6 +105,7 @@ + diff --git a/src/main/webapp/resources/js/admin/feature/export-reservations/export-reservations-button.html b/src/main/webapp/resources/js/admin/feature/export-reservations/export-reservations-button.html new file mode 100644 index 0000000000..edcd153d23 --- /dev/null +++ b/src/main/webapp/resources/js/admin/feature/export-reservations/export-reservations-button.html @@ -0,0 +1,5 @@ +
+
+ +
+
\ No newline at end of file diff --git a/src/main/webapp/resources/js/admin/feature/export-reservations/export-reservations-form.html b/src/main/webapp/resources/js/admin/feature/export-reservations/export-reservations-form.html new file mode 100644 index 0000000000..53cf286bc3 --- /dev/null +++ b/src/main/webapp/resources/js/admin/feature/export-reservations/export-reservations-form.html @@ -0,0 +1,43 @@ +
+
+

Export Reservations

+
+
+ +
+
+ Reservations can be exported for a given period of time.
+ The export will produce an "Excel" file with one sheet per Event +
+
+
+

Reservation date

+
+
+
+ + +
+
+
+
+ + +
+
+
+
+
+
+
+ +
+
+ Download +
+
+
+
diff --git a/src/main/webapp/resources/js/admin/feature/export-reservations/export-reservations.js b/src/main/webapp/resources/js/admin/feature/export-reservations/export-reservations.js new file mode 100644 index 0000000000..74273d3ced --- /dev/null +++ b/src/main/webapp/resources/js/admin/feature/export-reservations/export-reservations.js @@ -0,0 +1,60 @@ +(function() { + +'use strict'; + + +angular.module('adminApplication').component('exportReservationsButton', { + templateUrl: window.ALFIO_CONTEXT_PATH + '/resources/js/admin/feature/export-reservations/export-reservations-button.html', + controller: exportReservationsButton +}); + + +function exportReservationsButton(EventService, $uibModal) { + var ctrl = this; + + ctrl.$onInit = function() { + EventService.getEventsCount().then(function(response) { + ctrl.eventsCount = response.data; + }); + } + + ctrl.openModal = function() { + $uibModal.open({ + size: 'lg', + templateUrl: window.ALFIO_CONTEXT_PATH + '/resources/js/admin/feature/export-reservations/export-reservations-form.html', + backdrop: 'static', + controllerAs: '$ctrl', + bindToController: true, + controller: function($scope) { + var modalCtrl = this; + modalCtrl.maxDate = moment().endOf('day'); + modalCtrl.searchFrom = null; + modalCtrl.searchTo = null; + modalCtrl.ready = false; + modalCtrl.formattedSearchFrom = null; + modalCtrl.formattedSearchTo = null; + + modalCtrl.close = function() { + $scope.$dismiss(); + } + + $scope.$watch('$ctrl.searchFrom', function(newValue) { + if(newValue) { + modalCtrl.ready = moment(modalCtrl.searchTo).isAfter(moment(newValue)); + modalCtrl.formattedSearchFrom = moment(newValue).format('YYYY-MM-DD'); + } + }); + $scope.$watch('$ctrl.searchTo', function(newValue) { + if(newValue) { + modalCtrl.ready = moment(newValue).isAfter(moment(modalCtrl.searchFrom)); + modalCtrl.formattedSearchTo = moment(newValue).format('YYYY-MM-DD'); + } + }); + } + }); + } +} + +exportReservationsButton.$inject = ['EventService', '$uibModal']; + +})(); \ No newline at end of file diff --git a/src/main/webapp/resources/js/admin/ng-app/admin-application.js b/src/main/webapp/resources/js/admin/ng-app/admin-application.js index c6192bf505..ce7c2c1c8e 100644 --- a/src/main/webapp/resources/js/admin/ng-app/admin-application.js +++ b/src/main/webapp/resources/js/admin/ng-app/admin-application.js @@ -29,6 +29,7 @@ template: ['
', '

Events

', '
', + '', '', '', '
'].join('') diff --git a/src/main/webapp/resources/js/admin/service/service.js b/src/main/webapp/resources/js/admin/service/service.js index bdc2195248..e2db07f6e2 100644 --- a/src/main/webapp/resources/js/admin/service/service.js +++ b/src/main/webapp/resources/js/admin/service/service.js @@ -56,6 +56,9 @@ var service = { data: {}, + getEventsCount: function () { + return $http.get('/admin/api/events-count').error(HttpErrorHandler.handle); + }, getAllEvents : function() { return $http.get('/admin/api/events').error(HttpErrorHandler.handle); }, diff --git a/src/test/java/alfio/controller/api/v2/user/reservation/BaseReservationFlowTest.java b/src/test/java/alfio/controller/api/v2/user/reservation/BaseReservationFlowTest.java index ae101a4ddd..10734ffb10 100644 --- a/src/test/java/alfio/controller/api/v2/user/reservation/BaseReservationFlowTest.java +++ b/src/test/java/alfio/controller/api/v2/user/reservation/BaseReservationFlowTest.java @@ -67,6 +67,7 @@ import com.opencsv.CSVReader; import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.io.IOUtils; +import org.junit.jupiter.api.Assertions; import org.mockito.Mockito; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -89,6 +90,7 @@ import java.math.BigDecimal; import java.nio.charset.StandardCharsets; import java.security.Principal; +import java.time.LocalDate; import java.time.LocalDateTime; import java.time.ZonedDateTime; import java.util.*; @@ -141,6 +143,7 @@ public abstract class BaseReservationFlowTest extends BaseIntegrationTest { protected final OrganizationDeleter organizationDeleter; protected final PromoCodeDiscountRepository promoCodeDiscountRepository; protected final PromoCodeRequestManager promoCodeRequestManager; + protected final ExportManager exportManager; private Integer additionalServiceId; @@ -289,6 +292,7 @@ protected void testBasicFlow(Supplier contextSupplier) t var context = contextSupplier.get(); ensureConfiguration(context); + Assertions.assertEquals(1, eventManager.getEventsCount()); // check if EVENT_CREATED was logged List extLogs = extensionLogRepository.getPage(null, null, null, 100, 0); @@ -1107,6 +1111,7 @@ protected void testBasicFlow(Supplier contextSupplier) t context.userId )); + checkReservationExport(); //test revert check in assertTrue(checkInApiController.revertCheckIn(context.event.getId(), ticketIdentifier, principal)); @@ -1261,6 +1266,23 @@ protected void testBasicFlow(Supplier contextSupplier) t } + private void checkReservationExport() { + // load all reservations + var now = LocalDate.now(clockProvider.getClock()); + var reservationsByEvent = exportManager.reservationsForInterval(now.minusDays(1), now); + assertEquals(1, reservationsByEvent.size()); + assertEquals(1, reservationsByEvent.get(0).getReservations().size()); + assertEquals(1, reservationsByEvent.get(0).getReservations().get(0).getTickets().size()); + + // ensure that the filtering works as expected + reservationsByEvent = exportManager.reservationsForInterval(now.plusDays(1), now.plusDays(2)); + assertEquals(0, reservationsByEvent.size()); + + // ensure that we get error if the interval is wrong + var wrongFrom = now.plusDays(1); + assertThrows(IllegalArgumentException.class, () -> exportManager.reservationsForInterval(wrongFrom, now)); + } + static void insertExtension(ExtensionService extensionService, String path) throws IOException { insertExtension(extensionService, path, true, true); } diff --git a/src/test/java/alfio/controller/api/v2/user/reservation/CustomTaxPolicyIntegrationTest.java b/src/test/java/alfio/controller/api/v2/user/reservation/CustomTaxPolicyIntegrationTest.java index eead9b8f04..4acbc6e6d3 100644 --- a/src/test/java/alfio/controller/api/v2/user/reservation/CustomTaxPolicyIntegrationTest.java +++ b/src/test/java/alfio/controller/api/v2/user/reservation/CustomTaxPolicyIntegrationTest.java @@ -19,22 +19,13 @@ import alfio.TestConfiguration; import alfio.config.DataSourceConfiguration; import alfio.config.Initializer; -import alfio.controller.IndexController; import alfio.controller.api.ControllerConfiguration; -import alfio.controller.api.admin.AdditionalServiceApiController; -import alfio.controller.api.admin.CheckInApiController; -import alfio.controller.api.admin.EventApiController; -import alfio.controller.api.admin.UsersApiController; -import alfio.controller.api.v1.AttendeeApiController; -import alfio.controller.api.v2.InfoApiController; -import alfio.controller.api.v2.TranslationsApiController; -import alfio.controller.api.v2.user.EventApiV2Controller; import alfio.controller.api.v2.user.ReservationApiV2Controller; -import alfio.controller.api.v2.user.TicketApiV2Controller; import alfio.controller.form.ContactAndTicketsForm; import alfio.controller.form.UpdateTicketOwnerForm; import alfio.extension.ExtensionService; -import alfio.manager.*; +import alfio.manager.EventManager; +import alfio.manager.TicketReservationManager; import alfio.manager.user.UserManager; import alfio.model.Event; import alfio.model.PriceContainer; @@ -44,11 +35,11 @@ import alfio.model.modification.TicketCategoryModification; import alfio.model.modification.TicketReservationModification; import alfio.model.modification.TicketReservationWithOptionalCodeModification; -import alfio.repository.*; -import alfio.repository.audit.ScanAuditRepository; +import alfio.repository.EventRepository; +import alfio.repository.TicketCategoryRepository; +import alfio.repository.TicketRepository; import alfio.repository.system.ConfigurationRepository; import alfio.repository.user.OrganizationRepository; -import alfio.repository.user.UserRepository; import alfio.test.util.IntegrationTestUtil; import alfio.util.ClockProvider; import org.apache.commons.lang3.time.DateUtils; @@ -56,7 +47,6 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.ContextConfiguration; import org.springframework.transaction.annotation.Transactional; @@ -98,38 +88,11 @@ public CustomTaxPolicyIntegrationTest(OrganizationRepository organizationReposit UserManager userManager, ClockProvider clockProvider, ConfigurationRepository configurationRepository, - EventStatisticsManager eventStatisticsManager, TicketCategoryRepository ticketCategoryRepository, - TicketReservationRepository ticketReservationRepository, - EventApiController eventApiController, TicketRepository ticketRepository, - TicketFieldRepository ticketFieldRepository, - AdditionalServiceApiController additionalServiceApiController, - SpecialPriceTokenGenerator specialPriceTokenGenerator, - SpecialPriceRepository specialPriceRepository, - CheckInApiController checkInApiController, - AttendeeApiController attendeeApiController, - UsersApiController usersApiController, - ScanAuditRepository scanAuditRepository, - AuditingRepository auditingRepository, - AdminReservationManager adminReservationManager, TicketReservationManager ticketReservationManager, - InfoApiController infoApiController, - TranslationsApiController translationsApiController, - EventApiV2Controller eventApiV2Controller, ReservationApiV2Controller reservationApiV2Controller, - TicketApiV2Controller ticketApiV2Controller, - IndexController indexController, - NamedParameterJdbcTemplate jdbcTemplate, - ExtensionLogRepository extensionLogRepository, - ExtensionService extensionService, - PollRepository pollRepository, - NotificationManager notificationManager, - UserRepository userRepository, - OrganizationDeleter organizationDeleter, - PromoCodeDiscountRepository promoCodeDiscountRepository, - PromoCodeRequestManager promoCodeRequestManager, - CheckInManager checkInManager) { + ExtensionService extensionService) { this.organizationRepository = organizationRepository; this.userManager = userManager; this.extensionService = extensionService; diff --git a/src/test/java/alfio/controller/api/v2/user/reservation/DiscountedReservationFlowIntegrationTest.java b/src/test/java/alfio/controller/api/v2/user/reservation/DiscountedReservationFlowIntegrationTest.java index 4144823cd3..18b05ec108 100644 --- a/src/test/java/alfio/controller/api/v2/user/reservation/DiscountedReservationFlowIntegrationTest.java +++ b/src/test/java/alfio/controller/api/v2/user/reservation/DiscountedReservationFlowIntegrationTest.java @@ -114,7 +114,8 @@ public DiscountedReservationFlowIntegrationTest(ConfigurationRepository configur PromoCodeDiscountRepository promoCodeDiscountRepository, PromoCodeRequestManager promoCodeRequestManager, OrganizationRepository organizationRepository, - UserManager userManager) { + UserManager userManager, + ExportManager exportManager) { super(configurationRepository, eventManager, eventRepository, @@ -149,7 +150,8 @@ public DiscountedReservationFlowIntegrationTest(ConfigurationRepository configur userRepository, organizationDeleter, promoCodeDiscountRepository, - promoCodeRequestManager); + promoCodeRequestManager, + exportManager); this.organizationRepository = organizationRepository; this.userManager = userManager; } diff --git a/src/test/java/alfio/controller/api/v2/user/reservation/HybridEventReservationFlowIntegrationTest.java b/src/test/java/alfio/controller/api/v2/user/reservation/HybridEventReservationFlowIntegrationTest.java index 3301130933..6ade090930 100644 --- a/src/test/java/alfio/controller/api/v2/user/reservation/HybridEventReservationFlowIntegrationTest.java +++ b/src/test/java/alfio/controller/api/v2/user/reservation/HybridEventReservationFlowIntegrationTest.java @@ -109,7 +109,8 @@ public HybridEventReservationFlowIntegrationTest(OrganizationRepository organiza UserRepository userRepository, OrganizationDeleter organizationDeleter, PromoCodeDiscountRepository promoCodeDiscountRepository, - PromoCodeRequestManager promoCodeRequestManager) { + PromoCodeRequestManager promoCodeRequestManager, + ExportManager exportManager) { super(configurationRepository, eventManager, eventRepository, @@ -144,7 +145,8 @@ public HybridEventReservationFlowIntegrationTest(OrganizationRepository organiza userRepository, organizationDeleter, promoCodeDiscountRepository, - promoCodeRequestManager); + promoCodeRequestManager, + exportManager); this.organizationRepository = organizationRepository; this.userManager = userManager; } diff --git a/src/test/java/alfio/controller/api/v2/user/reservation/OnlineEventReservationFlowIntegrationTest.java b/src/test/java/alfio/controller/api/v2/user/reservation/OnlineEventReservationFlowIntegrationTest.java index 8be5dd3ee7..1b14147ed5 100644 --- a/src/test/java/alfio/controller/api/v2/user/reservation/OnlineEventReservationFlowIntegrationTest.java +++ b/src/test/java/alfio/controller/api/v2/user/reservation/OnlineEventReservationFlowIntegrationTest.java @@ -109,7 +109,8 @@ public OnlineEventReservationFlowIntegrationTest(OrganizationRepository organiza UserRepository userRepository, OrganizationDeleter organizationDeleter, PromoCodeDiscountRepository promoCodeDiscountRepository, - PromoCodeRequestManager promoCodeRequestManager) { + PromoCodeRequestManager promoCodeRequestManager, + ExportManager exportManager) { super(configurationRepository, eventManager, eventRepository, @@ -144,7 +145,8 @@ public OnlineEventReservationFlowIntegrationTest(OrganizationRepository organiza userRepository, organizationDeleter, promoCodeDiscountRepository, - promoCodeRequestManager); + promoCodeRequestManager, + exportManager); this.organizationRepository = organizationRepository; this.userManager = userManager; } diff --git a/src/test/java/alfio/controller/api/v2/user/reservation/ReservationFlowAuthenticatedUserIntegrationTest.java b/src/test/java/alfio/controller/api/v2/user/reservation/ReservationFlowAuthenticatedUserIntegrationTest.java index 02f49ace81..d2e62c8409 100644 --- a/src/test/java/alfio/controller/api/v2/user/reservation/ReservationFlowAuthenticatedUserIntegrationTest.java +++ b/src/test/java/alfio/controller/api/v2/user/reservation/ReservationFlowAuthenticatedUserIntegrationTest.java @@ -120,7 +120,8 @@ public ReservationFlowAuthenticatedUserIntegrationTest(OrganizationRepository or UserApiV2Controller publicUserApiController, OrganizationDeleter organizationDeleter, PromoCodeDiscountRepository promoCodeDiscountRepository, - PromoCodeRequestManager promoCodeRequestManager) { + PromoCodeRequestManager promoCodeRequestManager, + ExportManager exportManager) { super(configurationRepository, eventManager, eventRepository, @@ -155,7 +156,8 @@ public ReservationFlowAuthenticatedUserIntegrationTest(OrganizationRepository or userRepository, organizationDeleter, promoCodeDiscountRepository, - promoCodeRequestManager); + promoCodeRequestManager, + exportManager); this.organizationRepository = organizationRepository; this.userManager = userManager; this.publicUserApiController = publicUserApiController; diff --git a/src/test/java/alfio/controller/api/v2/user/reservation/ReservationFlowIntegrationTest.java b/src/test/java/alfio/controller/api/v2/user/reservation/ReservationFlowIntegrationTest.java index 9b82d6f473..d6e6a2c9a0 100644 --- a/src/test/java/alfio/controller/api/v2/user/reservation/ReservationFlowIntegrationTest.java +++ b/src/test/java/alfio/controller/api/v2/user/reservation/ReservationFlowIntegrationTest.java @@ -113,7 +113,8 @@ public ReservationFlowIntegrationTest(OrganizationRepository organizationReposit OrganizationDeleter organizationDeleter, PromoCodeDiscountRepository promoCodeDiscountRepository, PromoCodeRequestManager promoCodeRequestManager, - CheckInManager checkInManager) { + CheckInManager checkInManager, + ExportManager exportManager) { super(configurationRepository, eventManager, eventRepository, @@ -148,7 +149,8 @@ public ReservationFlowIntegrationTest(OrganizationRepository organizationReposit userRepository, organizationDeleter, promoCodeDiscountRepository, - promoCodeRequestManager); + promoCodeRequestManager, + exportManager); this.organizationRepository = organizationRepository; this.userManager = userManager; this.checkInManager = checkInManager; diff --git a/src/test/java/alfio/controller/api/v2/user/reservation/ReservationFlowWithSubscriptionIntegrationTest.java b/src/test/java/alfio/controller/api/v2/user/reservation/ReservationFlowWithSubscriptionIntegrationTest.java index be683210e6..9402f2aaba 100644 --- a/src/test/java/alfio/controller/api/v2/user/reservation/ReservationFlowWithSubscriptionIntegrationTest.java +++ b/src/test/java/alfio/controller/api/v2/user/reservation/ReservationFlowWithSubscriptionIntegrationTest.java @@ -137,7 +137,8 @@ public ReservationFlowWithSubscriptionIntegrationTest(OrganizationRepository org PlatformTransactionManager platformTransactionManager, OrganizationDeleter organizationDeleter, PromoCodeDiscountRepository promoCodeDiscountRepository, - PromoCodeRequestManager promoCodeRequestManager) { + PromoCodeRequestManager promoCodeRequestManager, + ExportManager exportManager) { super(configurationRepository, eventManager, eventRepository, @@ -172,7 +173,8 @@ public ReservationFlowWithSubscriptionIntegrationTest(OrganizationRepository org userRepository, organizationDeleter, promoCodeDiscountRepository, - promoCodeRequestManager); + promoCodeRequestManager, + exportManager); this.organizationRepository = organizationRepository; this.userManager = userManager; this.subscriptionManager = subscriptionManager; diff --git a/src/test/java/alfio/controller/api/v2/user/reservation/StripeReservationFlowIntegrationTest.java b/src/test/java/alfio/controller/api/v2/user/reservation/StripeReservationFlowIntegrationTest.java index 81e5d2736c..e335de19d6 100644 --- a/src/test/java/alfio/controller/api/v2/user/reservation/StripeReservationFlowIntegrationTest.java +++ b/src/test/java/alfio/controller/api/v2/user/reservation/StripeReservationFlowIntegrationTest.java @@ -135,7 +135,8 @@ public StripeReservationFlowIntegrationTest(OrganizationRepository organizationR OrganizationDeleter organizationDeleter, PromoCodeDiscountRepository promoCodeDiscountRepository, PromoCodeRequestManager promoCodeRequestManager, - StripePaymentWebhookController stripePaymentWebhookController) { + StripePaymentWebhookController stripePaymentWebhookController, + ExportManager exportManager) { super(configurationRepository, eventManager, eventRepository, @@ -170,7 +171,8 @@ public StripeReservationFlowIntegrationTest(OrganizationRepository organizationR userRepository, organizationDeleter, promoCodeDiscountRepository, - promoCodeRequestManager); + promoCodeRequestManager, + exportManager); this.organizationRepository = organizationRepository; this.userManager = userManager; this.stripePaymentWebhookController = stripePaymentWebhookController; From 9dcc5f4d5f818104e0d0eb20764fd34d27c723e8 Mon Sep 17 00:00:00 2001 From: Celestino Bellone <3385346+cbellone@users.noreply.github.com> Date: Sun, 12 Feb 2023 16:45:18 +0100 Subject: [PATCH 153/218] fix errors after cherry-pick --- .../reservation/BaseReservationFlowTest.java | 4 +- src/test/resources/api/descriptor.json | 469 +++++++++++------- 2 files changed, 300 insertions(+), 173 deletions(-) diff --git a/src/test/java/alfio/controller/api/v2/user/reservation/BaseReservationFlowTest.java b/src/test/java/alfio/controller/api/v2/user/reservation/BaseReservationFlowTest.java index 10734ffb10..0bdaeccb66 100644 --- a/src/test/java/alfio/controller/api/v2/user/reservation/BaseReservationFlowTest.java +++ b/src/test/java/alfio/controller/api/v2/user/reservation/BaseReservationFlowTest.java @@ -186,7 +186,8 @@ protected BaseReservationFlowTest(ConfigurationRepository configurationRepositor UserRepository userRepository, OrganizationDeleter organizationDeleter, PromoCodeDiscountRepository promoCodeDiscountRepository, - PromoCodeRequestManager promoCodeRequestManager) { + PromoCodeRequestManager promoCodeRequestManager, + ExportManager exportManager) { this.configurationRepository = configurationRepository; this.eventManager = eventManager; this.eventRepository = eventRepository; @@ -222,6 +223,7 @@ protected BaseReservationFlowTest(ConfigurationRepository configurationRepositor this.organizationDeleter = organizationDeleter; this.promoCodeDiscountRepository = promoCodeDiscountRepository; this.promoCodeRequestManager = promoCodeRequestManager; + this.exportManager = exportManager; } private void ensureConfiguration(ReservationFlowContext context) { diff --git a/src/test/resources/api/descriptor.json b/src/test/resources/api/descriptor.json index c0b32be673..62bac4d822 100644 --- a/src/test/resources/api/descriptor.json +++ b/src/test/resources/api/descriptor.json @@ -20003,6 +20003,72 @@ } } }, + "/admin/api/export/reservations" : { + "get" : { + "tags" : [ "export-api-controller" ], + "operationId" : "downloadAllEvents", + "parameters" : [ { + "name" : "from", + "in" : "query", + "required" : true, + "schema" : { + "type" : "string" + } + }, { + "name" : "to", + "in" : "query", + "required" : true, + "schema" : { + "type" : "string" + } + } ], + "responses" : { + "500" : { + "description" : "Internal Server Error", + "content" : { + "*/*" : { + "schema" : { + "type" : "string" + } + } + } + }, + "400" : { + "description" : "Bad Request", + "content" : { + "*/*" : { + "schema" : { + "type" : "string" + } + } + } + }, + "405" : { + "description" : "Method Not Allowed", + "content" : { + "*/*" : { + "schema" : { + "type" : "string" + } + } + } + }, + "401" : { + "description" : "Unauthorized", + "content" : { + "*/*" : { + "schema" : { + "type" : "string" + } + } + } + }, + "200" : { + "description" : "OK" + } + } + } + }, "/admin/api/expired-events" : { "get" : { "tags" : [ "event-api-controller" ], @@ -21606,6 +21672,65 @@ } } }, + "/admin/api/events-count" : { + "get" : { + "tags" : [ "event-api-controller" ], + "operationId" : "getEventsCount", + "responses" : { + "500" : { + "description" : "Internal Server Error", + "content" : { + "*/*" : { + "schema" : { + "type" : "string" + } + } + } + }, + "400" : { + "description" : "Bad Request", + "content" : { + "*/*" : { + "schema" : { + "type" : "string" + } + } + } + }, + "405" : { + "description" : "Method Not Allowed", + "content" : { + "*/*" : { + "schema" : { + "type" : "string" + } + } + } + }, + "401" : { + "description" : "Unauthorized", + "content" : { + "*/*" : { + "schema" : { + "type" : "string" + } + } + } + }, + "200" : { + "description" : "OK", + "content" : { + "*/*" : { + "schema" : { + "type" : "integer", + "format" : "int32" + } + } + } + } + } + } + }, "/admin/api/events-all-languages" : { "get" : { "tags" : [ "event-api-controller" ], @@ -25869,23 +25994,10 @@ "refundedAmount" : { "type" : "string" }, - "notYetPaid" : { - "type" : "boolean" - }, - "vatExempt" : { - "type" : "boolean" - }, - "priceInCents" : { - "type" : "integer", - "format" : "int32" - }, "ticketAmount" : { "type" : "integer", "format" : "int32" }, - "singleTicketOrder" : { - "type" : "boolean" - }, "displayVat" : { "type" : "boolean" }, @@ -25900,6 +26012,19 @@ }, "priceBeforeTaxes" : { "type" : "string" + }, + "singleTicketOrder" : { + "type" : "boolean" + }, + "notYetPaid" : { + "type" : "boolean" + }, + "vatExempt" : { + "type" : "boolean" + }, + "priceInCents" : { + "type" : "integer", + "format" : "int32" } } }, @@ -26093,13 +26218,13 @@ "valid" : { "type" : "boolean" }, - "formattedValidityFrom" : { + "formattedValidityTo" : { "type" : "string" }, - "pin" : { + "formattedValidityFrom" : { "type" : "string" }, - "formattedValidityTo" : { + "pin" : { "type" : "string" } } @@ -26589,6 +26714,10 @@ "currencyCode" : { "type" : "string" }, + "status" : { + "type" : "string", + "enum" : [ "PENDING", "IN_PAYMENT", "EXTERNAL_PROCESSING_PAYMENT", "WAITING_EXTERNAL_CONFIRMATION", "OFFLINE_PAYMENT", "DEFERRED_OFFLINE_PAYMENT", "COMPLETE", "STUCK", "CANCELLED", "CREDIT_NOTE_ISSUED" ] + }, "stuck" : { "type" : "boolean" }, @@ -26615,14 +26744,22 @@ "type" : "string", "format" : "date-time" }, - "status" : { - "type" : "string", - "enum" : [ "PENDING", "IN_PAYMENT", "EXTERNAL_PROCESSING_PAYMENT", "WAITING_EXTERNAL_CONFIRMATION", "OFFLINE_PAYMENT", "DEFERRED_OFFLINE_PAYMENT", "COMPLETE", "STUCK", "CANCELLED", "CREDIT_NOTE_ISSUED" ] - }, "promoCodeDiscountId" : { "type" : "integer", "format" : "int32" }, + "firstName" : { + "type" : "string" + }, + "lastName" : { + "type" : "string" + }, + "hasInvoiceNumber" : { + "type" : "boolean" + }, + "invoiceNumber" : { + "type" : "string" + }, "paymentMethod" : { "type" : "string", "enum" : [ "STRIPE", "ON_SITE", "OFFLINE", "NONE", "ADMIN", "PAYPAL", "MOLLIE", "SAFERPAY" ] @@ -26631,11 +26768,18 @@ "type" : "string", "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "CUSTOM_INCLUDED_EXEMPT", "CUSTOM_NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] }, - "hasInvoiceNumber" : { - "type" : "boolean" + "srcPriceCts" : { + "type" : "integer", + "format" : "int32" }, - "invoiceNumber" : { - "type" : "string" + "finalPrice" : { + "type" : "number" + }, + "vat" : { + "type" : "number" + }, + "appliedDiscount" : { + "type" : "number" }, "finalPriceCts" : { "type" : "integer", @@ -26658,25 +26802,6 @@ "invoiceRequested" : { "type" : "boolean" }, - "firstName" : { - "type" : "string" - }, - "lastName" : { - "type" : "string" - }, - "srcPriceCts" : { - "type" : "integer", - "format" : "int32" - }, - "finalPrice" : { - "type" : "number" - }, - "vat" : { - "type" : "number" - }, - "appliedDiscount" : { - "type" : "number" - }, "pendingOfflinePayment" : { "type" : "boolean" }, @@ -28464,16 +28589,16 @@ "currencyCode" : { "type" : "string" }, + "status" : { + "type" : "string", + "enum" : [ "FREE", "PENDING", "TO_BE_PAID", "ACQUIRED", "CANCELLED", "CHECKED_IN", "EXPIRED", "INVALIDATED", "RELEASED", "PRE_RESERVED" ] + }, "formattedNetPrice" : { "type" : "string" }, "extReference" : { "type" : "string" }, - "status" : { - "type" : "string", - "enum" : [ "FREE", "PENDING", "TO_BE_PAID", "ACQUIRED", "CANCELLED", "CHECKED_IN", "EXPIRED", "INVALIDATED", "RELEASED", "PRE_RESERVED" ] - }, "tags" : { "type" : "array", "items" : { @@ -28487,33 +28612,33 @@ "type" : "integer", "format" : "int32" }, + "firstName" : { + "type" : "string" + }, + "lastName" : { + "type" : "string" + }, + "subscriptionId" : { + "type" : "string", + "format" : "uuid" + }, "vatStatus" : { "type" : "string", "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "CUSTOM_INCLUDED_EXEMPT", "CUSTOM_NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] }, - "finalPriceCts" : { + "srcPriceCts" : { "type" : "integer", "format" : "int32" }, - "vatCts" : { + "finalPriceCts" : { "type" : "integer", "format" : "int32" }, - "discountCts" : { + "vatCts" : { "type" : "integer", "format" : "int32" }, - "firstName" : { - "type" : "string" - }, - "lastName" : { - "type" : "string" - }, - "subscriptionId" : { - "type" : "string", - "format" : "uuid" - }, - "srcPriceCts" : { + "discountCts" : { "type" : "integer", "format" : "int32" }, @@ -29787,16 +29912,16 @@ "currencyCode" : { "type" : "string" }, + "status" : { + "type" : "string", + "enum" : [ "FREE", "PENDING", "TO_BE_PAID", "ACQUIRED", "CANCELLED", "CHECKED_IN", "EXPIRED", "INVALIDATED", "RELEASED", "PRE_RESERVED" ] + }, "formattedNetPrice" : { "type" : "string" }, "extReference" : { "type" : "string" }, - "status" : { - "type" : "string", - "enum" : [ "FREE", "PENDING", "TO_BE_PAID", "ACQUIRED", "CANCELLED", "CHECKED_IN", "EXPIRED", "INVALIDATED", "RELEASED", "PRE_RESERVED" ] - }, "tags" : { "type" : "array", "items" : { @@ -29810,33 +29935,33 @@ "type" : "integer", "format" : "int32" }, + "firstName" : { + "type" : "string" + }, + "lastName" : { + "type" : "string" + }, + "subscriptionId" : { + "type" : "string", + "format" : "uuid" + }, "vatStatus" : { "type" : "string", "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "CUSTOM_INCLUDED_EXEMPT", "CUSTOM_NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] }, - "finalPriceCts" : { + "srcPriceCts" : { "type" : "integer", "format" : "int32" }, - "vatCts" : { + "finalPriceCts" : { "type" : "integer", "format" : "int32" }, - "discountCts" : { + "vatCts" : { "type" : "integer", "format" : "int32" }, - "firstName" : { - "type" : "string" - }, - "lastName" : { - "type" : "string" - }, - "subscriptionId" : { - "type" : "string", - "format" : "uuid" - }, - "srcPriceCts" : { + "discountCts" : { "type" : "integer", "format" : "int32" }, @@ -31726,6 +31851,18 @@ "displayName" : { "type" : "string" }, + "titleAsText" : { + "type" : "object", + "additionalProperties" : { + "type" : "string" + } + }, + "descriptionAsText" : { + "type" : "object", + "additionalProperties" : { + "type" : "string" + } + }, "publicIdentifier" : { "type" : "string" }, @@ -31752,18 +31889,6 @@ "freeOfCharge" : { "type" : "boolean" }, - "titleAsText" : { - "type" : "object", - "additionalProperties" : { - "type" : "string" - } - }, - "descriptionAsText" : { - "type" : "object", - "additionalProperties" : { - "type" : "string" - } - }, "fileBlobIdIsPresent" : { "type" : "boolean" }, @@ -31864,19 +31989,19 @@ "currencyCode" : { "type" : "string" }, + "status" : { + "type" : "string", + "enum" : [ "FREE", "PENDING", "TO_BE_PAID", "ACQUIRED", "CANCELLED", "CHECKED_IN", "EXPIRED", "INVALIDATED", "RELEASED", "PRE_RESERVED" ] + }, + "stuck" : { + "type" : "boolean" + }, "formattedNetPrice" : { "type" : "string" }, "extReference" : { "type" : "string" }, - "stuck" : { - "type" : "boolean" - }, - "status" : { - "type" : "string", - "enum" : [ "FREE", "PENDING", "TO_BE_PAID", "ACQUIRED", "CANCELLED", "CHECKED_IN", "EXPIRED", "INVALIDATED", "RELEASED", "PRE_RESERVED" ] - }, "tags" : { "type" : "array", "items" : { @@ -31893,22 +32018,6 @@ "type" : "integer", "format" : "int32" }, - "vatStatus" : { - "type" : "string", - "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "CUSTOM_INCLUDED_EXEMPT", "CUSTOM_NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] - }, - "finalPriceCts" : { - "type" : "integer", - "format" : "int32" - }, - "vatCts" : { - "type" : "integer", - "format" : "int32" - }, - "discountCts" : { - "type" : "integer", - "format" : "int32" - }, "firstName" : { "type" : "string" }, @@ -31919,6 +32028,10 @@ "type" : "string", "format" : "uuid" }, + "vatStatus" : { + "type" : "string", + "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "CUSTOM_INCLUDED_EXEMPT", "CUSTOM_NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] + }, "srcPriceCts" : { "type" : "integer", "format" : "int32" @@ -31926,6 +32039,18 @@ "finalPrice" : { "type" : "number" }, + "finalPriceCts" : { + "type" : "integer", + "format" : "int32" + }, + "vatCts" : { + "type" : "integer", + "format" : "int32" + }, + "discountCts" : { + "type" : "integer", + "format" : "int32" + }, "email" : { "type" : "string" }, @@ -32112,16 +32237,16 @@ "currencyCode" : { "type" : "string" }, + "status" : { + "type" : "string", + "enum" : [ "FREE", "PENDING", "TO_BE_PAID", "ACQUIRED", "CANCELLED", "CHECKED_IN", "EXPIRED", "INVALIDATED", "RELEASED", "PRE_RESERVED" ] + }, "formattedNetPrice" : { "type" : "string" }, "extReference" : { "type" : "string" }, - "status" : { - "type" : "string", - "enum" : [ "FREE", "PENDING", "TO_BE_PAID", "ACQUIRED", "CANCELLED", "CHECKED_IN", "EXPIRED", "INVALIDATED", "RELEASED", "PRE_RESERVED" ] - }, "tags" : { "type" : "array", "items" : { @@ -32135,33 +32260,33 @@ "type" : "integer", "format" : "int32" }, + "firstName" : { + "type" : "string" + }, + "lastName" : { + "type" : "string" + }, + "subscriptionId" : { + "type" : "string", + "format" : "uuid" + }, "vatStatus" : { "type" : "string", "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "CUSTOM_INCLUDED_EXEMPT", "CUSTOM_NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] }, - "finalPriceCts" : { + "srcPriceCts" : { "type" : "integer", "format" : "int32" }, - "vatCts" : { + "finalPriceCts" : { "type" : "integer", "format" : "int32" }, - "discountCts" : { + "vatCts" : { "type" : "integer", "format" : "int32" }, - "firstName" : { - "type" : "string" - }, - "lastName" : { - "type" : "string" - }, - "subscriptionId" : { - "type" : "string", - "format" : "uuid" - }, - "srcPriceCts" : { + "discountCts" : { "type" : "integer", "format" : "int32" }, @@ -32806,7 +32931,7 @@ } } }, - "EventInfo" : { + "EventBasicInfo" : { "type" : "object", "properties" : { "shortName" : { @@ -32827,7 +32952,7 @@ "type" : "string" }, "event" : { - "$ref" : "#/components/schemas/EventInfo" + "$ref" : "#/components/schemas/EventBasicInfo" }, "reservations" : { "type" : "array", @@ -32916,6 +33041,15 @@ "description" : { "type" : "string" }, + "formattedStart" : { + "type" : "string" + }, + "formattedEnd" : { + "type" : "string" + }, + "formattedDiscountAmount" : { + "type" : "string" + }, "eventId" : { "type" : "integer", "format" : "int32" @@ -32974,15 +33108,6 @@ }, "fixedAmount" : { "type" : "boolean" - }, - "formattedStart" : { - "type" : "string" - }, - "formattedEnd" : { - "type" : "string" - }, - "formattedDiscountAmount" : { - "type" : "string" } } }, @@ -33269,9 +33394,32 @@ "type" : "string", "enum" : [ "DRAFT", "PUBLIC", "DISABLED" ] }, + "notSoldTickets" : { + "type" : "integer", + "format" : "int32" + }, + "soldTickets" : { + "type" : "integer", + "format" : "int32" + }, + "pendingTickets" : { + "type" : "integer", + "format" : "int32" + }, + "dynamicAllocation" : { + "type" : "integer", + "format" : "int32" + }, + "releasedTickets" : { + "type" : "integer", + "format" : "int32" + }, "shortName" : { "type" : "string" }, + "formattedEnd" : { + "type" : "string" + }, "organizationId" : { "type" : "integer", "format" : "int32" @@ -33301,29 +33449,6 @@ "expired" : { "type" : "boolean" }, - "notSoldTickets" : { - "type" : "integer", - "format" : "int32" - }, - "soldTickets" : { - "type" : "integer", - "format" : "int32" - }, - "pendingTickets" : { - "type" : "integer", - "format" : "int32" - }, - "dynamicAllocation" : { - "type" : "integer", - "format" : "int32" - }, - "releasedTickets" : { - "type" : "integer", - "format" : "int32" - }, - "formattedEnd" : { - "type" : "string" - }, "warningNeeded" : { "type" : "boolean" }, @@ -33637,6 +33762,12 @@ "type" : "integer", "format" : "int32" }, + "disabledValues" : { + "type" : "array", + "items" : { + "type" : "string" + } + }, "minLength" : { "type" : "integer", "format" : "int32" @@ -33695,12 +33826,6 @@ "type" : "integer", "format" : "int32" } - }, - "disabledValues" : { - "type" : "array", - "items" : { - "type" : "string" - } } } }, From debbb9dc86f2f38089d2a3dcc53a8af212c27587 Mon Sep 17 00:00:00 2001 From: Celestino Bellone <3385346+cbellone@users.noreply.github.com> Date: Sun, 12 Feb 2023 19:07:17 +0100 Subject: [PATCH 154/218] add the possibility to hide PIN on subscriptions (cherry-picked from 606ab665e76c1e8b2c0402dea386946f5bfafbba) --- .../api/v2/model/ReservationInfo.java | 3 +- .../v2/user/ReservationApiV2Controller.java | 8 +++- .../java/alfio/manager/ExtensionManager.java | 2 +- .../alfio/manager/NotificationManager.java | 7 ++-- .../manager/TicketReservationManager.java | 2 +- ...ubscriptionReservationCreationRequest.java | 13 +++++- .../SubscriptionConfiguration.java | 42 +++++++++++++++++++ .../model/metadata/SubscriptionMetadata.java | 15 ++++++- .../java/alfio/util/TemplateResource.java | 4 +- .../resources/alfio/templates/subscription.ms | 3 +- .../v1/ReservationApiV1ControllerTest.java | 3 +- 11 files changed, 87 insertions(+), 15 deletions(-) create mode 100644 src/main/java/alfio/model/api/v1/admin/subscription/SubscriptionConfiguration.java diff --git a/src/main/java/alfio/controller/api/v2/model/ReservationInfo.java b/src/main/java/alfio/controller/api/v2/model/ReservationInfo.java index 945be99eed..126f9e9ca6 100644 --- a/src/main/java/alfio/controller/api/v2/model/ReservationInfo.java +++ b/src/main/java/alfio/controller/api/v2/model/ReservationInfo.java @@ -23,6 +23,7 @@ import alfio.model.SummaryRow.SummaryType; import alfio.model.TicketCategory; import alfio.model.TicketReservation.TicketReservationStatus; +import alfio.model.api.v1.admin.subscription.SubscriptionConfiguration; import alfio.model.subscription.UsageDetails; import alfio.model.transaction.PaymentMethod; import alfio.model.transaction.PaymentProxy; @@ -178,7 +179,7 @@ public record ReservationInfoOrderSummaryRow(String name, } - public record SubscriptionInfo(UUID id, String pin, UsageDetails usageDetails, SubscriptionOwner owner) { + public record SubscriptionInfo(UUID id, String pin, UsageDetails usageDetails, SubscriptionOwner owner, SubscriptionConfiguration configuration) { } diff --git a/src/main/java/alfio/controller/api/v2/user/ReservationApiV2Controller.java b/src/main/java/alfio/controller/api/v2/user/ReservationApiV2Controller.java index 41da144c66..68be71bd46 100644 --- a/src/main/java/alfio/controller/api/v2/user/ReservationApiV2Controller.java +++ b/src/main/java/alfio/controller/api/v2/user/ReservationApiV2Controller.java @@ -39,6 +39,7 @@ import alfio.manager.user.PublicUserManager; import alfio.model.*; import alfio.model.PurchaseContext.PurchaseContextType; +import alfio.model.metadata.SubscriptionMetadata; import alfio.model.subscription.UsageDetails; import alfio.model.system.ConfigurationKeys; import alfio.model.transaction.*; @@ -72,6 +73,7 @@ import static alfio.model.system.ConfigurationKeys.ENABLE_ITALY_E_INVOICING; import static alfio.model.system.ConfigurationKeys.FORCE_TICKET_OWNER_ASSIGNMENT_AT_RESERVATION; +import static java.util.Objects.requireNonNullElseGet; import static java.util.stream.Collectors.toMap; @RestController @@ -219,14 +221,16 @@ public ResponseEntity getReservationInfo(@PathVariable("reserva List subscriptionInfos = null; if (purchaseContext.ofType(PurchaseContextType.subscription)) { subscriptionInfos = subscriptionRepository.findSubscriptionsByReservationId(reservationId).stream() - .limit(1) // since we support only one subscription for now, it make sense to limit the result to avoid N+1 + .limit(1) // since we support only one subscription for now, it makes sense to limit the result to avoid N+1 .map(s -> { int usageCount = ticketRepository.countSubscriptionUsage(s.getId(), null); + var metadata = requireNonNullElseGet(subscriptionRepository.getSubscriptionMetadata(s.getId()), SubscriptionMetadata::empty); return new ReservationInfo.SubscriptionInfo( s.getStatus() == AllocationStatus.ACQUIRED ? s.getId() : null, s.getStatus() == AllocationStatus.ACQUIRED ? s.getPin() : null, UsageDetails.fromSubscription(s, usageCount), - new ReservationInfo.SubscriptionOwner(s.getFirstName(), s.getLastName(), s.getEmail())); + new ReservationInfo.SubscriptionOwner(s.getFirstName(), s.getLastName(), s.getEmail()), + metadata.getConfiguration()); }) .collect(Collectors.toList()); } diff --git a/src/main/java/alfio/manager/ExtensionManager.java b/src/main/java/alfio/manager/ExtensionManager.java index f81d7e5818..0724503c46 100644 --- a/src/main/java/alfio/manager/ExtensionManager.java +++ b/src/main/java/alfio/manager/ExtensionManager.java @@ -550,7 +550,7 @@ public Optional handleSubscriptionAssignmentMetadata(Subsc SubscriptionMetadata subscriptionMetadata) { var context = new HashMap(); context.put("subscription", subscription); - context.put("metadata", subscriptionMetadata); + context.put("metadata", Objects.requireNonNullElseGet(subscriptionMetadata, SubscriptionMetadata::empty)); context.put("subscriptionDescriptor", descriptor); return Optional.ofNullable(syncCall(ExtensionEvent.SUBSCRIPTION_ASSIGNED_GENERATE_METADATA, descriptor, context, SubscriptionMetadata.class, false)); } diff --git a/src/main/java/alfio/manager/NotificationManager.java b/src/main/java/alfio/manager/NotificationManager.java index cc6949ecc3..2b382c53c0 100644 --- a/src/main/java/alfio/manager/NotificationManager.java +++ b/src/main/java/alfio/manager/NotificationManager.java @@ -131,7 +131,7 @@ public NotificationManager(Mailer mailer, attachmentTransformer.put(Mailer.AttachmentIdentifier.PASSBOOK, passKitManager::getPass); Function> retrieveFieldValues = EventUtil.retrieveFieldValues(ticketRepository, ticketFieldRepository, additionalServiceItemRepository); attachmentTransformer.put(Mailer.AttachmentIdentifier.TICKET_PDF, generateTicketPDF(eventRepository, organizationRepository, configurationManager, fileUploadManager, templateManager, ticketReservationRepository, retrieveFieldValues, extensionManager, ticketRepository, subscriptionRepository)); - attachmentTransformer.put(Mailer.AttachmentIdentifier.SUBSCRIPTION_PDF, generateSubscriptionPDF(organizationRepository, configurationManager, fileUploadManager, templateManager, ticketReservationRepository, extensionManager, subscriptionRepository, messageSourceManager)); + attachmentTransformer.put(Mailer.AttachmentIdentifier.SUBSCRIPTION_PDF, generateSubscriptionPDF(organizationRepository, configurationManager, fileUploadManager, templateManager, ticketReservationRepository, extensionManager, subscriptionRepository)); } private static Function, byte[]> generateTicketPDF(EventRepository eventRepository, @@ -513,8 +513,7 @@ private static Function, byte[]> generateSubscriptionPDF(Org TemplateManager templateManager, TicketReservationRepository ticketReservationRepository, ExtensionManager extensionManager, - SubscriptionRepository subscriptionRepository, - MessageSourceManager messageSourceManager) { + SubscriptionRepository subscriptionRepository) { return model -> { ByteArrayOutputStream baos = new ByteArrayOutputStream(); var subscriptionId = UUID.fromString(model.get("subscriptionId")); @@ -523,7 +522,7 @@ private static Function, byte[]> generateSubscriptionPDF(Org var subscriptionDescriptor = subscriptionRepository.findDescriptorBySubscriptionId(subscriptionId); var reservation = ticketReservationRepository.findReservationById(subscription.getReservationId()); Organization organization = organizationRepository.getById(subscriptionDescriptor.getOrganizationId()); - var metadata = subscriptionRepository.getSubscriptionMetadata(subscription.getId()); + var metadata = Objects.requireNonNullElseGet(subscriptionRepository.getSubscriptionMetadata(subscription.getId()), SubscriptionMetadata::empty); TemplateProcessor.renderSubscriptionPDF(subscription, LocaleUtil.forLanguageTag(reservation.getUserLanguage()), subscriptionDescriptor, diff --git a/src/main/java/alfio/manager/TicketReservationManager.java b/src/main/java/alfio/manager/TicketReservationManager.java index f8e0b36b92..2a2c10f92e 100644 --- a/src/main/java/alfio/manager/TicketReservationManager.java +++ b/src/main/java/alfio/manager/TicketReservationManager.java @@ -2796,7 +2796,7 @@ public Optional createSubscriptionReservation(SubscriptionDescriptor sub Locale locale, BindingResult bindingResult, Principal principal) { - return createSubscriptionReservation(subscriptionDescriptor, locale, bindingResult, principal, null); + return createSubscriptionReservation(subscriptionDescriptor, locale, bindingResult, principal, SubscriptionMetadata.empty()); } public Optional createSubscriptionReservation(SubscriptionDescriptor subscriptionDescriptor, diff --git a/src/main/java/alfio/model/api/v1/admin/SubscriptionReservationCreationRequest.java b/src/main/java/alfio/model/api/v1/admin/SubscriptionReservationCreationRequest.java index 34afb8982f..9b15c94e53 100644 --- a/src/main/java/alfio/model/api/v1/admin/SubscriptionReservationCreationRequest.java +++ b/src/main/java/alfio/model/api/v1/admin/SubscriptionReservationCreationRequest.java @@ -16,27 +16,32 @@ */ package alfio.model.api.v1.admin; +import alfio.model.api.v1.admin.subscription.SubscriptionConfiguration; import alfio.model.metadata.SubscriptionMetadata; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.Map; +import java.util.Objects; public class SubscriptionReservationCreationRequest implements ReservationAPICreationRequest { private final Map metadata; private final ReservationUser user; private final String language; private final ReservationConfiguration reservationConfiguration; + private final SubscriptionConfiguration subscriptionConfiguration; @JsonCreator public SubscriptionReservationCreationRequest(@JsonProperty("metadata") Map metadata, @JsonProperty("user") ReservationUser user, @JsonProperty("language") String language, - @JsonProperty("reservationConfiguration") ReservationConfiguration reservationConfiguration) { + @JsonProperty("reservationConfiguration") ReservationConfiguration reservationConfiguration, + @JsonProperty("subscriptionConfiguration") SubscriptionConfiguration subscriptionConfiguration) { this.metadata = metadata; this.user = user; this.language = language; this.reservationConfiguration = reservationConfiguration; + this.subscriptionConfiguration = Objects.requireNonNullElseGet(subscriptionConfiguration, SubscriptionConfiguration::defaultConfiguration); } public Map getMetadata() { @@ -58,9 +63,13 @@ public ReservationConfiguration getReservationConfiguration() { return reservationConfiguration; } + public SubscriptionConfiguration getSubscriptionConfiguration() { + return subscriptionConfiguration; + } + public SubscriptionMetadata getMetadataOrNull() { if (metadata != null && !metadata.isEmpty()) { - return new SubscriptionMetadata(metadata); + return new SubscriptionMetadata(metadata, subscriptionConfiguration); } return null; } diff --git a/src/main/java/alfio/model/api/v1/admin/subscription/SubscriptionConfiguration.java b/src/main/java/alfio/model/api/v1/admin/subscription/SubscriptionConfiguration.java new file mode 100644 index 0000000000..c1a05e5ad0 --- /dev/null +++ b/src/main/java/alfio/model/api/v1/admin/subscription/SubscriptionConfiguration.java @@ -0,0 +1,42 @@ +/** + * This file is part of alf.io. + * + * alf.io is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * alf.io is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with alf.io. If not, see . + */ +package alfio.model.api.v1.admin.subscription; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; + +import java.util.Objects; + +public class SubscriptionConfiguration { + /** + * Display PIN information on reservation page and PDF. Default is {@code true} + */ + private final boolean displayPin; + + @JsonCreator + public SubscriptionConfiguration(@JsonProperty("displayPin") Boolean displayPin) { + this.displayPin = Objects.requireNonNullElse(displayPin, true); + } + + public boolean isDisplayPin() { + return displayPin; + } + + public static SubscriptionConfiguration defaultConfiguration() { + return new SubscriptionConfiguration(true); + } +} diff --git a/src/main/java/alfio/model/metadata/SubscriptionMetadata.java b/src/main/java/alfio/model/metadata/SubscriptionMetadata.java index bdf0506f93..ef3fc9007b 100644 --- a/src/main/java/alfio/model/metadata/SubscriptionMetadata.java +++ b/src/main/java/alfio/model/metadata/SubscriptionMetadata.java @@ -16,6 +16,7 @@ */ package alfio.model.metadata; +import alfio.model.api.v1.admin.subscription.SubscriptionConfiguration; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; @@ -25,13 +26,25 @@ public class SubscriptionMetadata { private final Map properties; + private final SubscriptionConfiguration configuration; @JsonCreator - public SubscriptionMetadata(@JsonProperty("properties") Map properties) { + public SubscriptionMetadata(@JsonProperty("properties") Map properties, + @JsonProperty("configuration") SubscriptionConfiguration configuration) { this.properties = Objects.requireNonNullElse(properties, Map.of()); + this.configuration = Objects.requireNonNullElseGet(configuration, SubscriptionConfiguration::defaultConfiguration); } + public Map getProperties() { return properties; } + + public SubscriptionConfiguration getConfiguration() { + return configuration; + } + + public static SubscriptionMetadata empty() { + return new SubscriptionMetadata(null, null); + } } diff --git a/src/main/java/alfio/util/TemplateResource.java b/src/main/java/alfio/util/TemplateResource.java index 4c634ac4bd..ca1ea12280 100644 --- a/src/main/java/alfio/util/TemplateResource.java +++ b/src/main/java/alfio/util/TemplateResource.java @@ -18,6 +18,7 @@ import alfio.model.*; import alfio.model.PurchaseContext.PurchaseContextType; +import alfio.model.api.v1.admin.subscription.SubscriptionConfiguration; import alfio.model.metadata.SubscriptionMetadata; import alfio.model.modification.SendCodeModification; import alfio.model.subscription.Subscription; @@ -236,7 +237,7 @@ public Map prepareSampleModel(Organization organization, Purchas ZonedDateTime.now(ClockProvider.clock().withZone(zoneId)), subscriptionDescriptor.getTimeZone() ); - var subscriptionMetadata = new SubscriptionMetadata(Map.of("key", "value")); + var subscriptionMetadata = new SubscriptionMetadata(Map.of("key", "value"), SubscriptionConfiguration.defaultConfiguration()); return buildModelForSubscriptionPDF(subscription, subscriptionDescriptor, organization, subscriptionMetadata, imageData, RESERVATION_ID_VALUE, Locale.ENGLISH, sampleTicketReservation(zoneId)); } }, @@ -626,6 +627,7 @@ public static Map buildModelForSubscriptionPDF(Subscription subs model.put("reservation", reservation); model.put(RESERVATION_ID, reservationId); model.put(METADATA_ATTRIBUTES_KEY, metadata.getProperties()); + model.put("displayPin", metadata.getConfiguration().isDisplayPin()); imageData.ifPresent(iData -> { model.put("logo", iData.eventImage); model.put("imageWidth", iData.imageWidth); diff --git a/src/main/resources/alfio/templates/subscription.ms b/src/main/resources/alfio/templates/subscription.ms index 23dce3cca0..4c2b35c744 100644 --- a/src/main/resources/alfio/templates/subscription.ms +++ b/src/main/resources/alfio/templates/subscription.ms @@ -44,13 +44,14 @@

{{#subscriptionDescription}}{{/subscriptionDescription}}

+ {{#displayPin}}

{{#i18n}}reservation-page-complete.subscription.pin-description{{/i18n}}

{{subscription.pin}}

{{#i18n}}reservation-page-complete.subscription.id-description{{/i18n}}

{{subscription.id}}

-

+ {{/displayPin}} diff --git a/src/test/java/alfio/controller/api/v1/ReservationApiV1ControllerTest.java b/src/test/java/alfio/controller/api/v1/ReservationApiV1ControllerTest.java index 4ac134d20e..9ff66588de 100644 --- a/src/test/java/alfio/controller/api/v1/ReservationApiV1ControllerTest.java +++ b/src/test/java/alfio/controller/api/v1/ReservationApiV1ControllerTest.java @@ -420,7 +420,8 @@ void createSubscriptionWithMetadata() { var reservationRequest = new SubscriptionReservationCreationRequest(Map.of("key", "value"), new ReservationUser("test@test.org", "Test", "Test1", "test@test.org", null), "en", - new ReservationConfiguration(true)); + new ReservationConfiguration(true), + null); var reservationResponse = controller.createSubscriptionReservation(descriptorId, reservationRequest, principal); assertTrue(reservationResponse.getStatusCode().is2xxSuccessful()); assertNotNull(reservationResponse.getBody()); From 283f14a2dd2e1382f166e044670fb4bee7f0a585 Mon Sep 17 00:00:00 2001 From: Celestino Bellone <3385346+cbellone@users.noreply.github.com> Date: Sun, 12 Feb 2023 19:21:29 +0100 Subject: [PATCH 155/218] fix errors after cherry-pick --- .../alfio/manager/NotificationManager.java | 1 + src/test/resources/api/descriptor.json | 397 +++++++++--------- 2 files changed, 208 insertions(+), 190 deletions(-) diff --git a/src/main/java/alfio/manager/NotificationManager.java b/src/main/java/alfio/manager/NotificationManager.java index 2b382c53c0..d51bedb639 100644 --- a/src/main/java/alfio/manager/NotificationManager.java +++ b/src/main/java/alfio/manager/NotificationManager.java @@ -26,6 +26,7 @@ import alfio.manager.system.Mailer; import alfio.model.*; import alfio.model.PurchaseContext.PurchaseContextType; +import alfio.model.metadata.SubscriptionMetadata; import alfio.model.subscription.SubscriptionDescriptor; import alfio.model.system.ConfigurationKeys; import alfio.model.user.Organization; diff --git a/src/test/resources/api/descriptor.json b/src/test/resources/api/descriptor.json index 62bac4d822..2188454d62 100644 --- a/src/test/resources/api/descriptor.json +++ b/src/test/resources/api/descriptor.json @@ -25994,10 +25994,23 @@ "refundedAmount" : { "type" : "string" }, + "notYetPaid" : { + "type" : "boolean" + }, + "vatExempt" : { + "type" : "boolean" + }, + "priceInCents" : { + "type" : "integer", + "format" : "int32" + }, "ticketAmount" : { "type" : "integer", "format" : "int32" }, + "singleTicketOrder" : { + "type" : "boolean" + }, "displayVat" : { "type" : "boolean" }, @@ -26012,19 +26025,6 @@ }, "priceBeforeTaxes" : { "type" : "string" - }, - "singleTicketOrder" : { - "type" : "boolean" - }, - "notYetPaid" : { - "type" : "boolean" - }, - "vatExempt" : { - "type" : "boolean" - }, - "priceInCents" : { - "type" : "integer", - "format" : "int32" } } }, @@ -26218,13 +26218,13 @@ "valid" : { "type" : "boolean" }, - "formattedValidityTo" : { + "pin" : { "type" : "string" }, - "formattedValidityFrom" : { + "formattedValidityTo" : { "type" : "string" }, - "pin" : { + "formattedValidityFrom" : { "type" : "string" } } @@ -26377,9 +26377,6 @@ "type" : "string", "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "CUSTOM_INCLUDED_EXEMPT", "CUSTOM_NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] }, - "formattedNetPrice" : { - "type" : "string" - }, "assigned" : { "type" : "boolean" }, @@ -26388,6 +26385,9 @@ }, "formattedFinalPrice" : { "type" : "string" + }, + "formattedNetPrice" : { + "type" : "string" } } }, @@ -26748,6 +26748,31 @@ "type" : "integer", "format" : "int32" }, + "finalPriceCts" : { + "type" : "integer", + "format" : "int32" + }, + "vatCts" : { + "type" : "integer", + "format" : "int32" + }, + "discountCts" : { + "type" : "integer", + "format" : "int32" + }, + "vatNr" : { + "type" : "string" + }, + "vatCountryCode" : { + "type" : "string" + }, + "invoiceRequested" : { + "type" : "boolean" + }, + "vatStatus" : { + "type" : "string", + "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "CUSTOM_INCLUDED_EXEMPT", "CUSTOM_NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] + }, "firstName" : { "type" : "string" }, @@ -26764,10 +26789,6 @@ "type" : "string", "enum" : [ "STRIPE", "ON_SITE", "OFFLINE", "NONE", "ADMIN", "PAYPAL", "MOLLIE", "SAFERPAY" ] }, - "vatStatus" : { - "type" : "string", - "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "CUSTOM_INCLUDED_EXEMPT", "CUSTOM_NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] - }, "srcPriceCts" : { "type" : "integer", "format" : "int32" @@ -26781,27 +26802,6 @@ "appliedDiscount" : { "type" : "number" }, - "finalPriceCts" : { - "type" : "integer", - "format" : "int32" - }, - "vatCts" : { - "type" : "integer", - "format" : "int32" - }, - "discountCts" : { - "type" : "integer", - "format" : "int32" - }, - "vatNr" : { - "type" : "string" - }, - "vatCountryCode" : { - "type" : "string" - }, - "invoiceRequested" : { - "type" : "boolean" - }, "pendingOfflinePayment" : { "type" : "boolean" }, @@ -28092,6 +28092,14 @@ } } }, + "SubscriptionConfiguration" : { + "type" : "object", + "properties" : { + "displayPin" : { + "type" : "boolean" + } + } + }, "SubscriptionMetadata" : { "type" : "object", "properties" : { @@ -28100,6 +28108,9 @@ "additionalProperties" : { "type" : "string" } + }, + "configuration" : { + "$ref" : "#/components/schemas/SubscriptionConfiguration" } } }, @@ -28121,6 +28132,9 @@ "reservationConfiguration" : { "$ref" : "#/components/schemas/ReservationConfiguration" }, + "subscriptionConfiguration" : { + "$ref" : "#/components/schemas/SubscriptionConfiguration" + }, "metadataOrNull" : { "$ref" : "#/components/schemas/SubscriptionMetadata" } @@ -28593,12 +28607,6 @@ "type" : "string", "enum" : [ "FREE", "PENDING", "TO_BE_PAID", "ACQUIRED", "CANCELLED", "CHECKED_IN", "EXPIRED", "INVALIDATED", "RELEASED", "PRE_RESERVED" ] }, - "formattedNetPrice" : { - "type" : "string" - }, - "extReference" : { - "type" : "string" - }, "tags" : { "type" : "array", "items" : { @@ -28608,6 +28616,22 @@ "assigned" : { "type" : "boolean" }, + "finalPriceCts" : { + "type" : "integer", + "format" : "int32" + }, + "vatCts" : { + "type" : "integer", + "format" : "int32" + }, + "discountCts" : { + "type" : "integer", + "format" : "int32" + }, + "vatStatus" : { + "type" : "string", + "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "CUSTOM_INCLUDED_EXEMPT", "CUSTOM_NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] + }, "eventId" : { "type" : "integer", "format" : "int32" @@ -28622,26 +28646,10 @@ "type" : "string", "format" : "uuid" }, - "vatStatus" : { - "type" : "string", - "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "CUSTOM_INCLUDED_EXEMPT", "CUSTOM_NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] - }, "srcPriceCts" : { "type" : "integer", "format" : "int32" }, - "finalPriceCts" : { - "type" : "integer", - "format" : "int32" - }, - "vatCts" : { - "type" : "integer", - "format" : "int32" - }, - "discountCts" : { - "type" : "integer", - "format" : "int32" - }, "email" : { "type" : "string" }, @@ -28671,6 +28679,12 @@ "formattedFinalPrice" : { "type" : "string" }, + "formattedNetPrice" : { + "type" : "string" + }, + "extReference" : { + "type" : "string" + }, "categoryName" : { "type" : "string" } @@ -29916,12 +29930,6 @@ "type" : "string", "enum" : [ "FREE", "PENDING", "TO_BE_PAID", "ACQUIRED", "CANCELLED", "CHECKED_IN", "EXPIRED", "INVALIDATED", "RELEASED", "PRE_RESERVED" ] }, - "formattedNetPrice" : { - "type" : "string" - }, - "extReference" : { - "type" : "string" - }, "tags" : { "type" : "array", "items" : { @@ -29931,6 +29939,22 @@ "assigned" : { "type" : "boolean" }, + "finalPriceCts" : { + "type" : "integer", + "format" : "int32" + }, + "vatCts" : { + "type" : "integer", + "format" : "int32" + }, + "discountCts" : { + "type" : "integer", + "format" : "int32" + }, + "vatStatus" : { + "type" : "string", + "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "CUSTOM_INCLUDED_EXEMPT", "CUSTOM_NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] + }, "eventId" : { "type" : "integer", "format" : "int32" @@ -29945,26 +29969,10 @@ "type" : "string", "format" : "uuid" }, - "vatStatus" : { - "type" : "string", - "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "CUSTOM_INCLUDED_EXEMPT", "CUSTOM_NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] - }, "srcPriceCts" : { "type" : "integer", "format" : "int32" }, - "finalPriceCts" : { - "type" : "integer", - "format" : "int32" - }, - "vatCts" : { - "type" : "integer", - "format" : "int32" - }, - "discountCts" : { - "type" : "integer", - "format" : "int32" - }, "email" : { "type" : "string" }, @@ -29993,6 +30001,12 @@ }, "formattedFinalPrice" : { "type" : "string" + }, + "formattedNetPrice" : { + "type" : "string" + }, + "extReference" : { + "type" : "string" } } }, @@ -31036,6 +31050,9 @@ }, "owner" : { "$ref" : "#/components/schemas/SubscriptionOwner" + }, + "configuration" : { + "$ref" : "#/components/schemas/SubscriptionConfiguration" } } }, @@ -31851,18 +31868,6 @@ "displayName" : { "type" : "string" }, - "titleAsText" : { - "type" : "object", - "additionalProperties" : { - "type" : "string" - } - }, - "descriptionAsText" : { - "type" : "object", - "additionalProperties" : { - "type" : "string" - } - }, "publicIdentifier" : { "type" : "string" }, @@ -31889,6 +31894,18 @@ "freeOfCharge" : { "type" : "boolean" }, + "titleAsText" : { + "type" : "object", + "additionalProperties" : { + "type" : "string" + } + }, + "descriptionAsText" : { + "type" : "object", + "additionalProperties" : { + "type" : "string" + } + }, "fileBlobIdIsPresent" : { "type" : "boolean" }, @@ -31993,27 +32010,37 @@ "type" : "string", "enum" : [ "FREE", "PENDING", "TO_BE_PAID", "ACQUIRED", "CANCELLED", "CHECKED_IN", "EXPIRED", "INVALIDATED", "RELEASED", "PRE_RESERVED" ] }, - "stuck" : { - "type" : "boolean" - }, - "formattedNetPrice" : { - "type" : "string" - }, - "extReference" : { - "type" : "string" - }, "tags" : { "type" : "array", "items" : { "type" : "string" } }, + "stuck" : { + "type" : "boolean" + }, "assigned" : { "type" : "boolean" }, "transaction" : { "$ref" : "#/components/schemas/Transaction" }, + "finalPriceCts" : { + "type" : "integer", + "format" : "int32" + }, + "vatCts" : { + "type" : "integer", + "format" : "int32" + }, + "discountCts" : { + "type" : "integer", + "format" : "int32" + }, + "vatStatus" : { + "type" : "string", + "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "CUSTOM_INCLUDED_EXEMPT", "CUSTOM_NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] + }, "eventId" : { "type" : "integer", "format" : "int32" @@ -32028,10 +32055,6 @@ "type" : "string", "format" : "uuid" }, - "vatStatus" : { - "type" : "string", - "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "CUSTOM_INCLUDED_EXEMPT", "CUSTOM_NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] - }, "srcPriceCts" : { "type" : "integer", "format" : "int32" @@ -32039,18 +32062,6 @@ "finalPrice" : { "type" : "number" }, - "finalPriceCts" : { - "type" : "integer", - "format" : "int32" - }, - "vatCts" : { - "type" : "integer", - "format" : "int32" - }, - "discountCts" : { - "type" : "integer", - "format" : "int32" - }, "email" : { "type" : "string" }, @@ -32080,6 +32091,12 @@ "formattedFinalPrice" : { "type" : "string" }, + "formattedNetPrice" : { + "type" : "string" + }, + "extReference" : { + "type" : "string" + }, "transactionTimestamp" : { "type" : "string", "format" : "date-time" @@ -32241,12 +32258,6 @@ "type" : "string", "enum" : [ "FREE", "PENDING", "TO_BE_PAID", "ACQUIRED", "CANCELLED", "CHECKED_IN", "EXPIRED", "INVALIDATED", "RELEASED", "PRE_RESERVED" ] }, - "formattedNetPrice" : { - "type" : "string" - }, - "extReference" : { - "type" : "string" - }, "tags" : { "type" : "array", "items" : { @@ -32256,6 +32267,22 @@ "assigned" : { "type" : "boolean" }, + "finalPriceCts" : { + "type" : "integer", + "format" : "int32" + }, + "vatCts" : { + "type" : "integer", + "format" : "int32" + }, + "discountCts" : { + "type" : "integer", + "format" : "int32" + }, + "vatStatus" : { + "type" : "string", + "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "CUSTOM_INCLUDED_EXEMPT", "CUSTOM_NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] + }, "eventId" : { "type" : "integer", "format" : "int32" @@ -32270,26 +32297,10 @@ "type" : "string", "format" : "uuid" }, - "vatStatus" : { - "type" : "string", - "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "CUSTOM_INCLUDED_EXEMPT", "CUSTOM_NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] - }, "srcPriceCts" : { "type" : "integer", "format" : "int32" }, - "finalPriceCts" : { - "type" : "integer", - "format" : "int32" - }, - "vatCts" : { - "type" : "integer", - "format" : "int32" - }, - "discountCts" : { - "type" : "integer", - "format" : "int32" - }, "email" : { "type" : "string" }, @@ -32319,6 +32330,12 @@ "formattedFinalPrice" : { "type" : "string" }, + "formattedNetPrice" : { + "type" : "string" + }, + "extReference" : { + "type" : "string" + }, "additionalFields" : { "type" : "object", "additionalProperties" : { @@ -33041,15 +33058,6 @@ "description" : { "type" : "string" }, - "formattedStart" : { - "type" : "string" - }, - "formattedEnd" : { - "type" : "string" - }, - "formattedDiscountAmount" : { - "type" : "string" - }, "eventId" : { "type" : "integer", "format" : "int32" @@ -33108,6 +33116,15 @@ }, "fixedAmount" : { "type" : "boolean" + }, + "formattedStart" : { + "type" : "string" + }, + "formattedEnd" : { + "type" : "string" + }, + "formattedDiscountAmount" : { + "type" : "string" } } }, @@ -33394,32 +33411,9 @@ "type" : "string", "enum" : [ "DRAFT", "PUBLIC", "DISABLED" ] }, - "notSoldTickets" : { - "type" : "integer", - "format" : "int32" - }, - "soldTickets" : { - "type" : "integer", - "format" : "int32" - }, - "pendingTickets" : { - "type" : "integer", - "format" : "int32" - }, - "dynamicAllocation" : { - "type" : "integer", - "format" : "int32" - }, - "releasedTickets" : { - "type" : "integer", - "format" : "int32" - }, "shortName" : { "type" : "string" }, - "formattedEnd" : { - "type" : "string" - }, "organizationId" : { "type" : "integer", "format" : "int32" @@ -33434,21 +33428,44 @@ "fileBlobId" : { "type" : "string" }, - "notAllocatedTickets" : { + "checkedInTickets" : { "type" : "integer", "format" : "int32" }, - "availableSeats" : { + "notAllocatedTickets" : { "type" : "integer", "format" : "int32" }, - "checkedInTickets" : { + "availableSeats" : { "type" : "integer", "format" : "int32" }, "expired" : { "type" : "boolean" }, + "notSoldTickets" : { + "type" : "integer", + "format" : "int32" + }, + "soldTickets" : { + "type" : "integer", + "format" : "int32" + }, + "pendingTickets" : { + "type" : "integer", + "format" : "int32" + }, + "dynamicAllocation" : { + "type" : "integer", + "format" : "int32" + }, + "releasedTickets" : { + "type" : "integer", + "format" : "int32" + }, + "formattedEnd" : { + "type" : "string" + }, "warningNeeded" : { "type" : "boolean" }, @@ -33762,12 +33779,6 @@ "type" : "integer", "format" : "int32" }, - "disabledValues" : { - "type" : "array", - "items" : { - "type" : "string" - } - }, "minLength" : { "type" : "integer", "format" : "int32" @@ -33779,11 +33790,11 @@ "required" : { "type" : "boolean" }, - "eventId" : { + "additionalServiceId" : { "type" : "integer", "format" : "int32" }, - "additionalServiceId" : { + "eventId" : { "type" : "integer", "format" : "int32" }, @@ -33799,6 +33810,12 @@ "editable" : { "type" : "boolean" }, + "disabledValues" : { + "type" : "array", + "items" : { + "type" : "string" + } + }, "inputField" : { "type" : "boolean" }, From b2343cf9c37b0e500e45ef67877671185ea95994 Mon Sep 17 00:00:00 2001 From: Celestino Bellone <3385346+cbellone@users.noreply.github.com> Date: Wed, 15 Feb 2023 19:02:14 +0100 Subject: [PATCH 156/218] do not include PIN in the email if configuration forbids it --- src/main/java/alfio/manager/TicketReservationManager.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/alfio/manager/TicketReservationManager.java b/src/main/java/alfio/manager/TicketReservationManager.java index 2a2c10f92e..498d88b1c9 100644 --- a/src/main/java/alfio/manager/TicketReservationManager.java +++ b/src/main/java/alfio/manager/TicketReservationManager.java @@ -886,10 +886,11 @@ public void sendConfirmationEmail(PurchaseContext purchaseContext, TicketReserva if(purchaseContext.ofType(PurchaseContextType.subscription)) { var firstSubscription = subscriptionRepository.findSubscriptionsByReservationId(reservationId).stream().findFirst().orElseThrow(); boolean sendSeparateEmailToOwner = !Objects.equals(firstSubscription.getEmail(), ticketReservation.getEmail()); + var metadata = Objects.requireNonNullElseGet(subscriptionRepository.getSubscriptionMetadata(firstSubscription.getId()), SubscriptionMetadata::empty); Map initialModel = Map.of( "pin", firstSubscription.getPin(), "subscriptionId", firstSubscription.getId(), - "includePin", true, + "includePin", metadata.getConfiguration().isDisplayPin(), "fullName", firstSubscription.getFirstName() + " " + firstSubscription.getLastName()); var model = prepareModelForReservationEmail(purchaseContext, ticketReservation, vat, summary, List.of(), initialModel); var subscriptionAttachments = new ArrayList<>(attachments); From a00c7248b49a0afda0ab009078ce7c2be2d12fbf Mon Sep 17 00:00:00 2001 From: Sylvain Jermini Date: Sat, 4 Mar 2023 21:17:50 +0100 Subject: [PATCH 157/218] Fix spring-session <-> spring security integration + session removal on user deletion/disable (#1199) spring-session: configure the correct integration with spring-security, allowing us to save the user principal in the db column --- .../java/alfio/config/MvcConfiguration.java | 7 +++++ .../AbstractFormBasedWebSecurity.java | 12 ++++++-- .../authentication/FormBasedWebSecurity.java | 7 +++-- .../OpenIdAdminWebSecurity.java | 7 +++-- .../api/admin/UsersApiController.java | 7 ++--- .../java/alfio/manager/user/UserManager.java | 28 ++++++++++++++++--- src/test/java/alfio/TestConfiguration.java | 7 +++++ 7 files changed, 61 insertions(+), 14 deletions(-) diff --git a/src/main/java/alfio/config/MvcConfiguration.java b/src/main/java/alfio/config/MvcConfiguration.java index b07d912d38..4ca3be85cc 100644 --- a/src/main/java/alfio/config/MvcConfiguration.java +++ b/src/main/java/alfio/config/MvcConfiguration.java @@ -28,7 +28,9 @@ import org.springframework.http.converter.HttpMessageConverter; import org.springframework.http.converter.StringHttpMessageConverter; import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; +import org.springframework.session.FindByIndexNameSessionRepository; import org.springframework.session.jdbc.config.annotation.web.http.EnableJdbcHttpSession; +import org.springframework.session.security.SpringSessionBackedSessionRegistry; import org.springframework.session.web.http.CookieHttpSessionIdResolver; import org.springframework.session.web.http.HeaderHttpSessionIdResolver; import org.springframework.session.web.http.HttpSessionIdResolver; @@ -129,6 +131,11 @@ public ViewResolver viewResolver() { return resolver; } + @Bean + public SpringSessionBackedSessionRegistry sessionRegistry(FindByIndexNameSessionRepository sessionRepository) { + return new SpringSessionBackedSessionRegistry<>(sessionRepository); + } + @Bean public HttpSessionIdResolver httpSessionIdResolver() { var publicSessionIdResolver = HeaderHttpSessionIdResolver.xAuthToken(); diff --git a/src/main/java/alfio/config/authentication/AbstractFormBasedWebSecurity.java b/src/main/java/alfio/config/authentication/AbstractFormBasedWebSecurity.java index 8f2fb7503f..39e7bd12ce 100644 --- a/src/main/java/alfio/config/authentication/AbstractFormBasedWebSecurity.java +++ b/src/main/java/alfio/config/authentication/AbstractFormBasedWebSecurity.java @@ -45,6 +45,8 @@ import org.springframework.security.web.util.matcher.AntPathRequestMatcher; import org.springframework.security.web.util.matcher.NegatedRequestMatcher; import org.springframework.security.web.util.matcher.RequestHeaderRequestMatcher; +import org.springframework.session.FindByIndexNameSessionRepository; +import org.springframework.session.security.SpringSessionBackedSessionRegistry; import javax.servlet.Filter; import javax.servlet.RequestDispatcher; @@ -90,6 +92,7 @@ abstract class AbstractFormBasedWebSecurity { private final DataSource dataSource; private final PasswordEncoder passwordEncoder; private final PublicOpenIdAuthenticationManager publicOpenIdAuthenticationManager; + private final SpringSessionBackedSessionRegistry sessionRegistry; protected AbstractFormBasedWebSecurity(Environment environment, UserManager userManager, @@ -98,7 +101,8 @@ protected AbstractFormBasedWebSecurity(Environment environment, CsrfTokenRepository csrfTokenRepository, DataSource dataSource, PasswordEncoder passwordEncoder, - PublicOpenIdAuthenticationManager publicOpenIdAuthenticationManager) { + PublicOpenIdAuthenticationManager publicOpenIdAuthenticationManager, + SpringSessionBackedSessionRegistry sessionRegistry) { this.environment = environment; this.userManager = userManager; this.recaptchaService = recaptchaService; @@ -107,6 +111,7 @@ protected AbstractFormBasedWebSecurity(Environment environment, this.dataSource = dataSource; this.passwordEncoder = passwordEncoder; this.publicOpenIdAuthenticationManager = publicOpenIdAuthenticationManager; + this.sessionRegistry = sessionRegistry; } @@ -132,7 +137,10 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { .loginProcessingUrl(AUTHENTICATE) .defaultSuccessUrl("/admin") .failureUrl("/authentication?failed") - .and().logout().permitAll(); + .and().logout().permitAll() + .and() + // this allows us to sync between spring session and spring security, thus saving the principal name in the session table + .sessionManagement().maximumSessions(-1).sessionRegistry(sessionRegistry); http.addFilterBefore(openIdPublicCallbackLoginFilter(publicOpenIdAuthenticationManager, authenticationManager), UsernamePasswordAuthenticationFilter.class) .addFilterBefore(openIdPublicAuthenticationFilter(publicOpenIdAuthenticationManager), AnonymousAuthenticationFilter.class); diff --git a/src/main/java/alfio/config/authentication/FormBasedWebSecurity.java b/src/main/java/alfio/config/authentication/FormBasedWebSecurity.java index b9372dd76b..95087317e4 100644 --- a/src/main/java/alfio/config/authentication/FormBasedWebSecurity.java +++ b/src/main/java/alfio/config/authentication/FormBasedWebSecurity.java @@ -26,6 +26,7 @@ import org.springframework.core.env.Environment; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.security.web.csrf.CsrfTokenRepository; +import org.springframework.session.security.SpringSessionBackedSessionRegistry; import javax.sql.DataSource; @@ -43,7 +44,8 @@ public FormBasedWebSecurity(Environment environment, CsrfTokenRepository csrfTokenRepository, DataSource dataSource, PasswordEncoder passwordEncoder, - PublicOpenIdAuthenticationManager publicOpenIdAuthenticationManager) { + PublicOpenIdAuthenticationManager publicOpenIdAuthenticationManager, + SpringSessionBackedSessionRegistry sessionRegistry) { super(environment, userManager, recaptchaService, @@ -51,6 +53,7 @@ public FormBasedWebSecurity(Environment environment, csrfTokenRepository, dataSource, passwordEncoder, - publicOpenIdAuthenticationManager); + publicOpenIdAuthenticationManager, + sessionRegistry); } } diff --git a/src/main/java/alfio/config/authentication/OpenIdAdminWebSecurity.java b/src/main/java/alfio/config/authentication/OpenIdAdminWebSecurity.java index 000e77e37c..b2bffe46de 100644 --- a/src/main/java/alfio/config/authentication/OpenIdAdminWebSecurity.java +++ b/src/main/java/alfio/config/authentication/OpenIdAdminWebSecurity.java @@ -35,6 +35,7 @@ import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; import org.springframework.security.web.csrf.CsrfTokenRepository; import org.springframework.security.web.util.matcher.AntPathRequestMatcher; +import org.springframework.session.security.SpringSessionBackedSessionRegistry; import javax.sql.DataSource; @@ -55,7 +56,8 @@ public OpenIdAdminWebSecurity(Environment environment, DataSource dataSource, PasswordEncoder passwordEncoder, AdminOpenIdAuthenticationManager adminOpenIdAuthenticationManager, - PublicOpenIdAuthenticationManager openIdAuthenticationManager) { + PublicOpenIdAuthenticationManager openIdAuthenticationManager, + SpringSessionBackedSessionRegistry sessionRegistry) { super(environment, userManager, recaptchaService, @@ -63,7 +65,8 @@ public OpenIdAdminWebSecurity(Environment environment, csrfTokenRepository, dataSource, passwordEncoder, - openIdAuthenticationManager); + openIdAuthenticationManager, + sessionRegistry); this.adminOpenIdAuthenticationManager = adminOpenIdAuthenticationManager; } diff --git a/src/main/java/alfio/controller/api/admin/UsersApiController.java b/src/main/java/alfio/controller/api/admin/UsersApiController.java index 4d210ac98e..0ada6ed254 100644 --- a/src/main/java/alfio/controller/api/admin/UsersApiController.java +++ b/src/main/java/alfio/controller/api/admin/UsersApiController.java @@ -36,7 +36,6 @@ import org.slf4j.LoggerFactory; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.util.StreamUtils; import org.springframework.web.bind.annotation.*; @@ -268,7 +267,7 @@ public UserModification loadCurrentUser(Principal principal) { @PostMapping("/users/current/update-password") public ValidationResult updateCurrentUserPassword(@RequestBody PasswordModification passwordModification, Principal principal) { return userManager.validateNewPassword(principal.getName(), passwordModification.oldPassword, passwordModification.newPassword, passwordModification.newPasswordConfirm) - .ifSuccess(() -> userManager.updatePassword(principal.getName(), passwordModification.newPassword)); + .ifSuccess(() -> userManager.updateCurrentUserPassword(principal.getName(), passwordModification.newPassword)); } @PostMapping("/users/current/edit") @@ -279,8 +278,8 @@ public void updateCurrentUser(@RequestBody UserModification userModification, Pr } @PutMapping("/users/{id}/reset-password") - public UserWithPasswordAndQRCode resetPassword(@PathVariable("id") int userId, @RequestParam("baseUrl") String baseUrl) { - UserWithPassword userWithPassword = userManager.resetPassword(userId); + public UserWithPasswordAndQRCode resetPassword(@PathVariable("id") int userId, @RequestParam("baseUrl") String baseUrl, Principal principal) { + UserWithPassword userWithPassword = userManager.resetPassword(userId, principal.getName()); return new UserWithPasswordAndQRCode(userWithPassword, Base64.getEncoder().encodeToString(generateQRCode(userWithPassword, baseUrl))); } diff --git a/src/main/java/alfio/manager/user/UserManager.java b/src/main/java/alfio/manager/user/UserManager.java index fefe63f134..329a4bebfc 100644 --- a/src/main/java/alfio/manager/user/UserManager.java +++ b/src/main/java/alfio/manager/user/UserManager.java @@ -34,6 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.session.FindByIndexNameSessionRepository; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.Assert; @@ -64,18 +65,22 @@ public class UserManager { private final PasswordEncoder passwordEncoder; private final InvoiceSequencesRepository invoiceSequencesRepository; + private final FindByIndexNameSessionRepository sessionsByPrincipalFinder; + public UserManager(AuthorityRepository authorityRepository, OrganizationRepository organizationRepository, UserOrganizationRepository userOrganizationRepository, UserRepository userRepository, PasswordEncoder passwordEncoder, - InvoiceSequencesRepository invoiceSequencesRepository) { + InvoiceSequencesRepository invoiceSequencesRepository, + FindByIndexNameSessionRepository sessionsByPrincipalFinder) { this.authorityRepository = authorityRepository; this.organizationRepository = organizationRepository; this.userOrganizationRepository = userOrganizationRepository; this.userRepository = userRepository; this.passwordEncoder = passwordEncoder; this.invoiceSequencesRepository = invoiceSequencesRepository; + this.sessionsByPrincipalFinder = sessionsByPrincipalFinder; } private List getUserAuthorities(User user) { @@ -285,15 +290,20 @@ public UserWithPassword insertUser(int organizationId, String username, String f } - public UserWithPassword resetPassword(int userId) { + public UserWithPassword resetPassword(int userId, String currentUser) { User user = findUser(userId); String password = PasswordGenerator.generateRandomPassword(); Validate.isTrue(userRepository.resetPassword(userId, passwordEncoder.encode(password)) == 1, "error during password reset"); + + if (!currentUser.equals(user.getUsername())) { + invalidateSessionsForUser(user.getUsername()); + } + return new UserWithPassword(user, password, UUID.randomUUID().toString()); } - public void updatePassword(String username, String newPassword) { + public void updateCurrentUserPassword(String username, String newPassword) { User user = userRepository.findByUsername(username).orElseThrow(IllegalStateException::new); Validate.isTrue(PasswordGenerator.isValid(newPassword), "invalid password"); Validate.isTrue(userRepository.resetPassword(user.getId(), passwordEncoder.encode(newPassword)) == 1, "error during password update"); @@ -303,14 +313,24 @@ public void updatePassword(String username, String newPassword) { public void deleteUser(int userId, String currentUsername) { User currentUser = userRepository.findEnabledByUsername(currentUsername).orElseThrow(IllegalArgumentException::new); Assert.isTrue(userId != currentUser.getId(), "sorry but you cannot delete your own account."); + var userToDelete = userRepository.findById(userId); userRepository.deleteUserAndReferences(userId); + invalidateSessionsForUser(userToDelete.getUsername()); + } + + private void invalidateSessionsForUser(String username) { + var sessionsToInvalidate = sessionsByPrincipalFinder.findByPrincipalName(username).keySet(); + sessionsToInvalidate.forEach(sessionsByPrincipalFinder::deleteById); } public void enable(int userId, String currentUsername, boolean status) { User currentUser = userRepository.findEnabledByUsername(currentUsername).orElseThrow(IllegalArgumentException::new); Assert.isTrue(userId != currentUser.getId(), "sorry but you cannot commit suicide"); - userRepository.toggleEnabled(userId, status); + if (!status) { // disable user + var userToDisable = userRepository.findById(userId); + invalidateSessionsForUser(userToDisable.getUsername()); + } } public ValidationResult validateUser(Integer id, String username, String firstName, String lastName, String emailAddress) { diff --git a/src/test/java/alfio/TestConfiguration.java b/src/test/java/alfio/TestConfiguration.java index 7da4bfdee3..83b09b3f25 100644 --- a/src/test/java/alfio/TestConfiguration.java +++ b/src/test/java/alfio/TestConfiguration.java @@ -26,12 +26,14 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Caffeine; +import org.mockito.Mockito; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.core.env.Environment; import org.springframework.security.web.csrf.CookieCsrfTokenRepository; import org.springframework.security.web.csrf.CsrfTokenRepository; +import org.springframework.session.FindByIndexNameSessionRepository; import java.time.Duration; import java.util.Map; @@ -68,4 +70,9 @@ ObjectMapper objectMapper() { CsrfTokenRepository csrfTokenRepository() { return new CookieCsrfTokenRepository(); } + + @Bean + FindByIndexNameSessionRepository sessionsByPrincipalFinder() { + return Mockito.mock(FindByIndexNameSessionRepository.class); + } } From 94e2923a317452e337393789c9f3192dfc1ddac2 Mon Sep 17 00:00:00 2001 From: Sylvain Jermini Date: Tue, 7 Mar 2023 08:43:58 +0100 Subject: [PATCH 158/218] fix various findings (#1200) (#1201) * fix issue found by @yelprofessor : avoid binding for potentially user controlled input * csv export: escape with a tab if first char is one that would trigger the formula expansion --- src/main/java/alfio/util/ExportUtils.java | 21 ++++++++++++++++++- .../alfio/web-templates/admin-index.ms | 4 ++-- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/src/main/java/alfio/util/ExportUtils.java b/src/main/java/alfio/util/ExportUtils.java index 2cbd66ffb5..244a0790d5 100644 --- a/src/main/java/alfio/util/ExportUtils.java +++ b/src/main/java/alfio/util/ExportUtils.java @@ -20,6 +20,7 @@ import ch.digitalfondue.basicxlsx.StreamingWorkbook; import ch.digitalfondue.basicxlsx.Style; import com.opencsv.CSVWriter; +import org.apache.commons.lang3.StringUtils; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; @@ -74,6 +75,17 @@ public static void addSheetToWorkbook(String sheetName, } } + // https://owasp.org/www-community/attacks/CSV_Injection + private static String escapeFormulaChar(String s) { + var trimmed = StringUtils.trimToEmpty(s); + // tab and carriage return are removed by the trimming + var res = trimmed; + if (StringUtils.startsWithAny(trimmed, "=", "+", "-", "@")) { + res = "\t" + trimmed; // http://georgemauer.net/2017/10/07/csv-injection.html starting with a tab seems to be enough? + } + return res; + } + public static void exportCsv(String fileName, String[] header, Stream data, HttpServletResponse response) throws IOException { response.setContentType("text/csv;charset=UTF-8"); response.setHeader("Content-Disposition", "attachment; filename=" + fileName); @@ -83,7 +95,14 @@ public static void exportCsv(String fileName, String[] header, Stream out.write(marker); } writer.writeNext(header); - data.forEachOrdered(writer::writeNext); + data.forEachOrdered(d -> { + var copy = Arrays.copyOf(d, d.length); + for (var i = 0; i < copy.length; i++) { + var res = copy[i]; + copy[i] = escapeFormulaChar(res); + } + writer.writeNext(copy); + }); writer.flush(); out.flush(); } diff --git a/src/main/resources/alfio/web-templates/admin-index.ms b/src/main/resources/alfio/web-templates/admin-index.ms index 717f1272ad..26d677d129 100644 --- a/src/main/resources/alfio/web-templates/admin-index.ms +++ b/src/main/resources/alfio/web-templates/admin-index.ms @@ -195,7 +195,7 @@ @@ -203,7 +203,7 @@ {{#eventImage}}{{/eventImage}} {{^eventImage}}{{/eventImage}} - +
{{purchaseContext.displayName}}

{{purchaseContext.displayName}}

{{#i18n}}invoice.vat-invoice [{{vatTranslation}}]{{/i18n}}

 +

+ {{#proforma}}{{#i18n}}invoice.proforma [{{vatTranslation}}]{{/i18n}}{{/proforma}} + {{^proforma}}{{#i18n}}invoice.vat-invoice [{{vatTranslation}}]{{/i18n}}{{/proforma}} +

+
@@ -199,27 +220,8 @@ -
-

{{#i18n}}invoice.order-information{{/i18n}}

-

{{ticketReservation.id}}

-

{{#i18n}}invoice.buyer{{/i18n}} {{ticketReservation.fullName}} <{{ticketReservation.email}}>

- {{#hasRefund}} -

{{#i18n}}invoice.refund [{{purchaseContext.currency}} {{orderSummary.refundedAmount}}]{{/i18n}}

- {{/hasRefund}} -
- - {{#invoicingAdditionalInfo}} - 
{{#italianEInvoicing}}
-{{#i18n}}invoice.vat [{{vatTranslation}}]{{/i18n}}: {{ticketReservation.vatNr}}
-{{#i18n}}invoice-fields.fiscalCode{{/i18n}}: {{fiscalCode}}
-{{#i18n}}invoice-fields.addresseeItalyEInvoice{{/i18n}}: {{referenceType}}
-{{#i18n}}invoice-fields.addressee-code{{/i18n}}: {{addresseeCode}}
-PEC: {{pec}}{{/italianEInvoicing}}
-
- {{/invoicingAdditionalInfo}} - {{#isOfflinePayment}} -
+

{{#i18n}}invoice.payment-instruction-no-later-than [{{#format-date}}{{expirationDate}} {{#i18n}}datetime.pattern{{/i18n}} locale:{{#i18n}}locale{{/i18n}}{{/format-date}}]{{/i18n}}


{{#i18n}}invoice.payment-instruction{{/i18n}}

@@ -236,9 +238,46 @@ PEC: {{pec}}{{/italianEInvoicing}}

{{#i18n}}invoice.payment-contact [{{organization.email}}]{{/i18n}}

{{/isOfflinePayment}} +
+

{{#i18n}}invoice.regards{{/i18n}}

+

{{organization.name}}

+
-

{{#i18n}}invoice.regards{{/i18n}}

-

{{organization.name}}

- +
+
+

{{#i18n}}invoice.order-information{{/i18n}}: {{ticketReservation.id}}, {{#i18n}}invoice.buyer{{/i18n}} {{ticketReservation.fullName}} <{{ticketReservation.email}}>

+ {{#hasRefund}} +

{{#i18n}}invoice.refund [{{purchaseContext.currency}} {{orderSummary.refundedAmount}}]{{/i18n}}

+ {{/hasRefund}} +
+ {{#invoicingAdditionalInfo}} + + {{#italianEInvoicing}} + + + + + + + + + + + + + + + + + + + {{/italianEInvoicing}} +
{{#i18n}}invoice.vat [{{vatTranslation}}]{{/i18n}}{{#i18n}}invoice-fields.fiscalCode{{/i18n}}{{#i18n}}invoice-fields.addresseeItalyEInvoice{{/i18n}}{{#i18n}}invoice-fields.addressee-code{{/i18n}}{{#i18n}}invoice-fields.pec{{/i18n}}
{{ticketReservation.vatNr}} 12345678901{{fiscalCode}}{{referenceType}}{{addresseeCode}}ABCDEFG{{pec}}celestino.bellone@claranet.com
+ {{#italianEInvoicing}} + +

Il presente documento non costituisce fattura valida ai fini del DpR 633 26/10/1972 e successive modifiche. La fattura definitiva verrà emessa all’atto del pagamento del corrispettivo (articolo 6, comma 3, DpR 633/72).

+ {{/italianEInvoicing}} + {{/invoicingAdditionalInfo}} +
\ No newline at end of file From c821aa9edae7b5f86b77d177526c7d5248909e64 Mon Sep 17 00:00:00 2001 From: Celestino Bellone <3385346+cbellone@users.noreply.github.com> Date: Fri, 14 Apr 2023 19:30:42 +0200 Subject: [PATCH 183/218] fix failing test --- src/test/resources/api/descriptor.json | 4716 ++++++++++++------------ 1 file changed, 2358 insertions(+), 2358 deletions(-) diff --git a/src/test/resources/api/descriptor.json b/src/test/resources/api/descriptor.json index f579197004..f0aae51711 100644 --- a/src/test/resources/api/descriptor.json +++ b/src/test/resources/api/descriptor.json @@ -39,8 +39,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -49,8 +49,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -120,8 +120,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -130,8 +130,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -191,8 +191,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -201,8 +201,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -258,8 +258,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -268,8 +268,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -324,8 +324,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -334,8 +334,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -402,8 +402,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -412,8 +412,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -476,8 +476,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -486,8 +486,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -558,8 +558,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -568,8 +568,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -640,8 +640,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -650,8 +650,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -712,148 +712,6 @@ } } }, - "400" : { - "description" : "Bad Request", - "content" : { - "*/*" : { - "schema" : { - "type" : "string" - } - } - } - }, - "405" : { - "description" : "Method Not Allowed", - "content" : { - "*/*" : { - "schema" : { - "type" : "string" - } - } - } - }, - "401" : { - "description" : "Unauthorized", - "content" : { - "*/*" : { - "schema" : { - "type" : "string" - } - } - } - }, - "200" : { - "description" : "OK", - "content" : { - "*/*" : { - "schema" : { - "type" : "boolean" - } - } - } - } - } - } - }, - "/admin/api/users/{id}/reset-password" : { - "put" : { - "tags" : [ "users-api-controller" ], - "operationId" : "resetPassword", - "parameters" : [ { - "name" : "id", - "in" : "path", - "required" : true, - "schema" : { - "type" : "integer", - "format" : "int32" - } - }, { - "name" : "baseUrl", - "in" : "query", - "required" : true, - "schema" : { - "type" : "string" - } - } ], - "responses" : { - "500" : { - "description" : "Internal Server Error", - "content" : { - "*/*" : { - "schema" : { - "type" : "string" - } - } - } - }, - "400" : { - "description" : "Bad Request", - "content" : { - "*/*" : { - "schema" : { - "type" : "string" - } - } - } - }, - "405" : { - "description" : "Method Not Allowed", - "content" : { - "*/*" : { - "schema" : { - "type" : "string" - } - } - } - }, - "401" : { - "description" : "Unauthorized", - "content" : { - "*/*" : { - "schema" : { - "type" : "string" - } - } - } - }, - "200" : { - "description" : "OK", - "content" : { - "*/*" : { - "schema" : { - "$ref" : "#/components/schemas/UserWithPasswordAndQRCode" - } - } - } - } - } - } - }, - "/admin/api/system/api-key" : { - "get" : { - "tags" : [ "system-api-key-api-controller" ], - "operationId" : "retrieveApiKey", - "responses" : { - "500" : { - "description" : "Internal Server Error", - "content" : { - "*/*" : { - "schema" : { - "type" : "string" - } - } - } - }, - "400" : { - "description" : "Bad Request", - "content" : { - "*/*" : { - "schema" : { - "type" : "string" - } - } - } - }, "405" : { "description" : "Method Not Allowed", "content" : { @@ -864,42 +722,6 @@ } } }, - "401" : { - "description" : "Unauthorized", - "content" : { - "*/*" : { - "schema" : { - "type" : "string" - } - } - } - }, - "200" : { - "description" : "OK", - "content" : { - "*/*" : { - "schema" : { - "type" : "string" - } - } - } - } - } - }, - "put" : { - "tags" : [ "system-api-key-api-controller" ], - "operationId" : "rotateApiKey", - "responses" : { - "500" : { - "description" : "Internal Server Error", - "content" : { - "*/*" : { - "schema" : { - "type" : "string" - } - } - } - }, "400" : { "description" : "Bad Request", "content" : { @@ -910,16 +732,194 @@ } } }, - "405" : { - "description" : "Method Not Allowed", - "content" : { - "*/*" : { - "schema" : { - "type" : "string" - } - } - } - }, + "401" : { + "description" : "Unauthorized", + "content" : { + "*/*" : { + "schema" : { + "type" : "string" + } + } + } + }, + "200" : { + "description" : "OK", + "content" : { + "*/*" : { + "schema" : { + "type" : "boolean" + } + } + } + } + } + } + }, + "/admin/api/users/{id}/reset-password" : { + "put" : { + "tags" : [ "users-api-controller" ], + "operationId" : "resetPassword", + "parameters" : [ { + "name" : "id", + "in" : "path", + "required" : true, + "schema" : { + "type" : "integer", + "format" : "int32" + } + }, { + "name" : "baseUrl", + "in" : "query", + "required" : true, + "schema" : { + "type" : "string" + } + } ], + "responses" : { + "500" : { + "description" : "Internal Server Error", + "content" : { + "*/*" : { + "schema" : { + "type" : "string" + } + } + } + }, + "405" : { + "description" : "Method Not Allowed", + "content" : { + "*/*" : { + "schema" : { + "type" : "string" + } + } + } + }, + "400" : { + "description" : "Bad Request", + "content" : { + "*/*" : { + "schema" : { + "type" : "string" + } + } + } + }, + "401" : { + "description" : "Unauthorized", + "content" : { + "*/*" : { + "schema" : { + "type" : "string" + } + } + } + }, + "200" : { + "description" : "OK", + "content" : { + "*/*" : { + "schema" : { + "$ref" : "#/components/schemas/UserWithPasswordAndQRCode" + } + } + } + } + } + } + }, + "/admin/api/system/api-key" : { + "get" : { + "tags" : [ "system-api-key-api-controller" ], + "operationId" : "retrieveApiKey", + "responses" : { + "500" : { + "description" : "Internal Server Error", + "content" : { + "*/*" : { + "schema" : { + "type" : "string" + } + } + } + }, + "405" : { + "description" : "Method Not Allowed", + "content" : { + "*/*" : { + "schema" : { + "type" : "string" + } + } + } + }, + "400" : { + "description" : "Bad Request", + "content" : { + "*/*" : { + "schema" : { + "type" : "string" + } + } + } + }, + "401" : { + "description" : "Unauthorized", + "content" : { + "*/*" : { + "schema" : { + "type" : "string" + } + } + } + }, + "200" : { + "description" : "OK", + "content" : { + "*/*" : { + "schema" : { + "type" : "string" + } + } + } + } + } + }, + "put" : { + "tags" : [ "system-api-key-api-controller" ], + "operationId" : "rotateApiKey", + "responses" : { + "500" : { + "description" : "Internal Server Error", + "content" : { + "*/*" : { + "schema" : { + "type" : "string" + } + } + } + }, + "405" : { + "description" : "Method Not Allowed", + "content" : { + "*/*" : { + "schema" : { + "type" : "string" + } + } + } + }, + "400" : { + "description" : "Bad Request", + "content" : { + "*/*" : { + "schema" : { + "type" : "string" + } + } + } + }, "401" : { "description" : "Unauthorized", "content" : { @@ -981,8 +981,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -991,8 +991,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -1072,8 +1072,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -1082,8 +1082,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -1153,8 +1153,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -1163,8 +1163,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -1242,8 +1242,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -1252,8 +1252,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -1329,8 +1329,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -1339,8 +1339,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -1403,8 +1403,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -1413,8 +1413,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -1482,8 +1482,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -1492,8 +1492,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -1548,8 +1548,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -1558,8 +1558,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -1622,8 +1622,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -1632,8 +1632,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -1696,8 +1696,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -1706,8 +1706,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -1770,8 +1770,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -1780,8 +1780,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -1852,8 +1852,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -1862,8 +1862,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -1934,8 +1934,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -1944,8 +1944,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -2002,8 +2002,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -2012,8 +2012,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -2076,8 +2076,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -2086,8 +2086,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -2145,8 +2145,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -2155,8 +2155,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -2222,8 +2222,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -2232,8 +2232,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -2310,8 +2310,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -2320,8 +2320,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -2383,8 +2383,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -2393,8 +2393,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -2458,8 +2458,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -2468,8 +2468,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -2516,8 +2516,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -2526,8 +2526,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -2582,8 +2582,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -2592,8 +2592,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -2655,8 +2655,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -2665,8 +2665,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -2736,8 +2736,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -2746,8 +2746,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -2794,8 +2794,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -2804,8 +2804,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -2860,8 +2860,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -2870,8 +2870,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -2916,8 +2916,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -2926,8 +2926,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -2974,8 +2974,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -2984,8 +2984,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -3040,8 +3040,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -3050,8 +3050,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -3104,16 +3104,6 @@ } } }, - "400" : { - "description" : "Bad Request", - "content" : { - "*/*" : { - "schema" : { - "type" : "string" - } - } - } - }, "405" : { "description" : "Method Not Allowed", "content" : { @@ -3124,77 +3114,6 @@ } } }, - "401" : { - "description" : "Unauthorized", - "content" : { - "*/*" : { - "schema" : { - "type" : "string" - } - } - } - }, - "200" : { - "description" : "OK", - "content" : { - "*/*" : { - "schema" : { - "$ref" : "#/components/schemas/ValidatedResponseString" - } - } - } - } - } - } - }, - "/api/v2/public/reservation/{reservationId}/validate-to-overview" : { - "post" : { - "tags" : [ "reservation-api-v-2-controller" ], - "operationId" : "validateToOverview", - "parameters" : [ { - "name" : "reservationId", - "in" : "path", - "required" : true, - "schema" : { - "type" : "string" - } - }, { - "name" : "lang", - "in" : "query", - "required" : true, - "schema" : { - "type" : "string" - } - }, { - "name" : "ignoreWarnings", - "in" : "query", - "required" : false, - "schema" : { - "type" : "boolean", - "default" : false - } - } ], - "requestBody" : { - "content" : { - "application/json" : { - "schema" : { - "$ref" : "#/components/schemas/ContactAndTicketsForm" - } - } - }, - "required" : true - }, - "responses" : { - "500" : { - "description" : "Internal Server Error", - "content" : { - "*/*" : { - "schema" : { - "type" : "string" - } - } - } - }, "400" : { "description" : "Bad Request", "content" : { @@ -3205,16 +3124,6 @@ } } }, - "405" : { - "description" : "Method Not Allowed", - "content" : { - "*/*" : { - "schema" : { - "type" : "string" - } - } - } - }, "401" : { "description" : "Unauthorized", "content" : { @@ -3230,7 +3139,7 @@ "content" : { "*/*" : { "schema" : { - "$ref" : "#/components/schemas/ValidatedResponseBoolean" + "$ref" : "#/components/schemas/ValidatedResponseString" } } } @@ -3238,10 +3147,10 @@ } } }, - "/api/v2/public/event/{eventName}/reservation/{reservationId}/validate-to-overview" : { + "/api/v2/public/reservation/{reservationId}/validate-to-overview" : { "post" : { "tags" : [ "reservation-api-v-2-controller" ], - "operationId" : "validateToOverview_1", + "operationId" : "validateToOverview", "parameters" : [ { "name" : "reservationId", "in" : "path", @@ -3286,6 +3195,16 @@ } } }, + "405" : { + "description" : "Method Not Allowed", + "content" : { + "*/*" : { + "schema" : { + "type" : "string" + } + } + } + }, "400" : { "description" : "Bad Request", "content" : { @@ -3296,6 +3215,77 @@ } } }, + "401" : { + "description" : "Unauthorized", + "content" : { + "*/*" : { + "schema" : { + "type" : "string" + } + } + } + }, + "200" : { + "description" : "OK", + "content" : { + "*/*" : { + "schema" : { + "$ref" : "#/components/schemas/ValidatedResponseBoolean" + } + } + } + } + } + } + }, + "/api/v2/public/event/{eventName}/reservation/{reservationId}/validate-to-overview" : { + "post" : { + "tags" : [ "reservation-api-v-2-controller" ], + "operationId" : "validateToOverview_1", + "parameters" : [ { + "name" : "reservationId", + "in" : "path", + "required" : true, + "schema" : { + "type" : "string" + } + }, { + "name" : "lang", + "in" : "query", + "required" : true, + "schema" : { + "type" : "string" + } + }, { + "name" : "ignoreWarnings", + "in" : "query", + "required" : false, + "schema" : { + "type" : "boolean", + "default" : false + } + } ], + "requestBody" : { + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ContactAndTicketsForm" + } + } + }, + "required" : true + }, + "responses" : { + "500" : { + "description" : "Internal Server Error", + "content" : { + "*/*" : { + "schema" : { + "type" : "string" + } + } + } + }, "405" : { "description" : "Method Not Allowed", "content" : { @@ -3306,6 +3296,16 @@ } } }, + "400" : { + "description" : "Bad Request", + "content" : { + "*/*" : { + "schema" : { + "type" : "string" + } + } + } + }, "401" : { "description" : "Unauthorized", "content" : { @@ -3366,8 +3366,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -3376,8 +3376,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -3446,8 +3446,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -3456,8 +3456,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -3512,8 +3512,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -3522,8 +3522,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -3578,8 +3578,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -3588,8 +3588,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -3654,8 +3654,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -3664,8 +3664,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -3720,8 +3720,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -3730,8 +3730,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -3801,8 +3801,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -3811,8 +3811,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -3865,8 +3865,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -3875,8 +3875,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -3931,8 +3931,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -3941,8 +3941,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -4012,8 +4012,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -4022,8 +4022,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -4076,8 +4076,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -4086,8 +4086,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -4152,8 +4152,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -4162,8 +4162,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -4225,8 +4225,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -4235,8 +4235,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -4308,8 +4308,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -4318,8 +4318,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -4392,8 +4392,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -4402,8 +4402,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -4468,8 +4468,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -4478,8 +4478,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -4535,8 +4535,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -4545,8 +4545,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -4610,8 +4610,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -4620,8 +4620,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -4675,8 +4675,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -4685,8 +4685,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -4736,8 +4736,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -4746,8 +4746,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -4813,8 +4813,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -4823,8 +4823,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -4880,8 +4880,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -4890,8 +4890,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -4961,8 +4961,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -4971,8 +4971,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -5040,8 +5040,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -5050,8 +5050,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -5108,8 +5108,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -5118,8 +5118,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -5184,8 +5184,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -5194,8 +5194,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -5250,8 +5250,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -5260,8 +5260,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -5326,8 +5326,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -5336,8 +5336,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -5394,8 +5394,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -5404,8 +5404,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -5633,8 +5633,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -5643,8 +5643,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -5712,8 +5712,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -5722,8 +5722,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -5781,8 +5781,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -5791,8 +5791,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -5858,8 +5858,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -5868,8 +5868,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -5943,8 +5943,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -5953,8 +5953,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -6009,8 +6009,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -6019,8 +6019,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -6083,8 +6083,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -6093,8 +6093,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -6159,8 +6159,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -6169,8 +6169,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -6227,8 +6227,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -6237,8 +6237,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -6295,8 +6295,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -6305,8 +6305,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -6363,8 +6363,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -6373,8 +6373,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -6424,8 +6424,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -6434,8 +6434,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -6773,16 +6773,6 @@ } } }, - "400" : { - "description" : "Bad Request", - "content" : { - "*/*" : { - "schema" : { - "type" : "string" - } - } - } - }, "405" : { "description" : "Method Not Allowed", "content" : { @@ -6793,75 +6783,6 @@ } } }, - "401" : { - "description" : "Unauthorized", - "content" : { - "*/*" : { - "schema" : { - "type" : "string" - } - } - } - }, - "200" : { - "description" : "OK", - "content" : { - "*/*" : { - "schema" : { - "$ref" : "#/components/schemas/ResultTicketReservationDescriptor" - } - } - } - } - } - }, - "post" : { - "tags" : [ "admin-reservation-api-controller" ], - "operationId" : "updateReservation", - "parameters" : [ { - "name" : "purchaseContextType", - "in" : "path", - "required" : true, - "schema" : { - "type" : "string", - "enum" : [ "subscription", "event" ] - } - }, { - "name" : "publicIdentifier", - "in" : "path", - "required" : true, - "schema" : { - "type" : "string" - } - }, { - "name" : "reservationId", - "in" : "path", - "required" : true, - "schema" : { - "type" : "string" - } - } ], - "requestBody" : { - "content" : { - "application/json" : { - "schema" : { - "$ref" : "#/components/schemas/AdminReservationModification" - } - } - }, - "required" : true - }, - "responses" : { - "500" : { - "description" : "Internal Server Error", - "content" : { - "*/*" : { - "schema" : { - "type" : "string" - } - } - } - }, "400" : { "description" : "Bad Request", "content" : { @@ -6872,16 +6793,6 @@ } } }, - "405" : { - "description" : "Method Not Allowed", - "content" : { - "*/*" : { - "schema" : { - "type" : "string" - } - } - } - }, "401" : { "description" : "Unauthorized", "content" : { @@ -6897,18 +6808,16 @@ "content" : { "*/*" : { "schema" : { - "$ref" : "#/components/schemas/ResultBoolean" + "$ref" : "#/components/schemas/ResultTicketReservationDescriptor" } } } } } - } - }, - "/admin/api/reservation/{purchaseContextType}/{publicIdentifier}/{reservationId}/refund" : { + }, "post" : { "tags" : [ "admin-reservation-api-controller" ], - "operationId" : "refund", + "operationId" : "updateReservation", "parameters" : [ { "name" : "purchaseContextType", "in" : "path", @@ -6936,7 +6845,7 @@ "content" : { "application/json" : { "schema" : { - "$ref" : "#/components/schemas/RefundAmount" + "$ref" : "#/components/schemas/AdminReservationModification" } } }, @@ -6953,6 +6862,16 @@ } } }, + "405" : { + "description" : "Method Not Allowed", + "content" : { + "*/*" : { + "schema" : { + "type" : "string" + } + } + } + }, "400" : { "description" : "Bad Request", "content" : { @@ -6963,6 +6882,77 @@ } } }, + "401" : { + "description" : "Unauthorized", + "content" : { + "*/*" : { + "schema" : { + "type" : "string" + } + } + } + }, + "200" : { + "description" : "OK", + "content" : { + "*/*" : { + "schema" : { + "$ref" : "#/components/schemas/ResultBoolean" + } + } + } + } + } + } + }, + "/admin/api/reservation/{purchaseContextType}/{publicIdentifier}/{reservationId}/refund" : { + "post" : { + "tags" : [ "admin-reservation-api-controller" ], + "operationId" : "refund", + "parameters" : [ { + "name" : "purchaseContextType", + "in" : "path", + "required" : true, + "schema" : { + "type" : "string", + "enum" : [ "subscription", "event" ] + } + }, { + "name" : "publicIdentifier", + "in" : "path", + "required" : true, + "schema" : { + "type" : "string" + } + }, { + "name" : "reservationId", + "in" : "path", + "required" : true, + "schema" : { + "type" : "string" + } + } ], + "requestBody" : { + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/RefundAmount" + } + } + }, + "required" : true + }, + "responses" : { + "500" : { + "description" : "Internal Server Error", + "content" : { + "*/*" : { + "schema" : { + "type" : "string" + } + } + } + }, "405" : { "description" : "Method Not Allowed", "content" : { @@ -6973,6 +6963,16 @@ } } }, + "400" : { + "description" : "Bad Request", + "content" : { + "*/*" : { + "schema" : { + "type" : "string" + } + } + } + }, "401" : { "description" : "Unauthorized", "content" : { @@ -7049,8 +7049,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -7059,8 +7059,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -7153,8 +7153,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -7163,8 +7163,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -7237,8 +7237,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -7247,8 +7247,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -7320,8 +7320,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -7330,8 +7330,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -7388,8 +7388,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -7398,8 +7398,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -7458,8 +7458,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -7468,8 +7468,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -7516,8 +7516,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -7526,8 +7526,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -7576,8 +7576,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -7586,8 +7586,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -7738,8 +7738,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -7748,8 +7748,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -7806,8 +7806,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -7816,8 +7816,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -7874,8 +7874,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -7884,8 +7884,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -7942,8 +7942,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -7952,8 +7952,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -8017,8 +8017,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -8027,8 +8027,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -8100,8 +8100,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -8110,8 +8110,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -8174,8 +8174,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -8184,8 +8184,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -8244,8 +8244,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -8254,8 +8254,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -8553,8 +8553,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -8563,8 +8563,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -8611,8 +8611,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -8621,8 +8621,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -8680,8 +8680,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -8690,8 +8690,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -8753,8 +8753,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -8763,8 +8763,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -8834,8 +8834,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -8844,8 +8844,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -8905,8 +8905,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -8915,8 +8915,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -8978,8 +8978,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -8988,8 +8988,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -9042,8 +9042,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -9052,8 +9052,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -9122,8 +9122,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -9132,8 +9132,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -9195,8 +9195,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -9205,8 +9205,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -9265,8 +9265,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -9275,8 +9275,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -9342,8 +9342,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -9352,8 +9352,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -9415,8 +9415,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -9425,8 +9425,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -9491,8 +9491,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -9501,8 +9501,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -9751,8 +9751,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -9761,8 +9761,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -9835,8 +9835,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -9845,8 +9845,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -9925,8 +9925,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -9935,8 +9935,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -10009,8 +10009,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -10019,8 +10019,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -10074,8 +10074,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -10084,8 +10084,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -10149,8 +10149,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -10159,8 +10159,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -10224,8 +10224,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -10234,8 +10234,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -10293,8 +10293,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -10303,8 +10303,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -10364,8 +10364,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -10374,8 +10374,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -10442,8 +10442,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -10452,8 +10452,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -10519,8 +10519,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -10529,8 +10529,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -10587,8 +10587,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -10597,8 +10597,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -10655,8 +10655,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -10665,8 +10665,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -10739,8 +10739,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -10749,8 +10749,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -10806,16 +10806,6 @@ } } }, - "400" : { - "description" : "Bad Request", - "content" : { - "*/*" : { - "schema" : { - "type" : "string" - } - } - } - }, "405" : { "description" : "Method Not Allowed", "content" : { @@ -10826,64 +10816,6 @@ } } }, - "401" : { - "description" : "Unauthorized", - "content" : { - "*/*" : { - "schema" : { - "type" : "string" - } - } - } - }, - "200" : { - "description" : "OK", - "content" : { - "*/*" : { - "schema" : { - "type" : "array", - "items" : { - "$ref" : "#/components/schemas/AdditionalService" - } - } - } - } - } - } - }, - "post" : { - "tags" : [ "additional-service-api-controller" ], - "operationId" : "insert", - "parameters" : [ { - "name" : "eventId", - "in" : "path", - "required" : true, - "schema" : { - "type" : "integer", - "format" : "int32" - } - } ], - "requestBody" : { - "content" : { - "application/json" : { - "schema" : { - "$ref" : "#/components/schemas/AdditionalService" - } - } - }, - "required" : true - }, - "responses" : { - "500" : { - "description" : "Internal Server Error", - "content" : { - "*/*" : { - "schema" : { - "type" : "string" - } - } - } - }, "400" : { "description" : "Bad Request", "content" : { @@ -10894,16 +10826,84 @@ } } }, - "405" : { - "description" : "Method Not Allowed", - "content" : { - "*/*" : { - "schema" : { - "type" : "string" - } - } - } - }, + "401" : { + "description" : "Unauthorized", + "content" : { + "*/*" : { + "schema" : { + "type" : "string" + } + } + } + }, + "200" : { + "description" : "OK", + "content" : { + "*/*" : { + "schema" : { + "type" : "array", + "items" : { + "$ref" : "#/components/schemas/AdditionalService" + } + } + } + } + } + } + }, + "post" : { + "tags" : [ "additional-service-api-controller" ], + "operationId" : "insert", + "parameters" : [ { + "name" : "eventId", + "in" : "path", + "required" : true, + "schema" : { + "type" : "integer", + "format" : "int32" + } + } ], + "requestBody" : { + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/AdditionalService" + } + } + }, + "required" : true + }, + "responses" : { + "500" : { + "description" : "Internal Server Error", + "content" : { + "*/*" : { + "schema" : { + "type" : "string" + } + } + } + }, + "405" : { + "description" : "Method Not Allowed", + "content" : { + "*/*" : { + "schema" : { + "type" : "string" + } + } + } + }, + "400" : { + "description" : "Bad Request", + "content" : { + "*/*" : { + "schema" : { + "type" : "string" + } + } + } + }, "401" : { "description" : "Unauthorized", "content" : { @@ -10952,8 +10952,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -10962,8 +10962,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -11026,8 +11026,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -11036,8 +11036,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -11109,8 +11109,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -11119,8 +11119,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -11200,8 +11200,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -11210,8 +11210,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -11291,8 +11291,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -11301,8 +11301,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -11372,8 +11372,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -11382,8 +11382,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -11462,8 +11462,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -11472,8 +11472,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -11546,8 +11546,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -11556,8 +11556,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -11630,8 +11630,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -11640,8 +11640,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -11712,8 +11712,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -11722,8 +11722,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -11786,8 +11786,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -11796,8 +11796,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -11860,8 +11860,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -11870,8 +11870,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -11934,8 +11934,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -11944,8 +11944,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -12014,8 +12014,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -12024,8 +12024,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -12102,8 +12102,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -12112,8 +12112,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -12175,8 +12175,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -12185,8 +12185,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -12248,8 +12248,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -12258,8 +12258,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -12338,8 +12338,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -12348,8 +12348,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -12432,8 +12432,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -12442,8 +12442,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -12503,8 +12503,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -12513,8 +12513,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -12571,8 +12571,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -12581,8 +12581,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -12653,8 +12653,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -12663,8 +12663,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -12711,8 +12711,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -12721,8 +12721,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -12772,8 +12772,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -12782,8 +12782,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -12838,8 +12838,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -12848,8 +12848,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -12959,8 +12959,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -12969,8 +12969,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -13025,8 +13025,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -13035,8 +13035,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -13098,8 +13098,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -13108,8 +13108,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -13171,8 +13171,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -13181,8 +13181,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -13229,8 +13229,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -13239,8 +13239,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -13298,8 +13298,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -13308,8 +13308,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -13367,8 +13367,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -13377,8 +13377,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -13436,8 +13436,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -13446,8 +13446,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -13513,8 +13513,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -13523,8 +13523,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -13582,8 +13582,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -13592,8 +13592,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -13651,8 +13651,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -13661,8 +13661,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -13724,8 +13724,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -13734,8 +13734,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -13797,8 +13797,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -13807,8 +13807,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -13870,8 +13870,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -13880,8 +13880,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -13950,8 +13950,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -13960,8 +13960,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -14023,8 +14023,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -14033,8 +14033,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -14089,8 +14089,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -14099,8 +14099,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -14155,8 +14155,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -14165,8 +14165,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -14228,8 +14228,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -14238,8 +14238,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -14294,8 +14294,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -14304,8 +14304,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -14360,8 +14360,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -14370,8 +14370,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -14441,8 +14441,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -14451,8 +14451,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -14514,8 +14514,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -14524,8 +14524,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -14594,8 +14594,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -14604,8 +14604,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -14645,8 +14645,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -14655,8 +14655,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -14719,8 +14719,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -14729,8 +14729,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -14780,8 +14780,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -14790,8 +14790,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -14850,8 +14850,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -14860,8 +14860,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -14916,8 +14916,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -14926,8 +14926,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -14982,8 +14982,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -14992,8 +14992,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -15201,8 +15201,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -15211,8 +15211,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -15274,8 +15274,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -15284,8 +15284,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -15359,8 +15359,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -15369,8 +15369,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -15448,8 +15448,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -15458,8 +15458,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -15522,8 +15522,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -15532,8 +15532,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -15603,8 +15603,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -15613,8 +15613,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -15680,8 +15680,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -15690,8 +15690,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -15765,8 +15765,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -15775,8 +15775,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -15834,8 +15834,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -15844,8 +15844,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -15900,8 +15900,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -15910,8 +15910,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -15958,8 +15958,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -15968,8 +15968,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -16019,8 +16019,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -16029,8 +16029,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -16080,8 +16080,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -16090,8 +16090,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -16141,8 +16141,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -16151,8 +16151,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -16211,8 +16211,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -16221,8 +16221,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -16276,8 +16276,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -16286,8 +16286,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -16334,8 +16334,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -16344,8 +16344,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -16392,8 +16392,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -16402,8 +16402,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -16453,8 +16453,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -16463,8 +16463,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -16511,8 +16511,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -16521,8 +16521,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -17361,8 +17361,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -17371,8 +17371,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -17454,8 +17454,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -17464,8 +17464,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -17542,8 +17542,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -17552,8 +17552,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -17623,16 +17623,6 @@ } } }, - "400" : { - "description" : "Bad Request", - "content" : { - "*/*" : { - "schema" : { - "type" : "string" - } - } - } - }, "405" : { "description" : "Method Not Allowed", "content" : { @@ -17643,67 +17633,6 @@ } } }, - "401" : { - "description" : "Unauthorized", - "content" : { - "*/*" : { - "schema" : { - "type" : "string" - } - } - } - }, - "200" : { - "description" : "OK", - "content" : { - "*/*" : { - "schema" : { - "$ref" : "#/components/schemas/ResultTransactionAndPaymentInfo" - } - } - } - } - } - } - }, - "/admin/api/reservation/{purchaseContextType}/{publicIdentifier}/{reservationId}/email-list" : { - "get" : { - "tags" : [ "admin-reservation-api-controller" ], - "operationId" : "getEmailList", - "parameters" : [ { - "name" : "purchaseContextType", - "in" : "path", - "required" : true, - "schema" : { - "type" : "string", - "enum" : [ "subscription", "event" ] - } - }, { - "name" : "publicIdentifier", - "in" : "path", - "required" : true, - "schema" : { - "type" : "string" - } - }, { - "name" : "reservationId", - "in" : "path", - "required" : true, - "schema" : { - "type" : "string" - } - } ], - "responses" : { - "500" : { - "description" : "Internal Server Error", - "content" : { - "*/*" : { - "schema" : { - "type" : "string" - } - } - } - }, "400" : { "description" : "Bad Request", "content" : { @@ -17714,16 +17643,6 @@ } } }, - "405" : { - "description" : "Method Not Allowed", - "content" : { - "*/*" : { - "schema" : { - "type" : "string" - } - } - } - }, "401" : { "description" : "Unauthorized", "content" : { @@ -17739,7 +17658,7 @@ "content" : { "*/*" : { "schema" : { - "$ref" : "#/components/schemas/ResultListLightweightMailMessage" + "$ref" : "#/components/schemas/ResultTransactionAndPaymentInfo" } } } @@ -17747,10 +17666,10 @@ } } }, - "/admin/api/reservation/{purchaseContextType}/{publicIdentifier}/{reservationId}/billing-documents" : { + "/admin/api/reservation/{purchaseContextType}/{publicIdentifier}/{reservationId}/email-list" : { "get" : { "tags" : [ "admin-reservation-api-controller" ], - "operationId" : "getBillingDocuments", + "operationId" : "getEmailList", "parameters" : [ { "name" : "purchaseContextType", "in" : "path", @@ -17785,6 +17704,16 @@ } } }, + "405" : { + "description" : "Method Not Allowed", + "content" : { + "*/*" : { + "schema" : { + "type" : "string" + } + } + } + }, "400" : { "description" : "Bad Request", "content" : { @@ -17795,6 +17724,67 @@ } } }, + "401" : { + "description" : "Unauthorized", + "content" : { + "*/*" : { + "schema" : { + "type" : "string" + } + } + } + }, + "200" : { + "description" : "OK", + "content" : { + "*/*" : { + "schema" : { + "$ref" : "#/components/schemas/ResultListLightweightMailMessage" + } + } + } + } + } + } + }, + "/admin/api/reservation/{purchaseContextType}/{publicIdentifier}/{reservationId}/billing-documents" : { + "get" : { + "tags" : [ "admin-reservation-api-controller" ], + "operationId" : "getBillingDocuments", + "parameters" : [ { + "name" : "purchaseContextType", + "in" : "path", + "required" : true, + "schema" : { + "type" : "string", + "enum" : [ "subscription", "event" ] + } + }, { + "name" : "publicIdentifier", + "in" : "path", + "required" : true, + "schema" : { + "type" : "string" + } + }, { + "name" : "reservationId", + "in" : "path", + "required" : true, + "schema" : { + "type" : "string" + } + } ], + "responses" : { + "500" : { + "description" : "Internal Server Error", + "content" : { + "*/*" : { + "schema" : { + "type" : "string" + } + } + } + }, "405" : { "description" : "Method Not Allowed", "content" : { @@ -17805,6 +17795,16 @@ } } }, + "400" : { + "description" : "Bad Request", + "content" : { + "*/*" : { + "schema" : { + "type" : "string" + } + } + } + }, "401" : { "description" : "Unauthorized", "content" : { @@ -17874,8 +17874,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -17884,8 +17884,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -17954,8 +17954,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -17964,8 +17964,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -18035,8 +18035,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -18045,8 +18045,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -18135,8 +18135,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -18145,8 +18145,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -18209,8 +18209,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -18219,8 +18219,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -18287,8 +18287,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -18297,8 +18297,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -18357,8 +18357,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -18367,8 +18367,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -18425,8 +18425,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -18435,8 +18435,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -18615,8 +18615,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -18625,8 +18625,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -18685,8 +18685,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -18695,8 +18695,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -18760,8 +18760,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -18770,8 +18770,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -18830,8 +18830,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -18840,8 +18840,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -18900,8 +18900,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -18910,8 +18910,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -18970,8 +18970,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -18980,8 +18980,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -19031,8 +19031,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -19041,8 +19041,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -19109,8 +19109,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -19119,8 +19119,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -19182,8 +19182,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -19192,8 +19192,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -19240,8 +19240,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -19250,8 +19250,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -19660,8 +19660,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -19670,8 +19670,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -19733,8 +19733,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -19743,8 +19743,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -19813,8 +19813,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -19823,8 +19823,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -19877,8 +19877,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -19887,8 +19887,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -19967,8 +19967,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -19977,8 +19977,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -20040,8 +20040,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -20050,8 +20050,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -20091,8 +20091,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -20101,8 +20101,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -20167,8 +20167,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -20177,8 +20177,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -20243,8 +20243,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -20253,8 +20253,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -20323,8 +20323,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -20333,8 +20333,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -20397,8 +20397,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -20407,8 +20407,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -20456,8 +20456,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -20466,8 +20466,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -20525,8 +20525,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -20535,8 +20535,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -20592,8 +20592,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -20602,8 +20602,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -20661,8 +20661,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -20671,8 +20671,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -20728,8 +20728,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -20738,8 +20738,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -20805,8 +20805,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -20815,8 +20815,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -20887,8 +20887,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -20897,8 +20897,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -20961,8 +20961,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -20971,8 +20971,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -21030,8 +21030,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -21040,8 +21040,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -21089,8 +21089,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -21099,8 +21099,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -21156,8 +21156,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -21166,8 +21166,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -21215,8 +21215,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -21225,8 +21225,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -21292,8 +21292,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -21302,8 +21302,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -21362,8 +21362,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -21372,8 +21372,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -21432,8 +21432,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -21442,8 +21442,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -21505,8 +21505,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -21515,8 +21515,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -21575,8 +21575,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -21585,8 +21585,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -21633,8 +21633,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -21643,8 +21643,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -21694,8 +21694,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -21704,8 +21704,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -21753,8 +21753,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -21763,8 +21763,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -21822,8 +21822,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -21832,8 +21832,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -21899,8 +21899,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -21909,8 +21909,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -21958,8 +21958,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -21968,8 +21968,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -22032,8 +22032,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -22042,8 +22042,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -22099,8 +22099,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -22109,8 +22109,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -22164,8 +22164,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -22174,8 +22174,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -22225,8 +22225,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -22235,8 +22235,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -22296,8 +22296,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -22306,8 +22306,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -22373,8 +22373,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -22383,8 +22383,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -22440,8 +22440,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -22450,8 +22450,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -22504,8 +22504,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -22514,8 +22514,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -22568,8 +22568,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -22578,8 +22578,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -22641,8 +22641,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -22651,8 +22651,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -22708,8 +22708,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -22718,8 +22718,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -22789,8 +22789,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -22799,8 +22799,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -22878,8 +22878,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -22888,8 +22888,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -22949,8 +22949,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -22959,8 +22959,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -23008,8 +23008,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -23018,8 +23018,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -23069,8 +23069,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -23079,8 +23079,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -23143,8 +23143,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -23153,8 +23153,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -23213,8 +23213,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -23223,8 +23223,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -23288,8 +23288,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -23298,8 +23298,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -23374,8 +23374,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -23384,8 +23384,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -23440,8 +23440,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -23450,8 +23450,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -23507,8 +23507,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -23517,8 +23517,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -23558,8 +23558,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -23568,8 +23568,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -23635,8 +23635,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -23645,8 +23645,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -23708,8 +23708,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -23718,8 +23718,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -23781,8 +23781,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -23791,8 +23791,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -23847,8 +23847,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -23857,8 +23857,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -23913,8 +23913,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -23923,8 +23923,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -23980,8 +23980,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -23990,8 +23990,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -24039,8 +24039,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -24049,8 +24049,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -24121,8 +24121,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -24131,8 +24131,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -24421,8 +24421,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -24431,8 +24431,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -24489,8 +24489,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -24499,8 +24499,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -24564,8 +24564,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -24574,8 +24574,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -24638,8 +24638,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -24648,8 +24648,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -24727,8 +24727,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -24737,8 +24737,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -24801,8 +24801,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -24811,8 +24811,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -24883,8 +24883,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -24893,8 +24893,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -24950,8 +24950,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -24960,8 +24960,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -25017,8 +25017,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -25027,8 +25027,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -25081,7 +25081,7 @@ "required" : true, "schema" : { "type" : "string", - "enum" : [ "NOT_RECOGNIZED", "INIT_COMPLETED", "SYSTEM_API_KEY", "SHOW_PROJECT_BANNER", "SUPPORTED_LANGUAGES", "BASE_URL", "GLOBAL_PRIVACY_POLICY", "GLOBAL_TERMS", "ANNOUNCEMENT_BANNER_CONTENT", "MAPS_PROVIDER", "MAPS_CLIENT_API_KEY", "MAPS_HERE_APP_ID", "MAPS_HERE_APP_CODE", "MAPS_HERE_API_KEY", "RECAPTCHA_API_KEY", "RECAPTCHA_SECRET", "ENABLE_CAPTCHA_FOR_LOGIN", "DISPLAY_STATS_IN_EVENT_DETAIL", "DEMO_MODE_ACCOUNT_EXPIRATION_DAYS", "PLATFORM_MODE_ENABLED", "PLATFORM_FEE", "PLATFORM_FIXED_FEE", "PLATFORM_PERCENTAGE_FEE", "PLATFORM_MINIMUM_FEE", "PLATFORM_MAXIMUM_FEE", "PAYMENT_METHODS_BLACKLIST", "STRIPE_CC_ENABLED", "STRIPE_PUBLIC_KEY", "STRIPE_SECRET_KEY", "STRIPE_CONNECT_CLIENT_ID", "STRIPE_CONNECT_CALLBACK", "STRIPE_WEBHOOK_KEY", "STRIPE_WEBHOOK_PAYMENT_KEY", "STRIPE_CONNECTED_ID", "STRIPE_ENABLE_SCA", "SAFERPAY_ENABLED", "SAFERPAY_LIVE_MODE", "SAFERPAY_API_USERNAME", "SAFERPAY_API_PASSWORD", "SAFERPAY_CUSTOMER_ID", "SAFERPAY_TERMINAL_ID", "SPECIAL_PRICE_CODE_LENGTH", "MAX_AMOUNT_OF_TICKETS_BY_RESERVATION", "ASSIGNMENT_REMINDER_START", "ASSIGNMENT_REMINDER_INTERVAL", "OPTIONAL_DATA_REMINDER_ENABLED", "RESERVATION_TIMEOUT", "RESERVATION_MIN_TIMEOUT_AFTER_FAILED_PAYMENT", "NOTIFY_ALL_FAILED_PAYMENT_ATTEMPTS", "DISPLAY_TICKETS_LEFT_INDICATOR", "ENABLE_CAPTCHA_FOR_TICKET_SELECTION", "DISPLAY_EXPIRED_CATEGORIES", "DISPLAY_DISCOUNT_CODE_BOX", "USE_PARTNER_CODE_INSTEAD_OF_PROMOTIONAL", "ENABLE_CUSTOMER_REFERENCE", "ENABLE_ATTENDEE_AUTOCOMPLETE", "FORCE_TICKET_OWNER_ASSIGNMENT_AT_RESERVATION", "SEND_TICKETS_AUTOMATICALLY", "ALLOW_TICKET_DOWNLOAD", "SEND_RESERVATION_EMAIL_IF_NECESSARY", "ENABLE_TICKET_TRANSFER", "ALLOW_FREE_TICKETS_CANCELLATION", "INCLUDE_CHECK_IN_URL_ICAL", "MAILER_TYPE", "MAX_EMAIL_PER_CYCLE", "MAIL_REPLY_TO", "MAIL_SET_ORG_REPLY_TO", "MAIL_SYSTEM_NOTIFICATION_CC", "MAIL_FOOTER", "SMTP_HOST", "SMTP_PORT", "SMTP_PROTOCOL", "SMTP_USERNAME", "SMTP_PASSWORD", "SMTP_FROM_EMAIL", "SMTP_PROPERTIES", "BANK_TRANSFER_ENABLED", "DEFERRED_BANK_TRANSFER_ENABLED", "SHOW_ONLY_BASIC_INSTRUCTIONS", "DEFERRED_BANK_TRANSFER_SEND_CONFIRMATION_EMAIL", "OFFLINE_PAYMENT_DAYS", "OFFLINE_REMINDER_HOURS", "ENABLE_CAPTCHA_FOR_OFFLINE_PAYMENTS", "BANK_ACCOUNT_NR", "BANK_ACCOUNT_OWNER", "AUTOMATIC_REMOVAL_EXPIRED_OFFLINE_PAYMENT", "PARTIAL_RESERVATION_ID_LENGTH", "REVOLUT_ENABLED", "REVOLUT_MANUAL_REVIEW", "REVOLUT_LIVE_MODE", "REVOLUT_API_KEY", "MAILGUN_KEY", "MAILGUN_DOMAIN", "MAILGUN_FROM", "MAILGUN_EU", "SENDGRID_API_KEY", "SENDGRID_FROM", "MAILJET_APIKEY_PUBLIC", "MAILJET_APIKEY_PRIVATE", "MAILJET_FROM", "GOOGLE_ANALYTICS_KEY", "GOOGLE_ANALYTICS_ANONYMOUS_MODE", "ENABLE_WAITING_QUEUE", "ENABLE_PRE_REGISTRATION", "ENABLE_WAITING_QUEUE_NOTIFICATION", "WAITING_QUEUE_RESERVATION_TIMEOUT", "STOP_WAITING_QUEUE_SUBSCRIPTIONS", "ENABLE_HTML_EMAILS", "MAIL_ATTEMPTS_COUNT", "PAYPAL_ENABLED", "PAYPAL_CLIENT_ID", "PAYPAL_CLIENT_SECRET", "PAYPAL_LIVE_MODE", "PAYPAL_DEMO_MODE_USERNAME", "PAYPAL_DEMO_MODE_PASSWORD", "MOLLIE_CC_ENABLED", "MOLLIE_API_KEY", "MOLLIE_CONNECT_CLIENT_ID", "MOLLIE_CONNECT_REFRESH_TOKEN", "MOLLIE_CONNECT_CLIENT_SECRET", "MOLLIE_CONNECT_CALLBACK", "MOLLIE_CONNECT_PROFILE_ID", "MOLLIE_CONNECT_LIVE_MODE", "ON_SITE_ENABLED", "SEND_TICKETS_AFTER_IMPORT_ATTENDEE", "CREATE_RESERVATION_FOR_EACH_IMPORTED_ATTENDEE", "VAT_NR", "INVOICE_NUMBER_PATTERN", "INVOICE_ADDRESS", "USE_INVOICE_NUMBER_AS_ID", "VAT_NUMBER_IS_REQUIRED", "GENERATE_ONLY_INVOICE", "REUSE_INVOICE_NUMBER_FOR_CREDIT_NOTE", "ENABLE_ITALY_E_INVOICING", "ENABLE_EU_VAT_DIRECTIVE", "ENABLE_REVERSE_CHARGE_ONLINE", "ENABLE_REVERSE_CHARGE_IN_PERSON", "ENABLE_VIES_VALIDATION", "APPLY_VAT_FOREIGN_BUSINESS", "COUNTRY_OF_BUSINESS", "EU_COUNTRIES_LIST", "EU_VAT_API_ADDRESS", "APPLY_TAX_TO_CATEGORY", "ENABLE_PASS", "PASSBOOK_TYPE_IDENTIFIER", "PASSBOOK_TEAM_IDENTIFIER", "PASSBOOK_KEYSTORE", "PASSBOOK_KEYSTORE_PASSWORD", "PASSBOOK_PRIVATE_KEY_ALIAS", "CHECK_IN_STATS", "ALFIO_PI_INTEGRATION_ENABLED", "OFFLINE_CHECKIN_ENABLED", "LABEL_PRINTING_ENABLED", "LABEL_LAYOUT", "CHECK_IN_COLOR_CONFIGURATION", "SECURITY_CSP_REPORT_ENABLED", "SECURITY_CSP_REPORT_URI", "EMBED_ALLOWED_ORIGINS", "EMBED_POST_MESSAGE_ORIGIN", "TRANSLATION_OVERRIDE", "BASE_CUSTOM_CSS", "EVENT_CUSTOM_CSS", "DESCRIPTION_MAXLENGTH", "OPENID_PUBLIC_ENABLED", "OPENID_CONFIGURATION_JSON", "GENERATE_TICKETS_FOR_SUBSCRIPTIONS" ] + "enum" : [ "NOT_RECOGNIZED", "INIT_COMPLETED", "SYSTEM_API_KEY", "SHOW_PROJECT_BANNER", "SUPPORTED_LANGUAGES", "BASE_URL", "GLOBAL_PRIVACY_POLICY", "GLOBAL_TERMS", "ANNOUNCEMENT_BANNER_CONTENT", "MAPS_PROVIDER", "MAPS_CLIENT_API_KEY", "MAPS_HERE_APP_ID", "MAPS_HERE_APP_CODE", "MAPS_HERE_API_KEY", "RECAPTCHA_API_KEY", "RECAPTCHA_SECRET", "ENABLE_CAPTCHA_FOR_LOGIN", "DISPLAY_STATS_IN_EVENT_DETAIL", "DEMO_MODE_ACCOUNT_EXPIRATION_DAYS", "PLATFORM_MODE_ENABLED", "PLATFORM_FEE", "PLATFORM_FIXED_FEE", "PLATFORM_PERCENTAGE_FEE", "PLATFORM_MINIMUM_FEE", "PLATFORM_MAXIMUM_FEE", "PAYMENT_METHODS_BLACKLIST", "STRIPE_CC_ENABLED", "STRIPE_PUBLIC_KEY", "STRIPE_SECRET_KEY", "STRIPE_CONNECT_CLIENT_ID", "STRIPE_CONNECT_CALLBACK", "STRIPE_WEBHOOK_KEY", "STRIPE_WEBHOOK_PAYMENT_KEY", "STRIPE_CONNECTED_ID", "STRIPE_ENABLE_SCA", "SAFERPAY_ENABLED", "SAFERPAY_LIVE_MODE", "SAFERPAY_API_USERNAME", "SAFERPAY_API_PASSWORD", "SAFERPAY_CUSTOMER_ID", "SAFERPAY_TERMINAL_ID", "SPECIAL_PRICE_CODE_LENGTH", "MAX_AMOUNT_OF_TICKETS_BY_RESERVATION", "ASSIGNMENT_REMINDER_START", "ASSIGNMENT_REMINDER_INTERVAL", "OPTIONAL_DATA_REMINDER_ENABLED", "RESERVATION_TIMEOUT", "RESERVATION_MIN_TIMEOUT_AFTER_FAILED_PAYMENT", "NOTIFY_ALL_FAILED_PAYMENT_ATTEMPTS", "DISPLAY_TICKETS_LEFT_INDICATOR", "ENABLE_CAPTCHA_FOR_TICKET_SELECTION", "DISPLAY_EXPIRED_CATEGORIES", "DISPLAY_DISCOUNT_CODE_BOX", "USE_PARTNER_CODE_INSTEAD_OF_PROMOTIONAL", "ENABLE_CUSTOMER_REFERENCE", "ENABLE_ATTENDEE_AUTOCOMPLETE", "FORCE_TICKET_OWNER_ASSIGNMENT_AT_RESERVATION", "SEND_TICKETS_AUTOMATICALLY", "ALLOW_TICKET_DOWNLOAD", "SEND_RESERVATION_EMAIL_IF_NECESSARY", "ENABLE_TICKET_TRANSFER", "ALLOW_FREE_TICKETS_CANCELLATION", "INCLUDE_CHECK_IN_URL_ICAL", "MAILER_TYPE", "MAX_EMAIL_PER_CYCLE", "MAIL_REPLY_TO", "MAIL_SET_ORG_REPLY_TO", "MAIL_SYSTEM_NOTIFICATION_CC", "MAIL_FOOTER", "SMTP_HOST", "SMTP_PORT", "SMTP_PROTOCOL", "SMTP_USERNAME", "SMTP_PASSWORD", "SMTP_FROM_EMAIL", "SMTP_PROPERTIES", "BANK_TRANSFER_ENABLED", "DEFERRED_BANK_TRANSFER_ENABLED", "SHOW_ONLY_BASIC_INSTRUCTIONS", "DEFERRED_BANK_TRANSFER_SEND_CONFIRMATION_EMAIL", "OFFLINE_PAYMENT_DAYS", "OFFLINE_REMINDER_HOURS", "ENABLE_CAPTCHA_FOR_OFFLINE_PAYMENTS", "BANK_ACCOUNT_NR", "BANK_ACCOUNT_OWNER", "AUTOMATIC_REMOVAL_EXPIRED_OFFLINE_PAYMENT", "PARTIAL_RESERVATION_ID_LENGTH", "REVOLUT_ENABLED", "REVOLUT_MANUAL_REVIEW", "REVOLUT_LIVE_MODE", "REVOLUT_API_KEY", "MAILGUN_KEY", "MAILGUN_DOMAIN", "MAILGUN_FROM", "MAILGUN_EU", "SENDGRID_API_KEY", "SENDGRID_FROM", "MAILJET_APIKEY_PUBLIC", "MAILJET_APIKEY_PRIVATE", "MAILJET_FROM", "GOOGLE_ANALYTICS_KEY", "GOOGLE_ANALYTICS_ANONYMOUS_MODE", "ENABLE_WAITING_QUEUE", "ENABLE_PRE_REGISTRATION", "ENABLE_WAITING_QUEUE_NOTIFICATION", "WAITING_QUEUE_RESERVATION_TIMEOUT", "STOP_WAITING_QUEUE_SUBSCRIPTIONS", "ENABLE_HTML_EMAILS", "MAIL_ATTEMPTS_COUNT", "PAYPAL_ENABLED", "PAYPAL_CLIENT_ID", "PAYPAL_CLIENT_SECRET", "PAYPAL_LIVE_MODE", "PAYPAL_DEMO_MODE_USERNAME", "PAYPAL_DEMO_MODE_PASSWORD", "MOLLIE_CC_ENABLED", "MOLLIE_API_KEY", "MOLLIE_CONNECT_CLIENT_ID", "MOLLIE_CONNECT_REFRESH_TOKEN", "MOLLIE_CONNECT_CLIENT_SECRET", "MOLLIE_CONNECT_CALLBACK", "MOLLIE_CONNECT_PROFILE_ID", "MOLLIE_CONNECT_LIVE_MODE", "ON_SITE_ENABLED", "SEND_TICKETS_AFTER_IMPORT_ATTENDEE", "CREATE_RESERVATION_FOR_EACH_IMPORTED_ATTENDEE", "VAT_NR", "INVOICE_NUMBER_PATTERN", "INVOICE_ADDRESS", "USE_INVOICE_NUMBER_AS_ID", "VAT_NUMBER_IS_REQUIRED", "GENERATE_ONLY_INVOICE", "REUSE_INVOICE_NUMBER_FOR_CREDIT_NOTE", "ENABLE_ITALY_E_INVOICING", "ITALY_E_INVOICING_SEND_PROFORMA", "ENABLE_EU_VAT_DIRECTIVE", "ENABLE_REVERSE_CHARGE_ONLINE", "ENABLE_REVERSE_CHARGE_IN_PERSON", "ENABLE_VIES_VALIDATION", "APPLY_VAT_FOREIGN_BUSINESS", "COUNTRY_OF_BUSINESS", "EU_COUNTRIES_LIST", "EU_VAT_API_ADDRESS", "APPLY_TAX_TO_CATEGORY", "ENABLE_PASS", "PASSBOOK_TYPE_IDENTIFIER", "PASSBOOK_TEAM_IDENTIFIER", "PASSBOOK_KEYSTORE", "PASSBOOK_KEYSTORE_PASSWORD", "PASSBOOK_PRIVATE_KEY_ALIAS", "CHECK_IN_STATS", "ALFIO_PI_INTEGRATION_ENABLED", "OFFLINE_CHECKIN_ENABLED", "LABEL_PRINTING_ENABLED", "LABEL_LAYOUT", "CHECK_IN_COLOR_CONFIGURATION", "SECURITY_CSP_REPORT_ENABLED", "SECURITY_CSP_REPORT_URI", "EMBED_ALLOWED_ORIGINS", "EMBED_POST_MESSAGE_ORIGIN", "TRANSLATION_OVERRIDE", "BASE_CUSTOM_CSS", "EVENT_CUSTOM_CSS", "DESCRIPTION_MAXLENGTH", "OPENID_PUBLIC_ENABLED", "OPENID_CONFIGURATION_JSON", "GENERATE_TICKETS_FOR_SUBSCRIPTIONS" ] } } ], "responses" : { @@ -25095,8 +25095,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -25105,8 +25105,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -25161,8 +25161,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -25171,8 +25171,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -25222,7 +25222,7 @@ "required" : true, "schema" : { "type" : "string", - "enum" : [ "NOT_RECOGNIZED", "INIT_COMPLETED", "SYSTEM_API_KEY", "SHOW_PROJECT_BANNER", "SUPPORTED_LANGUAGES", "BASE_URL", "GLOBAL_PRIVACY_POLICY", "GLOBAL_TERMS", "ANNOUNCEMENT_BANNER_CONTENT", "MAPS_PROVIDER", "MAPS_CLIENT_API_KEY", "MAPS_HERE_APP_ID", "MAPS_HERE_APP_CODE", "MAPS_HERE_API_KEY", "RECAPTCHA_API_KEY", "RECAPTCHA_SECRET", "ENABLE_CAPTCHA_FOR_LOGIN", "DISPLAY_STATS_IN_EVENT_DETAIL", "DEMO_MODE_ACCOUNT_EXPIRATION_DAYS", "PLATFORM_MODE_ENABLED", "PLATFORM_FEE", "PLATFORM_FIXED_FEE", "PLATFORM_PERCENTAGE_FEE", "PLATFORM_MINIMUM_FEE", "PLATFORM_MAXIMUM_FEE", "PAYMENT_METHODS_BLACKLIST", "STRIPE_CC_ENABLED", "STRIPE_PUBLIC_KEY", "STRIPE_SECRET_KEY", "STRIPE_CONNECT_CLIENT_ID", "STRIPE_CONNECT_CALLBACK", "STRIPE_WEBHOOK_KEY", "STRIPE_WEBHOOK_PAYMENT_KEY", "STRIPE_CONNECTED_ID", "STRIPE_ENABLE_SCA", "SAFERPAY_ENABLED", "SAFERPAY_LIVE_MODE", "SAFERPAY_API_USERNAME", "SAFERPAY_API_PASSWORD", "SAFERPAY_CUSTOMER_ID", "SAFERPAY_TERMINAL_ID", "SPECIAL_PRICE_CODE_LENGTH", "MAX_AMOUNT_OF_TICKETS_BY_RESERVATION", "ASSIGNMENT_REMINDER_START", "ASSIGNMENT_REMINDER_INTERVAL", "OPTIONAL_DATA_REMINDER_ENABLED", "RESERVATION_TIMEOUT", "RESERVATION_MIN_TIMEOUT_AFTER_FAILED_PAYMENT", "NOTIFY_ALL_FAILED_PAYMENT_ATTEMPTS", "DISPLAY_TICKETS_LEFT_INDICATOR", "ENABLE_CAPTCHA_FOR_TICKET_SELECTION", "DISPLAY_EXPIRED_CATEGORIES", "DISPLAY_DISCOUNT_CODE_BOX", "USE_PARTNER_CODE_INSTEAD_OF_PROMOTIONAL", "ENABLE_CUSTOMER_REFERENCE", "ENABLE_ATTENDEE_AUTOCOMPLETE", "FORCE_TICKET_OWNER_ASSIGNMENT_AT_RESERVATION", "SEND_TICKETS_AUTOMATICALLY", "ALLOW_TICKET_DOWNLOAD", "SEND_RESERVATION_EMAIL_IF_NECESSARY", "ENABLE_TICKET_TRANSFER", "ALLOW_FREE_TICKETS_CANCELLATION", "INCLUDE_CHECK_IN_URL_ICAL", "MAILER_TYPE", "MAX_EMAIL_PER_CYCLE", "MAIL_REPLY_TO", "MAIL_SET_ORG_REPLY_TO", "MAIL_SYSTEM_NOTIFICATION_CC", "MAIL_FOOTER", "SMTP_HOST", "SMTP_PORT", "SMTP_PROTOCOL", "SMTP_USERNAME", "SMTP_PASSWORD", "SMTP_FROM_EMAIL", "SMTP_PROPERTIES", "BANK_TRANSFER_ENABLED", "DEFERRED_BANK_TRANSFER_ENABLED", "SHOW_ONLY_BASIC_INSTRUCTIONS", "DEFERRED_BANK_TRANSFER_SEND_CONFIRMATION_EMAIL", "OFFLINE_PAYMENT_DAYS", "OFFLINE_REMINDER_HOURS", "ENABLE_CAPTCHA_FOR_OFFLINE_PAYMENTS", "BANK_ACCOUNT_NR", "BANK_ACCOUNT_OWNER", "AUTOMATIC_REMOVAL_EXPIRED_OFFLINE_PAYMENT", "PARTIAL_RESERVATION_ID_LENGTH", "REVOLUT_ENABLED", "REVOLUT_MANUAL_REVIEW", "REVOLUT_LIVE_MODE", "REVOLUT_API_KEY", "MAILGUN_KEY", "MAILGUN_DOMAIN", "MAILGUN_FROM", "MAILGUN_EU", "SENDGRID_API_KEY", "SENDGRID_FROM", "MAILJET_APIKEY_PUBLIC", "MAILJET_APIKEY_PRIVATE", "MAILJET_FROM", "GOOGLE_ANALYTICS_KEY", "GOOGLE_ANALYTICS_ANONYMOUS_MODE", "ENABLE_WAITING_QUEUE", "ENABLE_PRE_REGISTRATION", "ENABLE_WAITING_QUEUE_NOTIFICATION", "WAITING_QUEUE_RESERVATION_TIMEOUT", "STOP_WAITING_QUEUE_SUBSCRIPTIONS", "ENABLE_HTML_EMAILS", "MAIL_ATTEMPTS_COUNT", "PAYPAL_ENABLED", "PAYPAL_CLIENT_ID", "PAYPAL_CLIENT_SECRET", "PAYPAL_LIVE_MODE", "PAYPAL_DEMO_MODE_USERNAME", "PAYPAL_DEMO_MODE_PASSWORD", "MOLLIE_CC_ENABLED", "MOLLIE_API_KEY", "MOLLIE_CONNECT_CLIENT_ID", "MOLLIE_CONNECT_REFRESH_TOKEN", "MOLLIE_CONNECT_CLIENT_SECRET", "MOLLIE_CONNECT_CALLBACK", "MOLLIE_CONNECT_PROFILE_ID", "MOLLIE_CONNECT_LIVE_MODE", "ON_SITE_ENABLED", "SEND_TICKETS_AFTER_IMPORT_ATTENDEE", "CREATE_RESERVATION_FOR_EACH_IMPORTED_ATTENDEE", "VAT_NR", "INVOICE_NUMBER_PATTERN", "INVOICE_ADDRESS", "USE_INVOICE_NUMBER_AS_ID", "VAT_NUMBER_IS_REQUIRED", "GENERATE_ONLY_INVOICE", "REUSE_INVOICE_NUMBER_FOR_CREDIT_NOTE", "ENABLE_ITALY_E_INVOICING", "ENABLE_EU_VAT_DIRECTIVE", "ENABLE_REVERSE_CHARGE_ONLINE", "ENABLE_REVERSE_CHARGE_IN_PERSON", "ENABLE_VIES_VALIDATION", "APPLY_VAT_FOREIGN_BUSINESS", "COUNTRY_OF_BUSINESS", "EU_COUNTRIES_LIST", "EU_VAT_API_ADDRESS", "APPLY_TAX_TO_CATEGORY", "ENABLE_PASS", "PASSBOOK_TYPE_IDENTIFIER", "PASSBOOK_TEAM_IDENTIFIER", "PASSBOOK_KEYSTORE", "PASSBOOK_KEYSTORE_PASSWORD", "PASSBOOK_PRIVATE_KEY_ALIAS", "CHECK_IN_STATS", "ALFIO_PI_INTEGRATION_ENABLED", "OFFLINE_CHECKIN_ENABLED", "LABEL_PRINTING_ENABLED", "LABEL_LAYOUT", "CHECK_IN_COLOR_CONFIGURATION", "SECURITY_CSP_REPORT_ENABLED", "SECURITY_CSP_REPORT_URI", "EMBED_ALLOWED_ORIGINS", "EMBED_POST_MESSAGE_ORIGIN", "TRANSLATION_OVERRIDE", "BASE_CUSTOM_CSS", "EVENT_CUSTOM_CSS", "DESCRIPTION_MAXLENGTH", "OPENID_PUBLIC_ENABLED", "OPENID_CONFIGURATION_JSON", "GENERATE_TICKETS_FOR_SUBSCRIPTIONS" ] + "enum" : [ "NOT_RECOGNIZED", "INIT_COMPLETED", "SYSTEM_API_KEY", "SHOW_PROJECT_BANNER", "SUPPORTED_LANGUAGES", "BASE_URL", "GLOBAL_PRIVACY_POLICY", "GLOBAL_TERMS", "ANNOUNCEMENT_BANNER_CONTENT", "MAPS_PROVIDER", "MAPS_CLIENT_API_KEY", "MAPS_HERE_APP_ID", "MAPS_HERE_APP_CODE", "MAPS_HERE_API_KEY", "RECAPTCHA_API_KEY", "RECAPTCHA_SECRET", "ENABLE_CAPTCHA_FOR_LOGIN", "DISPLAY_STATS_IN_EVENT_DETAIL", "DEMO_MODE_ACCOUNT_EXPIRATION_DAYS", "PLATFORM_MODE_ENABLED", "PLATFORM_FEE", "PLATFORM_FIXED_FEE", "PLATFORM_PERCENTAGE_FEE", "PLATFORM_MINIMUM_FEE", "PLATFORM_MAXIMUM_FEE", "PAYMENT_METHODS_BLACKLIST", "STRIPE_CC_ENABLED", "STRIPE_PUBLIC_KEY", "STRIPE_SECRET_KEY", "STRIPE_CONNECT_CLIENT_ID", "STRIPE_CONNECT_CALLBACK", "STRIPE_WEBHOOK_KEY", "STRIPE_WEBHOOK_PAYMENT_KEY", "STRIPE_CONNECTED_ID", "STRIPE_ENABLE_SCA", "SAFERPAY_ENABLED", "SAFERPAY_LIVE_MODE", "SAFERPAY_API_USERNAME", "SAFERPAY_API_PASSWORD", "SAFERPAY_CUSTOMER_ID", "SAFERPAY_TERMINAL_ID", "SPECIAL_PRICE_CODE_LENGTH", "MAX_AMOUNT_OF_TICKETS_BY_RESERVATION", "ASSIGNMENT_REMINDER_START", "ASSIGNMENT_REMINDER_INTERVAL", "OPTIONAL_DATA_REMINDER_ENABLED", "RESERVATION_TIMEOUT", "RESERVATION_MIN_TIMEOUT_AFTER_FAILED_PAYMENT", "NOTIFY_ALL_FAILED_PAYMENT_ATTEMPTS", "DISPLAY_TICKETS_LEFT_INDICATOR", "ENABLE_CAPTCHA_FOR_TICKET_SELECTION", "DISPLAY_EXPIRED_CATEGORIES", "DISPLAY_DISCOUNT_CODE_BOX", "USE_PARTNER_CODE_INSTEAD_OF_PROMOTIONAL", "ENABLE_CUSTOMER_REFERENCE", "ENABLE_ATTENDEE_AUTOCOMPLETE", "FORCE_TICKET_OWNER_ASSIGNMENT_AT_RESERVATION", "SEND_TICKETS_AUTOMATICALLY", "ALLOW_TICKET_DOWNLOAD", "SEND_RESERVATION_EMAIL_IF_NECESSARY", "ENABLE_TICKET_TRANSFER", "ALLOW_FREE_TICKETS_CANCELLATION", "INCLUDE_CHECK_IN_URL_ICAL", "MAILER_TYPE", "MAX_EMAIL_PER_CYCLE", "MAIL_REPLY_TO", "MAIL_SET_ORG_REPLY_TO", "MAIL_SYSTEM_NOTIFICATION_CC", "MAIL_FOOTER", "SMTP_HOST", "SMTP_PORT", "SMTP_PROTOCOL", "SMTP_USERNAME", "SMTP_PASSWORD", "SMTP_FROM_EMAIL", "SMTP_PROPERTIES", "BANK_TRANSFER_ENABLED", "DEFERRED_BANK_TRANSFER_ENABLED", "SHOW_ONLY_BASIC_INSTRUCTIONS", "DEFERRED_BANK_TRANSFER_SEND_CONFIRMATION_EMAIL", "OFFLINE_PAYMENT_DAYS", "OFFLINE_REMINDER_HOURS", "ENABLE_CAPTCHA_FOR_OFFLINE_PAYMENTS", "BANK_ACCOUNT_NR", "BANK_ACCOUNT_OWNER", "AUTOMATIC_REMOVAL_EXPIRED_OFFLINE_PAYMENT", "PARTIAL_RESERVATION_ID_LENGTH", "REVOLUT_ENABLED", "REVOLUT_MANUAL_REVIEW", "REVOLUT_LIVE_MODE", "REVOLUT_API_KEY", "MAILGUN_KEY", "MAILGUN_DOMAIN", "MAILGUN_FROM", "MAILGUN_EU", "SENDGRID_API_KEY", "SENDGRID_FROM", "MAILJET_APIKEY_PUBLIC", "MAILJET_APIKEY_PRIVATE", "MAILJET_FROM", "GOOGLE_ANALYTICS_KEY", "GOOGLE_ANALYTICS_ANONYMOUS_MODE", "ENABLE_WAITING_QUEUE", "ENABLE_PRE_REGISTRATION", "ENABLE_WAITING_QUEUE_NOTIFICATION", "WAITING_QUEUE_RESERVATION_TIMEOUT", "STOP_WAITING_QUEUE_SUBSCRIPTIONS", "ENABLE_HTML_EMAILS", "MAIL_ATTEMPTS_COUNT", "PAYPAL_ENABLED", "PAYPAL_CLIENT_ID", "PAYPAL_CLIENT_SECRET", "PAYPAL_LIVE_MODE", "PAYPAL_DEMO_MODE_USERNAME", "PAYPAL_DEMO_MODE_PASSWORD", "MOLLIE_CC_ENABLED", "MOLLIE_API_KEY", "MOLLIE_CONNECT_CLIENT_ID", "MOLLIE_CONNECT_REFRESH_TOKEN", "MOLLIE_CONNECT_CLIENT_SECRET", "MOLLIE_CONNECT_CALLBACK", "MOLLIE_CONNECT_PROFILE_ID", "MOLLIE_CONNECT_LIVE_MODE", "ON_SITE_ENABLED", "SEND_TICKETS_AFTER_IMPORT_ATTENDEE", "CREATE_RESERVATION_FOR_EACH_IMPORTED_ATTENDEE", "VAT_NR", "INVOICE_NUMBER_PATTERN", "INVOICE_ADDRESS", "USE_INVOICE_NUMBER_AS_ID", "VAT_NUMBER_IS_REQUIRED", "GENERATE_ONLY_INVOICE", "REUSE_INVOICE_NUMBER_FOR_CREDIT_NOTE", "ENABLE_ITALY_E_INVOICING", "ITALY_E_INVOICING_SEND_PROFORMA", "ENABLE_EU_VAT_DIRECTIVE", "ENABLE_REVERSE_CHARGE_ONLINE", "ENABLE_REVERSE_CHARGE_IN_PERSON", "ENABLE_VIES_VALIDATION", "APPLY_VAT_FOREIGN_BUSINESS", "COUNTRY_OF_BUSINESS", "EU_COUNTRIES_LIST", "EU_VAT_API_ADDRESS", "APPLY_TAX_TO_CATEGORY", "ENABLE_PASS", "PASSBOOK_TYPE_IDENTIFIER", "PASSBOOK_TEAM_IDENTIFIER", "PASSBOOK_KEYSTORE", "PASSBOOK_KEYSTORE_PASSWORD", "PASSBOOK_PRIVATE_KEY_ALIAS", "CHECK_IN_STATS", "ALFIO_PI_INTEGRATION_ENABLED", "OFFLINE_CHECKIN_ENABLED", "LABEL_PRINTING_ENABLED", "LABEL_LAYOUT", "CHECK_IN_COLOR_CONFIGURATION", "SECURITY_CSP_REPORT_ENABLED", "SECURITY_CSP_REPORT_URI", "EMBED_ALLOWED_ORIGINS", "EMBED_POST_MESSAGE_ORIGIN", "TRANSLATION_OVERRIDE", "BASE_CUSTOM_CSS", "EVENT_CUSTOM_CSS", "DESCRIPTION_MAXLENGTH", "OPENID_PUBLIC_ENABLED", "OPENID_CONFIGURATION_JSON", "GENERATE_TICKETS_FOR_SUBSCRIPTIONS" ] } } ], "responses" : { @@ -25236,8 +25236,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -25246,8 +25246,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -25305,7 +25305,7 @@ "required" : true, "schema" : { "type" : "string", - "enum" : [ "NOT_RECOGNIZED", "INIT_COMPLETED", "SYSTEM_API_KEY", "SHOW_PROJECT_BANNER", "SUPPORTED_LANGUAGES", "BASE_URL", "GLOBAL_PRIVACY_POLICY", "GLOBAL_TERMS", "ANNOUNCEMENT_BANNER_CONTENT", "MAPS_PROVIDER", "MAPS_CLIENT_API_KEY", "MAPS_HERE_APP_ID", "MAPS_HERE_APP_CODE", "MAPS_HERE_API_KEY", "RECAPTCHA_API_KEY", "RECAPTCHA_SECRET", "ENABLE_CAPTCHA_FOR_LOGIN", "DISPLAY_STATS_IN_EVENT_DETAIL", "DEMO_MODE_ACCOUNT_EXPIRATION_DAYS", "PLATFORM_MODE_ENABLED", "PLATFORM_FEE", "PLATFORM_FIXED_FEE", "PLATFORM_PERCENTAGE_FEE", "PLATFORM_MINIMUM_FEE", "PLATFORM_MAXIMUM_FEE", "PAYMENT_METHODS_BLACKLIST", "STRIPE_CC_ENABLED", "STRIPE_PUBLIC_KEY", "STRIPE_SECRET_KEY", "STRIPE_CONNECT_CLIENT_ID", "STRIPE_CONNECT_CALLBACK", "STRIPE_WEBHOOK_KEY", "STRIPE_WEBHOOK_PAYMENT_KEY", "STRIPE_CONNECTED_ID", "STRIPE_ENABLE_SCA", "SAFERPAY_ENABLED", "SAFERPAY_LIVE_MODE", "SAFERPAY_API_USERNAME", "SAFERPAY_API_PASSWORD", "SAFERPAY_CUSTOMER_ID", "SAFERPAY_TERMINAL_ID", "SPECIAL_PRICE_CODE_LENGTH", "MAX_AMOUNT_OF_TICKETS_BY_RESERVATION", "ASSIGNMENT_REMINDER_START", "ASSIGNMENT_REMINDER_INTERVAL", "OPTIONAL_DATA_REMINDER_ENABLED", "RESERVATION_TIMEOUT", "RESERVATION_MIN_TIMEOUT_AFTER_FAILED_PAYMENT", "NOTIFY_ALL_FAILED_PAYMENT_ATTEMPTS", "DISPLAY_TICKETS_LEFT_INDICATOR", "ENABLE_CAPTCHA_FOR_TICKET_SELECTION", "DISPLAY_EXPIRED_CATEGORIES", "DISPLAY_DISCOUNT_CODE_BOX", "USE_PARTNER_CODE_INSTEAD_OF_PROMOTIONAL", "ENABLE_CUSTOMER_REFERENCE", "ENABLE_ATTENDEE_AUTOCOMPLETE", "FORCE_TICKET_OWNER_ASSIGNMENT_AT_RESERVATION", "SEND_TICKETS_AUTOMATICALLY", "ALLOW_TICKET_DOWNLOAD", "SEND_RESERVATION_EMAIL_IF_NECESSARY", "ENABLE_TICKET_TRANSFER", "ALLOW_FREE_TICKETS_CANCELLATION", "INCLUDE_CHECK_IN_URL_ICAL", "MAILER_TYPE", "MAX_EMAIL_PER_CYCLE", "MAIL_REPLY_TO", "MAIL_SET_ORG_REPLY_TO", "MAIL_SYSTEM_NOTIFICATION_CC", "MAIL_FOOTER", "SMTP_HOST", "SMTP_PORT", "SMTP_PROTOCOL", "SMTP_USERNAME", "SMTP_PASSWORD", "SMTP_FROM_EMAIL", "SMTP_PROPERTIES", "BANK_TRANSFER_ENABLED", "DEFERRED_BANK_TRANSFER_ENABLED", "SHOW_ONLY_BASIC_INSTRUCTIONS", "DEFERRED_BANK_TRANSFER_SEND_CONFIRMATION_EMAIL", "OFFLINE_PAYMENT_DAYS", "OFFLINE_REMINDER_HOURS", "ENABLE_CAPTCHA_FOR_OFFLINE_PAYMENTS", "BANK_ACCOUNT_NR", "BANK_ACCOUNT_OWNER", "AUTOMATIC_REMOVAL_EXPIRED_OFFLINE_PAYMENT", "PARTIAL_RESERVATION_ID_LENGTH", "REVOLUT_ENABLED", "REVOLUT_MANUAL_REVIEW", "REVOLUT_LIVE_MODE", "REVOLUT_API_KEY", "MAILGUN_KEY", "MAILGUN_DOMAIN", "MAILGUN_FROM", "MAILGUN_EU", "SENDGRID_API_KEY", "SENDGRID_FROM", "MAILJET_APIKEY_PUBLIC", "MAILJET_APIKEY_PRIVATE", "MAILJET_FROM", "GOOGLE_ANALYTICS_KEY", "GOOGLE_ANALYTICS_ANONYMOUS_MODE", "ENABLE_WAITING_QUEUE", "ENABLE_PRE_REGISTRATION", "ENABLE_WAITING_QUEUE_NOTIFICATION", "WAITING_QUEUE_RESERVATION_TIMEOUT", "STOP_WAITING_QUEUE_SUBSCRIPTIONS", "ENABLE_HTML_EMAILS", "MAIL_ATTEMPTS_COUNT", "PAYPAL_ENABLED", "PAYPAL_CLIENT_ID", "PAYPAL_CLIENT_SECRET", "PAYPAL_LIVE_MODE", "PAYPAL_DEMO_MODE_USERNAME", "PAYPAL_DEMO_MODE_PASSWORD", "MOLLIE_CC_ENABLED", "MOLLIE_API_KEY", "MOLLIE_CONNECT_CLIENT_ID", "MOLLIE_CONNECT_REFRESH_TOKEN", "MOLLIE_CONNECT_CLIENT_SECRET", "MOLLIE_CONNECT_CALLBACK", "MOLLIE_CONNECT_PROFILE_ID", "MOLLIE_CONNECT_LIVE_MODE", "ON_SITE_ENABLED", "SEND_TICKETS_AFTER_IMPORT_ATTENDEE", "CREATE_RESERVATION_FOR_EACH_IMPORTED_ATTENDEE", "VAT_NR", "INVOICE_NUMBER_PATTERN", "INVOICE_ADDRESS", "USE_INVOICE_NUMBER_AS_ID", "VAT_NUMBER_IS_REQUIRED", "GENERATE_ONLY_INVOICE", "REUSE_INVOICE_NUMBER_FOR_CREDIT_NOTE", "ENABLE_ITALY_E_INVOICING", "ENABLE_EU_VAT_DIRECTIVE", "ENABLE_REVERSE_CHARGE_ONLINE", "ENABLE_REVERSE_CHARGE_IN_PERSON", "ENABLE_VIES_VALIDATION", "APPLY_VAT_FOREIGN_BUSINESS", "COUNTRY_OF_BUSINESS", "EU_COUNTRIES_LIST", "EU_VAT_API_ADDRESS", "APPLY_TAX_TO_CATEGORY", "ENABLE_PASS", "PASSBOOK_TYPE_IDENTIFIER", "PASSBOOK_TEAM_IDENTIFIER", "PASSBOOK_KEYSTORE", "PASSBOOK_KEYSTORE_PASSWORD", "PASSBOOK_PRIVATE_KEY_ALIAS", "CHECK_IN_STATS", "ALFIO_PI_INTEGRATION_ENABLED", "OFFLINE_CHECKIN_ENABLED", "LABEL_PRINTING_ENABLED", "LABEL_LAYOUT", "CHECK_IN_COLOR_CONFIGURATION", "SECURITY_CSP_REPORT_ENABLED", "SECURITY_CSP_REPORT_URI", "EMBED_ALLOWED_ORIGINS", "EMBED_POST_MESSAGE_ORIGIN", "TRANSLATION_OVERRIDE", "BASE_CUSTOM_CSS", "EVENT_CUSTOM_CSS", "DESCRIPTION_MAXLENGTH", "OPENID_PUBLIC_ENABLED", "OPENID_CONFIGURATION_JSON", "GENERATE_TICKETS_FOR_SUBSCRIPTIONS" ] + "enum" : [ "NOT_RECOGNIZED", "INIT_COMPLETED", "SYSTEM_API_KEY", "SHOW_PROJECT_BANNER", "SUPPORTED_LANGUAGES", "BASE_URL", "GLOBAL_PRIVACY_POLICY", "GLOBAL_TERMS", "ANNOUNCEMENT_BANNER_CONTENT", "MAPS_PROVIDER", "MAPS_CLIENT_API_KEY", "MAPS_HERE_APP_ID", "MAPS_HERE_APP_CODE", "MAPS_HERE_API_KEY", "RECAPTCHA_API_KEY", "RECAPTCHA_SECRET", "ENABLE_CAPTCHA_FOR_LOGIN", "DISPLAY_STATS_IN_EVENT_DETAIL", "DEMO_MODE_ACCOUNT_EXPIRATION_DAYS", "PLATFORM_MODE_ENABLED", "PLATFORM_FEE", "PLATFORM_FIXED_FEE", "PLATFORM_PERCENTAGE_FEE", "PLATFORM_MINIMUM_FEE", "PLATFORM_MAXIMUM_FEE", "PAYMENT_METHODS_BLACKLIST", "STRIPE_CC_ENABLED", "STRIPE_PUBLIC_KEY", "STRIPE_SECRET_KEY", "STRIPE_CONNECT_CLIENT_ID", "STRIPE_CONNECT_CALLBACK", "STRIPE_WEBHOOK_KEY", "STRIPE_WEBHOOK_PAYMENT_KEY", "STRIPE_CONNECTED_ID", "STRIPE_ENABLE_SCA", "SAFERPAY_ENABLED", "SAFERPAY_LIVE_MODE", "SAFERPAY_API_USERNAME", "SAFERPAY_API_PASSWORD", "SAFERPAY_CUSTOMER_ID", "SAFERPAY_TERMINAL_ID", "SPECIAL_PRICE_CODE_LENGTH", "MAX_AMOUNT_OF_TICKETS_BY_RESERVATION", "ASSIGNMENT_REMINDER_START", "ASSIGNMENT_REMINDER_INTERVAL", "OPTIONAL_DATA_REMINDER_ENABLED", "RESERVATION_TIMEOUT", "RESERVATION_MIN_TIMEOUT_AFTER_FAILED_PAYMENT", "NOTIFY_ALL_FAILED_PAYMENT_ATTEMPTS", "DISPLAY_TICKETS_LEFT_INDICATOR", "ENABLE_CAPTCHA_FOR_TICKET_SELECTION", "DISPLAY_EXPIRED_CATEGORIES", "DISPLAY_DISCOUNT_CODE_BOX", "USE_PARTNER_CODE_INSTEAD_OF_PROMOTIONAL", "ENABLE_CUSTOMER_REFERENCE", "ENABLE_ATTENDEE_AUTOCOMPLETE", "FORCE_TICKET_OWNER_ASSIGNMENT_AT_RESERVATION", "SEND_TICKETS_AUTOMATICALLY", "ALLOW_TICKET_DOWNLOAD", "SEND_RESERVATION_EMAIL_IF_NECESSARY", "ENABLE_TICKET_TRANSFER", "ALLOW_FREE_TICKETS_CANCELLATION", "INCLUDE_CHECK_IN_URL_ICAL", "MAILER_TYPE", "MAX_EMAIL_PER_CYCLE", "MAIL_REPLY_TO", "MAIL_SET_ORG_REPLY_TO", "MAIL_SYSTEM_NOTIFICATION_CC", "MAIL_FOOTER", "SMTP_HOST", "SMTP_PORT", "SMTP_PROTOCOL", "SMTP_USERNAME", "SMTP_PASSWORD", "SMTP_FROM_EMAIL", "SMTP_PROPERTIES", "BANK_TRANSFER_ENABLED", "DEFERRED_BANK_TRANSFER_ENABLED", "SHOW_ONLY_BASIC_INSTRUCTIONS", "DEFERRED_BANK_TRANSFER_SEND_CONFIRMATION_EMAIL", "OFFLINE_PAYMENT_DAYS", "OFFLINE_REMINDER_HOURS", "ENABLE_CAPTCHA_FOR_OFFLINE_PAYMENTS", "BANK_ACCOUNT_NR", "BANK_ACCOUNT_OWNER", "AUTOMATIC_REMOVAL_EXPIRED_OFFLINE_PAYMENT", "PARTIAL_RESERVATION_ID_LENGTH", "REVOLUT_ENABLED", "REVOLUT_MANUAL_REVIEW", "REVOLUT_LIVE_MODE", "REVOLUT_API_KEY", "MAILGUN_KEY", "MAILGUN_DOMAIN", "MAILGUN_FROM", "MAILGUN_EU", "SENDGRID_API_KEY", "SENDGRID_FROM", "MAILJET_APIKEY_PUBLIC", "MAILJET_APIKEY_PRIVATE", "MAILJET_FROM", "GOOGLE_ANALYTICS_KEY", "GOOGLE_ANALYTICS_ANONYMOUS_MODE", "ENABLE_WAITING_QUEUE", "ENABLE_PRE_REGISTRATION", "ENABLE_WAITING_QUEUE_NOTIFICATION", "WAITING_QUEUE_RESERVATION_TIMEOUT", "STOP_WAITING_QUEUE_SUBSCRIPTIONS", "ENABLE_HTML_EMAILS", "MAIL_ATTEMPTS_COUNT", "PAYPAL_ENABLED", "PAYPAL_CLIENT_ID", "PAYPAL_CLIENT_SECRET", "PAYPAL_LIVE_MODE", "PAYPAL_DEMO_MODE_USERNAME", "PAYPAL_DEMO_MODE_PASSWORD", "MOLLIE_CC_ENABLED", "MOLLIE_API_KEY", "MOLLIE_CONNECT_CLIENT_ID", "MOLLIE_CONNECT_REFRESH_TOKEN", "MOLLIE_CONNECT_CLIENT_SECRET", "MOLLIE_CONNECT_CALLBACK", "MOLLIE_CONNECT_PROFILE_ID", "MOLLIE_CONNECT_LIVE_MODE", "ON_SITE_ENABLED", "SEND_TICKETS_AFTER_IMPORT_ATTENDEE", "CREATE_RESERVATION_FOR_EACH_IMPORTED_ATTENDEE", "VAT_NR", "INVOICE_NUMBER_PATTERN", "INVOICE_ADDRESS", "USE_INVOICE_NUMBER_AS_ID", "VAT_NUMBER_IS_REQUIRED", "GENERATE_ONLY_INVOICE", "REUSE_INVOICE_NUMBER_FOR_CREDIT_NOTE", "ENABLE_ITALY_E_INVOICING", "ITALY_E_INVOICING_SEND_PROFORMA", "ENABLE_EU_VAT_DIRECTIVE", "ENABLE_REVERSE_CHARGE_ONLINE", "ENABLE_REVERSE_CHARGE_IN_PERSON", "ENABLE_VIES_VALIDATION", "APPLY_VAT_FOREIGN_BUSINESS", "COUNTRY_OF_BUSINESS", "EU_COUNTRIES_LIST", "EU_VAT_API_ADDRESS", "APPLY_TAX_TO_CATEGORY", "ENABLE_PASS", "PASSBOOK_TYPE_IDENTIFIER", "PASSBOOK_TEAM_IDENTIFIER", "PASSBOOK_KEYSTORE", "PASSBOOK_KEYSTORE_PASSWORD", "PASSBOOK_PRIVATE_KEY_ALIAS", "CHECK_IN_STATS", "ALFIO_PI_INTEGRATION_ENABLED", "OFFLINE_CHECKIN_ENABLED", "LABEL_PRINTING_ENABLED", "LABEL_LAYOUT", "CHECK_IN_COLOR_CONFIGURATION", "SECURITY_CSP_REPORT_ENABLED", "SECURITY_CSP_REPORT_URI", "EMBED_ALLOWED_ORIGINS", "EMBED_POST_MESSAGE_ORIGIN", "TRANSLATION_OVERRIDE", "BASE_CUSTOM_CSS", "EVENT_CUSTOM_CSS", "DESCRIPTION_MAXLENGTH", "OPENID_PUBLIC_ENABLED", "OPENID_CONFIGURATION_JSON", "GENERATE_TICKETS_FOR_SUBSCRIPTIONS" ] } } ], "responses" : { @@ -25319,8 +25319,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -25329,8 +25329,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -25417,24 +25417,24 @@ "value" : { "type" : "boolean" }, - "warnings" : { - "type" : "array", - "items" : { - "$ref" : "#/components/schemas/WarningMessage" - } - }, - "success" : { - "type" : "boolean" - }, "errorCount" : { "type" : "integer", "format" : "int32" }, + "success" : { + "type" : "boolean" + }, "validationErrors" : { "type" : "array", "items" : { "$ref" : "#/components/schemas/ErrorDescriptor" } + }, + "warnings" : { + "type" : "array", + "items" : { + "$ref" : "#/components/schemas/WarningMessage" + } } } }, @@ -25571,10 +25571,11 @@ "enabled" : { "type" : "boolean" }, - "description" : { - "type" : "string" + "validTo" : { + "type" : "string", + "format" : "date-time" }, - "username" : { + "description" : { "type" : "string" }, "firstName" : { @@ -25586,13 +25587,12 @@ "emailAddress" : { "type" : "string" }, + "username" : { + "type" : "string" + }, "validToEpochSecond" : { "type" : "integer", "format" : "int64" - }, - "validTo" : { - "type" : "string", - "format" : "date-time" } } }, @@ -25602,15 +25602,15 @@ "location" : { "type" : "string" }, + "description" : { + "type" : "string" + }, "arguments" : { "type" : "array", "items" : { "type" : "object" } }, - "description" : { - "type" : "string" - }, "code" : { "type" : "string" } @@ -25635,11 +25635,11 @@ "success" : { "type" : "boolean" }, - "formattedErrors" : { - "type" : "string" - }, "firstErrorOrNull" : { "$ref" : "#/components/schemas/ErrorCode" + }, + "formattedErrors" : { + "type" : "string" } } }, @@ -26001,37 +26001,37 @@ "refundedAmount" : { "type" : "string" }, - "singleTicketOrder" : { + "vatExempt" : { "type" : "boolean" }, - "displayVat" : { - "type" : "boolean" + "priceInCents" : { + "type" : "integer", + "format" : "int32" }, - "totalNetPrice" : { - "type" : "string" + "ticketAmount" : { + "type" : "integer", + "format" : "int32" }, "descriptionForPayment" : { "type" : "string" }, - "displaySplitPaymentNote" : { + "notYetPaid" : { "type" : "boolean" }, - "priceBeforeTaxes" : { - "type" : "string" - }, - "ticketAmount" : { - "type" : "integer", - "format" : "int32" + "singleTicketOrder" : { + "type" : "boolean" }, - "notYetPaid" : { + "displayVat" : { "type" : "boolean" }, - "vatExempt" : { + "totalNetPrice" : { + "type" : "string" + }, + "displaySplitPaymentNote" : { "type" : "boolean" }, - "priceInCents" : { - "type" : "integer", - "format" : "int32" + "priceBeforeTaxes" : { + "type" : "string" } } }, @@ -26098,10 +26098,10 @@ "currencyCode" : { "type" : "string" }, - "dynamic" : { + "fixedAmount" : { "type" : "boolean" }, - "fixedAmount" : { + "dynamic" : { "type" : "boolean" } } @@ -26125,11 +26125,11 @@ "success" : { "type" : "boolean" }, - "formattedErrors" : { - "type" : "string" - }, "firstErrorOrNull" : { "$ref" : "#/components/schemas/ErrorCode" + }, + "formattedErrors" : { + "type" : "string" } } }, @@ -26145,14 +26145,14 @@ "key" : { "$ref" : "#/components/schemas/TicketCategory" }, - "left" : { - "$ref" : "#/components/schemas/TicketCategory" - }, "right" : { "type" : "array", "items" : { "$ref" : "#/components/schemas/Ticket" } + }, + "left" : { + "$ref" : "#/components/schemas/TicketCategory" } } }, @@ -26225,13 +26225,13 @@ "valid" : { "type" : "boolean" }, - "formattedValidityTo" : { + "pin" : { "type" : "string" }, - "formattedValidityFrom" : { + "formattedValidityTo" : { "type" : "string" }, - "pin" : { + "formattedValidityFrom" : { "type" : "string" } } @@ -26290,14 +26290,14 @@ "type" : "string", "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "CUSTOM_INCLUDED_EXEMPT", "CUSTOM_NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] }, + "descriptionForPayment" : { + "type" : "string" + }, "discount" : { "type" : "boolean" }, "taxDetail" : { "type" : "boolean" - }, - "descriptionForPayment" : { - "type" : "string" } } }, @@ -26384,16 +26384,16 @@ "type" : "string", "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "CUSTOM_INCLUDED_EXEMPT", "CUSTOM_NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] }, - "formattedNetPrice" : { - "type" : "string" - }, "assigned" : { "type" : "boolean" }, + "formattedFinalPrice" : { + "type" : "string" + }, "checkedIn" : { "type" : "boolean" }, - "formattedFinalPrice" : { + "formattedNetPrice" : { "type" : "string" } } @@ -26592,43 +26592,43 @@ "cancelled" : { "type" : "boolean" }, + "hasInvoiceNumber" : { + "type" : "boolean" + }, "stuck" : { "type" : "boolean" }, "hasBillingAddress" : { "type" : "boolean" }, - "hasVatNumber" : { + "hasInvoiceOrReceiptDocument" : { "type" : "boolean" }, - "hasInvoiceNumber" : { + "hasBeenPaid" : { "type" : "boolean" }, - "pendingOfflinePayment" : { + "hasVatNumber" : { "type" : "boolean" }, - "paidAmount" : { - "type" : "string" - }, "lineSplittedBillingAddress" : { "type" : "array", "items" : { "type" : "string" } }, - "hasInvoiceOrReceiptDocument" : { - "type" : "boolean" + "paidAmount" : { + "type" : "string" }, - "hasBeenPaid" : { + "pendingOfflinePayment" : { "type" : "boolean" }, - "finalPrice" : { + "taxablePrice" : { "type" : "number" }, - "netPrice" : { + "finalPrice" : { "type" : "number" }, - "taxablePrice" : { + "netPrice" : { "type" : "number" } } @@ -26725,76 +26725,30 @@ "type" : "string", "enum" : [ "PENDING", "IN_PAYMENT", "EXTERNAL_PROCESSING_PAYMENT", "WAITING_EXTERNAL_CONFIRMATION", "OFFLINE_PAYMENT", "DEFERRED_OFFLINE_PAYMENT", "FINALIZING", "OFFLINE_FINALIZING", "COMPLETE", "STUCK", "CANCELLED", "CREDIT_NOTE_ISSUED" ] }, - "stuck" : { - "type" : "boolean" - }, - "reminderSent" : { - "type" : "boolean" - }, - "hasBillingAddress" : { - "type" : "boolean" - }, - "hasVatNumber" : { - "type" : "boolean" - }, - "latestReminder" : { - "type" : "string", - "format" : "date-time" - }, - "invoiceModel" : { - "type" : "string" - }, - "usedVatPercent" : { - "type" : "number" - }, - "creationTimestamp" : { - "type" : "string", - "format" : "date-time" - }, - "promoCodeDiscountId" : { - "type" : "integer", - "format" : "int32" - }, - "email" : { - "type" : "string" - }, - "userLanguage" : { - "type" : "string" - }, "firstName" : { "type" : "string" }, "lastName" : { "type" : "string" }, - "hasInvoiceNumber" : { - "type" : "boolean" + "email" : { + "type" : "string" }, "invoiceNumber" : { "type" : "string" }, - "paymentMethod" : { - "type" : "string", - "enum" : [ "STRIPE", "ON_SITE", "OFFLINE", "NONE", "ADMIN", "PAYPAL", "MOLLIE", "SAFERPAY" ] - }, "vatStatus" : { "type" : "string", "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "CUSTOM_INCLUDED_EXEMPT", "CUSTOM_NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] }, - "srcPriceCts" : { + "invoiceRequested" : { + "type" : "boolean" + }, + "finalPriceCts" : { "type" : "integer", "format" : "int32" }, - "finalPrice" : { - "type" : "number" - }, - "vat" : { - "type" : "number" - }, - "appliedDiscount" : { - "type" : "number" - }, - "finalPriceCts" : { + "srcPriceCts" : { "type" : "integer", "format" : "int32" }, @@ -26806,58 +26760,95 @@ "type" : "integer", "format" : "int32" }, - "vatNr" : { - "type" : "string" + "paymentMethod" : { + "type" : "string", + "enum" : [ "STRIPE", "ON_SITE", "OFFLINE", "NONE", "ADMIN", "PAYPAL", "MOLLIE", "SAFERPAY" ] }, - "vatCountryCode" : { + "vatNr" : { "type" : "string" }, - "invoiceRequested" : { - "type" : "boolean" - }, - "vatPercentageOrZero" : { + "taxablePrice" : { "type" : "number" }, - "netPrice" : { + "appliedDiscount" : { "type" : "number" }, - "pendingOfflinePayment" : { - "type" : "boolean" + "userLanguage" : { + "type" : "string" }, "validity" : { "type" : "string", "format" : "date-time" }, + "promoCodeDiscountId" : { + "type" : "integer", + "format" : "int32" + }, + "confirmationTimestamp" : { + "type" : "string", + "format" : "date-time" + }, + "invoiceModel" : { + "type" : "string" + }, "billingAddress" : { "type" : "string" }, - "customerReference" : { + "latestReminder" : { + "type" : "string", + "format" : "date-time" + }, + "reminderSent" : { + "type" : "boolean" + }, + "directAssignmentRequested" : { + "type" : "boolean" + }, + "vatCountryCode" : { "type" : "string" }, - "registrationTimestamp" : { + "usedVatPercent" : { + "type" : "number" + }, + "vatIncluded" : { + "type" : "boolean" + }, + "creationTimestamp" : { "type" : "string", "format" : "date-time" }, - "confirmationTimestamp" : { + "customerReference" : { + "type" : "string" + }, + "registrationTimestamp" : { "type" : "string", "format" : "date-time" }, + "finalPrice" : { + "type" : "number" + }, + "vat" : { + "type" : "number" + }, "discount" : { "$ref" : "#/components/schemas/PromoCodeDiscount" }, - "paidAmount" : { - "type" : "string" + "netPrice" : { + "type" : "number" }, - "lineSplittedBillingAddress" : { - "type" : "array", - "items" : { - "type" : "string" - } + "vatPercentageOrZero" : { + "type" : "number" }, - "directAssignmentRequested" : { + "optionalVatPercentage" : { + "type" : "number" + }, + "hasInvoiceNumber" : { "type" : "boolean" }, - "vatIncluded" : { + "stuck" : { + "type" : "boolean" + }, + "hasBillingAddress" : { "type" : "boolean" }, "hasInvoiceOrReceiptDocument" : { @@ -26866,11 +26857,20 @@ "hasBeenPaid" : { "type" : "boolean" }, - "optionalVatPercentage" : { - "type" : "number" + "hasVatNumber" : { + "type" : "boolean" }, - "taxablePrice" : { - "type" : "number" + "lineSplittedBillingAddress" : { + "type" : "array", + "items" : { + "type" : "string" + } + }, + "paidAmount" : { + "type" : "string" + }, + "pendingOfflinePayment" : { + "type" : "boolean" } } }, @@ -27373,24 +27373,24 @@ "value" : { "$ref" : "#/components/schemas/User" }, - "warnings" : { - "type" : "array", - "items" : { - "$ref" : "#/components/schemas/WarningMessage" - } - }, - "success" : { - "type" : "boolean" - }, "errorCount" : { "type" : "integer", "format" : "int32" }, + "success" : { + "type" : "boolean" + }, "validationErrors" : { "type" : "array", "items" : { "$ref" : "#/components/schemas/ErrorDescriptor" } + }, + "warnings" : { + "type" : "array", + "items" : { + "$ref" : "#/components/schemas/WarningMessage" + } } } }, @@ -27411,24 +27411,24 @@ "value" : { "type" : "string" }, - "warnings" : { - "type" : "array", - "items" : { - "$ref" : "#/components/schemas/WarningMessage" - } - }, - "success" : { - "type" : "boolean" - }, "errorCount" : { "type" : "integer", "format" : "int32" }, + "success" : { + "type" : "boolean" + }, "validationErrors" : { "type" : "array", "items" : { "$ref" : "#/components/schemas/ErrorDescriptor" } + }, + "warnings" : { + "type" : "array", + "items" : { + "$ref" : "#/components/schemas/WarningMessage" + } } } }, @@ -27562,12 +27562,12 @@ "type" : "string", "enum" : [ "CREDIT_CARD", "PAYPAL", "IDEAL", "BANK_TRANSFER", "ON_SITE", "NONE", "APPLE_PAY", "BANCONTACT", "ING_HOME_PAY", "BELFIUS", "KBC", "PRZELEWY_24", "ALIPAY", "POSTFINANCE", "TWINT" ] }, + "token" : { + "type" : "string" + }, "paymentProvider" : { "type" : "string", "enum" : [ "STRIPE", "ON_SITE", "OFFLINE", "NONE", "ADMIN", "PAYPAL", "MOLLIE", "SAFERPAY" ] - }, - "token" : { - "type" : "string" } } }, @@ -27648,24 +27648,24 @@ "value" : { "$ref" : "#/components/schemas/ReservationPaymentResult" }, - "warnings" : { - "type" : "array", - "items" : { - "$ref" : "#/components/schemas/WarningMessage" - } - }, - "success" : { - "type" : "boolean" - }, "errorCount" : { "type" : "integer", "format" : "int32" }, + "success" : { + "type" : "boolean" + }, "validationErrors" : { "type" : "array", "items" : { "$ref" : "#/components/schemas/ErrorDescriptor" } + }, + "warnings" : { + "type" : "array", + "items" : { + "$ref" : "#/components/schemas/WarningMessage" + } } } }, @@ -27812,16 +27812,16 @@ "captcha" : { "type" : "string" }, - "additionalServices" : { + "tickets" : { "type" : "array", "items" : { - "$ref" : "#/components/schemas/AdditionalServiceReservationModification" + "$ref" : "#/components/schemas/TicketReservationModification" } }, - "tickets" : { + "additionalServices" : { "type" : "array", "items" : { - "$ref" : "#/components/schemas/TicketReservationModification" + "$ref" : "#/components/schemas/AdditionalServiceReservationModification" } } } @@ -28053,14 +28053,6 @@ "type" : "integer", "format" : "int32" }, - "validityFrom" : { - "type" : "string", - "format" : "date-time" - }, - "validityTo" : { - "type" : "string", - "format" : "date-time" - }, "timeUnit" : { "type" : "string", "enum" : [ "DAYS", "MONTHS", "YEARS" ] @@ -28068,6 +28060,14 @@ "numEntries" : { "type" : "integer", "format" : "int32" + }, + "validityFrom" : { + "type" : "string", + "format" : "date-time" + }, + "validityTo" : { + "type" : "string", + "format" : "date-time" } } }, @@ -28610,50 +28610,33 @@ "currencyCode" : { "type" : "string" }, - "formattedNetPrice" : { - "type" : "string" - }, - "extReference" : { - "type" : "string" - }, "status" : { "type" : "string", "enum" : [ "FREE", "PENDING", "TO_BE_PAID", "ACQUIRED", "CANCELLED", "CHECKED_IN", "EXPIRED", "INVALIDATED", "RELEASED", "PRE_RESERVED" ] }, - "tags" : { - "type" : "array", - "items" : { - "type" : "string" - } - }, - "assigned" : { - "type" : "boolean" - }, - "email" : { + "firstName" : { "type" : "string" }, - "userLanguage" : { + "lastName" : { "type" : "string" }, - "eventId" : { - "type" : "integer", - "format" : "int32" - }, - "firstName" : { + "email" : { "type" : "string" }, - "lastName" : { - "type" : "string" + "assigned" : { + "type" : "boolean" }, - "subscriptionId" : { - "type" : "string", - "format" : "uuid" + "formattedFinalPrice" : { + "type" : "string" }, "vatStatus" : { "type" : "string", "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "CUSTOM_INCLUDED_EXEMPT", "CUSTOM_NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] }, - "srcPriceCts" : { + "uuid" : { + "type" : "string" + }, + "categoryId" : { "type" : "integer", "format" : "int32" }, @@ -28661,37 +28644,54 @@ "type" : "integer", "format" : "int32" }, - "vatCts" : { + "srcPriceCts" : { "type" : "integer", "format" : "int32" }, - "discountCts" : { + "vatCts" : { "type" : "integer", "format" : "int32" }, - "categoryId" : { + "discountCts" : { "type" : "integer", "format" : "int32" }, "ticketsReservationId" : { "type" : "string" }, - "uuid" : { + "eventId" : { + "type" : "integer", + "format" : "int32" + }, + "userLanguage" : { "type" : "string" }, + "tags" : { + "type" : "array", + "items" : { + "type" : "string" + } + }, "lockedAssignment" : { "type" : "boolean" }, "checkedIn" : { "type" : "boolean" }, + "formattedNetPrice" : { + "type" : "string" + }, "creation" : { "type" : "string", "format" : "date-time" }, - "formattedFinalPrice" : { + "extReference" : { "type" : "string" }, + "subscriptionId" : { + "type" : "string", + "format" : "uuid" + }, "categoryName" : { "type" : "string" } @@ -28857,11 +28857,11 @@ "success" : { "type" : "boolean" }, - "formattedErrors" : { - "type" : "string" - }, "firstErrorOrNull" : { "$ref" : "#/components/schemas/ErrorCode" + }, + "formattedErrors" : { + "type" : "string" } } }, @@ -28919,11 +28919,11 @@ "success" : { "type" : "boolean" }, - "formattedErrors" : { - "type" : "string" - }, "firstErrorOrNull" : { "$ref" : "#/components/schemas/ErrorCode" + }, + "formattedErrors" : { + "type" : "string" } } }, @@ -29258,6 +29258,13 @@ "supportsTicketsGeneration" : { "type" : "boolean" }, + "publicIdentifier" : { + "type" : "string" + }, + "priceCts" : { + "type" : "integer", + "format" : "int32" + }, "validityFromModel" : { "$ref" : "#/components/schemas/DateTimeModification" }, @@ -29269,13 +29276,6 @@ }, "onSaleToModel" : { "$ref" : "#/components/schemas/DateTimeModification" - }, - "publicIdentifier" : { - "type" : "string" - }, - "priceCts" : { - "type" : "integer", - "format" : "int32" } } }, @@ -29378,11 +29378,11 @@ "key" : { "type" : "boolean" }, - "left" : { - "type" : "boolean" - }, "right" : { "type" : "string" + }, + "left" : { + "type" : "boolean" } } }, @@ -29712,12 +29712,12 @@ "TripleBooleanStringString" : { "type" : "object", "properties" : { - "left" : { - "type" : "boolean" - }, "right" : { "type" : "string" }, + "left" : { + "type" : "boolean" + }, "middle" : { "type" : "string" } @@ -29936,50 +29936,33 @@ "currencyCode" : { "type" : "string" }, - "formattedNetPrice" : { - "type" : "string" - }, - "extReference" : { - "type" : "string" - }, "status" : { "type" : "string", "enum" : [ "FREE", "PENDING", "TO_BE_PAID", "ACQUIRED", "CANCELLED", "CHECKED_IN", "EXPIRED", "INVALIDATED", "RELEASED", "PRE_RESERVED" ] }, - "tags" : { - "type" : "array", - "items" : { - "type" : "string" - } - }, - "assigned" : { - "type" : "boolean" - }, - "email" : { + "firstName" : { "type" : "string" }, - "userLanguage" : { + "lastName" : { "type" : "string" }, - "eventId" : { - "type" : "integer", - "format" : "int32" - }, - "firstName" : { + "email" : { "type" : "string" }, - "lastName" : { - "type" : "string" + "assigned" : { + "type" : "boolean" }, - "subscriptionId" : { - "type" : "string", - "format" : "uuid" + "formattedFinalPrice" : { + "type" : "string" }, "vatStatus" : { "type" : "string", "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "CUSTOM_INCLUDED_EXEMPT", "CUSTOM_NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] }, - "srcPriceCts" : { + "uuid" : { + "type" : "string" + }, + "categoryId" : { "type" : "integer", "format" : "int32" }, @@ -29987,36 +29970,53 @@ "type" : "integer", "format" : "int32" }, - "vatCts" : { + "srcPriceCts" : { "type" : "integer", "format" : "int32" }, - "discountCts" : { + "vatCts" : { "type" : "integer", "format" : "int32" }, - "categoryId" : { + "discountCts" : { "type" : "integer", "format" : "int32" }, "ticketsReservationId" : { "type" : "string" }, - "uuid" : { + "eventId" : { + "type" : "integer", + "format" : "int32" + }, + "userLanguage" : { "type" : "string" }, + "tags" : { + "type" : "array", + "items" : { + "type" : "string" + } + }, "lockedAssignment" : { "type" : "boolean" }, "checkedIn" : { "type" : "boolean" }, + "formattedNetPrice" : { + "type" : "string" + }, "creation" : { "type" : "string", "format" : "date-time" }, - "formattedFinalPrice" : { + "extReference" : { "type" : "string" + }, + "subscriptionId" : { + "type" : "string", + "format" : "uuid" } } }, @@ -30687,11 +30687,9 @@ "type" : "string" } }, - "title" : { - "type" : "object", - "additionalProperties" : { - "type" : "string" - } + "usageType" : { + "type" : "string", + "enum" : [ "ONCE_PER_EVENT", "UNLIMITED" ] }, "vat" : { "type" : "string" @@ -30700,39 +30698,38 @@ "type" : "integer", "format" : "int32" }, + "free" : { + "type" : "boolean" + }, "vatIncluded" : { "type" : "boolean" }, + "fileBlobId" : { + "type" : "string" + }, + "title" : { + "type" : "object", + "additionalProperties" : { + "type" : "string" + } + }, "termsAndConditionsUrl" : { "type" : "string" }, "privacyPolicyUrl" : { "type" : "string" }, - "validityUnits" : { - "type" : "integer", - "format" : "int32" + "validityType" : { + "type" : "string", + "enum" : [ "STANDARD", "CUSTOM", "NOT_SET" ] }, "validityTimeUnit" : { "type" : "string", "enum" : [ "DAYS", "MONTHS", "YEARS" ] }, - "usageType" : { - "type" : "string", - "enum" : [ "ONCE_PER_EVENT", "UNLIMITED" ] - }, - "free" : { - "type" : "boolean" - }, - "fileBlobId" : { - "type" : "string" - }, - "validityType" : { - "type" : "string", - "enum" : [ "STANDARD", "CUSTOM", "NOT_SET" ] - }, - "formattedPrice" : { - "type" : "string" + "validityUnits" : { + "type" : "integer", + "format" : "int32" }, "assignmentConfiguration" : { "$ref" : "#/components/schemas/AssignmentConfiguration" @@ -30743,6 +30740,9 @@ "canApplySubscriptions" : { "type" : "boolean" }, + "formattedPrice" : { + "type" : "string" + }, "contentLanguages" : { "type" : "array", "items" : { @@ -30760,20 +30760,20 @@ "redirectUrl" : { "type" : "string" }, - "initialized" : { + "redirect" : { "type" : "boolean" }, + "gatewayIdOrNull" : { + "type" : "string" + }, "successful" : { "type" : "boolean" }, "failed" : { "type" : "boolean" }, - "redirect" : { + "initialized" : { "type" : "boolean" - }, - "gatewayIdOrNull" : { - "type" : "string" } } }, @@ -31279,34 +31279,37 @@ "currency" : { "type" : "string" }, - "shortName" : { + "websiteUrl" : { "type" : "string" }, - "title" : { - "type" : "object", - "additionalProperties" : { - "type" : "string" - } - }, "vat" : { "type" : "string" }, + "free" : { + "type" : "boolean" + }, + "sameDay" : { + "type" : "boolean" + }, "vatIncluded" : { "type" : "boolean" }, - "termsAndConditionsUrl" : { + "fileBlobId" : { "type" : "string" }, - "privacyPolicyUrl" : { - "type" : "string" + "title" : { + "type" : "object", + "additionalProperties" : { + "type" : "string" + } }, - "free" : { - "type" : "boolean" + "shortName" : { + "type" : "string" }, - "fileBlobId" : { + "termsAndConditionsUrl" : { "type" : "string" }, - "websiteUrl" : { + "privacyPolicyUrl" : { "type" : "string" }, "organizationName" : { @@ -31315,9 +31318,6 @@ "organizationEmail" : { "type" : "string" }, - "sameDay" : { - "type" : "boolean" - }, "datesWithOffset" : { "$ref" : "#/components/schemas/DatesWithTimeZoneOffset" }, @@ -31368,24 +31368,24 @@ "value" : { "$ref" : "#/components/schemas/EventCode" }, - "warnings" : { - "type" : "array", - "items" : { - "$ref" : "#/components/schemas/WarningMessage" - } - }, - "success" : { - "type" : "boolean" - }, "errorCount" : { "type" : "integer", "format" : "int32" }, + "success" : { + "type" : "boolean" + }, "validationErrors" : { "type" : "array", "items" : { "$ref" : "#/components/schemas/ErrorDescriptor" } + }, + "warnings" : { + "type" : "array", + "items" : { + "$ref" : "#/components/schemas/WarningMessage" + } } } }, @@ -31585,24 +31585,24 @@ "$ref" : "#/components/schemas/Poll" } }, - "warnings" : { - "type" : "array", - "items" : { - "$ref" : "#/components/schemas/WarningMessage" - } - }, - "success" : { - "type" : "boolean" - }, "errorCount" : { "type" : "integer", "format" : "int32" }, + "success" : { + "type" : "boolean" + }, "validationErrors" : { "type" : "array", "items" : { "$ref" : "#/components/schemas/ErrorDescriptor" } + }, + "warnings" : { + "type" : "array", + "items" : { + "$ref" : "#/components/schemas/WarningMessage" + } } } }, @@ -31651,24 +31651,24 @@ "value" : { "$ref" : "#/components/schemas/PollWithOptions" }, - "warnings" : { - "type" : "array", - "items" : { - "$ref" : "#/components/schemas/WarningMessage" - } - }, - "success" : { - "type" : "boolean" - }, "errorCount" : { "type" : "integer", "format" : "int32" }, + "success" : { + "type" : "boolean" + }, "validationErrors" : { "type" : "array", "items" : { "$ref" : "#/components/schemas/ErrorDescriptor" } + }, + "warnings" : { + "type" : "array", + "items" : { + "$ref" : "#/components/schemas/WarningMessage" + } } } }, @@ -31884,21 +31884,12 @@ "displayName" : { "type" : "string" }, - "titleAsText" : { - "type" : "object", - "additionalProperties" : { - "type" : "string" - } - }, - "descriptionAsText" : { - "type" : "object", - "additionalProperties" : { - "type" : "string" + "contentLanguages" : { + "type" : "array", + "items" : { + "$ref" : "#/components/schemas/ContentLanguage" } }, - "publicIdentifier" : { - "type" : "string" - }, "allowedPaymentProxies" : { "type" : "array", "items" : { @@ -31906,12 +31897,6 @@ "enum" : [ "STRIPE", "ON_SITE", "OFFLINE", "NONE", "ADMIN", "PAYPAL", "MOLLIE", "SAFERPAY" ] } }, - "contentLanguages" : { - "type" : "array", - "items" : { - "$ref" : "#/components/schemas/ContentLanguage" - } - }, "begin" : { "type" : "string", "format" : "date-time" @@ -31919,9 +31904,24 @@ "freeOfCharge" : { "type" : "boolean" }, + "publicIdentifier" : { + "type" : "string" + }, "privacyPolicyLinkOrNull" : { "type" : "string" }, + "titleAsText" : { + "type" : "object", + "additionalProperties" : { + "type" : "string" + } + }, + "descriptionAsText" : { + "type" : "object", + "additionalProperties" : { + "type" : "string" + } + }, "fileBlobIdIsPresent" : { "type" : "boolean" }, @@ -31952,12 +31952,12 @@ "descriptor" : { "$ref" : "#/components/schemas/SubscriptionDescriptor" }, - "unitPrice" : { - "type" : "number" - }, "availableCount" : { "type" : "integer", "format" : "int32" + }, + "unitPrice" : { + "type" : "number" } } }, @@ -32022,111 +32022,111 @@ "currencyCode" : { "type" : "string" }, - "formattedNetPrice" : { - "type" : "string" - }, - "extReference" : { - "type" : "string" - }, "status" : { "type" : "string", "enum" : [ "FREE", "PENDING", "TO_BE_PAID", "ACQUIRED", "CANCELLED", "CHECKED_IN", "EXPIRED", "INVALIDATED", "RELEASED", "PRE_RESERVED" ] }, - "stuck" : { - "type" : "boolean" - }, - "tags" : { - "type" : "array", - "items" : { - "type" : "string" - } - }, - "assigned" : { - "type" : "boolean" - }, - "transaction" : { - "$ref" : "#/components/schemas/Transaction" - }, - "email" : { + "firstName" : { "type" : "string" }, - "userLanguage" : { + "lastName" : { "type" : "string" }, - "eventId" : { - "type" : "integer", - "format" : "int32" - }, - "firstName" : { + "email" : { "type" : "string" }, - "lastName" : { - "type" : "string" + "assigned" : { + "type" : "boolean" }, - "subscriptionId" : { - "type" : "string", - "format" : "uuid" + "formattedFinalPrice" : { + "type" : "string" }, "vatStatus" : { "type" : "string", "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "CUSTOM_INCLUDED_EXEMPT", "CUSTOM_NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] }, - "srcPriceCts" : { + "uuid" : { + "type" : "string" + }, + "categoryId" : { "type" : "integer", "format" : "int32" }, - "finalPrice" : { - "type" : "number" - }, "finalPriceCts" : { "type" : "integer", "format" : "int32" }, - "vatCts" : { + "srcPriceCts" : { "type" : "integer", "format" : "int32" }, - "discountCts" : { + "vatCts" : { "type" : "integer", "format" : "int32" }, - "categoryId" : { + "discountCts" : { "type" : "integer", "format" : "int32" }, "ticketsReservationId" : { "type" : "string" }, - "uuid" : { + "eventId" : { + "type" : "integer", + "format" : "int32" + }, + "userLanguage" : { "type" : "string" }, + "transaction" : { + "$ref" : "#/components/schemas/Transaction" + }, + "finalPrice" : { + "type" : "number" + }, + "tags" : { + "type" : "array", + "items" : { + "type" : "string" + } + }, "lockedAssignment" : { "type" : "boolean" }, "checkedIn" : { "type" : "boolean" }, + "formattedNetPrice" : { + "type" : "string" + }, "creation" : { "type" : "string", "format" : "date-time" }, - "formattedFinalPrice" : { + "extReference" : { "type" : "string" }, - "transactionTimestamp" : { + "subscriptionId" : { "type" : "string", - "format" : "date-time" + "format" : "uuid" }, "paid" : { "type" : "boolean" }, + "stuck" : { + "type" : "boolean" + }, + "transactionTimestamp" : { + "type" : "string", + "format" : "date-time" + }, "pending" : { "type" : "boolean" }, - "netPrice" : { + "taxablePrice" : { "type" : "number" }, - "taxablePrice" : { + "netPrice" : { "type" : "number" } } @@ -32253,11 +32253,11 @@ "success" : { "type" : "boolean" }, - "formattedErrors" : { - "type" : "string" - }, "firstErrorOrNull" : { "$ref" : "#/components/schemas/ErrorCode" + }, + "formattedErrors" : { + "type" : "string" } } }, @@ -32270,50 +32270,39 @@ "currencyCode" : { "type" : "string" }, - "formattedNetPrice" : { - "type" : "string" - }, - "extReference" : { - "type" : "string" - }, "status" : { "type" : "string", "enum" : [ "FREE", "PENDING", "TO_BE_PAID", "ACQUIRED", "CANCELLED", "CHECKED_IN", "EXPIRED", "INVALIDATED", "RELEASED", "PRE_RESERVED" ] }, - "tags" : { - "type" : "array", - "items" : { + "additionalFields" : { + "type" : "object", + "additionalProperties" : { "type" : "string" } }, - "assigned" : { - "type" : "boolean" - }, - "email" : { + "firstName" : { "type" : "string" }, - "userLanguage" : { + "lastName" : { "type" : "string" }, - "eventId" : { - "type" : "integer", - "format" : "int32" - }, - "firstName" : { + "email" : { "type" : "string" }, - "lastName" : { - "type" : "string" + "assigned" : { + "type" : "boolean" }, - "subscriptionId" : { - "type" : "string", - "format" : "uuid" + "formattedFinalPrice" : { + "type" : "string" }, "vatStatus" : { "type" : "string", "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "CUSTOM_INCLUDED_EXEMPT", "CUSTOM_NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] }, - "srcPriceCts" : { + "uuid" : { + "type" : "string" + }, + "categoryId" : { "type" : "integer", "format" : "int32" }, @@ -32321,42 +32310,53 @@ "type" : "integer", "format" : "int32" }, - "vatCts" : { + "srcPriceCts" : { "type" : "integer", "format" : "int32" }, - "discountCts" : { + "vatCts" : { "type" : "integer", "format" : "int32" }, - "categoryId" : { + "discountCts" : { "type" : "integer", "format" : "int32" }, "ticketsReservationId" : { "type" : "string" }, - "uuid" : { + "eventId" : { + "type" : "integer", + "format" : "int32" + }, + "userLanguage" : { "type" : "string" }, + "tags" : { + "type" : "array", + "items" : { + "type" : "string" + } + }, "lockedAssignment" : { "type" : "boolean" }, "checkedIn" : { "type" : "boolean" }, + "formattedNetPrice" : { + "type" : "string" + }, "creation" : { "type" : "string", "format" : "date-time" }, - "formattedFinalPrice" : { + "extReference" : { "type" : "string" }, - "additionalFields" : { - "type" : "object", - "additionalProperties" : { - "type" : "string" - } + "subscriptionId" : { + "type" : "string", + "format" : "uuid" } } }, @@ -32391,12 +32391,29 @@ "type" : "string", "enum" : [ "WAITING", "RETRY", "IN_PROCESS", "SENT", "ERROR" ] }, + "organizationId" : { + "type" : "integer", + "format" : "int32" + }, + "requestTimestamp" : { + "type" : "string", + "format" : "date-time" + }, "attempts" : { "type" : "integer", "format" : "int32" }, - "checksum" : { - "type" : "string" + "subscriptionDescriptorId" : { + "type" : "string", + "format" : "uuid" + }, + "eventId" : { + "type" : "integer", + "format" : "int32" + }, + "purchaseContextType" : { + "type" : "string", + "enum" : [ "subscription", "event" ] }, "recipient" : { "type" : "string" @@ -32416,25 +32433,8 @@ "attachments" : { "type" : "string" }, - "purchaseContextType" : { - "type" : "string", - "enum" : [ "subscription", "event" ] - }, - "subscriptionDescriptorId" : { - "type" : "string", - "format" : "uuid" - }, - "eventId" : { - "type" : "integer", - "format" : "int32" - }, - "organizationId" : { - "type" : "integer", - "format" : "int32" - }, - "requestTimestamp" : { - "type" : "string", - "format" : "date-time" + "checksum" : { + "type" : "string" }, "sentTimestamp" : { "type" : "string", @@ -32468,14 +32468,14 @@ "type" : "integer", "format" : "int32" }, - "participationPercentage" : { - "type" : "string" - }, "optionStatistics" : { "type" : "array", "items" : { "$ref" : "#/components/schemas/StatisticDetail" } + }, + "participationPercentage" : { + "type" : "string" } } }, @@ -32543,10 +32543,11 @@ "enabled" : { "type" : "boolean" }, - "description" : { - "type" : "string" + "validTo" : { + "type" : "string", + "format" : "date-time" }, - "username" : { + "description" : { "type" : "string" }, "firstName" : { @@ -32558,13 +32559,12 @@ "emailAddress" : { "type" : "string" }, + "username" : { + "type" : "string" + }, "validToEpochSecond" : { "type" : "integer", "format" : "int64" - }, - "validTo" : { - "type" : "string", - "format" : "date-time" } } }, @@ -32637,11 +32637,11 @@ "success" : { "type" : "boolean" }, - "formattedErrors" : { - "type" : "string" - }, "firstErrorOrNull" : { "$ref" : "#/components/schemas/ErrorCode" + }, + "formattedErrors" : { + "type" : "string" } } }, @@ -32684,11 +32684,11 @@ "success" : { "type" : "boolean" }, - "formattedErrors" : { - "type" : "string" - }, "firstErrorOrNull" : { "$ref" : "#/components/schemas/ErrorCode" + }, + "formattedErrors" : { + "type" : "string" } } }, @@ -32797,11 +32797,11 @@ "success" : { "type" : "boolean" }, - "formattedErrors" : { - "type" : "string" - }, "firstErrorOrNull" : { "$ref" : "#/components/schemas/ErrorCode" + }, + "formattedErrors" : { + "type" : "string" } } }, @@ -32867,11 +32867,11 @@ "success" : { "type" : "boolean" }, - "formattedErrors" : { - "type" : "string" - }, "firstErrorOrNull" : { "$ref" : "#/components/schemas/ErrorCode" + }, + "formattedErrors" : { + "type" : "string" } } }, @@ -32941,11 +32941,11 @@ "success" : { "type" : "boolean" }, - "formattedErrors" : { - "type" : "string" - }, "firstErrorOrNull" : { "$ref" : "#/components/schemas/ErrorCode" + }, + "formattedErrors" : { + "type" : "string" } } }, @@ -33068,48 +33068,42 @@ "currencyCode" : { "type" : "string" }, - "dynamic" : { - "type" : "boolean" - }, "description" : { "type" : "string" }, - "formattedStart" : { - "type" : "string" + "currentlyValid" : { + "type" : "boolean" }, - "formattedEnd" : { + "formattedDiscountAmount" : { "type" : "string" }, - "formattedDiscountAmount" : { + "categories" : { + "uniqueItems" : true, + "type" : "array", + "items" : { + "type" : "integer", + "format" : "int32" + } + }, + "promoCode" : { "type" : "string" }, - "eventId" : { + "organizationId" : { "type" : "integer", "format" : "int32" }, - "organizationId" : { + "eventId" : { "type" : "integer", "format" : "int32" }, - "promoCode" : { - "type" : "string" - }, - "utcStart" : { - "type" : "string", - "format" : "date-time" - }, - "utcEnd" : { + "discountType" : { "type" : "string", - "format" : "date-time" + "enum" : [ "FIXED_AMOUNT", "PERCENTAGE", "FIXED_AMOUNT_RESERVATION", "NONE" ] }, "discountAmount" : { "type" : "integer", "format" : "int32" }, - "discountType" : { - "type" : "string", - "enum" : [ "FIXED_AMOUNT", "PERCENTAGE", "FIXED_AMOUNT_RESERVATION", "NONE" ] - }, "codeType" : { "type" : "string", "enum" : [ "DISCOUNT", "ACCESS", "DYNAMIC" ] @@ -33118,29 +33112,35 @@ "type" : "integer", "format" : "int32" }, - "maxUsage" : { - "type" : "integer", - "format" : "int32" + "fixedAmount" : { + "type" : "boolean" }, - "categories" : { - "uniqueItems" : true, - "type" : "array", - "items" : { - "type" : "integer", - "format" : "int32" - } + "expired" : { + "type" : "boolean" }, - "currentlyValid" : { + "dynamic" : { "type" : "boolean" }, "emailReference" : { "type" : "string" }, - "expired" : { - "type" : "boolean" + "utcStart" : { + "type" : "string", + "format" : "date-time" }, - "fixedAmount" : { - "type" : "boolean" + "utcEnd" : { + "type" : "string", + "format" : "date-time" + }, + "maxUsage" : { + "type" : "integer", + "format" : "int32" + }, + "formattedStart" : { + "type" : "string" + }, + "formattedEnd" : { + "type" : "string" } } }, @@ -33427,6 +33427,13 @@ "type" : "string", "enum" : [ "DRAFT", "PUBLIC", "DISABLED" ] }, + "allowedPaymentProxies" : { + "type" : "array", + "items" : { + "type" : "string", + "enum" : [ "STRIPE", "ON_SITE", "OFFLINE", "NONE", "ADMIN", "PAYPAL", "MOLLIE", "SAFERPAY" ] + } + }, "notSoldTickets" : { "type" : "integer", "format" : "int32" @@ -33435,51 +33442,36 @@ "type" : "integer", "format" : "int32" }, - "pendingTickets" : { - "type" : "integer", - "format" : "int32" - }, - "dynamicAllocation" : { - "type" : "integer", - "format" : "int32" - }, - "releasedTickets" : { + "availableSeats" : { "type" : "integer", "format" : "int32" }, - "formattedEnd" : { - "type" : "string" - }, - "shortName" : { + "fileBlobId" : { "type" : "string" }, "organizationId" : { "type" : "integer", "format" : "int32" }, - "allowedPaymentProxies" : { - "type" : "array", - "items" : { - "type" : "string", - "enum" : [ "STRIPE", "ON_SITE", "OFFLINE", "NONE", "ADMIN", "PAYPAL", "MOLLIE", "SAFERPAY" ] - } - }, - "fileBlobId" : { + "shortName" : { "type" : "string" }, - "notAllocatedTickets" : { + "checkedInTickets" : { "type" : "integer", "format" : "int32" }, - "availableSeats" : { + "dynamicAllocation" : { "type" : "integer", "format" : "int32" }, - "checkedInTickets" : { + "expired" : { + "type" : "boolean" + }, + "notAllocatedTickets" : { "type" : "integer", "format" : "int32" }, - "expired" : { + "visibleForCurrentUser" : { "type" : "boolean" }, "warningNeeded" : { @@ -33488,11 +33480,19 @@ "formattedBegin" : { "type" : "string" }, - "visibleForCurrentUser" : { - "type" : "boolean" - }, "displayStatistics" : { "type" : "boolean" + }, + "pendingTickets" : { + "type" : "integer", + "format" : "int32" + }, + "releasedTickets" : { + "type" : "integer", + "format" : "int32" + }, + "formattedEnd" : { + "type" : "string" } } }, @@ -33511,22 +33511,20 @@ "timeZone" : { "type" : "string" }, - "url" : { - "type" : "string" - }, - "descriptions" : { - "type" : "array", - "items" : { - "$ref" : "#/components/schemas/PublicEventDescription" - } + "apiVersion" : { + "type" : "integer", + "format" : "int32" }, - "oneDay" : { - "type" : "boolean" + "end" : { + "type" : "string" }, "begin" : { "type" : "string" }, - "end" : { + "url" : { + "type" : "string" + }, + "imageUrl" : { "type" : "string" }, "latitude" : { @@ -33535,12 +33533,14 @@ "longitude" : { "type" : "string" }, - "imageUrl" : { - "type" : "string" + "descriptions" : { + "type" : "array", + "items" : { + "$ref" : "#/components/schemas/PublicEventDescription" + } }, - "apiVersion" : { - "type" : "integer", - "format" : "int32" + "oneDay" : { + "type" : "boolean" } } }, @@ -33634,10 +33634,10 @@ "key" : { "type" : "string" }, - "left" : { + "right" : { "type" : "string" }, - "right" : { + "left" : { "type" : "string" } } @@ -33726,12 +33726,15 @@ "type" : "integer", "format" : "int32" }, - "inputType" : { - "type" : "string" + "checkboxField" : { + "type" : "boolean" }, "countryField" : { "type" : "boolean" }, + "inputType" : { + "type" : "string" + }, "inputField" : { "type" : "boolean" }, @@ -33741,9 +33744,6 @@ "selectField" : { "type" : "boolean" }, - "checkboxField" : { - "type" : "boolean" - }, "euVat" : { "type" : "boolean" }, @@ -33788,10 +33788,13 @@ "type" : "integer", "format" : "int32" }, - "inputType" : { - "type" : "string" + "editable" : { + "type" : "boolean" }, - "disabledValues" : { + "checkboxField" : { + "type" : "boolean" + }, + "restrictedValues" : { "type" : "array", "items" : { "type" : "string" @@ -33801,37 +33804,37 @@ "type" : "integer", "format" : "int32" }, - "minLength" : { + "eventId" : { "type" : "integer", "format" : "int32" }, - "maxLength" : { + "additionalServiceId" : { "type" : "integer", "format" : "int32" }, "required" : { "type" : "boolean" }, - "eventId" : { + "maxLength" : { "type" : "integer", "format" : "int32" }, - "additionalServiceId" : { + "minLength" : { "type" : "integer", "format" : "int32" }, "countryField" : { "type" : "boolean" }, - "restrictedValues" : { + "inputType" : { + "type" : "string" + }, + "disabledValues" : { "type" : "array", "items" : { "type" : "string" } }, - "editable" : { - "type" : "boolean" - }, "inputField" : { "type" : "boolean" }, @@ -33841,9 +33844,6 @@ "selectField" : { "type" : "boolean" }, - "checkboxField" : { - "type" : "boolean" - }, "euVat" : { "type" : "boolean" }, @@ -33991,43 +33991,40 @@ "type" : "string", "enum" : [ "subscription", "event" ] }, - "title" : { - "type" : "object", - "additionalProperties" : { - "type" : "string" - } - }, - "publicIdentifier" : { - "type" : "string" - }, - "free" : { - "type" : "boolean" - }, "contentLanguages" : { "type" : "array", "items" : { "$ref" : "#/components/schemas/ContentLanguage" } }, - "freeOfCharge" : { + "fileBlobIdIsPresent" : { "type" : "boolean" }, - "online" : { - "type" : "boolean" + "regularPrice" : { + "type" : "number" }, "sameDay" : { "type" : "boolean" }, - "isOnline" : { + "title" : { + "type" : "object", + "additionalProperties" : { + "type" : "string" + } + }, + "freeOfCharge" : { "type" : "boolean" }, - "regularPrice" : { - "type" : "number" + "publicIdentifier" : { + "type" : "string" }, - "imageIsPresent" : { + "online" : { "type" : "boolean" }, - "fileBlobIdIsPresent" : { + "free" : { + "type" : "boolean" + }, + "imageIsPresent" : { "type" : "boolean" }, "multiplePaymentMethods" : { @@ -34051,6 +34048,9 @@ "type" : "integer", "format" : "int32" }, + "isOnline" : { + "type" : "boolean" + }, "firstContentLanguage" : { "$ref" : "#/components/schemas/ContentLanguage" } @@ -34212,11 +34212,11 @@ "success" : { "type" : "boolean" }, - "formattedErrors" : { - "type" : "string" - }, "firstErrorOrNull" : { "$ref" : "#/components/schemas/ErrorCode" + }, + "formattedErrors" : { + "type" : "string" } } }, @@ -34273,7 +34273,7 @@ }, "configurationKey" : { "type" : "string", - "enum" : [ "NOT_RECOGNIZED", "INIT_COMPLETED", "SYSTEM_API_KEY", "SHOW_PROJECT_BANNER", "SUPPORTED_LANGUAGES", "BASE_URL", "GLOBAL_PRIVACY_POLICY", "GLOBAL_TERMS", "ANNOUNCEMENT_BANNER_CONTENT", "MAPS_PROVIDER", "MAPS_CLIENT_API_KEY", "MAPS_HERE_APP_ID", "MAPS_HERE_APP_CODE", "MAPS_HERE_API_KEY", "RECAPTCHA_API_KEY", "RECAPTCHA_SECRET", "ENABLE_CAPTCHA_FOR_LOGIN", "DISPLAY_STATS_IN_EVENT_DETAIL", "DEMO_MODE_ACCOUNT_EXPIRATION_DAYS", "PLATFORM_MODE_ENABLED", "PLATFORM_FEE", "PLATFORM_FIXED_FEE", "PLATFORM_PERCENTAGE_FEE", "PLATFORM_MINIMUM_FEE", "PLATFORM_MAXIMUM_FEE", "PAYMENT_METHODS_BLACKLIST", "STRIPE_CC_ENABLED", "STRIPE_PUBLIC_KEY", "STRIPE_SECRET_KEY", "STRIPE_CONNECT_CLIENT_ID", "STRIPE_CONNECT_CALLBACK", "STRIPE_WEBHOOK_KEY", "STRIPE_WEBHOOK_PAYMENT_KEY", "STRIPE_CONNECTED_ID", "STRIPE_ENABLE_SCA", "SAFERPAY_ENABLED", "SAFERPAY_LIVE_MODE", "SAFERPAY_API_USERNAME", "SAFERPAY_API_PASSWORD", "SAFERPAY_CUSTOMER_ID", "SAFERPAY_TERMINAL_ID", "SPECIAL_PRICE_CODE_LENGTH", "MAX_AMOUNT_OF_TICKETS_BY_RESERVATION", "ASSIGNMENT_REMINDER_START", "ASSIGNMENT_REMINDER_INTERVAL", "OPTIONAL_DATA_REMINDER_ENABLED", "RESERVATION_TIMEOUT", "RESERVATION_MIN_TIMEOUT_AFTER_FAILED_PAYMENT", "NOTIFY_ALL_FAILED_PAYMENT_ATTEMPTS", "DISPLAY_TICKETS_LEFT_INDICATOR", "ENABLE_CAPTCHA_FOR_TICKET_SELECTION", "DISPLAY_EXPIRED_CATEGORIES", "DISPLAY_DISCOUNT_CODE_BOX", "USE_PARTNER_CODE_INSTEAD_OF_PROMOTIONAL", "ENABLE_CUSTOMER_REFERENCE", "ENABLE_ATTENDEE_AUTOCOMPLETE", "FORCE_TICKET_OWNER_ASSIGNMENT_AT_RESERVATION", "SEND_TICKETS_AUTOMATICALLY", "ALLOW_TICKET_DOWNLOAD", "SEND_RESERVATION_EMAIL_IF_NECESSARY", "ENABLE_TICKET_TRANSFER", "ALLOW_FREE_TICKETS_CANCELLATION", "INCLUDE_CHECK_IN_URL_ICAL", "MAILER_TYPE", "MAX_EMAIL_PER_CYCLE", "MAIL_REPLY_TO", "MAIL_SET_ORG_REPLY_TO", "MAIL_SYSTEM_NOTIFICATION_CC", "MAIL_FOOTER", "SMTP_HOST", "SMTP_PORT", "SMTP_PROTOCOL", "SMTP_USERNAME", "SMTP_PASSWORD", "SMTP_FROM_EMAIL", "SMTP_PROPERTIES", "BANK_TRANSFER_ENABLED", "DEFERRED_BANK_TRANSFER_ENABLED", "SHOW_ONLY_BASIC_INSTRUCTIONS", "DEFERRED_BANK_TRANSFER_SEND_CONFIRMATION_EMAIL", "OFFLINE_PAYMENT_DAYS", "OFFLINE_REMINDER_HOURS", "ENABLE_CAPTCHA_FOR_OFFLINE_PAYMENTS", "BANK_ACCOUNT_NR", "BANK_ACCOUNT_OWNER", "AUTOMATIC_REMOVAL_EXPIRED_OFFLINE_PAYMENT", "PARTIAL_RESERVATION_ID_LENGTH", "REVOLUT_ENABLED", "REVOLUT_MANUAL_REVIEW", "REVOLUT_LIVE_MODE", "REVOLUT_API_KEY", "MAILGUN_KEY", "MAILGUN_DOMAIN", "MAILGUN_FROM", "MAILGUN_EU", "SENDGRID_API_KEY", "SENDGRID_FROM", "MAILJET_APIKEY_PUBLIC", "MAILJET_APIKEY_PRIVATE", "MAILJET_FROM", "GOOGLE_ANALYTICS_KEY", "GOOGLE_ANALYTICS_ANONYMOUS_MODE", "ENABLE_WAITING_QUEUE", "ENABLE_PRE_REGISTRATION", "ENABLE_WAITING_QUEUE_NOTIFICATION", "WAITING_QUEUE_RESERVATION_TIMEOUT", "STOP_WAITING_QUEUE_SUBSCRIPTIONS", "ENABLE_HTML_EMAILS", "MAIL_ATTEMPTS_COUNT", "PAYPAL_ENABLED", "PAYPAL_CLIENT_ID", "PAYPAL_CLIENT_SECRET", "PAYPAL_LIVE_MODE", "PAYPAL_DEMO_MODE_USERNAME", "PAYPAL_DEMO_MODE_PASSWORD", "MOLLIE_CC_ENABLED", "MOLLIE_API_KEY", "MOLLIE_CONNECT_CLIENT_ID", "MOLLIE_CONNECT_REFRESH_TOKEN", "MOLLIE_CONNECT_CLIENT_SECRET", "MOLLIE_CONNECT_CALLBACK", "MOLLIE_CONNECT_PROFILE_ID", "MOLLIE_CONNECT_LIVE_MODE", "ON_SITE_ENABLED", "SEND_TICKETS_AFTER_IMPORT_ATTENDEE", "CREATE_RESERVATION_FOR_EACH_IMPORTED_ATTENDEE", "VAT_NR", "INVOICE_NUMBER_PATTERN", "INVOICE_ADDRESS", "USE_INVOICE_NUMBER_AS_ID", "VAT_NUMBER_IS_REQUIRED", "GENERATE_ONLY_INVOICE", "REUSE_INVOICE_NUMBER_FOR_CREDIT_NOTE", "ENABLE_ITALY_E_INVOICING", "ENABLE_EU_VAT_DIRECTIVE", "ENABLE_REVERSE_CHARGE_ONLINE", "ENABLE_REVERSE_CHARGE_IN_PERSON", "ENABLE_VIES_VALIDATION", "APPLY_VAT_FOREIGN_BUSINESS", "COUNTRY_OF_BUSINESS", "EU_COUNTRIES_LIST", "EU_VAT_API_ADDRESS", "APPLY_TAX_TO_CATEGORY", "ENABLE_PASS", "PASSBOOK_TYPE_IDENTIFIER", "PASSBOOK_TEAM_IDENTIFIER", "PASSBOOK_KEYSTORE", "PASSBOOK_KEYSTORE_PASSWORD", "PASSBOOK_PRIVATE_KEY_ALIAS", "CHECK_IN_STATS", "ALFIO_PI_INTEGRATION_ENABLED", "OFFLINE_CHECKIN_ENABLED", "LABEL_PRINTING_ENABLED", "LABEL_LAYOUT", "CHECK_IN_COLOR_CONFIGURATION", "SECURITY_CSP_REPORT_ENABLED", "SECURITY_CSP_REPORT_URI", "EMBED_ALLOWED_ORIGINS", "EMBED_POST_MESSAGE_ORIGIN", "TRANSLATION_OVERRIDE", "BASE_CUSTOM_CSS", "EVENT_CUSTOM_CSS", "DESCRIPTION_MAXLENGTH", "OPENID_PUBLIC_ENABLED", "OPENID_CONFIGURATION_JSON", "GENERATE_TICKETS_FOR_SUBSCRIPTIONS" ] + "enum" : [ "NOT_RECOGNIZED", "INIT_COMPLETED", "SYSTEM_API_KEY", "SHOW_PROJECT_BANNER", "SUPPORTED_LANGUAGES", "BASE_URL", "GLOBAL_PRIVACY_POLICY", "GLOBAL_TERMS", "ANNOUNCEMENT_BANNER_CONTENT", "MAPS_PROVIDER", "MAPS_CLIENT_API_KEY", "MAPS_HERE_APP_ID", "MAPS_HERE_APP_CODE", "MAPS_HERE_API_KEY", "RECAPTCHA_API_KEY", "RECAPTCHA_SECRET", "ENABLE_CAPTCHA_FOR_LOGIN", "DISPLAY_STATS_IN_EVENT_DETAIL", "DEMO_MODE_ACCOUNT_EXPIRATION_DAYS", "PLATFORM_MODE_ENABLED", "PLATFORM_FEE", "PLATFORM_FIXED_FEE", "PLATFORM_PERCENTAGE_FEE", "PLATFORM_MINIMUM_FEE", "PLATFORM_MAXIMUM_FEE", "PAYMENT_METHODS_BLACKLIST", "STRIPE_CC_ENABLED", "STRIPE_PUBLIC_KEY", "STRIPE_SECRET_KEY", "STRIPE_CONNECT_CLIENT_ID", "STRIPE_CONNECT_CALLBACK", "STRIPE_WEBHOOK_KEY", "STRIPE_WEBHOOK_PAYMENT_KEY", "STRIPE_CONNECTED_ID", "STRIPE_ENABLE_SCA", "SAFERPAY_ENABLED", "SAFERPAY_LIVE_MODE", "SAFERPAY_API_USERNAME", "SAFERPAY_API_PASSWORD", "SAFERPAY_CUSTOMER_ID", "SAFERPAY_TERMINAL_ID", "SPECIAL_PRICE_CODE_LENGTH", "MAX_AMOUNT_OF_TICKETS_BY_RESERVATION", "ASSIGNMENT_REMINDER_START", "ASSIGNMENT_REMINDER_INTERVAL", "OPTIONAL_DATA_REMINDER_ENABLED", "RESERVATION_TIMEOUT", "RESERVATION_MIN_TIMEOUT_AFTER_FAILED_PAYMENT", "NOTIFY_ALL_FAILED_PAYMENT_ATTEMPTS", "DISPLAY_TICKETS_LEFT_INDICATOR", "ENABLE_CAPTCHA_FOR_TICKET_SELECTION", "DISPLAY_EXPIRED_CATEGORIES", "DISPLAY_DISCOUNT_CODE_BOX", "USE_PARTNER_CODE_INSTEAD_OF_PROMOTIONAL", "ENABLE_CUSTOMER_REFERENCE", "ENABLE_ATTENDEE_AUTOCOMPLETE", "FORCE_TICKET_OWNER_ASSIGNMENT_AT_RESERVATION", "SEND_TICKETS_AUTOMATICALLY", "ALLOW_TICKET_DOWNLOAD", "SEND_RESERVATION_EMAIL_IF_NECESSARY", "ENABLE_TICKET_TRANSFER", "ALLOW_FREE_TICKETS_CANCELLATION", "INCLUDE_CHECK_IN_URL_ICAL", "MAILER_TYPE", "MAX_EMAIL_PER_CYCLE", "MAIL_REPLY_TO", "MAIL_SET_ORG_REPLY_TO", "MAIL_SYSTEM_NOTIFICATION_CC", "MAIL_FOOTER", "SMTP_HOST", "SMTP_PORT", "SMTP_PROTOCOL", "SMTP_USERNAME", "SMTP_PASSWORD", "SMTP_FROM_EMAIL", "SMTP_PROPERTIES", "BANK_TRANSFER_ENABLED", "DEFERRED_BANK_TRANSFER_ENABLED", "SHOW_ONLY_BASIC_INSTRUCTIONS", "DEFERRED_BANK_TRANSFER_SEND_CONFIRMATION_EMAIL", "OFFLINE_PAYMENT_DAYS", "OFFLINE_REMINDER_HOURS", "ENABLE_CAPTCHA_FOR_OFFLINE_PAYMENTS", "BANK_ACCOUNT_NR", "BANK_ACCOUNT_OWNER", "AUTOMATIC_REMOVAL_EXPIRED_OFFLINE_PAYMENT", "PARTIAL_RESERVATION_ID_LENGTH", "REVOLUT_ENABLED", "REVOLUT_MANUAL_REVIEW", "REVOLUT_LIVE_MODE", "REVOLUT_API_KEY", "MAILGUN_KEY", "MAILGUN_DOMAIN", "MAILGUN_FROM", "MAILGUN_EU", "SENDGRID_API_KEY", "SENDGRID_FROM", "MAILJET_APIKEY_PUBLIC", "MAILJET_APIKEY_PRIVATE", "MAILJET_FROM", "GOOGLE_ANALYTICS_KEY", "GOOGLE_ANALYTICS_ANONYMOUS_MODE", "ENABLE_WAITING_QUEUE", "ENABLE_PRE_REGISTRATION", "ENABLE_WAITING_QUEUE_NOTIFICATION", "WAITING_QUEUE_RESERVATION_TIMEOUT", "STOP_WAITING_QUEUE_SUBSCRIPTIONS", "ENABLE_HTML_EMAILS", "MAIL_ATTEMPTS_COUNT", "PAYPAL_ENABLED", "PAYPAL_CLIENT_ID", "PAYPAL_CLIENT_SECRET", "PAYPAL_LIVE_MODE", "PAYPAL_DEMO_MODE_USERNAME", "PAYPAL_DEMO_MODE_PASSWORD", "MOLLIE_CC_ENABLED", "MOLLIE_API_KEY", "MOLLIE_CONNECT_CLIENT_ID", "MOLLIE_CONNECT_REFRESH_TOKEN", "MOLLIE_CONNECT_CLIENT_SECRET", "MOLLIE_CONNECT_CALLBACK", "MOLLIE_CONNECT_PROFILE_ID", "MOLLIE_CONNECT_LIVE_MODE", "ON_SITE_ENABLED", "SEND_TICKETS_AFTER_IMPORT_ATTENDEE", "CREATE_RESERVATION_FOR_EACH_IMPORTED_ATTENDEE", "VAT_NR", "INVOICE_NUMBER_PATTERN", "INVOICE_ADDRESS", "USE_INVOICE_NUMBER_AS_ID", "VAT_NUMBER_IS_REQUIRED", "GENERATE_ONLY_INVOICE", "REUSE_INVOICE_NUMBER_FOR_CREDIT_NOTE", "ENABLE_ITALY_E_INVOICING", "ITALY_E_INVOICING_SEND_PROFORMA", "ENABLE_EU_VAT_DIRECTIVE", "ENABLE_REVERSE_CHARGE_ONLINE", "ENABLE_REVERSE_CHARGE_IN_PERSON", "ENABLE_VIES_VALIDATION", "APPLY_VAT_FOREIGN_BUSINESS", "COUNTRY_OF_BUSINESS", "EU_COUNTRIES_LIST", "EU_VAT_API_ADDRESS", "APPLY_TAX_TO_CATEGORY", "ENABLE_PASS", "PASSBOOK_TYPE_IDENTIFIER", "PASSBOOK_TEAM_IDENTIFIER", "PASSBOOK_KEYSTORE", "PASSBOOK_KEYSTORE_PASSWORD", "PASSBOOK_PRIVATE_KEY_ALIAS", "CHECK_IN_STATS", "ALFIO_PI_INTEGRATION_ENABLED", "OFFLINE_CHECKIN_ENABLED", "LABEL_PRINTING_ENABLED", "LABEL_LAYOUT", "CHECK_IN_COLOR_CONFIGURATION", "SECURITY_CSP_REPORT_ENABLED", "SECURITY_CSP_REPORT_URI", "EMBED_ALLOWED_ORIGINS", "EMBED_POST_MESSAGE_ORIGIN", "TRANSLATION_OVERRIDE", "BASE_CUSTOM_CSS", "EVENT_CUSTOM_CSS", "DESCRIPTION_MAXLENGTH", "OPENID_PUBLIC_ENABLED", "OPENID_CONFIGURATION_JSON", "GENERATE_TICKETS_FOR_SUBSCRIPTIONS" ] }, "configurationPathLevel" : { "type" : "string", @@ -34312,10 +34312,10 @@ "key" : { "type" : "string" }, - "left" : { + "right" : { "type" : "string" }, - "right" : { + "left" : { "type" : "string" } } From 4d49956da4d73c81d745f5378c7a43c396e0c52c Mon Sep 17 00:00:00 2001 From: Celestino Bellone <3385346+cbellone@users.noreply.github.com> Date: Mon, 17 Apr 2023 07:22:49 +0200 Subject: [PATCH 184/218] add italian translation --- src/main/resources/alfio/i18n/public_it.properties | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/resources/alfio/i18n/public_it.properties b/src/main/resources/alfio/i18n/public_it.properties index 7bc1789f2d..2b1afb0bce 100644 --- a/src/main/resources/alfio/i18n/public_it.properties +++ b/src/main/resources/alfio/i18n/public_it.properties @@ -187,6 +187,7 @@ invoice.payment-instruction = Indicazioni per il pagamento invoice.payment-instruction-no-later-than = Per confermare la tua prenotazione, dobbiamo ricevere il pagamento entro il {0}. invoice.payment-reason = Specificando {0} quale causale del pagamento. invoice.payment-to = Pagamento a\: +invoice.proforma = Fattura Proforma invoice.refund = Questa fattura è stata aggiornata dopo la cancellazione di uno o più biglietti ed il rimborso di {0}. invoice.refund.line-item = Rimborso invoice.regards = Cordiali saluti, @@ -202,6 +203,7 @@ invoice.vat-invoice = Fattura # please do not translate. This is strictly related to the Italian market invoice.vat-not-added = {0} non inclusa come da direttiva sulla Scissione dei Pagamenti invoice.vat-voided = {0} omessa, come da direttive UE +# Fuzzy link.new-tab = (si apre in un nuovo tab) locale = it my-orders.confirmation-date = Data di conferma From b4d7bb495ec9f887845590f68cb63878213b4b5d Mon Sep 17 00:00:00 2001 From: Lorena Mondini <60662357+Lorslux@users.noreply.github.com> Date: Fri, 28 Apr 2023 14:45:15 +0200 Subject: [PATCH 185/218] Admin frontend UI organization : list create - edit (#1212) * Added Load Organizations's table * Add table, organization component * Added news/edit * Functionality edit * added title edit or new * added form * added configuration service * added formGroup * added save button * added redirect * added update * UI style, input validator * clean up * revert docker compose change --- .../access-control.component.html | 1 + .../access-control.component.scss | 0 .../access-control.component.ts | 15 +++ .../admin/src/app/app-routing.module.ts | 19 ++++ .../projects/admin/src/app/app.component.ts | 2 +- frontend/projects/admin/src/app/app.module.ts | 9 ++ .../src/app/dashboard/dashboard.module.ts | 1 + .../app/missing-org/missing-org.component.ts | 1 - .../admin/src/app/model/instance-settings.ts | 4 + .../org-selector/org-selector.component.html | 45 ++++++-- .../org-selector/org-selector.component.ts | 2 + .../organization-edit.component.html | 106 ++++++++++++++++++ .../organization-edit.component.scss | 0 .../organization-edit.component.ts | 78 +++++++++++++ .../organizations.component.html | 40 +++++++ .../organizations.component.scss | 0 .../organizations/organizations.component.ts | 19 ++++ .../src/app/shared/configuration.service.ts | 17 +++ .../projects/admin/src/app/shared/icons.ts | 7 +- .../src/app/shared/organization.service.ts | 26 ++++- .../section-dashboard.component.ts | 3 + .../admin/src/app/svg/add-circle-new.ts | 4 + frontend/projects/admin/src/app/svg/edit.ts | 4 + .../admin/src/assets/svg/add-circle-new.svg | 1 + .../projects/admin/src/assets/svg/edit.svg | 1 + 25 files changed, 386 insertions(+), 19 deletions(-) create mode 100644 frontend/projects/admin/src/app/access-control/access-control.component.html create mode 100644 frontend/projects/admin/src/app/access-control/access-control.component.scss create mode 100644 frontend/projects/admin/src/app/access-control/access-control.component.ts create mode 100644 frontend/projects/admin/src/app/model/instance-settings.ts create mode 100644 frontend/projects/admin/src/app/organization-edit/organization-edit.component.html create mode 100644 frontend/projects/admin/src/app/organization-edit/organization-edit.component.scss create mode 100644 frontend/projects/admin/src/app/organization-edit/organization-edit.component.ts create mode 100644 frontend/projects/admin/src/app/organizations/organizations.component.html create mode 100644 frontend/projects/admin/src/app/organizations/organizations.component.scss create mode 100644 frontend/projects/admin/src/app/organizations/organizations.component.ts create mode 100644 frontend/projects/admin/src/app/shared/configuration.service.ts create mode 100644 frontend/projects/admin/src/app/svg/add-circle-new.ts create mode 100644 frontend/projects/admin/src/app/svg/edit.ts create mode 100644 frontend/projects/admin/src/assets/svg/add-circle-new.svg create mode 100644 frontend/projects/admin/src/assets/svg/edit.svg diff --git a/frontend/projects/admin/src/app/access-control/access-control.component.html b/frontend/projects/admin/src/app/access-control/access-control.component.html new file mode 100644 index 0000000000..46e0673e93 --- /dev/null +++ b/frontend/projects/admin/src/app/access-control/access-control.component.html @@ -0,0 +1 @@ +

access-control works!

diff --git a/frontend/projects/admin/src/app/access-control/access-control.component.scss b/frontend/projects/admin/src/app/access-control/access-control.component.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/frontend/projects/admin/src/app/access-control/access-control.component.ts b/frontend/projects/admin/src/app/access-control/access-control.component.ts new file mode 100644 index 0000000000..6101158ba7 --- /dev/null +++ b/frontend/projects/admin/src/app/access-control/access-control.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-access-control', + templateUrl: './access-control.component.html', + styleUrls: ['./access-control.component.scss'] +}) +export class AccessControlComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/frontend/projects/admin/src/app/app-routing.module.ts b/frontend/projects/admin/src/app/app-routing.module.ts index e95030080c..e04c743c87 100644 --- a/frontend/projects/admin/src/app/app-routing.module.ts +++ b/frontend/projects/admin/src/app/app-routing.module.ts @@ -1,6 +1,9 @@ import {NgModule} from '@angular/core'; import {PreloadAllModules, RouterModule, Routes} from '@angular/router'; import {MissingOrgComponent} from './missing-org/missing-org.component'; +import { OrganizationsComponent } from './organizations/organizations.component'; +import { OrganizationEditComponent } from './organization-edit/organization-edit.component'; +import { AccessControlComponent } from './access-control/access-control.component'; const routes: Routes = [ { @@ -15,6 +18,22 @@ const routes: Routes = [ path: 'authentication', loadChildren: () => import('./authentication/authentication.module').then(m => m.AuthenticationModule) }, + { + path: 'organizations', + component: OrganizationsComponent, + }, + { + path: 'organizations/new', + component: OrganizationEditComponent, + }, + { + path: 'organizations/:organizationId/edit', + component: OrganizationEditComponent, + }, + { + path: 'access-control', + component: AccessControlComponent, + }, { path: '', component: MissingOrgComponent, diff --git a/frontend/projects/admin/src/app/app.component.ts b/frontend/projects/admin/src/app/app.component.ts index ef3488c391..6349bf5a23 100644 --- a/frontend/projects/admin/src/app/app.component.ts +++ b/frontend/projects/admin/src/app/app.component.ts @@ -44,7 +44,7 @@ export class AppComponent implements OnInit { } public openOrgSelector(): void { - const modalRef = this.modalService.open(OrgSelectorComponent); + const modalRef = this.modalService.open(OrgSelectorComponent, { size: 'lg' }); const selector: OrgSelectorComponent = modalRef.componentInstance selector.organizations$ = this.organizations$; selector.organizationId$ = this.organizationId$; diff --git a/frontend/projects/admin/src/app/app.module.ts b/frontend/projects/admin/src/app/app.module.ts index 5acaee4f1c..b140d69edf 100644 --- a/frontend/projects/admin/src/app/app.module.ts +++ b/frontend/projects/admin/src/app/app.module.ts @@ -19,6 +19,11 @@ import {SectionDashboardComponent} from "./shared/section-dashboard/section-dash import {SharedModule} from "./shared/shared.module"; import {HttpLoginInterceptor, redirectToLogin} from "./shared/http-login.interceptor"; import {AlfioCommonModule} from "common"; +import { OrganizationsComponent } from './organizations/organizations.component'; +import { OrganizationEditComponent } from './organization-edit/organization-edit.component'; +import { ReactiveFormsModule } from '@angular/forms'; +import { AccessControlComponent } from './access-control/access-control.component'; + export function RedirectToLoginIfNeeded(userService: UserService, router: Router): () => Promise { return async () => { @@ -40,12 +45,16 @@ export function HttpLoaderFactory(http: HttpClient) { AppComponent, MissingOrgComponent, OrgSelectorComponent, + OrganizationsComponent, + OrganizationEditComponent, + AccessControlComponent, ], imports: [ BrowserModule, AppRoutingModule, AuthenticationModule, HttpClientModule, + ReactiveFormsModule, HttpClientXsrfModule.withOptions({ cookieName: 'XSRF-TOKEN', headerName: 'X-CSRF-TOKEN', diff --git a/frontend/projects/admin/src/app/dashboard/dashboard.module.ts b/frontend/projects/admin/src/app/dashboard/dashboard.module.ts index 459cf10ad8..73b5c8e446 100644 --- a/frontend/projects/admin/src/app/dashboard/dashboard.module.ts +++ b/frontend/projects/admin/src/app/dashboard/dashboard.module.ts @@ -25,6 +25,7 @@ import {FilterButtonComponent} from '../shared/filter-button/filter-button.compo { path: 'subscriptions', component: SubscriptionsComponent }, { path: 'organization-info', component: OrganizationInfoComponent }, { path: 'groups', component: GroupsComponent }, + ]), SvgIconComponent, FilterButtonComponent, diff --git a/frontend/projects/admin/src/app/missing-org/missing-org.component.ts b/frontend/projects/admin/src/app/missing-org/missing-org.component.ts index c0d094be90..9b1f3c15dd 100644 --- a/frontend/projects/admin/src/app/missing-org/missing-org.component.ts +++ b/frontend/projects/admin/src/app/missing-org/missing-org.component.ts @@ -22,5 +22,4 @@ export class MissingOrgComponent implements OnInit { } }); } - } diff --git a/frontend/projects/admin/src/app/model/instance-settings.ts b/frontend/projects/admin/src/app/model/instance-settings.ts new file mode 100644 index 0000000000..1cf4ce9e8d --- /dev/null +++ b/frontend/projects/admin/src/app/model/instance-settings.ts @@ -0,0 +1,4 @@ +export interface InstanceSetting { + descriptionMaxLength: number; + baseUrl: string; +} diff --git a/frontend/projects/admin/src/app/org-selector/org-selector.component.html b/frontend/projects/admin/src/app/org-selector/org-selector.component.html index 90e8f3aa29..9e6fd159d7 100644 --- a/frontend/projects/admin/src/app/org-selector/org-selector.component.html +++ b/frontend/projects/admin/src/app/org-selector/org-selector.component.html @@ -1,14 +1,39 @@ -
-

- +
+

+
-
-
    -
  • - -
    • -
+
+ + + + + + + + + + + + + + + +
NameDescriptionEmail
+ + {{ org.description }}{{ org.email }}
- +
diff --git a/frontend/projects/admin/src/app/org-selector/org-selector.component.ts b/frontend/projects/admin/src/app/org-selector/org-selector.component.ts index f5a2703f54..ebf291515f 100644 --- a/frontend/projects/admin/src/app/org-selector/org-selector.component.ts +++ b/frontend/projects/admin/src/app/org-selector/org-selector.component.ts @@ -8,6 +8,8 @@ import {Organization} from '../model/organization'; templateUrl: './org-selector.component.html', styleUrls: ['./org-selector.component.scss'] }) + + export class OrgSelectorComponent implements OnInit { public organizations$?: Observable; diff --git a/frontend/projects/admin/src/app/organization-edit/organization-edit.component.html b/frontend/projects/admin/src/app/organization-edit/organization-edit.component.html new file mode 100644 index 0000000000..24a5329858 --- /dev/null +++ b/frontend/projects/admin/src/app/organization-edit/organization-edit.component.html @@ -0,0 +1,106 @@ +
+

+ Add a new organization + Edit organization {{ (organization$ | async)?.name }} +

+
+ +
+
+

Organizer Data

+
+
+ + +
+
+ + +
+
+ + +
+

Advanced Configuration

+
+
+ +
+
+ {{ (instanceSetting$ | async)?.baseUrl }}/o/ +
+ +
+ / +
+
+
+ + +
+
+
+
+
+
+ +
+
+ +
+
+
diff --git a/frontend/projects/admin/src/app/organization-edit/organization-edit.component.scss b/frontend/projects/admin/src/app/organization-edit/organization-edit.component.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/frontend/projects/admin/src/app/organization-edit/organization-edit.component.ts b/frontend/projects/admin/src/app/organization-edit/organization-edit.component.ts new file mode 100644 index 0000000000..9e16bc9db6 --- /dev/null +++ b/frontend/projects/admin/src/app/organization-edit/organization-edit.component.ts @@ -0,0 +1,78 @@ +import { Component, OnInit } from '@angular/core'; +import { ActivatedRoute, Router } from '@angular/router'; +import { OrganizationService } from '../shared/organization.service'; +import { Observable, of } from 'rxjs'; +import { Organization } from '../model/organization'; +import { ConfigurationService } from '../shared/configuration.service'; +import { InstanceSetting } from '../model/instance-settings'; +import { FormBuilder, FormGroup } from '@angular/forms'; +import { Validators } from '@angular/forms'; + +@Component({ + selector: 'app-organization-edit', + templateUrl: './organization-edit.component.html', + styleUrls: ['./organization-edit.component.scss'], +}) +export class OrganizationEditComponent implements OnInit { + public organizationId: string | null = null; + public organization$: Observable = of(); + public editMode: boolean | undefined; + public instanceSetting$: Observable = of(); + public organizationForm: FormGroup; + + constructor( + private readonly route: ActivatedRoute, + private readonly organizationService: OrganizationService, + private readonly configurationService: ConfigurationService, + formBuilder: FormBuilder, + private readonly router: Router + ) { + this.organizationForm = formBuilder.group({ + id: [null], + name: [null, Validators.required], + email: [null, Validators.required], + description: [null, Validators.required], + slug: [], + externalId: [], + }); + } + + get organizationName() { + return this.organizationForm.get('name'); + } + get organizationEmail() { + return this.organizationForm.get('email'); + } + get organizationDescription() { + return this.organizationForm.get('description'); + } + + ngOnInit(): void { + this.organizationId = this.route.snapshot.paramMap.get('organizationId'); + this.instanceSetting$ = this.configurationService.loadInstanceSetting(); + + if (this.organizationId !== null) { + this.editMode = true; + this.organization$ = this.organizationService.getOrganization( + this.organizationId + ); + this.organization$.subscribe((org) => { + if (org) this.organizationForm.patchValue(org); + }); + } else { + this.editMode = false; + } + } + + save(): void { + const action = this.editMode + ? this.organizationService.update + : this.organizationService.create; + + action(this.organizationForm.value).subscribe((result) => { + if (result === 'OK') { + this.router.navigate(['/organizations']); + } + }); + } +} diff --git a/frontend/projects/admin/src/app/organizations/organizations.component.html b/frontend/projects/admin/src/app/organizations/organizations.component.html new file mode 100644 index 0000000000..dec9e060d4 --- /dev/null +++ b/frontend/projects/admin/src/app/organizations/organizations.component.html @@ -0,0 +1,40 @@ +
+

Organizations

+
+
+ +
+
+
+ + + + + + + + + + + + + + + + + +
NameDescriptionEmailEdit
+ {{ org.name }} + {{ org.description }}{{ org.email }} + +
+
diff --git a/frontend/projects/admin/src/app/organizations/organizations.component.scss b/frontend/projects/admin/src/app/organizations/organizations.component.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/frontend/projects/admin/src/app/organizations/organizations.component.ts b/frontend/projects/admin/src/app/organizations/organizations.component.ts new file mode 100644 index 0000000000..f4c8be1487 --- /dev/null +++ b/frontend/projects/admin/src/app/organizations/organizations.component.ts @@ -0,0 +1,19 @@ +import { Component, OnInit } from '@angular/core'; +import { OrganizationService } from '../shared/organization.service'; +import { Observable } from 'rxjs'; +import { Organization } from '../model/organization'; + +@Component({ + selector: 'app-organizations', + templateUrl: './organizations.component.html', + styleUrls: ['./organizations.component.scss'], +}) +export class OrganizationsComponent implements OnInit { + public organizations$?: Observable; + + constructor(private readonly organizationService: OrganizationService) {} + + ngOnInit(): void { + this.organizations$ = this.organizationService.getOrganizations(); + } +} diff --git a/frontend/projects/admin/src/app/shared/configuration.service.ts b/frontend/projects/admin/src/app/shared/configuration.service.ts new file mode 100644 index 0000000000..b4aa801675 --- /dev/null +++ b/frontend/projects/admin/src/app/shared/configuration.service.ts @@ -0,0 +1,17 @@ +import { HttpClient } from '@angular/common/http'; +import { Injectable } from '@angular/core'; +import { Observable } from 'rxjs'; +import { InstanceSetting } from '../model/instance-settings'; + +@Injectable({ + providedIn: 'root', +}) +export class ConfigurationService { + constructor(private httpClient: HttpClient) {} + + loadInstanceSetting(): Observable { + return this.httpClient.get( + '/admin/api/configuration/instance-settings' + ); + } +} diff --git a/frontend/projects/admin/src/app/shared/icons.ts b/frontend/projects/admin/src/app/shared/icons.ts index 0d6e7133cb..9e6560dd00 100644 --- a/frontend/projects/admin/src/app/shared/icons.ts +++ b/frontend/projects/admin/src/app/shared/icons.ts @@ -9,6 +9,8 @@ import {accessIcon} from "../svg/access"; import {groupsIcon} from "../svg/groups"; import {subscriptionIcon} from "../svg/subscription"; import {accountcircleIcon} from "../svg/accountcircle"; +import { addCircleNewIcon } from '../svg/add-circle-new'; +import { editIcon } from '../svg/edit'; const ICONS = [ checkIcon, @@ -22,7 +24,10 @@ const ICONS = [ accessIcon, groupsIcon, subscriptionIcon, - accountcircleIcon + accountcircleIcon, + addCircleNewIcon, + editIcon + ]; export const ICON_CONFIG = { sizes: { diff --git a/frontend/projects/admin/src/app/shared/organization.service.ts b/frontend/projects/admin/src/app/shared/organization.service.ts index 619fc1efb9..4055932746 100644 --- a/frontend/projects/admin/src/app/shared/organization.service.ts +++ b/frontend/projects/admin/src/app/shared/organization.service.ts @@ -1,14 +1,28 @@ -import {HttpClient} from "@angular/common/http"; -import {Injectable} from "@angular/core"; -import {Observable} from "rxjs"; -import {Organization} from "../model/organization"; +import { HttpClient } from '@angular/common/http'; +import { Injectable } from '@angular/core'; +import { Observable } from 'rxjs'; +import { Organization } from '../model/organization'; @Injectable() export class OrganizationService { - constructor(private httpClient: HttpClient) { - } + constructor(private httpClient: HttpClient) {} getOrganizations(): Observable { return this.httpClient.get('/admin/api/organizations'); } + + getOrganization(id: number | string): Observable { + return this.httpClient.get(`/admin/api/organizations/${id}`); + } + + create(organization: Organization): Observable { + return this.httpClient.post( + '/admin/api/organizations/new', + organization + ); + } + + update(organization : Organization) : Observable { + return this.httpClient.post('/admin/api/organizations/update', organization); + } } diff --git a/frontend/projects/admin/src/app/shared/section-dashboard/section-dashboard.component.ts b/frontend/projects/admin/src/app/shared/section-dashboard/section-dashboard.component.ts index efba3b90b7..e1161d8dd9 100644 --- a/frontend/projects/admin/src/app/shared/section-dashboard/section-dashboard.component.ts +++ b/frontend/projects/admin/src/app/shared/section-dashboard/section-dashboard.component.ts @@ -10,3 +10,6 @@ export class SectionDashboardComponent { hasMenu = false; } + + + diff --git a/frontend/projects/admin/src/app/svg/add-circle-new.ts b/frontend/projects/admin/src/app/svg/add-circle-new.ts new file mode 100644 index 0000000000..8a405ac1c1 --- /dev/null +++ b/frontend/projects/admin/src/app/svg/add-circle-new.ts @@ -0,0 +1,4 @@ +export const addCircleNewIcon = { + data: ``, + name: 'add-circle-new' as const +}; \ No newline at end of file diff --git a/frontend/projects/admin/src/app/svg/edit.ts b/frontend/projects/admin/src/app/svg/edit.ts new file mode 100644 index 0000000000..6374ac0a39 --- /dev/null +++ b/frontend/projects/admin/src/app/svg/edit.ts @@ -0,0 +1,4 @@ +export const editIcon = { + data: ``, + name: 'edit' as const +}; \ No newline at end of file diff --git a/frontend/projects/admin/src/assets/svg/add-circle-new.svg b/frontend/projects/admin/src/assets/svg/add-circle-new.svg new file mode 100644 index 0000000000..0570982608 --- /dev/null +++ b/frontend/projects/admin/src/assets/svg/add-circle-new.svg @@ -0,0 +1 @@ + diff --git a/frontend/projects/admin/src/assets/svg/edit.svg b/frontend/projects/admin/src/assets/svg/edit.svg new file mode 100644 index 0000000000..3a6ed16da0 --- /dev/null +++ b/frontend/projects/admin/src/assets/svg/edit.svg @@ -0,0 +1 @@ + \ No newline at end of file From 9b90dd1385933750270f8c9184d98a82033e0e25 Mon Sep 17 00:00:00 2001 From: Lorena Mondini <60662357+Lorslux@users.noreply.github.com> Date: Fri, 5 May 2023 16:22:45 +0200 Subject: [PATCH 186/218] Users management crud + organization selector fixed (#1217) User management (system-level) crud + fix for organization selector --- .../admin/src/app/app-routing.module.ts | 16 +++- .../projects/admin/src/app/app.component.html | 7 ++ .../projects/admin/src/app/app.component.ts | 73 ++++++++------ frontend/projects/admin/src/app/app.module.ts | 5 +- .../admin/src/app/model/organization.ts | 2 + frontend/projects/admin/src/app/model/role.ts | 7 ++ frontend/projects/admin/src/app/model/user.ts | 22 ++++- .../org-selector/org-selector.component.html | 4 +- .../org-selector/org-selector.component.ts | 19 ++-- .../organization-edit.component.html | 41 ++++---- .../organization-edit.component.ts | 13 ++- .../projects/admin/src/app/shared/icons.ts | 12 ++- .../admin/src/app/shared/user.service.ts | 80 ++++++++++++---- frontend/projects/admin/src/app/svg/delete.ts | 4 + frontend/projects/admin/src/app/svg/reset.ts | 4 + .../admin/src/app/svg/visibility-on.ts | 4 + .../admin/src/app/svg/visibilityoff.ts | 4 + .../user-system-edit.component.html | 95 +++++++++++++++++++ .../user-system-edit.component.scss | 0 .../user-system-edit.component.ts | 92 ++++++++++++++++++ .../user-system/user-system.component.html | 91 ++++++++++++++++++ .../user-system/user-system.component.scss | 0 .../app/user-system/user-system.component.ts | 51 ++++++++++ .../projects/admin/src/assets/svg/delete.svg | 1 + .../projects/admin/src/assets/svg/reset.svg | 1 + .../admin/src/assets/svg/visibility-on.svg | 1 + .../admin/src/assets/svg/visibilityoff.svg | 1 + 27 files changed, 560 insertions(+), 90 deletions(-) create mode 100644 frontend/projects/admin/src/app/model/role.ts create mode 100644 frontend/projects/admin/src/app/svg/delete.ts create mode 100644 frontend/projects/admin/src/app/svg/reset.ts create mode 100644 frontend/projects/admin/src/app/svg/visibility-on.ts create mode 100644 frontend/projects/admin/src/app/svg/visibilityoff.ts create mode 100644 frontend/projects/admin/src/app/user-system-edit/user-system-edit.component.html create mode 100644 frontend/projects/admin/src/app/user-system-edit/user-system-edit.component.scss create mode 100644 frontend/projects/admin/src/app/user-system-edit/user-system-edit.component.ts create mode 100644 frontend/projects/admin/src/app/user-system/user-system.component.html create mode 100644 frontend/projects/admin/src/app/user-system/user-system.component.scss create mode 100644 frontend/projects/admin/src/app/user-system/user-system.component.ts create mode 100644 frontend/projects/admin/src/assets/svg/delete.svg create mode 100644 frontend/projects/admin/src/assets/svg/reset.svg create mode 100644 frontend/projects/admin/src/assets/svg/visibility-on.svg create mode 100644 frontend/projects/admin/src/assets/svg/visibilityoff.svg diff --git a/frontend/projects/admin/src/app/app-routing.module.ts b/frontend/projects/admin/src/app/app-routing.module.ts index e04c743c87..f9308b96bb 100644 --- a/frontend/projects/admin/src/app/app-routing.module.ts +++ b/frontend/projects/admin/src/app/app-routing.module.ts @@ -4,6 +4,8 @@ import {MissingOrgComponent} from './missing-org/missing-org.component'; import { OrganizationsComponent } from './organizations/organizations.component'; import { OrganizationEditComponent } from './organization-edit/organization-edit.component'; import { AccessControlComponent } from './access-control/access-control.component'; +import { UserSystemComponent } from './user-system/user-system.component'; +import { UserSystemEditComponent } from './user-system-edit/user-system-edit.component'; const routes: Routes = [ { @@ -32,7 +34,19 @@ const routes: Routes = [ }, { path: 'access-control', - component: AccessControlComponent, + component: AccessControlComponent + }, + { + path: 'access-control/users', + component : UserSystemComponent, + }, + { + path: 'access-control/users/new', + component : UserSystemEditComponent, + }, + { + path: 'access-control/users/:userId/edit', + component : UserSystemEditComponent, }, { path: '', diff --git a/frontend/projects/admin/src/app/app.component.html b/frontend/projects/admin/src/app/app.component.html index 11444c1a39..ebef60a56e 100644 --- a/frontend/projects/admin/src/app/app.component.html +++ b/frontend/projects/admin/src/app/app.component.html @@ -44,10 +44,13 @@ + + + @@ -63,6 +66,10 @@ + + Users + + diff --git a/frontend/projects/admin/src/app/app.component.ts b/frontend/projects/admin/src/app/app.component.ts index 6349bf5a23..9304cca9f3 100644 --- a/frontend/projects/admin/src/app/app.component.ts +++ b/frontend/projects/admin/src/app/app.component.ts @@ -1,21 +1,20 @@ -import {Component, OnInit} from '@angular/core'; -import {ActivationEnd, Router} from '@angular/router'; -import {NgbModal} from '@ng-bootstrap/ng-bootstrap'; -import {TranslateService} from '@ngx-translate/core'; -import {combineLatest, filter, map, Observable, of} from 'rxjs'; -import {Organization} from './model/organization'; -import {UserInfo} from './model/user'; -import {OrgSelectorComponent} from './org-selector/org-selector.component'; -import {OrganizationService} from './shared/organization.service'; -import {UserService} from './shared/user.service'; +import { Component, OnInit } from '@angular/core'; +import { ActivationEnd, Router } from '@angular/router'; +import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; +import { TranslateService } from '@ngx-translate/core'; +import { combineLatest, filter, map, Observable, of } from 'rxjs'; +import { Organization } from './model/organization'; +import { UserInfo } from './model/user'; +import { OrgSelectorComponent } from './org-selector/org-selector.component'; +import { OrganizationService } from './shared/organization.service'; +import { UserService } from './shared/user.service'; @Component({ selector: 'app-root', templateUrl: './app.component.html', - styleUrls: ['./app.component.scss'] + styleUrls: ['./app.component.scss'], }) export class AppComponent implements OnInit { - public organizations$?: Observable; public organizationId$?: Observable; public currentUser$?: Observable; @@ -26,32 +25,48 @@ export class AppComponent implements OnInit { private readonly organizationService: OrganizationService, private readonly userService: UserService, private readonly router: Router, - private readonly modalService: NgbModal, - ) { - } + private readonly modalService: NgbModal + ) {} ngOnInit(): void { this.translateService.setDefaultLang('en'); this.translateService.use('en'); this.organizations$ = this.organizationService.getOrganizations(); - this.organizationId$ = this.router.events.pipe(filter(a => a instanceof ActivationEnd), map(a => { - const ae = a as ActivationEnd; - return ae.snapshot.params['organizationId']; - })); + this.organizationId$ = this.router.events.pipe( + filter((a) => a instanceof ActivationEnd), + map((a) => { + const ae = a as ActivationEnd; + return ae.snapshot.params['organizationId']; + }) + ); this.currentUser$ = this.userService.getCurrent(); - this.currentOrganization$ = combineLatest([this.organizationId$, this.organizations$]) - .pipe(map(([id, orgs]) => orgs.find(o => id !== null && o.id === Number.parseInt(id)))); + this.currentOrganization$ = combineLatest([ + this.organizationId$, + this.organizations$, + ]).pipe( + map(([id, orgs]) => + orgs.find((o) => id !== null && o.id === Number.parseInt(id)) + ) + ); } public openOrgSelector(): void { - const modalRef = this.modalService.open(OrgSelectorComponent, { size: 'lg' }); - const selector: OrgSelectorComponent = modalRef.componentInstance - selector.organizations$ = this.organizations$; - selector.organizationId$ = this.organizationId$; - modalRef.result.then((res: Organization) => { - this.router.navigate(['/organization', res.id, 'event']).then(r => {if (r) {this.currentOrganization$ = of(res)}}); - }).catch(() => { - // we do nothing on dismiss + const modalRef = this.modalService.open(OrgSelectorComponent, { + size: 'lg', }); + const selector: OrgSelectorComponent = modalRef.componentInstance; + selector.organizations$ = this.organizations$; + selector.organizationId$ = this.organizationId$; + modalRef.result + .then((res: Organization) => { + this.router.navigate(['/organization', res.id, 'event']).then((r) => { + if (r) { + this.currentOrganization$ = of(res); + } + }); + }) + .catch(() => { + // we do nothing on dismiss + }); } } diff --git a/frontend/projects/admin/src/app/app.module.ts b/frontend/projects/admin/src/app/app.module.ts index b140d69edf..b297c329ce 100644 --- a/frontend/projects/admin/src/app/app.module.ts +++ b/frontend/projects/admin/src/app/app.module.ts @@ -23,7 +23,8 @@ import { OrganizationsComponent } from './organizations/organizations.component' import { OrganizationEditComponent } from './organization-edit/organization-edit.component'; import { ReactiveFormsModule } from '@angular/forms'; import { AccessControlComponent } from './access-control/access-control.component'; - +import { UserSystemComponent } from './user-system/user-system.component'; +import { UserSystemEditComponent } from './user-system-edit/user-system-edit.component'; export function RedirectToLoginIfNeeded(userService: UserService, router: Router): () => Promise { return async () => { @@ -48,6 +49,8 @@ export function HttpLoaderFactory(http: HttpClient) { OrganizationsComponent, OrganizationEditComponent, AccessControlComponent, + UserSystemComponent, + UserSystemEditComponent, ], imports: [ BrowserModule, diff --git a/frontend/projects/admin/src/app/model/organization.ts b/frontend/projects/admin/src/app/model/organization.ts index 46019c9227..ee9d7af32d 100644 --- a/frontend/projects/admin/src/app/model/organization.ts +++ b/frontend/projects/admin/src/app/model/organization.ts @@ -3,4 +3,6 @@ export interface Organization { name: string; description: string; email: string; + externalId: string | null, + slug: string | null, } diff --git a/frontend/projects/admin/src/app/model/role.ts b/frontend/projects/admin/src/app/model/role.ts new file mode 100644 index 0000000000..49bd0c5679 --- /dev/null +++ b/frontend/projects/admin/src/app/model/role.ts @@ -0,0 +1,7 @@ +import { RoleType } from "./user"; + +export interface Role { + role: RoleType; + target: string[]; + description: string; +} diff --git a/frontend/projects/admin/src/app/model/user.ts b/frontend/projects/admin/src/app/model/user.ts index f7aae4700d..5bf3a02b38 100644 --- a/frontend/projects/admin/src/app/model/user.ts +++ b/frontend/projects/admin/src/app/model/user.ts @@ -1,3 +1,5 @@ +import { Organization } from "./organization"; + export interface UserInfo { id: number; type: UserType; @@ -6,7 +8,7 @@ export interface UserInfo { firstName: string; lastName: string; emailAddress: string; - role: Role; + role: RoleType; } export enum UserType { @@ -15,7 +17,7 @@ export enum UserType { API_KEY = 'API_KEY' } -export enum Role { +export enum RoleType { ADMIN = 'ADMIN', OWNER = 'OWNER', SUPERVISOR = 'SUPERVISOR', @@ -23,3 +25,19 @@ export enum Role { SPONSOR = 'SPONSOR', API_CONSUMER = 'API_CONSUMER' } + +export interface User { + id: number; + type: UserType; + enabled: boolean; + validTo: string | null; + username: string; + firstName: string; + lastName: string; + emailAddress: string; + validToEpochSecond: number | null; + description: string | null; + roles: RoleType[]; + memberOf: Organization[]; +} + diff --git a/frontend/projects/admin/src/app/org-selector/org-selector.component.html b/frontend/projects/admin/src/app/org-selector/org-selector.component.html index 9e6fd159d7..d2fe6a79d1 100644 --- a/frontend/projects/admin/src/app/org-selector/org-selector.component.html +++ b/frontend/projects/admin/src/app/org-selector/org-selector.component.html @@ -1,4 +1,4 @@ -
+

-
+
diff --git a/frontend/projects/admin/src/app/org-selector/org-selector.component.ts b/frontend/projects/admin/src/app/org-selector/org-selector.component.ts index ebf291515f..1e4ee9b4d1 100644 --- a/frontend/projects/admin/src/app/org-selector/org-selector.component.ts +++ b/frontend/projects/admin/src/app/org-selector/org-selector.component.ts @@ -1,27 +1,22 @@ -import {Component, OnInit} from '@angular/core'; -import {NgbActiveModal} from '@ng-bootstrap/ng-bootstrap'; -import {Observable} from 'rxjs'; -import {Organization} from '../model/organization'; +import { Component, OnInit } from '@angular/core'; +import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; +import { Observable } from 'rxjs'; +import { Organization } from '../model/organization'; @Component({ selector: 'app-org-selector', templateUrl: './org-selector.component.html', - styleUrls: ['./org-selector.component.scss'] + styleUrls: ['./org-selector.component.scss'], }) - - export class OrgSelectorComponent implements OnInit { - public organizations$?: Observable; public organizationId$?: Observable; - constructor(public activeModal: NgbActiveModal) { } + constructor(public activeModal: NgbActiveModal) {} - ngOnInit(): void { - } + ngOnInit(): void {} public selectOrganization(org: Organization): void { this.activeModal.close(org); } - } diff --git a/frontend/projects/admin/src/app/organization-edit/organization-edit.component.html b/frontend/projects/admin/src/app/organization-edit/organization-edit.component.html index 24a5329858..1a415ff1f9 100644 --- a/frontend/projects/admin/src/app/organization-edit/organization-edit.component.html +++ b/frontend/projects/admin/src/app/organization-edit/organization-edit.component.html @@ -82,25 +82,26 @@

Advanced Configuration

/> - -
-
-
- -
-
- +
+
+ +
+
+ +
-
+ + +
diff --git a/frontend/projects/admin/src/app/organization-edit/organization-edit.component.ts b/frontend/projects/admin/src/app/organization-edit/organization-edit.component.ts index 9e16bc9db6..30d935882b 100644 --- a/frontend/projects/admin/src/app/organization-edit/organization-edit.component.ts +++ b/frontend/projects/admin/src/app/organization-edit/organization-edit.component.ts @@ -65,12 +65,15 @@ export class OrganizationEditComponent implements OnInit { } save(): void { - const action = this.editMode - ? this.organizationService.update - : this.organizationService.create; + let result: Observable; + if (this.editMode) { + result = this.organizationService.update(this.organizationForm.value); + } else { + result = this.organizationService.create(this.organizationForm.value); + } - action(this.organizationForm.value).subscribe((result) => { - if (result === 'OK') { + result.subscribe((res) => { + if (res === 'OK') { this.router.navigate(['/organizations']); } }); diff --git a/frontend/projects/admin/src/app/shared/icons.ts b/frontend/projects/admin/src/app/shared/icons.ts index 9e6560dd00..3f0aa778e7 100644 --- a/frontend/projects/admin/src/app/shared/icons.ts +++ b/frontend/projects/admin/src/app/shared/icons.ts @@ -11,6 +11,10 @@ import {subscriptionIcon} from "../svg/subscription"; import {accountcircleIcon} from "../svg/accountcircle"; import { addCircleNewIcon } from '../svg/add-circle-new'; import { editIcon } from '../svg/edit'; +import { resetIcon } from '../svg/reset'; +import { deleteIcon } from '../svg/delete'; +import { visibilityoffIcon } from '../svg/visibilityoff'; +import { visibilityOnIcon } from '../svg/visibility-on'; const ICONS = [ checkIcon, @@ -26,7 +30,13 @@ const ICONS = [ subscriptionIcon, accountcircleIcon, addCircleNewIcon, - editIcon + editIcon, + resetIcon, + deleteIcon, + visibilityoffIcon, + visibilityOnIcon, + + ]; export const ICON_CONFIG = { diff --git a/frontend/projects/admin/src/app/shared/user.service.ts b/frontend/projects/admin/src/app/shared/user.service.ts index 22635eb17b..0d1ac5317b 100644 --- a/frontend/projects/admin/src/app/shared/user.service.ts +++ b/frontend/projects/admin/src/app/shared/user.service.ts @@ -1,29 +1,75 @@ -import {Injectable} from "@angular/core"; -import {HttpClient} from "@angular/common/http"; -import {catchError, map, Observable, of} from "rxjs"; -import {UserInfo} from "../model/user"; +import { Injectable } from '@angular/core'; +import { HttpClient } from '@angular/common/http'; +import { catchError, filter, map, Observable, of } from 'rxjs'; +import { User, UserInfo } from '../model/user'; +import { Role } from '../model/role'; @Injectable() export class UserService { - constructor(private httpClient: HttpClient) { - } + constructor(private httpClient: HttpClient) {} public checkUserLoggedIn(): Observable { - return this.httpClient.get<{authenticated: boolean}>('/authentication-status', { - observe: "response" - }).pipe( - map(resp => { - return resp.status === 200 - && (resp.body?.authenticated || false); - }), - catchError((err) => { - console.log('error!', err); - return of(false); + return this.httpClient + .get<{ authenticated: boolean }>('/authentication-status', { + observe: 'response', }) - ) + .pipe( + map((resp) => { + return resp.status === 200 && (resp.body?.authenticated || false); + }), + catchError((err) => { + console.log('error!', err); + return of(false); + }) + ); } getCurrent(): Observable { return this.httpClient.get('/admin/api/users/current'); } + + getAllUsers(): Observable { + return this.getAll().pipe( + map((users) => users.filter((user) => user.type !== 'API_KEY')) + ); + } + + getAllApiKey(): Observable { + return this.getAll().pipe( + map((users) => users.filter((user) => user.type === 'API_KEY')) + ); + } + + getAll(): Observable { + return this.httpClient.get('/admin/api/users'); + } + + enable(user: User, enabled: boolean): Observable { + return this.httpClient.post( + `/admin/api/users/${user.id}/enable/${enabled}`, + {} + ); + } + + deleteUser(user: User): Observable { + return this.httpClient.delete(`/admin/api/users/${user.id}`); + } + + getAllRoles(): Observable { + return this.httpClient.get('/admin/api/roles'); + } + + create(user: User): Observable { + return this.httpClient.post('/admin/api/users/new', user, { + params: { baseUrl: window.location.origin }, + }); + } + + getUser(id: number | string) : Observable{ + return this.httpClient.get(`/admin/api/users/${id}`); + } + + update(user: User) : Observable{ + return this.httpClient.post('/admin/api/users/edit', user); + } } diff --git a/frontend/projects/admin/src/app/svg/delete.ts b/frontend/projects/admin/src/app/svg/delete.ts new file mode 100644 index 0000000000..773b1d033d --- /dev/null +++ b/frontend/projects/admin/src/app/svg/delete.ts @@ -0,0 +1,4 @@ +export const deleteIcon = { + data: ``, + name: 'delete' as const +}; \ No newline at end of file diff --git a/frontend/projects/admin/src/app/svg/reset.ts b/frontend/projects/admin/src/app/svg/reset.ts new file mode 100644 index 0000000000..5a77218e49 --- /dev/null +++ b/frontend/projects/admin/src/app/svg/reset.ts @@ -0,0 +1,4 @@ +export const resetIcon = { + data: ``, + name: 'reset' as const +}; \ No newline at end of file diff --git a/frontend/projects/admin/src/app/svg/visibility-on.ts b/frontend/projects/admin/src/app/svg/visibility-on.ts new file mode 100644 index 0000000000..c044e4bc7b --- /dev/null +++ b/frontend/projects/admin/src/app/svg/visibility-on.ts @@ -0,0 +1,4 @@ +export const visibilityOnIcon = { + data: ``, + name: 'visibility-on' as const +}; \ No newline at end of file diff --git a/frontend/projects/admin/src/app/svg/visibilityoff.ts b/frontend/projects/admin/src/app/svg/visibilityoff.ts new file mode 100644 index 0000000000..e7ed5863a7 --- /dev/null +++ b/frontend/projects/admin/src/app/svg/visibilityoff.ts @@ -0,0 +1,4 @@ +export const visibilityoffIcon = { + data: ``, + name: 'visibilityoff' as const +}; \ No newline at end of file diff --git a/frontend/projects/admin/src/app/user-system-edit/user-system-edit.component.html b/frontend/projects/admin/src/app/user-system-edit/user-system-edit.component.html new file mode 100644 index 0000000000..f182047ea6 --- /dev/null +++ b/frontend/projects/admin/src/app/user-system-edit/user-system-edit.component.html @@ -0,0 +1,95 @@ +
+

User

+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+ +
+ + +
+
+
+ +
+
+ +
+
+ +
diff --git a/frontend/projects/admin/src/app/user-system-edit/user-system-edit.component.scss b/frontend/projects/admin/src/app/user-system-edit/user-system-edit.component.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/frontend/projects/admin/src/app/user-system-edit/user-system-edit.component.ts b/frontend/projects/admin/src/app/user-system-edit/user-system-edit.component.ts new file mode 100644 index 0000000000..377af17ac2 --- /dev/null +++ b/frontend/projects/admin/src/app/user-system-edit/user-system-edit.component.ts @@ -0,0 +1,92 @@ +import { Component, OnInit } from '@angular/core'; +import { FormBuilder, FormGroup, Validators } from '@angular/forms'; +import { OrganizationService } from '../shared/organization.service'; +import { UserService } from '../shared/user.service'; +import { Observable, map, of } from 'rxjs'; +import { Organization } from '../model/organization'; +import { Role } from '../model/role'; +import { ActivatedRoute, Router } from '@angular/router'; +import { RoleType, User } from '../model/user'; + +@Component({ + selector: 'app-user-system-edit', + templateUrl: './user-system-edit.component.html', + styleUrls: ['./user-system-edit.component.scss'], +}) +export class UserSystemEditComponent implements OnInit { + public userId: string | null = null; + public userForm: FormGroup; + public organizations$?: Observable; + public roles$?: Observable; + public editMode: boolean | undefined; + public user$: Observable = of(); + constructor( + private readonly route: ActivatedRoute, + formBuilder: FormBuilder, + private readonly organizationService: OrganizationService, + private readonly userService: UserService, + private readonly router: Router + ) { + this.userForm = formBuilder.group({ + target: null, + id: [null], + organizationId: [null, Validators.required], + role: [null, Validators.required], + username: [null, Validators.required], + firstName: [null, Validators.required], + lastName: [null, Validators.required], + emailAddress: [null, Validators.required], + }); + } + + get userName() { + return this.userForm.get('username'); + } + get userLastName() { + return this.userForm.get('lastName'); + } + get userFirstName() { + return this.userForm.get('firstName'); + } + + get userMail() { + return this.userForm.get('emailAddress'); + } + + ngOnInit(): void { + this.userId = this.route.snapshot.paramMap.get('userId'); + + this.organizations$ = this.organizationService.getOrganizations(); + this.roles$ = this.userService.getAllRoles().pipe( + map((roles) => { + return roles.filter((role) => role.target.includes('USER')); + }) + ); + + if (this.userId !== null) { + this.editMode = true; + this.user$ = this.userService.getUser(this.userId); + this.user$.subscribe((user) => { + if (user) this.userForm.patchValue(user); + }); + } else { + this.editMode = false; + } + } + + save(): void { + let result: Observable; + if (this.editMode) { + result = this.userService.update(this.userForm.value); + } else { + result = this.userService.create(this.userForm.value); + } + result.subscribe((res) => { + if (res === 'OK') { + this.router.navigate(['/access-control/users']); + } + }); + } + + +} diff --git a/frontend/projects/admin/src/app/user-system/user-system.component.html b/frontend/projects/admin/src/app/user-system/user-system.component.html new file mode 100644 index 0000000000..f018fe8a43 --- /dev/null +++ b/frontend/projects/admin/src/app/user-system/user-system.component.html @@ -0,0 +1,91 @@ +
+

Users

+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
EnabledUsernameNameRoleMember ofEditReset passwordEnable / DisableDelete
{{ user.enabled }} + {{ user.username }} + {{ user.firstName }} {{ user.lastName }} + {{ + roleDescription(role) | async + }} + + {{ + org.name + }} + + + + + + + + + + +
+
diff --git a/frontend/projects/admin/src/app/user-system/user-system.component.scss b/frontend/projects/admin/src/app/user-system/user-system.component.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/frontend/projects/admin/src/app/user-system/user-system.component.ts b/frontend/projects/admin/src/app/user-system/user-system.component.ts new file mode 100644 index 0000000000..d82308c423 --- /dev/null +++ b/frontend/projects/admin/src/app/user-system/user-system.component.ts @@ -0,0 +1,51 @@ +import { Component, OnInit } from '@angular/core'; +import { Observable, map, of, share, shareReplay } from 'rxjs'; +import { UserService } from '../shared/user.service'; +import { RoleType, User, UserType } from '../model/user'; +import { Role } from '../model/role'; + +@Component({ + selector: 'app-user-system', + templateUrl: './user-system.component.html', + styleUrls: ['./user-system.component.scss'], +}) +export class UserSystemComponent implements OnInit { + public users$?: Observable; + public roles$: Observable> = of(); + + constructor(private readonly userService: UserService) {} + + ngOnInit(): void { + this.users$ = this.userService.getAllUsers(); + this.roles$ = this.userService.getAllRoles().pipe( + map((roles) => { + const map: Map = new Map(); + roles.forEach((role) => { + map.set(role.role, role); + }); + return map; + }), + shareReplay(1) + ); + } + + enable(user: User) { + this.userService.enable(user, !user.enabled).subscribe((result) => { + this.users$ = this.userService.getAllUsers(); + }); + } + + deleteUser(user: User) { + if ( + window.confirm(`The user ${user.username} will be deleted. Are you sure?`) + ) { + this.userService.deleteUser(user).subscribe((result) => { + this.users$ = this.userService.getAllUsers(); + }); + } + } + + roleDescription(role: RoleType): Observable { + return this.roles$.pipe(map((roles) => roles.get(role)?.description)); + } +} diff --git a/frontend/projects/admin/src/assets/svg/delete.svg b/frontend/projects/admin/src/assets/svg/delete.svg new file mode 100644 index 0000000000..af36de6ca5 --- /dev/null +++ b/frontend/projects/admin/src/assets/svg/delete.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/projects/admin/src/assets/svg/reset.svg b/frontend/projects/admin/src/assets/svg/reset.svg new file mode 100644 index 0000000000..d804df854d --- /dev/null +++ b/frontend/projects/admin/src/assets/svg/reset.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/projects/admin/src/assets/svg/visibility-on.svg b/frontend/projects/admin/src/assets/svg/visibility-on.svg new file mode 100644 index 0000000000..659d390075 --- /dev/null +++ b/frontend/projects/admin/src/assets/svg/visibility-on.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/projects/admin/src/assets/svg/visibilityoff.svg b/frontend/projects/admin/src/assets/svg/visibilityoff.svg new file mode 100644 index 0000000000..90e94063c4 --- /dev/null +++ b/frontend/projects/admin/src/assets/svg/visibilityoff.svg @@ -0,0 +1 @@ + \ No newline at end of file From 5f3bff26f5b86d79843461b5afd20ee1738c3eae Mon Sep 17 00:00:00 2001 From: Sylvain Jermini Date: Fri, 5 May 2023 16:28:02 +0200 Subject: [PATCH 187/218] fix org-selector: remove unused class --- .../admin/src/app/org-selector/org-selector.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/projects/admin/src/app/org-selector/org-selector.component.html b/frontend/projects/admin/src/app/org-selector/org-selector.component.html index d2fe6a79d1..50ae90bd21 100644 --- a/frontend/projects/admin/src/app/org-selector/org-selector.component.html +++ b/frontend/projects/admin/src/app/org-selector/org-selector.component.html @@ -7,7 +7,7 @@

(click)="activeModal.dismiss('Cross click')" >
-
+
From babe92bdd6d210dd0cfe7ab25f9352bcf0db1e17 Mon Sep 17 00:00:00 2001 From: Celestino Bellone <3385346+cbellone@users.noreply.github.com> Date: Wed, 19 Apr 2023 08:46:53 +0200 Subject: [PATCH 188/218] close options dialog on success --- .../event/fragment/category-configuration-modal.html | 2 +- .../js/admin/feature/configuration/configuration.js | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/webapp/resources/angular-templates/admin/partials/event/fragment/category-configuration-modal.html b/src/main/webapp/resources/angular-templates/admin/partials/event/fragment/category-configuration-modal.html index fd2e37b557..bcfe198789 100644 --- a/src/main/webapp/resources/angular-templates/admin/partials/event/fragment/category-configuration-modal.html +++ b/src/main/webapp/resources/angular-templates/admin/partials/event/fragment/category-configuration-modal.html @@ -1,4 +1,4 @@
- +
\ No newline at end of file diff --git a/src/main/webapp/resources/js/admin/feature/configuration/configuration.js b/src/main/webapp/resources/js/admin/feature/configuration/configuration.js index e28be389e0..fdfc836cb5 100644 --- a/src/main/webapp/resources/js/admin/feature/configuration/configuration.js +++ b/src/main/webapp/resources/js/admin/feature/configuration/configuration.js @@ -660,7 +660,8 @@ scope: { event: '=', category: '=', - closeModal: '&' + closeModal: '&', + onSave: '&' }, bindToController: true, controller: ['ConfigurationService', '$rootScope', 'GroupService', '$q', CategoryConfigurationController], @@ -700,14 +701,15 @@ return; } categoryConf.loading = true; + var onSaveComplete = categoryConf.onSave ? categoryConf.onSave : load; ConfigurationService.updateCategoryConfig(categoryConf.category.id, categoryConf.event.id, categoryConf.settings).then(function() { if(categoryConf.group) { GroupService.linkTo(categoryConf.group).then(function() { - load(); + onSaveComplete(); }); } else { - load(); + onSaveComplete(); } }, function(e) { alert(e.data); From a8147138cf7632f23055b7b9e20c81a96900a8ad Mon Sep 17 00:00:00 2001 From: Celestino Bellone <3385346+cbellone@users.noreply.github.com> Date: Fri, 21 Apr 2023 11:00:23 +0200 Subject: [PATCH 189/218] display "+VAT" only if needed --- .../java/alfio/manager/EventStatisticsManager.java | 2 ++ .../alfio/model/TicketCategoryStatisticView.java | 14 ++++++++++++-- .../model/TicketCategoryWithAdditionalInfo.java | 5 +++++ .../java/alfio/model/system/Configuration.java | 13 ++++++++----- ...igrate__003_VIEW_ticket_category_statistics.sql | 6 +++++- .../ticket-category/ticket-category-detail.html | 2 +- .../feature/ticket-category/ticket-category.js | 6 ++++++ 7 files changed, 39 insertions(+), 9 deletions(-) diff --git a/src/main/java/alfio/manager/EventStatisticsManager.java b/src/main/java/alfio/manager/EventStatisticsManager.java index 5facf5aa9c..3444098789 100644 --- a/src/main/java/alfio/manager/EventStatisticsManager.java +++ b/src/main/java/alfio/manager/EventStatisticsManager.java @@ -145,6 +145,8 @@ public EventWithAdditionalInfo getEventWithAdditionalInfo(String eventName, Stri supportedCapabilities = Set.of(); } + // TODO category and event settings + return new EventWithAdditionalInfo(event, tWithInfo, eventStatistic, diff --git a/src/main/java/alfio/model/TicketCategoryStatisticView.java b/src/main/java/alfio/model/TicketCategoryStatisticView.java index f398818da0..0b8d60b6ea 100644 --- a/src/main/java/alfio/model/TicketCategoryStatisticView.java +++ b/src/main/java/alfio/model/TicketCategoryStatisticView.java @@ -16,9 +16,16 @@ */ package alfio.model; +import alfio.model.system.Configuration; +import alfio.util.Json; import ch.digitalfondue.npjt.ConstructorAnnotationRowMapper.Column; +import com.fasterxml.jackson.core.type.TypeReference; import lombok.Getter; +import java.lang.reflect.Type; +import java.util.List; +import java.util.Objects; + @Getter public class TicketCategoryStatisticView { @@ -36,6 +43,7 @@ public class TicketCategoryStatisticView { private final int stuckCount; private final boolean containsOrphanTickets; private final boolean containsStuckTickets; + private final List configuration; public TicketCategoryStatisticView(@Column("ticket_category_id") int id, @Column("max_tickets") int maxTickets, @@ -49,7 +57,8 @@ public TicketCategoryStatisticView(@Column("ticket_category_id") int id, @Column("released_count") int releasedCount, @Column("stuck_count") int stuckCount, @Column("is_containing_orphan_tickets") boolean containsOrphanTickets, - @Column("is_containing_stuck_tickets") boolean containsStuckTickets) { + @Column("is_containing_stuck_tickets") boolean containsStuckTickets, + @Column("category_configuration") String configurationJson) { this.id = id; this.maxTickets = maxTickets; this.bounded = bounded; @@ -63,9 +72,10 @@ public TicketCategoryStatisticView(@Column("ticket_category_id") int id, this.containsOrphanTickets = containsOrphanTickets; this.containsStuckTickets = containsStuckTickets; this.releasedTicketsCount = releasedCount; + this.configuration = Json.fromJson(Objects.requireNonNullElse(configurationJson, "[]"), new TypeReference<>() {}); } public static TicketCategoryStatisticView empty(int ticketCategoryId, int eventId) { - return new TicketCategoryStatisticView(ticketCategoryId, 0, false, false, eventId, 0, 0, 0, 0, 0, 0, false, false); + return new TicketCategoryStatisticView(ticketCategoryId, 0, false, false, eventId, 0, 0, 0, 0, 0, 0, false, false, null); } } diff --git a/src/main/java/alfio/model/TicketCategoryWithAdditionalInfo.java b/src/main/java/alfio/model/TicketCategoryWithAdditionalInfo.java index 1bd0cf1114..549308077b 100644 --- a/src/main/java/alfio/model/TicketCategoryWithAdditionalInfo.java +++ b/src/main/java/alfio/model/TicketCategoryWithAdditionalInfo.java @@ -19,6 +19,7 @@ import alfio.model.metadata.AlfioMetadata; import alfio.model.modification.StatisticsContainer; import alfio.model.modification.TicketWithStatistic; +import alfio.model.system.Configuration; import alfio.util.ClockProvider; import alfio.util.MonetaryUtil; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -182,4 +183,8 @@ public Optional getOptionalVatPercentage() { public VatStatus getVatStatus() { return event.getVatStatus(); } + + public List getConfiguration() { + return ticketCategoryStatisticView.getConfiguration(); + } } diff --git a/src/main/java/alfio/model/system/Configuration.java b/src/main/java/alfio/model/system/Configuration.java index b47cb18132..887c667187 100644 --- a/src/main/java/alfio/model/system/Configuration.java +++ b/src/main/java/alfio/model/system/Configuration.java @@ -18,6 +18,8 @@ import alfio.model.EventAndOrganizationId; import ch.digitalfondue.npjt.ConstructorAnnotationRowMapper.Column; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Getter; import org.apache.commons.lang3.builder.CompareToBuilder; import org.apache.commons.lang3.builder.EqualsBuilder; @@ -39,10 +41,11 @@ public class Configuration implements Comparable { private final boolean internal; - public Configuration(@Column("id") int id, - @Column("c_key") String key, - @Column("c_value") String value, - @Column("configuration_path_level") ConfigurationPathLevel configurationPathLevel) { + @JsonCreator + public Configuration(@JsonProperty("id") @Column("id") int id, + @JsonProperty("key") @Column("c_key") String key, + @JsonProperty("value") @Column("c_value") String value, + @JsonProperty("configurationPathLevel") @Column("configuration_path_level") ConfigurationPathLevel configurationPathLevel) { this.id = id; this.key = key; this.value = value; @@ -86,7 +89,7 @@ public interface ConfigurationPath { ConfigurationPathLevel pathLevel(); } - public static class SystemConfigurationPath implements ConfigurationPath { + public static class SystemConfigurationPath implements ConfigurationPath { @Override public ConfigurationPathLevel pathLevel() { return ConfigurationPathLevel.SYSTEM; diff --git a/src/main/resources/alfio/db/PGSQL/afterMigrate__003_VIEW_ticket_category_statistics.sql b/src/main/resources/alfio/db/PGSQL/afterMigrate__003_VIEW_ticket_category_statistics.sql index 33c0484145..73705456f7 100644 --- a/src/main/resources/alfio/db/PGSQL/afterMigrate__003_VIEW_ticket_category_statistics.sql +++ b/src/main/resources/alfio/db/PGSQL/afterMigrate__003_VIEW_ticket_category_statistics.sql @@ -33,7 +33,8 @@ from coalesce(sold_tickets_count,0) as sold_tickets_count, coalesce(released_count, 0) as released_count, case(bounded) when false then 0 else max_tickets - coalesce(sold_tickets_count,0 ) - coalesce(checked_in_count, 0) - coalesce(pending_count, 0) end as not_sold_tickets, - coalesce(stuck_count, 0) as stuck_count + coalesce(stuck_count, 0) as stuck_count, + category_configuration from (select max_tickets, bounded, id, event_id, expiration < now() as is_expired, access_restricted from ticket_category where tc_status = 'ACTIVE' ) ticket_cat @@ -60,5 +61,8 @@ left join where tickets_reservation.status = 'STUCK' group by category_id) stuck_count on ticket_cat.id = stuck_count.category_id +left join +(select ticket_category_id_fk, jsonb_agg(json_build_object('id', id, 'key', c_key, 'value', c_value, 'configurationPathLevel', 'TICKET_CATEGORY')) category_configuration + from configuration_ticket_category group by 1) tc_settings on ticket_cat.id = tc_settings.ticket_category_id_fk ) as res); \ No newline at end of file diff --git a/src/main/webapp/resources/js/admin/feature/ticket-category/ticket-category-detail.html b/src/main/webapp/resources/js/admin/feature/ticket-category/ticket-category-detail.html index 025ea67818..0b95e3d29b 100644 --- a/src/main/webapp/resources/js/admin/feature/ticket-category/ticket-category-detail.html +++ b/src/main/webapp/resources/js/admin/feature/ticket-category/ticket-category-detail.html @@ -37,7 +37,7 @@
Ticket Price - {{$ctrl.ticketCategory.price | money : ($ctrl.event.currency || "")}} + VAT + {{$ctrl.ticketCategory.price | money : ($ctrl.event.currency || "")}} + VAT
diff --git a/src/main/webapp/resources/js/admin/feature/ticket-category/ticket-category.js b/src/main/webapp/resources/js/admin/feature/ticket-category/ticket-category.js index 405c8a4d1f..1ba8f0d8db 100644 --- a/src/main/webapp/resources/js/admin/feature/ticket-category/ticket-category.js +++ b/src/main/webapp/resources/js/admin/feature/ticket-category/ticket-category.js @@ -25,6 +25,12 @@ ctrl.baseUrl = window.location.origin; + var applyTaxes = ctrl.ticketCategory.price > 0 && (ctrl.ticketCategory.configuration || []).findIndex(function(c) { + return c.key === 'APPLY_TAX_TO_CATEGORY' && c.value === 'false' + }) === -1; + + ctrl.plusVat = applyTaxes && !ctrl.event.vatIncluded; + ctrl.categoryHasDescriptions = function(category) { return category && category.description ? Object.keys(category.description).length > 0 : false; }; From 84a704e5038a441d3dacb31a72304bf52d17a31f Mon Sep 17 00:00:00 2001 From: Celestino Bellone <3385346+cbellone@users.noreply.github.com> Date: Fri, 21 Apr 2023 11:11:58 +0200 Subject: [PATCH 190/218] request made with a system API Key must skip row level security --- .../config/RoleAndOrganizationsTransactionPreparer.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/alfio/config/RoleAndOrganizationsTransactionPreparer.java b/src/main/java/alfio/config/RoleAndOrganizationsTransactionPreparer.java index b6b7839a1f..f553abe9cc 100644 --- a/src/main/java/alfio/config/RoleAndOrganizationsTransactionPreparer.java +++ b/src/main/java/alfio/config/RoleAndOrganizationsTransactionPreparer.java @@ -35,10 +35,15 @@ import java.util.TreeSet; import java.util.stream.Collectors; +import static alfio.config.authentication.support.AuthenticationConstants.ADMIN; +import static alfio.config.authentication.support.AuthenticationConstants.SYSTEM_API_CLIENT; + class RoleAndOrganizationsTransactionPreparer { private static final Logger log = LoggerFactory.getLogger(RoleAndOrganizationsTransactionPreparer.class); + private RoleAndOrganizationsTransactionPreparer() {} + private static final OrRequestMatcher IS_PUBLIC_URLS = new OrRequestMatcher( new AntPathRequestMatcher("/resources/**"), new AntPathRequestMatcher("/webjars/**"), @@ -84,7 +89,7 @@ private static boolean isAdmin() { return SecurityContextHolder.getContext().getAuthentication() .getAuthorities().stream() .map(GrantedAuthority::getAuthority) - .anyMatch("ROLE_ADMIN"::equals); + .anyMatch(authority -> authority.equals("ROLE_" + SYSTEM_API_CLIENT) || authority.equals("ROLE_" + ADMIN)); } return false; } From 8959805412c487a4108483d272388ba12035c10d Mon Sep 17 00:00:00 2001 From: Celestino Bellone <3385346+cbellone@users.noreply.github.com> Date: Sat, 22 Apr 2023 09:36:06 +0200 Subject: [PATCH 191/218] Recognize API calls authenticated by System API Key as ADMIN --- .../java/alfio/manager/user/UserManager.java | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/src/main/java/alfio/manager/user/UserManager.java b/src/main/java/alfio/manager/user/UserManager.java index c75e0a27ec..9d6e3e27f3 100644 --- a/src/main/java/alfio/manager/user/UserManager.java +++ b/src/main/java/alfio/manager/user/UserManager.java @@ -16,6 +16,7 @@ */ package alfio.manager.user; +import alfio.config.authentication.support.APITokenAuthentication; import alfio.model.modification.OrganizationModification; import alfio.model.result.ValidationResult; import alfio.model.user.*; @@ -47,6 +48,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; +import static alfio.config.authentication.support.AuthenticationConstants.SYSTEM_API_CLIENT; import static java.util.Objects.requireNonNull; import static java.util.stream.Collectors.toList; @@ -218,7 +220,7 @@ public int createOrganization(OrganizationModification om, Principal principal) public void updateOrganization(OrganizationModification om, Principal principal) { // - var orgId = requireNonNull(om.getId()); + int orgId = requireNonNull(om.getId()); checkAccessToOrganizationId(principal, orgId); // boolean isAdmin = RequestUtils.isAdmin(principal) || RequestUtils.isSystemApiKey(principal); @@ -432,6 +434,10 @@ private void checkIsAdmin(Principal principal) { if (principal == null) { return; } + if (isSystemApiUser(principal)) { + log.trace("Allowing call for System API Key"); + return; + } if (isAdmin(findUserByUsername(principal.getName()))) { return; } @@ -468,10 +474,20 @@ private void checkAccessToOrganizationId(Principal principal, int organizationId if (principal == null) { return; } + if (isSystemApiUser(principal)) { + log.trace("Allowing access to Organization " + organizationId + " to System API Key"); + return; + } if (isOwnerOfOrganization(principal.getName(), organizationId)) { return; } log.warn("User {} don't have access to organizationId {}", principal.getName(), organizationId); throw new IllegalArgumentException("User " + principal.getName() + " don't have access to organizationId " + organizationId); } + + private boolean isSystemApiUser(Principal principal) { + return principal instanceof APITokenAuthentication + && ((APITokenAuthentication)principal).getAuthorities().stream() + .allMatch(authority -> authority.getAuthority().equals("ROLE_" + SYSTEM_API_CLIENT)); + } } From dd31cbd037418c02ffcbff2fec9889b4f51a00e4 Mon Sep 17 00:00:00 2001 From: Celestino Bellone <3385346+cbellone@users.noreply.github.com> Date: Wed, 26 Apr 2023 20:14:25 +0200 Subject: [PATCH 192/218] delete email messages when deleting organization --- .../alfio/repository/OrganizationDeleterRepository.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/alfio/repository/OrganizationDeleterRepository.java b/src/main/java/alfio/repository/OrganizationDeleterRepository.java index c6995a4dea..c675ed6de5 100644 --- a/src/main/java/alfio/repository/OrganizationDeleterRepository.java +++ b/src/main/java/alfio/repository/OrganizationDeleterRepository.java @@ -73,6 +73,9 @@ public interface OrganizationDeleterRepository { @Query("delete from admin_reservation_request where organization_id_fk in (:organizationIds)") int deleteAdminReservationRequests(@Bind("organizationIds") List organizationIds); + @Query("delete from email_message where organization_id_fk in (:organizationIds)") + int deleteEmailMessages(@Bind("organizationIds") List organizationIds); + default void deleteEmptyOrganizations(List organizationIds) { // delete invoice sequences int deletedSequences = deleteInvoiceSequencesForEmptyOrganizations(organizationIds); @@ -93,6 +96,9 @@ default void deleteEmptyOrganizations(List organizationIds) { int deletedResources = deleteResourcesForEmptyOrganizations(organizationIds); LOGGER.info("deleted {} resources", deletedResources); + int deletedEmails = deleteEmailMessages(organizationIds); + LOGGER.info("deleted {} email messages", deletedEmails); + // delete subscriptions int deletedSubscriptions = deleteSubscriptions(organizationIds); int deletedDescriptors = deleteSubscriptionDescriptors(organizationIds); From 52603500fced64912d5590f8dcb4809fc4c6ba2b Mon Sep 17 00:00:00 2001 From: Celestino Bellone <3385346+cbellone@users.noreply.github.com> Date: Wed, 26 Apr 2023 21:25:04 +0200 Subject: [PATCH 193/218] additional check when accessing user --- .../controller/api/admin/EventApiController.java | 2 +- .../controller/api/admin/UsersApiController.java | 4 ++-- src/main/java/alfio/manager/user/UserManager.java | 12 +++++++++--- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/main/java/alfio/controller/api/admin/EventApiController.java b/src/main/java/alfio/controller/api/admin/EventApiController.java index 427256acfd..f952bb35d4 100644 --- a/src/main/java/alfio/controller/api/admin/EventApiController.java +++ b/src/main/java/alfio/controller/api/admin/EventApiController.java @@ -476,7 +476,7 @@ public void downloadSponsorScanExport(@PathVariable("eventName") String eventNam List line = new ArrayList<>(); Ticket ticket = p.getLeft().getTicket(); SponsorScan sponsorScan = p.getLeft().getSponsorScan(); - User user = userManager.findUser(sponsorScan.getUserId()); + User user = userManager.findUser(sponsorScan.getUserId(), principal); line.add(user.getUsername()); line.add(user.getDescription()); line.add(sponsorScan.getTimestamp().toString()); diff --git a/src/main/java/alfio/controller/api/admin/UsersApiController.java b/src/main/java/alfio/controller/api/admin/UsersApiController.java index 9b9095ec14..1de27f4c28 100644 --- a/src/main/java/alfio/controller/api/admin/UsersApiController.java +++ b/src/main/java/alfio/controller/api/admin/UsersApiController.java @@ -247,8 +247,8 @@ public String enableUser(@PathVariable("id") int userId, @PathVariable("enable") } @GetMapping("/users/{id}") - public UserModification loadUser(@PathVariable("id") int userId) { - User user = userManager.findUser(userId); + public UserModification loadUser(@PathVariable("id") int userId, Principal principal) { + User user = userManager.findUser(userId, principal); List userOrganizations = userManager.findUserOrganizations(user.getUsername()); return new UserModification(user.getId(), userOrganizations.get(0).getId(), userManager.getUserRole(user).name(), user.getUsername(), user.getFirstName(), user.getLastName(), user.getEmailAddress(), diff --git a/src/main/java/alfio/manager/user/UserManager.java b/src/main/java/alfio/manager/user/UserManager.java index 9d6e3e27f3..3b97e6d3e4 100644 --- a/src/main/java/alfio/manager/user/UserManager.java +++ b/src/main/java/alfio/manager/user/UserManager.java @@ -143,7 +143,12 @@ public boolean usernameExists(String username) { } @Transactional(readOnly = true) - public User findUser(int id) { + public User findUser(int id, Principal principal) { + checkAccessToUserId(principal, id); + return internalFindUser(id); + } + + private User internalFindUser(int id) { return userRepository.findById(id); } @@ -329,7 +334,7 @@ public UserWithPassword resetPassword(int userId, Principal principal) { // checkAccessToUserId(principal, userId); // - User user = findUser(userId); + User user = internalFindUser(userId); String password = PasswordGenerator.generateRandomPassword(); Validate.isTrue(userRepository.resetPassword(userId, passwordEncoder.encode(password)) == 1, "error during password reset"); @@ -453,8 +458,9 @@ private void checkAccessToUserId(Principal principal, int userId) { if (isAdmin(currentUser)) { return; } - var targetUser = findUser(userId); + var targetUser = internalFindUser(userId); var targetUserOrgs = findUserOrganizations(targetUser.getUsername()); + Assert.state(!targetUser.getUsername().equals(ADMIN_USERNAME) && !isAdmin(targetUser), "Targeted user cannot be admin"); Assert.isTrue(targetUserOrgs.size() == 1, "Targeted user can only be in one organization"); for (var org : targetUserOrgs) { if (isOwnerOfOrganization(currentUser, org.getId())) { From 261dced9bd018c1ba2845e38ffabf1109f01f8bf Mon Sep 17 00:00:00 2001 From: Celestino Bellone <3385346+cbellone@users.noreply.github.com> Date: Sat, 29 Apr 2023 16:55:05 +0200 Subject: [PATCH 194/218] update wording on IT e-invoice --- src/main/resources/alfio/templates/invoice.ms | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/alfio/templates/invoice.ms b/src/main/resources/alfio/templates/invoice.ms index 388cd1ad16..60a7bff427 100644 --- a/src/main/resources/alfio/templates/invoice.ms +++ b/src/main/resources/alfio/templates/invoice.ms @@ -275,7 +275,7 @@
{{#italianEInvoicing}} -

Il presente documento non costituisce fattura valida ai fini del DpR 633 26/10/1972 e successive modifiche. La fattura definitiva verrà emessa all’atto del pagamento del corrispettivo (articolo 6, comma 3, DpR 633/72).

+

Documento privo di valenza fiscale ai sensi dell’art. 21 Dpr 633/72. L’originale è disponibile all’indirizzo telematico da Lei fornito oppure nella Sua area riservata dell’Agenzia delle Entrate.

{{/italianEInvoicing}} {{/invoicingAdditionalInfo}}
From c74ec1fc2dee568ba6e13a9760685d78450fa39d Mon Sep 17 00:00:00 2001 From: Celestino Bellone <3385346+cbellone@users.noreply.github.com> Date: Sat, 29 Apr 2023 18:46:35 +0200 Subject: [PATCH 195/218] customize reservation flow --- gradle.properties | 1 - .../v1/admin/ReservationApiV1Controller.java | 10 ++++++++-- .../java/alfio/model/ReservationMetadata.java | 20 ++++++++++++++++--- .../v1/admin/ReservationConfiguration.java | 18 +++++++++++++++-- .../v1/ReservationApiV1ControllerTest.java | 8 ++++---- 5 files changed, 45 insertions(+), 12 deletions(-) diff --git a/gradle.properties b/gradle.properties index be77460201..a991bcc2b6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,4 +6,3 @@ sourceCompatibility=17 targetCompatibility=17 systemProp.jdk.tls.client.protocols="TLSv1,TLSv1.1,TLSv1.2" - diff --git a/src/main/java/alfio/controller/api/v1/admin/ReservationApiV1Controller.java b/src/main/java/alfio/controller/api/v1/admin/ReservationApiV1Controller.java index f968e8131c..1f7ffe17a2 100644 --- a/src/main/java/alfio/controller/api/v1/admin/ReservationApiV1Controller.java +++ b/src/main/java/alfio/controller/api/v1/admin/ReservationApiV1Controller.java @@ -127,8 +127,14 @@ private CreationResponse postCreate(ReservationAPICreationRequest creationReques if(user != null) { ticketReservationManager.setReservationOwner(id, user.getUsername(), user.getEmail(), user.getFirstName(), user.getLastName(), locale.getLanguage()); } - if(creationRequest.getReservationConfiguration() != null) { - ticketReservationManager.setReservationMetadata(id, new ReservationMetadata(creationRequest.getReservationConfiguration().isHideContactData(), false, false)); + var reservationConfiguration = creationRequest.getReservationConfiguration(); + if(reservationConfiguration != null) { + var reservationMetadata = new ReservationMetadata(reservationConfiguration.isHideContactData(), + false, + false, + reservationConfiguration.isHideConfirmationButtons(), + reservationConfiguration.isLockEmailEdit()); + ticketReservationManager.setReservationMetadata(id, reservationMetadata); } var subscriptionId = creationRequest instanceof TicketReservationCreationRequest ? ((TicketReservationCreationRequest) creationRequest).getSubscriptionId() : null; return CreationResponse.success(id, ticketReservationManager.reservationUrlForExternalClients(id, purchaseContext, locale.getLanguage(), user != null, subscriptionId)); diff --git a/src/main/java/alfio/model/ReservationMetadata.java b/src/main/java/alfio/model/ReservationMetadata.java index b87d085087..402faf3787 100644 --- a/src/main/java/alfio/model/ReservationMetadata.java +++ b/src/main/java/alfio/model/ReservationMetadata.java @@ -24,14 +24,20 @@ public class ReservationMetadata { private final boolean hideContactData; private final boolean readyForConfirmation; private final boolean finalized; + private final boolean hideConfirmationButtons; + private final boolean lockEmailEdit; @JsonCreator public ReservationMetadata(@JsonProperty("hideContactData") Boolean hideContactData, @JsonProperty("readyForConfirmation") Boolean readyForConfirmation, - @JsonProperty("finalized") Boolean finalized) { + @JsonProperty("finalized") Boolean finalized, + @JsonProperty("hideConfirmationButtons") Boolean hideConfirmationButtons, + @JsonProperty("lockEmailEdit") Boolean lockEmailEdit) { this.hideContactData = Boolean.TRUE.equals(hideContactData); this.readyForConfirmation = Boolean.TRUE.equals(readyForConfirmation); this.finalized = Boolean.TRUE.equals(finalized); + this.hideConfirmationButtons = Boolean.TRUE.equals(hideConfirmationButtons); + this.lockEmailEdit = Boolean.TRUE.equals(lockEmailEdit); } public boolean isHideContactData() { @@ -46,11 +52,19 @@ public boolean isReadyForConfirmation() { return readyForConfirmation; } + public boolean isHideConfirmationButtons() { + return hideConfirmationButtons; + } + + public boolean isLockEmailEdit() { + return lockEmailEdit; + } + public ReservationMetadata withFinalized(boolean newValue) { - return new ReservationMetadata(hideContactData, readyForConfirmation, newValue); + return new ReservationMetadata(hideContactData, readyForConfirmation, newValue, hideConfirmationButtons, lockEmailEdit); } public ReservationMetadata withReadyForConfirmation(boolean newValue) { - return new ReservationMetadata(hideContactData, newValue, finalized); + return new ReservationMetadata(hideContactData, newValue, finalized, hideConfirmationButtons, lockEmailEdit); } } diff --git a/src/main/java/alfio/model/api/v1/admin/ReservationConfiguration.java b/src/main/java/alfio/model/api/v1/admin/ReservationConfiguration.java index cd6f3d2f7e..45cb17427e 100644 --- a/src/main/java/alfio/model/api/v1/admin/ReservationConfiguration.java +++ b/src/main/java/alfio/model/api/v1/admin/ReservationConfiguration.java @@ -21,13 +21,27 @@ public class ReservationConfiguration { private final boolean hideContactData; + private final boolean hideConfirmationButtons; + private final boolean lockEmailEdit; @JsonCreator - public ReservationConfiguration(@JsonProperty("hideContactData") boolean hideContactData) { - this.hideContactData = hideContactData; + public ReservationConfiguration(@JsonProperty("hideContactData") Boolean hideContactData, + @JsonProperty("hideConfirmationButtons") Boolean hideConfirmationButtons, + @JsonProperty("lockEmailEdit") Boolean lockEmailEdit) { + this.hideContactData = Boolean.TRUE.equals(hideContactData); + this.hideConfirmationButtons = Boolean.TRUE.equals(hideConfirmationButtons); + this.lockEmailEdit = Boolean.TRUE.equals(lockEmailEdit); } public boolean isHideContactData() { return hideContactData; } + + public boolean isHideConfirmationButtons() { + return hideConfirmationButtons; + } + + public boolean isLockEmailEdit() { + return lockEmailEdit; + } } diff --git a/src/test/java/alfio/controller/api/v1/ReservationApiV1ControllerTest.java b/src/test/java/alfio/controller/api/v1/ReservationApiV1ControllerTest.java index f7af1ddec1..f76414e621 100644 --- a/src/test/java/alfio/controller/api/v1/ReservationApiV1ControllerTest.java +++ b/src/test/java/alfio/controller/api/v1/ReservationApiV1ControllerTest.java @@ -48,10 +48,8 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.ContextConfiguration; -import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; import java.time.LocalDate; @@ -126,7 +124,7 @@ void createSingleTicketWithMetadata() { var creationRequest = new TicketReservationCreationRequest( List.of(ticket), List.of(), - new ReservationConfiguration(true), + new ReservationConfiguration(true, false, true), null, null, "en", @@ -155,6 +153,8 @@ void createSingleTicketWithMetadata() { var reservationMetadata = ticketReservationRepository.getMetadata(reservationId); assertNotNull(reservationMetadata); assertTrue(reservationMetadata.isHideContactData()); + assertFalse(reservationMetadata.isHideConfirmationButtons()); + assertTrue(reservationMetadata.isLockEmailEdit()); } @Test @@ -420,7 +420,7 @@ void createSubscriptionWithMetadata() { var reservationRequest = new SubscriptionReservationCreationRequest(Map.of("key", "value"), new ReservationUser("test@test.org", "Test", "Test1", "test@test.org", null), "en", - new ReservationConfiguration(true), + new ReservationConfiguration(true, false, false), null); var reservationResponse = controller.createSubscriptionReservation(descriptorId, reservationRequest, principal); assertTrue(reservationResponse.getStatusCode().is2xxSuccessful()); From a5ba60c20ac9f07e4d7ef8b7d657d82ef2837783 Mon Sep 17 00:00:00 2001 From: Celestino Bellone <3385346+cbellone@users.noreply.github.com> Date: Wed, 3 May 2023 19:34:47 +0200 Subject: [PATCH 196/218] Google Wallet integration (#1215) * Added 'Add to Google Wallet' link to email with image and dummy url to GoogleWalletApiController * Added alt to 'Add to Google Wallet' image on the ticket email. * Removed ConfigurationKeys for PR * add missing license header * add custom message HTML * Moved 'Add to Google Wallet' button to its own section in the ticket email. * Revert "Removed ConfigurationKeys for PR" This reverts commit 84ec1627b5448a96f515f7a66f6c637225e3030d. * fix build on Apple Silicon * Google Wallet implemention for Event Tickets *hopefully* completed * Changed the image of the Google Wallet pass to event.getImageUrl() * fix images size * fix event logo URL, remove unused param, add missing configuration * add missing ObjectMapper to test configuration * update package-lock.json * throw exception if pass generation was not successful * !dev is not accepted by pass API * invert eventName and description * Fixed a bug with the POST/PUT Request when creating/updating objects in the Google Wallet API. * Converting eventDescription from markdown to plain text on Google Wallet and Apple PassKit. * do not display wallet link if wallet is not enabled/requested * restore license * add configuration UI * fix double escaping issue * fix typo * update ticket email, add download link for Apple Wallet * add new frontend version * add new frontend version * update frontend * add documentation * add image * update email layout * update email layout, add image padding in responsive mode * update frontend * fix errors after merge * update add to google wallet badge * update public frontend * disable pass when ticket is released or reassigned * update frontend version * apply sonar suggestions --------- Co-authored-by: Edson Yanaga --- build.gradle | 1 + .../api/pass/PassKitApiController.java | 35 +- .../controller/api/v2/model/AlfioInfo.java | 5 +- .../api/v2/model/WalletConfiguration.java | 35 ++ .../api/wallet/GoogleWalletApiController.java | 56 +++ .../alfio/manager/NotificationManager.java | 4 +- .../java/alfio/manager/PassKitManager.java | 19 +- .../manager/TicketReservationManager.java | 10 +- .../manager/support/CustomMessageManager.java | 36 +- .../manager/system/ConfigurationManager.java | 10 +- .../java/alfio/manager/system/Mailer.java | 2 + .../manager/wallet/EventTicketClass.java | 154 ++++++++ .../manager/wallet/EventTicketObject.java | 64 ++++ .../manager/wallet/GoogleWalletException.java | 29 ++ .../manager/wallet/GoogleWalletManager.java | 349 ++++++++++++++++++ .../alfio/manager/wallet/WalletEntity.java | 27 ++ .../alfio/model/metadata/TicketMetadata.java | 3 + .../alfio/model/system/ConfigurationKeys.java | 8 +- .../system/command/InvalidateAccess.java | 48 +++ .../alfio/repository/AuditingRepository.java | 5 + .../java/alfio/util/MustacheCustomTag.java | 9 +- src/main/java/alfio/util/TemplateManager.java | 8 +- .../java/alfio/util/TemplateResource.java | 13 +- .../alfio/mjml/custom-message-html.mjml | 110 ++++++ .../alfio/mjml/ticket-email-html.mjml | 22 +- .../alfio/templates/custom-message-txt.ms | 4 + .../admin/partials/configuration/system.html | 26 +- .../email/add-to-apple-wallet-button.png | Bin 0 -> 8876 bytes ..._add_to_google_wallet_add-wallet-badge.png | Bin 0 -> 4543 bytes ..._add_to_google_wallet_add-wallet-badge.svg | 16 + .../java/alfio/BaseTestConfiguration.java | 6 + .../manager/wallet/EventTicketClassTest.java | 56 +++ .../manager/wallet/EventTicketObjectTest.java | 51 +++ .../model/system/ConfigurationKeysTest.java | 2 +- .../resources/wallet-json/event-class.json | 84 +++++ .../resources/wallet-json/event-object.json | 11 + .../resources/wallet-json/generic-object.json | 50 +++ .../Wallet integration/_index.md | 43 +-- .../Wallet integration/apple-pass.md | 44 +++ .../Wallet integration/google-wallet.md | 45 +++ .../google-wallet/001-settings.png | Bin 0 -> 60946 bytes 41 files changed, 1430 insertions(+), 70 deletions(-) create mode 100644 src/main/java/alfio/controller/api/v2/model/WalletConfiguration.java create mode 100644 src/main/java/alfio/controller/api/wallet/GoogleWalletApiController.java create mode 100644 src/main/java/alfio/manager/wallet/EventTicketClass.java create mode 100644 src/main/java/alfio/manager/wallet/EventTicketObject.java create mode 100644 src/main/java/alfio/manager/wallet/GoogleWalletException.java create mode 100644 src/main/java/alfio/manager/wallet/GoogleWalletManager.java create mode 100644 src/main/java/alfio/manager/wallet/WalletEntity.java create mode 100644 src/main/java/alfio/model/system/command/InvalidateAccess.java create mode 100644 src/main/resources/alfio/mjml/custom-message-html.mjml create mode 100644 src/main/resources/alfio/templates/custom-message-txt.ms create mode 100644 src/main/webapp/resources/images/email/add-to-apple-wallet-button.png create mode 100644 src/main/webapp/resources/images/email/enUS_add_to_google_wallet_add-wallet-badge.png create mode 100644 src/main/webapp/resources/images/email/enUS_add_to_google_wallet_add-wallet-badge.svg create mode 100644 src/test/java/alfio/manager/wallet/EventTicketClassTest.java create mode 100644 src/test/java/alfio/manager/wallet/EventTicketObjectTest.java create mode 100644 src/test/resources/wallet-json/event-class.json create mode 100644 src/test/resources/wallet-json/event-object.json create mode 100644 src/test/resources/wallet-json/generic-object.json create mode 100644 website/content/en/docs/Configuration/Wallet integration/apple-pass.md create mode 100644 website/content/en/docs/Configuration/Wallet integration/google-wallet.md create mode 100644 website/static/img/configuration/google-wallet/001-settings.png diff --git a/build.gradle b/build.gradle index b7c0884c20..e5e0f6af5a 100644 --- a/build.gradle +++ b/build.gradle @@ -152,6 +152,7 @@ dependencies { implementation 'ch.digitalfondue.basicxlsx:basicxlsx:0.5.1' implementation 'org.imgscalr:imgscalr-lib:4.2' implementation 'org.mozilla:rhino-runtime:1.7.13' + implementation 'com.google.auth:google-auth-library-oauth2-http:1.3.0' compileOnly "javax.servlet:javax.servlet-api:4.0.1" testImplementation "javax.servlet:javax.servlet-api:4.0.1" diff --git a/src/main/java/alfio/controller/api/pass/PassKitApiController.java b/src/main/java/alfio/controller/api/pass/PassKitApiController.java index fe84f7597c..25c4fa05ef 100644 --- a/src/main/java/alfio/controller/api/pass/PassKitApiController.java +++ b/src/main/java/alfio/controller/api/pass/PassKitApiController.java @@ -56,13 +56,36 @@ public void getLatestVersion(@PathVariable("eventName") String eventName, response.sendError(HttpServletResponse.SC_NOT_FOUND); } else { Pair pair = validationResult.get(); - try (var os = response.getOutputStream()) { - response.setContentType("application/vnd.apple.pkpass"); - passKitManager.writePass(pair.getRight(), pair.getLeft(), os); - } catch (Exception e) { - log.warn("Error during pass generation", e); - response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); + writePassResponse(response, pair.getLeft(), pair.getRight(), false); + } + } + + @GetMapping("/version/passes/{ticketUuid}") + public void downloadPassForTicket(@PathVariable("eventName") String eventName, + @PathVariable("ticketUuid") String ticketUuid, + HttpServletResponse response) throws IOException { + var ticketAndEventData = passKitManager.retrieveTicketDetails(eventName, ticketUuid); + if (ticketAndEventData.isPresent()) { + var pair = ticketAndEventData.get(); + writePassResponse(response, pair.getKey(), pair.getValue(), true); + } else { + response.sendError(HttpServletResponse.SC_NOT_FOUND); + } + } + + private void writePassResponse(HttpServletResponse response, + EventAndOrganizationId eventAndOrganizationId, + Ticket ticket, + boolean addFilename) throws IOException { + try (var os = response.getOutputStream()) { + response.setContentType("application/vnd.apple.pkpass"); + if (addFilename) { + response.setHeader("Content-Disposition", "attachment; filename=Passbook-"+ticket.getUuid().substring(0, 8)+".pkpass"); } + passKitManager.writePass(ticket, eventAndOrganizationId, os); + } catch (Exception e) { + log.warn("Error during pass generation", e); + response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); } } diff --git a/src/main/java/alfio/controller/api/v2/model/AlfioInfo.java b/src/main/java/alfio/controller/api/v2/model/AlfioInfo.java index 8d85456e2d..26f5ceef8d 100644 --- a/src/main/java/alfio/controller/api/v2/model/AlfioInfo.java +++ b/src/main/java/alfio/controller/api/v2/model/AlfioInfo.java @@ -30,6 +30,7 @@ public class AlfioInfo { private final String globalTermsUrl; private final InvoicingConfiguration invoicingConfiguration; private final String announcementBannerContentHTML; + private final WalletConfiguration walletConfiguration; public AlfioInfo(boolean demoModeEnabled, boolean devModeEnabled, @@ -38,7 +39,8 @@ public AlfioInfo(boolean demoModeEnabled, String globalPrivacyPolicyUrl, String globalTermsUrl, InvoicingConfiguration invoicingConfiguration, - String announcementBannerContentHTML) { + String announcementBannerContentHTML, + WalletConfiguration walletConfiguration) { this.demoModeEnabled = demoModeEnabled; this.devModeEnabled = devModeEnabled; this.prodModeEnabled = prodModeEnabled; @@ -47,5 +49,6 @@ public AlfioInfo(boolean demoModeEnabled, this.globalTermsUrl = globalTermsUrl; this.invoicingConfiguration = invoicingConfiguration; this.announcementBannerContentHTML = announcementBannerContentHTML; + this.walletConfiguration = walletConfiguration; } } diff --git a/src/main/java/alfio/controller/api/v2/model/WalletConfiguration.java b/src/main/java/alfio/controller/api/v2/model/WalletConfiguration.java new file mode 100644 index 0000000000..cff3423839 --- /dev/null +++ b/src/main/java/alfio/controller/api/v2/model/WalletConfiguration.java @@ -0,0 +1,35 @@ +/** + * This file is part of alf.io. + * + * alf.io is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * alf.io is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with alf.io. If not, see . + */ +package alfio.controller.api.v2.model; + +public class WalletConfiguration { + private final boolean gWalletEnabled; + private final boolean passEnabled; + + public WalletConfiguration(boolean gWalletEnabled, boolean passEnabled) { + this.gWalletEnabled = gWalletEnabled; + this.passEnabled = passEnabled; + } + + public boolean isgWalletEnabled() { + return gWalletEnabled; + } + + public boolean isPassEnabled() { + return passEnabled; + } +} diff --git a/src/main/java/alfio/controller/api/wallet/GoogleWalletApiController.java b/src/main/java/alfio/controller/api/wallet/GoogleWalletApiController.java new file mode 100644 index 0000000000..8b618e1ba6 --- /dev/null +++ b/src/main/java/alfio/controller/api/wallet/GoogleWalletApiController.java @@ -0,0 +1,56 @@ +/** + * This file is part of alf.io. + * + * alf.io is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * alf.io is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with alf.io. If not, see . + */ +package alfio.controller.api.wallet; + +import alfio.manager.wallet.GoogleWalletManager; +import alfio.model.EventAndOrganizationId; +import alfio.model.Ticket; +import lombok.RequiredArgsConstructor; +import lombok.extern.log4j.Log4j2; +import org.apache.commons.lang3.tuple.Pair; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.PrintWriter; +import java.util.Optional; + +@RestController +@RequestMapping("/api/wallet/event/{eventName}/v1") +@Log4j2 +@RequiredArgsConstructor +public class GoogleWalletApiController { + + private final GoogleWalletManager walletManager; + + @GetMapping("/version/passes/{uuid}") + public void walletPass(@PathVariable("eventName") String eventName, + @PathVariable("uuid") String serialNumber, + HttpServletResponse response) throws IOException { + Optional> validationResult = walletManager.validateTicket(eventName, serialNumber); + if (validationResult.isEmpty()) { + response.sendError(HttpServletResponse.SC_NOT_FOUND); + } else { + String walletUrl = walletManager.createAddToWalletUrl(validationResult.get().getRight(), validationResult.get().getLeft()); + response.sendRedirect(walletUrl); + } + } + +} diff --git a/src/main/java/alfio/manager/NotificationManager.java b/src/main/java/alfio/manager/NotificationManager.java index d51bedb639..8783f46fef 100644 --- a/src/main/java/alfio/manager/NotificationManager.java +++ b/src/main/java/alfio/manager/NotificationManager.java @@ -266,6 +266,8 @@ public void sendTicketByEmail(Ticket ticket, Organization organization = organizationRepository.getById(event.getOrganizationId()); + boolean htmlEmailEnabled = configurationManager.getFor(ConfigurationKeys.ENABLE_HTML_EMAILS, event.getConfigurationLevel()) + .getValueAsBooleanOrDefault(); // pre-generate template in order to reuse model var renderedTemplate = textBuilder.generate(ticket); @@ -282,7 +284,7 @@ public void sendTicketByEmail(Ticket ticket, }); attachments.add(CustomMessageManager.generateCalendarAttachmentForOnlineEvent(attachmentModel)); } else { - attachments.add(CustomMessageManager.generateTicketAttachment(ticket, reservation, ticketCategory, organization)); + attachments.add(CustomMessageManager.generateTicketAttachment(ticket, reservation, ticketCategory, organization, htmlEmailEnabled)); } String displayName = event.getDisplayName(); diff --git a/src/main/java/alfio/manager/PassKitManager.java b/src/main/java/alfio/manager/PassKitManager.java index 4a255b40b1..245022fe6d 100644 --- a/src/main/java/alfio/manager/PassKitManager.java +++ b/src/main/java/alfio/manager/PassKitManager.java @@ -17,6 +17,7 @@ package alfio.manager; import alfio.manager.system.ConfigurationManager; +import alfio.manager.system.Mailer; import alfio.model.*; import alfio.model.system.ConfigurationKeys; import alfio.model.user.Organization; @@ -24,6 +25,7 @@ import alfio.repository.user.OrganizationRepository; import alfio.util.Json; import alfio.util.LocaleUtil; +import alfio.util.MustacheCustomTag; import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Caffeine; import com.ryantenney.passkit4j.Pass; @@ -33,6 +35,8 @@ import com.ryantenney.passkit4j.sign.PassSigner; import com.ryantenney.passkit4j.sign.PassSignerImpl; import com.ryantenney.passkit4j.sign.PassSigningException; +import lombok.extern.log4j.Log4j2; +import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.tuple.Pair; import org.imgscalr.Scalr; import org.slf4j.Logger; @@ -100,6 +104,10 @@ public boolean writePass(Ticket ticket, EventAndOrganizationId event, OutputStre byte[] getPass(Map model) { try { + if (BooleanUtils.TRUE.equals(model.get(Mailer.SKIP_PASSBOOK))) { + log.trace("HTML email enabled. Skipping passbook generation"); + return null; + } Ticket ticket = Json.fromJson(model.get("ticket"), Ticket.class); int eventId = ticket.getEventId(); Event event = eventRepository.findById(eventId); @@ -165,7 +173,8 @@ private void buildPass(Ticket ticket, String privateKeyAlias = config.get(PASSBOOK_PRIVATE_KEY_ALIAS); - String eventDescription = eventDescriptionRepository.findDescriptionByEventIdTypeAndLocale(event.getId(), EventDescription.EventDescriptionType.DESCRIPTION, ticket.getUserLanguage()).orElse(""); + String eventDescription = MustacheCustomTag.renderToTextCommonmark( + eventDescriptionRepository.findDescriptionByEventIdTypeAndLocale(event.getId(), EventDescription.EventDescriptionType.DESCRIPTION, ticket.getUserLanguage()).orElse("")); TicketCategory category = ticketCategoryRepository.getById(ticket.getCategoryId()); var ticketValidityStart = Optional.ofNullable(category.getTicketValidityStart(event.getZoneId())).orElse(event.getBegin()); Pass pass = new Pass() @@ -243,6 +252,14 @@ private String buildAuthenticationToken(Ticket ticket, EventAndOrganizationId ev return Ticket.hmacSHA256Base64(privateKey, code); } + public Optional> retrieveTicketDetails(String eventName, String ticketUuid) { + return eventRepository.findOptionalEventAndOrganizationIdByShortName(eventName) + .flatMap(e -> ticketRepository.findOptionalByUUID(ticketUuid) + .filter(t -> e.getId() == t.getEventId()) + .map(t -> Pair.of(e, t)) + ); + } + public Optional> validateToken(String eventName, String typeIdentifier, String ticketUuid, String authorizationHeader) { String token; if(authorizationHeader.startsWith(APPLE_PASS)) { diff --git a/src/main/java/alfio/manager/TicketReservationManager.java b/src/main/java/alfio/manager/TicketReservationManager.java index 4538efb780..f318a46793 100644 --- a/src/main/java/alfio/manager/TicketReservationManager.java +++ b/src/main/java/alfio/manager/TicketReservationManager.java @@ -52,6 +52,7 @@ import alfio.model.result.WarningMessage; import alfio.model.subscription.*; import alfio.model.system.command.FinalizeReservation; +import alfio.model.system.command.InvalidateAccess; import alfio.model.transaction.*; import alfio.model.transaction.capabilities.OfflineProcessor; import alfio.model.transaction.capabilities.ServerInitiatedTransaction; @@ -1380,7 +1381,9 @@ public void updateTicketOwner(Ticket ticket, } extensionManager.handleTicketAssignment(newTicket, ticketCategoryRepository.getById(ticket.getCategoryId()), updateTicketOwner.getAdditional()); - + if (isTicketBeingReassigned(ticket, updateTicketOwner, event)) { + invalidateAccess(event, ticket); + } Ticket postUpdateTicket = ticketRepository.findByUUID(ticket.getUuid()); Map postUpdateTicketFields = ticketFieldRepository.findAllByTicketId(ticket.getId()).stream().collect(Collectors.toMap(TicketFieldValue::getName, TicketFieldValue::getValue)); @@ -1590,6 +1593,7 @@ public void releaseTicket(Event event, TicketReservation ticketReservation, fina throw new IllegalStateException("Cannot release reserved tickets"); } // + invalidateAccess(event, ticket); String reservationId = ticketReservation.getId(); //#365 - reset UUID when releasing a ticket @@ -1626,6 +1630,10 @@ public void releaseTicket(Event event, TicketReservation ticketReservation, fina extensionManager.handleTicketCancelledForEvent(event, Collections.singletonList(ticket.getUuid())); } + private void invalidateAccess(Event event, Ticket ticket) { + applicationEventPublisher.publishEvent(new InvalidateAccess(ticket, ticketRepository.getTicketMetadata(ticket.getId()), event)); + } + int getReservationTimeout(Configurable configurable) { return configurationManager.getFor(RESERVATION_TIMEOUT, configurable.getConfigurationLevel()).getValueAsIntOrDefault(25); } diff --git a/src/main/java/alfio/manager/support/CustomMessageManager.java b/src/main/java/alfio/manager/support/CustomMessageManager.java index 1568818cb5..9a4d428841 100644 --- a/src/main/java/alfio/manager/support/CustomMessageManager.java +++ b/src/main/java/alfio/manager/support/CustomMessageManager.java @@ -25,6 +25,7 @@ import alfio.manager.system.Mailer; import alfio.model.*; import alfio.model.modification.MessageModification; +import alfio.model.system.ConfigurationKeys; import alfio.model.user.Organization; import alfio.repository.EventRepository; import alfio.repository.TicketCategoryRepository; @@ -97,6 +98,11 @@ public void sendMessages(String eventName, Optional categoryId, List> byLanguage = input.stream().collect(Collectors.groupingBy(m -> m.getLocale().getLanguage())); var categoriesById = ticketCategoryRepository.findByEventIdAsMap(event.getId()); + var configuration = configurationManager.getFor(EnumSet.of(ConfigurationKeys.BASE_URL, + ConfigurationKeys.ENABLE_WALLET, ConfigurationKeys.ENABLE_PASS, ConfigurationKeys.ENABLE_HTML_EMAILS), event.getConfigurationLevel()); + var baseUrl = configuration.get(ConfigurationKeys.BASE_URL).getRequiredValue(); + boolean googleWalletEnabled = configuration.get(ConfigurationKeys.ENABLE_WALLET).getValueAsBooleanOrDefault(); + boolean appleWalletEnabled = configuration.get(ConfigurationKeys.ENABLE_PASS).getValueAsBooleanOrDefault(); sendMessagesExecutor.execute(() -> { var messageSource = messageSourceManager.getMessageSourceFor(event); @@ -115,6 +121,7 @@ public void sendMessages(String eventName, Optional categoryId, List { @@ -128,8 +135,9 @@ public void sendMessages(String eventName, Optional categoryId, List(TicketCheckInUtil.getOnlineCheckInInfo( extensionManager, eventRepository, @@ -149,10 +157,23 @@ public void sendMessages(String eventName, Optional categoryId, List RenderedTemplate.plaintext(text.toString(), templateModel), attachments); + templateModel.put("message", text); + templateModel.put("event", event); + templateModel.put("baseUrl", baseUrl); + notificationManager.sendSimpleEmail(event, ticket.getTicketsReservationId(), triple.getMiddle(), subject, + () -> templateManager.renderTemplate(event, TemplateResource.CUSTOM_MESSAGE, templateModel, Locale.forLanguageTag(ticket.getUserLanguage())), attachments); }); }); @@ -175,8 +196,15 @@ private List preview(Event event, List .collect(Collectors.toList()); } - public static Mailer.Attachment generateTicketAttachment(Ticket ticket, TicketReservation reservation, TicketCategory ticketCategory, Organization organization) { + public static Mailer.Attachment generateTicketAttachment(Ticket ticket, + TicketReservation reservation, + TicketCategory ticketCategory, + Organization organization, + boolean htmlEmailEnabled) { Map model = getModelForTicket(ticket, reservation, ticketCategory, organization); + if (htmlEmailEnabled) { + model.put(Mailer.SKIP_PASSBOOK, "true"); + } return new Mailer.Attachment("ticket-" + ticket.getUuid() + ".pdf", null, MediaType.APPLICATION_PDF_VALUE, model, Mailer.AttachmentIdentifier.TICKET_PDF); } diff --git a/src/main/java/alfio/manager/system/ConfigurationManager.java b/src/main/java/alfio/manager/system/ConfigurationManager.java index cc249e00ec..c0eecbd45f 100644 --- a/src/main/java/alfio/manager/system/ConfigurationManager.java +++ b/src/main/java/alfio/manager/system/ConfigurationManager.java @@ -19,6 +19,7 @@ import alfio.config.Initializer; import alfio.controller.api.v2.model.AlfioInfo; import alfio.controller.api.v2.model.AnalyticsConfiguration; +import alfio.controller.api.v2.model.WalletConfiguration; import alfio.controller.api.v2.user.support.PurchaseContextInfoBuilder; import alfio.manager.system.ConfigurationLevels.CategoryLevel; import alfio.manager.system.ConfigurationLevels.EventLevel; @@ -236,7 +237,7 @@ public void saveSystemConfiguration(ConfigurationKeys key, String value) { Optional conf = findByConfigurationPathAndKey(Configuration.system(), key); if(key.isBooleanComponentType()) { Optional state = getThreeStateValue(value); - if(conf.isPresent()) { + if(conf.filter(c -> c.getConfigurationPathLevel() != EXTERNAL).isPresent()) { if(state.isPresent()) { configurationRepository.update(key.getValue(), value); } else { @@ -718,7 +719,9 @@ public AlfioInfo getInfo(HttpSession session) { COUNTRY_OF_BUSINESS, ENABLE_REVERSE_CHARGE_IN_PERSON, ENABLE_REVERSE_CHARGE_ONLINE, - ANNOUNCEMENT_BANNER_CONTENT); + ANNOUNCEMENT_BANNER_CONTENT, + ENABLE_WALLET, + ENABLE_PASS); var conf = getFor(options, ConfigurationLevel.system()); var analyticsConf = AnalyticsConfiguration.build(conf, session); @@ -730,7 +733,8 @@ public AlfioInfo getInfo(HttpSession session) { conf.get(GLOBAL_PRIVACY_POLICY).getValueOrNull(), conf.get(GLOBAL_TERMS).getValueOrNull(), PurchaseContextInfoBuilder.invoicingInfo(this, conf), - StringUtils.trimToNull(conf.get(ANNOUNCEMENT_BANNER_CONTENT).getValueOrNull())); + StringUtils.trimToNull(conf.get(ANNOUNCEMENT_BANNER_CONTENT).getValueOrNull()), + new WalletConfiguration(conf.get(ENABLE_WALLET).getValueAsBooleanOrDefault(), conf.get(ENABLE_PASS).getValueAsBooleanOrDefault())); } public Map getPublicOpenIdConfiguration() { diff --git a/src/main/java/alfio/manager/system/Mailer.java b/src/main/java/alfio/manager/system/Mailer.java index fb94f9d120..547ad5a94f 100644 --- a/src/main/java/alfio/manager/system/Mailer.java +++ b/src/main/java/alfio/manager/system/Mailer.java @@ -26,6 +26,8 @@ public interface Mailer { + String SKIP_PASSBOOK = "skipPassbook"; + void send(Configurable configurable, String fromName, String to, List cc, String subject, String text, Optional html, Attachment... attachment); @Data diff --git a/src/main/java/alfio/manager/wallet/EventTicketClass.java b/src/main/java/alfio/manager/wallet/EventTicketClass.java new file mode 100644 index 0000000000..6873efc8da --- /dev/null +++ b/src/main/java/alfio/manager/wallet/EventTicketClass.java @@ -0,0 +1,154 @@ +/** + * This file is part of alf.io. + * + * alf.io is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * alf.io is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with alf.io. If not, see . + */ +package alfio.manager.wallet; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.node.ArrayNode; +import com.fasterxml.jackson.databind.node.ObjectNode; +import lombok.Builder; +import lombok.Getter; +import lombok.Setter; + +import java.time.ZonedDateTime; +import java.time.format.DateTimeFormatter; +import java.util.Map; + +@Builder +@Getter +public class EventTicketClass implements WalletEntity { + + public static final String WALLET_URL = "https://walletobjects.googleapis.com/walletobjects/v1/eventTicketClass"; + + private static final DateTimeFormatter EVENT_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSX"); + + private String id; + + private String eventName; + + private String eventOrGroupingId; + + private String description; + + private String venue; + + private LatitudeLongitudePoint location; + + private String ticketType; + + private String logoUri; + + private ZonedDateTime start; + + private ZonedDateTime end; + + public String build(ObjectMapper mapper) { + ObjectNode object = mapper.createObjectNode(); + object.put("id", id); + object.put("eventId", eventOrGroupingId); + object.put("multipleDevicesAndHoldersAllowedStatus", "ONE_USER_ALL_DEVICES"); + object.put("issuerName", eventName); + object.set("eventName", + mapper.createObjectNode().set("defaultValue", mapper.createObjectNode() + .put("language", "en-US") + .put("value", ticketType))); + object.set("venue", + mapper.createObjectNode().setAll( + Map.of( + "name", mapper.createObjectNode().set("defaultValue", mapper.createObjectNode() + .put("language", "en-US") + .put("value", venue)), + "address", mapper.createObjectNode().set("defaultValue", mapper.createObjectNode() + .put("language", "en-US") + .put("value", venue)) + ))); + object.set("dateTime", + mapper.createObjectNode() + .put("start", start.format(EVENT_TIME_FORMATTER)) + .put("end", end.format(EVENT_TIME_FORMATTER))); + object.put("reviewStatus", "UNDER_REVIEW"); + object.put("hexBackgroundColor", "#FFFFFF"); + object.set("logo", + mapper.createObjectNode().set("sourceUri", mapper.createObjectNode() + .put("uri", logoUri))); + object.set("classTemplateInfo", + mapper.createObjectNode().set("cardTemplateOverride", + mapper.createObjectNode().set("cardRowTemplateInfos", + mapper.createArrayNode() + .add(mapper.createObjectNode().set("oneItem", + mapper.createObjectNode().setAll( + Map.of( + "item", mapper.createObjectNode().set("firstValue", + mapper.createObjectNode().set("fields", + mapper.createArrayNode() + .add(mapper.createObjectNode().put("fieldPath", "class.dateTime.start")))))))) + .add(mapper.createObjectNode().set("oneItem", + mapper.createObjectNode().setAll( + Map.of( + "item", mapper.createObjectNode().set("firstValue", + mapper.createObjectNode().set("fields", + mapper.createArrayNode() + .add(mapper.createObjectNode().put("fieldPath", "class.dateTime.end")))))))) + ))); + object.set("linksModuleData", + mapper.createObjectNode().set("uris", + mapper.createArrayNode() + .add(mapper.createObjectNode() + .put("uri", "https://alf.io") + .put("description", "Powered by Alf.io, the Open Source ticket reservation system.") + .put("id", "alfio"))) + ); + object.set("messages", mapper.createArrayNode() + .add(mapper.createObjectNode() + .put("header", "Event Description") + .put("body", description)) + ); + if (location != null) { + object.set("locations", location.accept(mapper)); + } + + try { + return mapper.writeValueAsString(object); + } catch (JsonProcessingException e) { + throw new RuntimeException(e); + } + } + + @Getter + public static class LatitudeLongitudePoint { + private final Double latitude; + + private final Double longitude; + + private LatitudeLongitudePoint(Double latitude, Double longitude) { + this.latitude = latitude; + this.longitude = longitude; + } + + public static LatitudeLongitudePoint of(Double latitude, Double longitude) { + return new LatitudeLongitudePoint(latitude, longitude); + } + + private ArrayNode accept(ObjectMapper mapper) { + return mapper.createArrayNode() + .add(mapper.createObjectNode() + .put("latitude", latitude) + .put("longitude", longitude) + ); + } + } +} diff --git a/src/main/java/alfio/manager/wallet/EventTicketObject.java b/src/main/java/alfio/manager/wallet/EventTicketObject.java new file mode 100644 index 0000000000..a20221913f --- /dev/null +++ b/src/main/java/alfio/manager/wallet/EventTicketObject.java @@ -0,0 +1,64 @@ +/** + * This file is part of alf.io. + * + * alf.io is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * alf.io is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with alf.io. If not, see . + */ +package alfio.manager.wallet; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.node.ObjectNode; +import lombok.Builder; +import lombok.Getter; +import lombok.Setter; +import org.springframework.core.io.ByteArrayResource; + +import java.net.URI; +import java.time.format.DateTimeFormatter; + +@Builder +@Getter +public class EventTicketObject implements WalletEntity { + + public static final String WALLET_URL = "https://walletobjects.googleapis.com/walletobjects/v1/eventTicketObject"; + + private String id; + + private String classId; + + private String ticketHolderName; + + private String ticketNumber; + + private String barcode; + + public String build(ObjectMapper mapper) { + ObjectNode object = mapper.createObjectNode(); + object.put("id", id); + object.put("classId", classId); + object.put("state", "ACTIVE"); + object.put("ticketHolderName", ticketHolderName); + object.put("ticketNumber", ticketNumber); + object.set("barcode", mapper.createObjectNode() + .put("type", "QR_CODE") + .put("value", barcode)); + + try { + return mapper.writeValueAsString(object); + } catch (JsonProcessingException e) { + throw new RuntimeException(e); + } + } + +} diff --git a/src/main/java/alfio/manager/wallet/GoogleWalletException.java b/src/main/java/alfio/manager/wallet/GoogleWalletException.java new file mode 100644 index 0000000000..9e35d24257 --- /dev/null +++ b/src/main/java/alfio/manager/wallet/GoogleWalletException.java @@ -0,0 +1,29 @@ +/** + * This file is part of alf.io. + * + * alf.io is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * alf.io is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with alf.io. If not, see . + */ +package alfio.manager.wallet; + +public class GoogleWalletException extends RuntimeException { + + public GoogleWalletException(String message) { + super(message); + } + + public GoogleWalletException(String message, Throwable cause) { + super(message, cause); + } + +} diff --git a/src/main/java/alfio/manager/wallet/GoogleWalletManager.java b/src/main/java/alfio/manager/wallet/GoogleWalletManager.java new file mode 100644 index 0000000000..b473222fdb --- /dev/null +++ b/src/main/java/alfio/manager/wallet/GoogleWalletManager.java @@ -0,0 +1,349 @@ +/** + * This file is part of alf.io. + * + * alf.io is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * alf.io is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with alf.io. If not, see . + */ +package alfio.manager.wallet; + +import alfio.manager.system.ConfigurationManager; +import alfio.model.*; +import alfio.model.metadata.TicketMetadata; +import alfio.model.metadata.TicketMetadataContainer; +import alfio.model.system.ConfigurationKeys; +import alfio.model.system.command.InvalidateAccess; +import alfio.repository.*; +import alfio.util.HttpUtils; +import alfio.util.MustacheCustomTag; +import com.auth0.jwt.JWT; +import com.auth0.jwt.algorithms.Algorithm; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.google.auth.oauth2.GoogleCredentials; +import com.google.auth.oauth2.ServiceAccountCredentials; +import lombok.AllArgsConstructor; +import org.apache.commons.lang3.tuple.Pair; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.context.event.EventListener; +import org.springframework.core.env.Environment; +import org.springframework.core.env.Profiles; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.net.URI; +import java.net.http.HttpClient; +import java.net.http.HttpRequest; +import java.net.http.HttpResponse; +import java.nio.charset.StandardCharsets; +import java.security.interfaces.RSAPrivateKey; +import java.util.*; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import static alfio.config.Initializer.*; +import static alfio.model.system.ConfigurationKeys.*; + +@Component +@AllArgsConstructor +@Transactional +public class GoogleWalletManager { + + private static final Logger log = LoggerFactory.getLogger(GoogleWalletManager.class); + private static final String WALLET_OBJECT_ID = "gWalletObjectId"; + private static final String AUTHORIZATION = "Authorization"; + private static final String BEARER_PLACEHOLDER = "Bearer %s"; + private final EventRepository eventRepository; + private final ConfigurationManager configurationManager; + private final EventDescriptionRepository eventDescriptionRepository; + private final TicketCategoryRepository ticketCategoryRepository; + private final TicketRepository ticketRepository; + private final HttpClient httpClient; + private final ObjectMapper objectMapper; + private final Environment environment; + private final AuditingRepository auditingRepository; + + public Optional> validateTicket(String eventName, String ticketUuid) { + var eventOptional = eventRepository.findOptionalEventAndOrganizationIdByShortName(eventName); + if (eventOptional.isEmpty()) { + log.trace("event {} not found", eventName); + return Optional.empty(); + } + + var event = eventOptional.get(); + return ticketRepository.findOptionalByUUID(ticketUuid) + .filter(t -> t.getEventId() == event.getId()) + .map(t -> Pair.of(event, t)); + } + + public String createAddToWalletUrl(Ticket ticket, EventAndOrganizationId event) { + Map passConf = getConfigurationKeys(event); + if (!passConf.isEmpty()) { + return buildWalletPassUrl(ticket, eventRepository.findById(event.getId()), passConf); + } else { + throw new GoogleWalletException("Google Wallet integration is not enabled."); + } + } + + @EventListener + public void invalidateAccessForTicket(InvalidateAccess invalidateAccess) { + try { + Map passConf = getConfigurationKeys(invalidateAccess.getEvent()); + if (!passConf.isEmpty()) { + invalidateAccess.getTicketMetadataContainer() + .getMetadataForKey(TicketMetadataContainer.GENERAL) + .map(m -> m.getAttributes().get(WALLET_OBJECT_ID)) + .ifPresent(s -> invalidateObject(invalidateAccess.getTicket().getUuid(), s, passConf)); + } + } catch (Exception e) { + log.warn("Error while invalidating access for ticket " + invalidateAccess.getTicket().getUuid(), e); + } + } + + private void invalidateObject(String ticketId, String objectId, Map passConf) { + try { + log.trace("Invalidating access to object ID: {}", objectId); + var credentials = retrieveCredentials(passConf.get(WALLET_SERVICE_ACCOUNT_KEY)); + URI uriWithId = URI.create(String.format("%s/%s", EventTicketObject.WALLET_URL, objectId)); + HttpRequest expireRequest = HttpRequest.newBuilder() + .uri(uriWithId) + .header(AUTHORIZATION, String.format(BEARER_PLACEHOLDER, credentials.refreshAccessToken().getTokenValue())) + .method("PATCH", HttpRequest.BodyPublishers.ofString("{\"state\":\"INACTIVE\"}")) + .build(); + var response = httpClient.send(expireRequest, HttpResponse.BodyHandlers.ofString()); + if (HttpUtils.callSuccessful(response)) { + log.debug("Access invalidated for ticket {}", ticketId); + } else { + logIfWarnEnabled(() -> log.warn("Cannot invalidate access for ticket {}, response: {}", ticketId, response.body())); + } + } catch (IOException e) { + throw new GoogleWalletException(e.getMessage(), e); + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + throw new GoogleWalletException(e.getMessage(), e); + } + } + + private Map getConfigurationKeys(EventAndOrganizationId event) { + var conf = configurationManager.getFor(Set.of( + ENABLE_WALLET, + WALLET_ISSUER_IDENTIFIER, + WALLET_SERVICE_ACCOUNT_KEY, + WALLET_OVERWRITE_PREVIOUS_CLASSES_AND_EVENTS, + BASE_URL), + event.getConfigurationLevel()); + + if (!conf.get(ENABLE_WALLET).getValueAsBooleanOrDefault()) { + return Map.of(); + } + var configValues = Map.of( + WALLET_ISSUER_IDENTIFIER, conf.get(WALLET_ISSUER_IDENTIFIER).getValue(), + WALLET_SERVICE_ACCOUNT_KEY, conf.get(WALLET_SERVICE_ACCOUNT_KEY).getValue(), + WALLET_OVERWRITE_PREVIOUS_CLASSES_AND_EVENTS, conf.get(WALLET_OVERWRITE_PREVIOUS_CLASSES_AND_EVENTS).getValue(), + BASE_URL, conf.get(BASE_URL).getValue()); + + if (configValues.values().stream().anyMatch(Optional::isEmpty)) { + return Map.of(); + } + + return configValues + .entrySet() + .stream() + .collect(Collectors.toMap(Map.Entry::getKey, e -> e.getValue().orElseThrow())); + } + + private String buildWalletPassUrl(Ticket ticket, + Event event, + Map config) { + String baseUrl = config.get(BASE_URL); + String issuerId = config.get(WALLET_ISSUER_IDENTIFIER); + String serviceAccountKey = config.get(WALLET_SERVICE_ACCOUNT_KEY); + boolean overwritePreviousClassesAndEvents = Boolean.parseBoolean(config.get(WALLET_OVERWRITE_PREVIOUS_CLASSES_AND_EVENTS)); + + String eventDescription = MustacheCustomTag.renderToTextCommonmark( + eventDescriptionRepository.findDescriptionByEventIdTypeAndLocale(event.getId(), EventDescription.EventDescriptionType.DESCRIPTION, ticket.getUserLanguage()).orElse("")); + TicketCategory category = ticketCategoryRepository.getById(ticket.getCategoryId()); + var ticketValidityStart = Optional.ofNullable(category.getTicketValidityStart(event.getZoneId())).orElse(event.getBegin()); + var ticketValidityEnd = Optional.ofNullable(category.getTicketValidityEnd(event.getZoneId())).orElse(event.getEnd()); + + EventTicketClass.LatitudeLongitudePoint latitudeLongitudePoint = null; + if (event.getLatitude() != null && event.getLongitude() != null) { + latitudeLongitudePoint = EventTicketClass.LatitudeLongitudePoint.of(Double.parseDouble(event.getLatitude()), Double.parseDouble(event.getLongitude())); + } + + var host = URI.create(baseUrl).getHost().replace(".", "-"); + var eventTicketClass = EventTicketClass.builder() + .id(formatEventTicketClassId(event, issuerId, category, host)) + .eventOrGroupingId(Integer.toString(event.getId())) + .logoUri(baseUrl + "/file/" + event.getFileBlobId()) + .eventName(event.getDisplayName()) + .description(eventDescription) + .venue(event.getLocation()) + .location(latitudeLongitudePoint) + .ticketType(category.getName()) + .start(ticketValidityStart) + .end(ticketValidityEnd) + .build(); + + String walletTicketId = formatEventTicketObjectId(ticket, event, issuerId, host); + var eventTicketObject = EventTicketObject.builder() + .id(walletTicketId) + .classId(eventTicketClass.getId()) + .ticketHolderName(ticket.getFullName()) + .ticketNumber(ticket.getUuid()) + .barcode(ticket.ticketCode(event.getPrivateKey())) + .build(); + + GoogleCredentials credentials = retrieveCredentials(serviceAccountKey); + + createEventClass(credentials, eventTicketClass, overwritePreviousClassesAndEvents); + String eventObjectId = createEventObject(credentials, eventTicketObject, overwritePreviousClassesAndEvents); + String walletPassUrl = generateWalletPassUrl(credentials, eventObjectId, baseUrl); + persistPassId(ticket, eventObjectId); + return walletPassUrl; + } + + private static GoogleCredentials retrieveCredentials(String serviceAccountKey) { + try { + return GoogleCredentials + .fromStream(new ByteArrayInputStream(serviceAccountKey.getBytes(StandardCharsets.UTF_8))) + .createScoped(Collections.singleton("https://www.googleapis.com/auth/wallet_object.issuer")); + } catch (IOException e) { + throw new GoogleWalletException("Unable to retrieve Service Account Credentials from configuration", e); + } + } + + private void persistPassId(Ticket ticket, String eventObjectId) { + var metadataContainer = ticketRepository.getTicketMetadata(ticket.getId()); + var existingMetadata = metadataContainer.getMetadataForKey(TicketMetadataContainer.GENERAL); + var attributesMap = existingMetadata.map(ticketMetadata -> new HashMap<>(ticketMetadata.getAttributes())) + .orElseGet(HashMap::new); + attributesMap.put(WALLET_OBJECT_ID, eventObjectId); + metadataContainer.putMetadata(TicketMetadataContainer.GENERAL, existingMetadata.map(tm -> tm.withAttributes(attributesMap)).orElseGet(() -> new TicketMetadata(null, null, attributesMap))); + ticketRepository.updateTicketMetadata(ticket.getId(), metadataContainer); + } + + private String formatEventTicketObjectId(Ticket ticket, Event event, String issuerId, String host) { + return String.format("%s.%s-%s-object.%s-%s", + issuerId, + walletIdPrefix(), + host, + event.getShortName().replaceAll("[^\\w.-]", "_"), + // if the attendee gives their ticket to somebody else, the new ticket holder must be able to add their ticket to the wallet + // therefore we add count(audit(UPDATE_TICKET)) as suffix for the ticket UUID + ticket.getUuid()+ "_" + auditingRepository.countAuditsOfTypeForTicket(ticket.getTicketsReservationId(), ticket.getId(), Audit.EventType.UPDATE_TICKET)); + } + + private String formatEventTicketClassId(Event event, String issuerId, TicketCategory category, String host) { + return String.format("%s.%s-%s-class.%s-%d", issuerId, walletIdPrefix(), host, event.getShortName().replaceAll("[^\\w.-]", "_"), category.getId()); + } + + private String generateWalletPassUrl(GoogleCredentials credentials, String eventObjectId, String url) { + var objectIdMap = Map.of("id", eventObjectId); + var payload = Map.of("genericObjects", List.of(objectIdMap)); + var claims = Map.of( + "iss", ((ServiceAccountCredentials) credentials).getClientEmail(), + "aud", "google", + "origins", List.of(url), + "typ", "savetowallet", + "payload", payload + ); + + Algorithm algorithm = Algorithm.RSA256( + null, + (RSAPrivateKey) ((ServiceAccountCredentials) credentials).getPrivateKey()); + String token = JWT.create() + .withPayload(claims) + .sign(algorithm); + return String.format("https://pay.google.com/gp/v/save/%s", token); + } + + private String createEventClass(GoogleCredentials credentials, EventTicketClass eventTicketClass, boolean overwritePreviousClassesAndEvents) { + return createOnWallet(EventTicketClass.WALLET_URL, credentials, eventTicketClass, overwritePreviousClassesAndEvents); + } + + private String createEventObject(GoogleCredentials credentials, EventTicketObject eventTicketObject, boolean overwritePreviousClassesAndEvents) { + return createOnWallet(EventTicketObject.WALLET_URL, credentials, eventTicketObject, overwritePreviousClassesAndEvents); + } + + private String createOnWallet(String uri, GoogleCredentials credentials, WalletEntity entity, boolean overwritePreviousClassesAndEvents) { + try { + URI uriWithId = URI.create(String.format("%s/%s", uri, entity.getId())); + HttpRequest getRequest = HttpRequest.newBuilder() + .uri(uriWithId) + .header(AUTHORIZATION, String.format(BEARER_PLACEHOLDER, credentials.refreshAccessToken().getTokenValue())) + .GET() + .build(); + log.debug("GET Request: {}", getRequest); + + HttpResponse getResponse = httpClient.send(getRequest, HttpResponse.BodyHandlers.ofString()); + log.debug("GET Response: {}", getResponse); + if (getResponse.statusCode() != 200 && getResponse.statusCode() != 404) { + logIfWarnEnabled(() -> log.warn("Received {} status code when creating entity but 200 or 404 were expected: {}", getResponse.statusCode(), getResponse.body())); + throw new GoogleWalletException("Cannot create Wallet class. Response status: " + getResponse.statusCode()); + } + + if (getResponse.statusCode() == 404 || overwritePreviousClassesAndEvents) { + HttpRequest.Builder builder = HttpRequest.newBuilder() + .header(AUTHORIZATION, String.format(BEARER_PLACEHOLDER, credentials.refreshAccessToken().getTokenValue())); + if (getResponse.statusCode() == 404) { + builder = builder + .uri(URI.create(uri)) + .POST(HttpRequest.BodyPublishers.ofString(entity.build(objectMapper))); + } else { + builder = builder + .uri(uriWithId) + .PUT(HttpRequest.BodyPublishers.ofString(entity.build(objectMapper))); + } + HttpRequest postOrPutRequest = builder.build(); + log.debug("POST or PUT Request: {}", postOrPutRequest); + HttpResponse postOrPutResponse = httpClient.send(postOrPutRequest, HttpResponse.BodyHandlers.ofString()); + log.debug("POST or PUT Response: {}", postOrPutResponse); + if (postOrPutResponse.statusCode() != 200) { + logIfWarnEnabled(() -> log.warn("Received {} status code when creating entity: {}", postOrPutResponse.statusCode(), postOrPutResponse.body())); + throw new GoogleWalletException("Cannot create wallet. Response status: " + postOrPutResponse.statusCode()); + } + } + return entity.getId(); + } catch (IOException e) { + throw new GoogleWalletException("Error while communicating with the Google Wallet API", e); + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + throw new GoogleWalletException("Error while communicating with the Google Wallet API", e); + } + } + + private String walletIdPrefix() { + var profile = Stream.of(PROFILE_DEMO, PROFILE_DEV, PROFILE_LIVE) + .filter(p -> environment.acceptsProfiles(Profiles.of(p))) + .findFirst() + .orElseThrow(() -> new NoSuchElementException("No suitable Spring Profile found to create a Wallet ID prefix for classes and objects. Must have one of PROFILE_DEMO, PROFILE_DEV, or PROFILE_LIVE")); + if (profile.equals(PROFILE_LIVE)) { + return "live"; + } + return profile; + } + + private void logIfWarnEnabled(ConditionalLogger logger) { + if (log.isWarnEnabled()) { + logger.log(); + } + } + + @FunctionalInterface + private interface ConditionalLogger { + void log(); + } + +} diff --git a/src/main/java/alfio/manager/wallet/WalletEntity.java b/src/main/java/alfio/manager/wallet/WalletEntity.java new file mode 100644 index 0000000000..54be6e4567 --- /dev/null +++ b/src/main/java/alfio/manager/wallet/WalletEntity.java @@ -0,0 +1,27 @@ +/** + * This file is part of alf.io. + * + * alf.io is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * alf.io is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with alf.io. If not, see . + */ +package alfio.manager.wallet; + +import com.fasterxml.jackson.databind.ObjectMapper; + +public interface WalletEntity { + + public String getId(); + + public String build(ObjectMapper mapper); + +} diff --git a/src/main/java/alfio/model/metadata/TicketMetadata.java b/src/main/java/alfio/model/metadata/TicketMetadata.java index 8425c46848..e54f271970 100644 --- a/src/main/java/alfio/model/metadata/TicketMetadata.java +++ b/src/main/java/alfio/model/metadata/TicketMetadata.java @@ -80,6 +80,9 @@ public int hashCode() { public static TicketMetadata empty() { return new TicketMetadata(null, null, Map.of()); } + public TicketMetadata withAttributes(Map attributes) { + return new TicketMetadata(joinLink, Map.copyOf(linkDescription), Map.copyOf(attributes)); + } public static TicketMetadata copyOf(TicketMetadata src) { if (src != null) { diff --git a/src/main/java/alfio/model/system/ConfigurationKeys.java b/src/main/java/alfio/model/system/ConfigurationKeys.java index a5aab09597..40a9098593 100644 --- a/src/main/java/alfio/model/system/ConfigurationKeys.java +++ b/src/main/java/alfio/model/system/ConfigurationKeys.java @@ -234,13 +234,18 @@ public enum ConfigurationKeys { // //PASSBOOK - ENABLE_PASS("Enable Apple(tm) Wallet integration", false, SettingCategory.PASS_INTEGRATION, ComponentType.BOOLEAN, false, EnumSet.of(SYSTEM), BooleanUtils.FALSE), + ENABLE_PASS("Enable Apple(tm) Wallet integration (default: false)", false, SettingCategory.PASS_INTEGRATION, ComponentType.BOOLEAN, false, EnumSet.of(SYSTEM), BooleanUtils.FALSE), PASSBOOK_TYPE_IDENTIFIER("Passbook type identifier", false, SettingCategory.PASS_INTEGRATION, ComponentType.TEXT, false, EnumSet.of(SYSTEM)), PASSBOOK_TEAM_IDENTIFIER("Passbook team identifier", false, SettingCategory.PASS_INTEGRATION, ComponentType.TEXT, false, EnumSet.of(SYSTEM)), PASSBOOK_KEYSTORE("Passbook keystore(base64 encoded keystore)", false, SettingCategory.PASS_INTEGRATION, ComponentType.TEXTAREA, false, EnumSet.of(SYSTEM)), PASSBOOK_KEYSTORE_PASSWORD("Passbook keystore password", false, SettingCategory.PASS_INTEGRATION, ComponentType.TEXT, false, EnumSet.of(SYSTEM)), PASSBOOK_PRIVATE_KEY_ALIAS("Passbook Private Key alias", false, SettingCategory.PASS_INTEGRATION, ComponentType.TEXT, false, EnumSet.of(SYSTEM)), + //WALLET + ENABLE_WALLET("Enable Google Wallet(tm) integration (default: false)", false, SettingCategory.WALLET_INTEGRATION, ComponentType.BOOLEAN, false, EnumSet.of(SYSTEM), BooleanUtils.FALSE), + WALLET_ISSUER_IDENTIFIER("Google Wallet Issuer ID", false, SettingCategory.WALLET_INTEGRATION, ComponentType.TEXT, false, EnumSet.of(SYSTEM)), + WALLET_SERVICE_ACCOUNT_KEY("Google Wallet Service Account Key in JSON format", false, SettingCategory.WALLET_INTEGRATION, ComponentType.TEXTAREA, false, EnumSet.of(SYSTEM)), + WALLET_OVERWRITE_PREVIOUS_CLASSES_AND_EVENTS("Overwrite previous EventClass and EventObject definitions (use after code changes affecting the JSON, default: false)", false, SettingCategory.WALLET_INTEGRATION, ComponentType.BOOLEAN, false, EnumSet.of(SYSTEM), BooleanUtils.FALSE), //CHECK-IN CHECK_IN_STATS("Display check-in statistics in mobile apps", false, SettingCategory.GENERAL, ComponentType.BOOLEAN, false, EnumSet.of(SYSTEM, ORGANIZATION, EVENT), BooleanUtils.TRUE), @@ -291,6 +296,7 @@ public enum SettingCategory { MAP("Maps settings"), TRANSLATIONS("Translations"), PASS_INTEGRATION("Pass Integration"), + WALLET_INTEGRATION("Google Wallet Integration"), WAITING_LIST("Waiting List"), IMPORT_ATTENDEE("Import Attendees"), OPENID("Public users Authentication"), diff --git a/src/main/java/alfio/model/system/command/InvalidateAccess.java b/src/main/java/alfio/model/system/command/InvalidateAccess.java new file mode 100644 index 0000000000..bbc6f0e3ca --- /dev/null +++ b/src/main/java/alfio/model/system/command/InvalidateAccess.java @@ -0,0 +1,48 @@ +/** + * This file is part of alf.io. + * + * alf.io is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * alf.io is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with alf.io. If not, see . + */ +package alfio.model.system.command; + +import alfio.model.Event; +import alfio.model.Ticket; +import alfio.model.metadata.TicketMetadataContainer; + +/** + * Signals that access for the ticket must be invalidated on external systems + */ +public class InvalidateAccess { + private final Ticket ticket; + private final TicketMetadataContainer ticketMetadataContainer; + private final Event event; + + public InvalidateAccess(Ticket ticket, TicketMetadataContainer ticketMetadataContainer, Event event) { + this.ticket = ticket; + this.ticketMetadataContainer = ticketMetadataContainer; + this.event = event; + } + + public Ticket getTicket() { + return ticket; + } + + public TicketMetadataContainer getTicketMetadataContainer() { + return ticketMetadataContainer; + } + + public Event getEvent() { + return event; + } +} diff --git a/src/main/java/alfio/repository/AuditingRepository.java b/src/main/java/alfio/repository/AuditingRepository.java index 9357a78ab2..34614fc49e 100644 --- a/src/main/java/alfio/repository/AuditingRepository.java +++ b/src/main/java/alfio/repository/AuditingRepository.java @@ -74,6 +74,11 @@ default int insert(String reservationId, Integer userId, PurchaseContext p, Audi @Query("select count(*) from auditing_user where reservation_id = :reservationId and event_type = :eventType") Integer countAuditsOfTypeForReservation(@Bind("reservationId") String reservationId, @Bind("eventType") Audit.EventType eventType); + @Query("select count(*) from auditing_user where reservation_id = :reservationId and entity_id = :ticketId::text and event_type = :eventType") + Integer countAuditsOfTypeForTicket(@Bind("reservationId") String reservationId, + @Bind("ticketId") int ticketId, + @Bind("eventType") Audit.EventType eventType); + @Query("select count(*) from auditing_user where reservation_id = :reservationId and event_type in (:eventTypes) and date_trunc('day', :referenceDate::timestamp) = date_trunc('day', event_time)") Integer countAuditsOfTypesInTheSameDay(@Bind("reservationId") String reservationId, @Bind("eventTypes") Collection eventTypes, @Bind("referenceDate") ZonedDateTime date); diff --git a/src/main/java/alfio/util/MustacheCustomTag.java b/src/main/java/alfio/util/MustacheCustomTag.java index 579d23c914..b83e89e55e 100644 --- a/src/main/java/alfio/util/MustacheCustomTag.java +++ b/src/main/java/alfio/util/MustacheCustomTag.java @@ -93,7 +93,8 @@ private MustacheCustomTag() {} static final Mustache.Lambda RENDER_MARKDOWN = (frag, out) -> { String execution = frag.execute().strip(); if(execution.endsWith(".html")) { - out.write(renderToHtmlCommonmarkEscaped(StringUtils.removeEnd(execution, ".html"))); + // Markdown renderer will take care of escaping all dangerous content + out.write(renderToHtmlCommonmark(StringUtils.removeEnd(execution, ".html"), null)); } else if(execution.endsWith(".text")) { out.write(renderToTextCommonmark(StringUtils.removeEnd(execution, ".text"))); } else { @@ -238,9 +239,13 @@ private static Optional getScheme(String uri) { } public static String renderToHtmlCommonmarkEscaped(String input, String localizedNewWindowLabel) { + return renderToHtmlCommonmark(StringEscapeUtils.escapeHtml4(input), localizedNewWindowLabel); + } + + private static String renderToHtmlCommonmark(String input, String localizedNewWindowLabel) { try { A11Y_NEW_TAB_LABEL.set(localizedNewWindowLabel); - Node document = COMMONMARK_PARSER.parse(StringEscapeUtils.escapeHtml4(input)); + Node document = COMMONMARK_PARSER.parse(input); return COMMONMARK_RENDERER.render(document); } finally { A11Y_NEW_TAB_LABEL.remove(); diff --git a/src/main/java/alfio/util/TemplateManager.java b/src/main/java/alfio/util/TemplateManager.java index 5de3afc9b7..a5a1720d93 100644 --- a/src/main/java/alfio/util/TemplateManager.java +++ b/src/main/java/alfio/util/TemplateManager.java @@ -157,7 +157,8 @@ private Map modelEnricher(Map model, PurchaseCon private String render(Resource resource, Map model, Locale locale, PurchaseContext purchaseContext, TemplateOutput templateOutput) { try { var messageSource = messageSourceManager.getMessageSourceFor(purchaseContext); - boolean usePartnerCode = configurationManager.getFor(ConfigurationKeys.USE_PARTNER_CODE_INSTEAD_OF_PROMOTIONAL, ConfigurationLevel.purchaseContext(purchaseContext)) + var configuration = configurationManager.getFor(EnumSet.of(ConfigurationKeys.USE_PARTNER_CODE_INSTEAD_OF_PROMOTIONAL, ConfigurationKeys.ENABLE_WALLET, ConfigurationKeys.ENABLE_PASS), ConfigurationLevel.purchaseContext(purchaseContext)); + boolean usePartnerCode = Objects.requireNonNull(configuration.get(ConfigurationKeys.USE_PARTNER_CODE_INSTEAD_OF_PROMOTIONAL)) .getValueAsBooleanOrDefault(); ModelAndView mv = new ModelAndView(); mv.getModelMap().addAllAttributes(model); @@ -173,6 +174,11 @@ private String render(Resource resource, Map model, Locale local updatedModel.putIfAbsent("custom-header-text", ""); updatedModel.putIfAbsent("custom-body-text", ""); updatedModel.putIfAbsent("custom-footer-text", ""); + boolean googleWalletEnabled = configuration.get(ConfigurationKeys.ENABLE_WALLET).getValueAsBooleanOrDefault(); + boolean appleWalletEnabled = configuration.get(ConfigurationKeys.ENABLE_PASS).getValueAsBooleanOrDefault(); + updatedModel.putIfAbsent("googleWalletEnabled", googleWalletEnabled); + updatedModel.putIfAbsent("appleWalletEnabled", appleWalletEnabled); + updatedModel.putIfAbsent("walletEnabled", googleWalletEnabled || appleWalletEnabled); return compile(resource, templateOutput).execute(mv.getModel()); } catch (Exception e) { log.error("TemplateManager: got exception while generating a template", e); diff --git a/src/main/java/alfio/util/TemplateResource.java b/src/main/java/alfio/util/TemplateResource.java index ca1ea12280..182fcccca1 100644 --- a/src/main/java/alfio/util/TemplateResource.java +++ b/src/main/java/alfio/util/TemplateResource.java @@ -257,7 +257,18 @@ public Map prepareSampleModel(Organization organization, Purchas "email@email.tld", RESERVATION_ID_VALUE, "en", null, WaitingQueueSubscription.Type.PRE_SALES); return buildModelForWaitingQueueReservationEmail(organization, event, subscription, "http://your-domain.tld/reservation-url", ZonedDateTime.now(clock)); } - }; + }, + CUSTOM_MESSAGE("/alfio/templates/custom-message", TemplateResource.MULTIPART_ALTERNATIVE_MIMETYPE, TemplateManager.TemplateOutput.TEXT) { + @Override + public Map prepareSampleModel(Organization organization, PurchaseContext purchaseContext, Optional imageData) { + var now = purchaseContext.now(ClockProvider.clock()); + var event = (Event) purchaseContext; + TicketCategory ticketCategory = new TicketCategory(0, now, now, 42, "Ticket", false, TicketCategory.Status.ACTIVE, event.getId(), false, 1000, null, null, null, null, null, "CHF", 0, null, TicketCategory.TicketAccessType.INHERIT); + var model = buildModelForTicketEmail(organization, event, sampleTicketReservation(event.getZoneId()), "http://your-domain.tld", "http://your-domain.tld/ticket-url", "http://your-domain.tld/calendar-url", sampleTicket(event.getZoneId()), ticketCategory, Map.of()); + model.put("message", "This is your message"); + return model; + } + },; public static final String MULTIPART_ALTERNATIVE_MIMETYPE = "multipart/alternative"; diff --git a/src/main/resources/alfio/mjml/custom-message-html.mjml b/src/main/resources/alfio/mjml/custom-message-html.mjml new file mode 100644 index 0000000000..6a483f4a55 --- /dev/null +++ b/src/main/resources/alfio/mjml/custom-message-html.mjml @@ -0,0 +1,110 @@ + + + + + + + + body { + background: white; + color: #393939; + } + .content-section { + background: white; + } + a { + color: #0056b3; + text-decoration: none; + } + a:hover { + color: #0056b3; + text-decoration: underline; + } + + @media (prefers-color-scheme: dark) { + body { + background: black; + color: #ccc; + } + a { + color: inherit; + text-decoration: none; + } + a:hover { + color: inherit; + text-decoration: underline; + } + } + + tr { + line-height:2; + text-align:center; + } + + tr .bottom-border { + border-bottom:2px solid #ecedee; + } + + li { + margin-top: 10px; + } + img.wallet { + padding-top: 20px; + } + + + + + + + + + + + + + + + + + {{event.displayName}} + + + + + + + + + {{#render-markdown}}{{message}}.html{{/render-markdown}} + + + + + {{#walletEnabled}} + + {{#googleWalletEnabled}} + + + + {{/googleWalletEnabled}} + {{#appleWalletEnabled}} + + + + {{/appleWalletEnabled}} + + {{/walletEnabled}} + + + + {{#i18n}}alfio.credits{{/i18n}} + + + + + diff --git a/src/main/resources/alfio/mjml/ticket-email-html.mjml b/src/main/resources/alfio/mjml/ticket-email-html.mjml index 7da1daabea..c2366fe25f 100644 --- a/src/main/resources/alfio/mjml/ticket-email-html.mjml +++ b/src/main/resources/alfio/mjml/ticket-email-html.mjml @@ -44,6 +44,9 @@ tr .bottom-border { border-bottom:2px solid #ecedee; } + img.wallet { + padding-top: 20px; + } @@ -123,8 +126,23 @@ - - + + {{#walletEnabled}} + + {{#googleWalletEnabled}} + + + + {{/googleWalletEnabled}} + {{#appleWalletEnabled}} + + + + {{/appleWalletEnabled}} + + {{/walletEnabled}} + + {{#i18n}}email-ticket.view-modify{{/i18n}} diff --git a/src/main/resources/alfio/templates/custom-message-txt.ms b/src/main/resources/alfio/templates/custom-message-txt.ms new file mode 100644 index 0000000000..a59c45bbb3 --- /dev/null +++ b/src/main/resources/alfio/templates/custom-message-txt.ms @@ -0,0 +1,4 @@ +{{#render-markdown}}{{message}}.text{{/render-markdown}} + +-- +{{#i18n}}alfio.credits{{/i18n}} \ No newline at end of file diff --git a/src/main/webapp/resources/angular-templates/admin/partials/configuration/system.html b/src/main/webapp/resources/angular-templates/admin/partials/configuration/system.html index 56370236c8..59b980007f 100644 --- a/src/main/webapp/resources/angular-templates/admin/partials/configuration/system.html +++ b/src/main/webapp/resources/angular-templates/admin/partials/configuration/system.html @@ -55,12 +55,28 @@

End-Users Authentication

-

Pass Integration

- Integration with Apple (tm) Pass +

Mobile wallet integration

+ Integration with mobile Wallets
-
-
- +
+
+
Google Wallet (tm) integration
+
+
+
+ +
+
+
+ +
+
+
Apple Pass (tm) integration
+
+
+
+ +
diff --git a/src/main/webapp/resources/images/email/add-to-apple-wallet-button.png b/src/main/webapp/resources/images/email/add-to-apple-wallet-button.png new file mode 100644 index 0000000000000000000000000000000000000000..c42ba869a04f2a060ee0d5ab8a327c51b2ebad5b GIT binary patch literal 8876 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 literal 0 HcmV?d00001 diff --git a/src/main/webapp/resources/images/email/enUS_add_to_google_wallet_add-wallet-badge.png b/src/main/webapp/resources/images/email/enUS_add_to_google_wallet_add-wallet-badge.png new file mode 100644 index 0000000000000000000000000000000000000000..4854a1235f82c5a285aa2cfb669ceececa940d7b GIT binary patch literal 4543 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 literal 0 HcmV?d00001 diff --git a/src/main/webapp/resources/images/email/enUS_add_to_google_wallet_add-wallet-badge.svg b/src/main/webapp/resources/images/email/enUS_add_to_google_wallet_add-wallet-badge.svg new file mode 100644 index 0000000000..9fc8683719 --- /dev/null +++ b/src/main/webapp/resources/images/email/enUS_add_to_google_wallet_add-wallet-badge.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/src/test/java/alfio/BaseTestConfiguration.java b/src/test/java/alfio/BaseTestConfiguration.java index 8be125fe93..08f85215e4 100644 --- a/src/test/java/alfio/BaseTestConfiguration.java +++ b/src/test/java/alfio/BaseTestConfiguration.java @@ -25,6 +25,7 @@ import alfio.util.ClockProvider; import alfio.util.RefreshableDataSource; import com.stripe.Stripe; +import com.fasterxml.jackson.databind.ObjectMapper; import com.zaxxer.hikari.HikariConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -138,4 +139,9 @@ public void initStripeMock() { Stripe.overrideUploadBase("http://localhost:" + httpPort); Stripe.enableTelemetry = false; } + + @Bean + public ObjectMapper objectMapper() { + return new ObjectMapper(); + } } diff --git a/src/test/java/alfio/manager/wallet/EventTicketClassTest.java b/src/test/java/alfio/manager/wallet/EventTicketClassTest.java new file mode 100644 index 0000000000..86c74496fb --- /dev/null +++ b/src/test/java/alfio/manager/wallet/EventTicketClassTest.java @@ -0,0 +1,56 @@ +/** + * This file is part of alf.io. + * + * alf.io is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * alf.io is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with alf.io. If not, see . + */ +package alfio.manager.wallet; + +import com.fasterxml.jackson.databind.ObjectMapper; +import org.junit.jupiter.api.Test; + +import java.nio.file.Files; +import java.nio.file.Path; +import java.time.Month; +import java.time.ZoneId; +import java.time.ZonedDateTime; +import java.time.format.DateTimeFormatter; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + +class EventTicketClassTest { + + @Test + void build() throws Exception { + ObjectMapper objectMapper = new ObjectMapper(); + + EventTicketClass object = EventTicketClass.builder() + .id("ISSUER_ID.EVENT_CLASS_ID") + .eventOrGroupingId("1") + .eventName("Devoxx Belgium 2022") + .ticketType("Speaker") + .logoUri("https://reg.devoxx.be/file/c73315d4890c5fade112165c40338b72271e43939eed4e1e57a4e4891ee19cc8") + .venue("Antwerp Kinepolis Belgium") + .start(ZonedDateTime.of(2022, Month.OCTOBER.getValue(), 10, 8, 0, 0, 0, ZoneId.of("UTC"))) + .end(ZonedDateTime.of(2022, Month.OCTOBER.getValue(), 14, 14, 0, 0, 0, ZoneId.of("UTC"))) + .build(); + String build = object.build(objectMapper); + + var resource = getClass().getResource("/wallet-json/event-class.json"); + assertNotNull(resource); + var payload = Files.readString(Path.of(resource.toURI())); + assertEquals(objectMapper.readTree(resource), objectMapper.readTree(build)); + } + +} \ No newline at end of file diff --git a/src/test/java/alfio/manager/wallet/EventTicketObjectTest.java b/src/test/java/alfio/manager/wallet/EventTicketObjectTest.java new file mode 100644 index 0000000000..b4ae00e99e --- /dev/null +++ b/src/test/java/alfio/manager/wallet/EventTicketObjectTest.java @@ -0,0 +1,51 @@ +/** + * This file is part of alf.io. + * + * alf.io is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * alf.io is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with alf.io. If not, see . + */ +package alfio.manager.wallet; + +import com.fasterxml.jackson.databind.ObjectMapper; +import org.junit.jupiter.api.Test; + +import java.nio.file.Files; +import java.nio.file.Path; +import java.time.Month; +import java.time.ZoneId; +import java.time.ZonedDateTime; + +import static org.junit.jupiter.api.Assertions.*; + +class EventTicketObjectTest { + + @Test + void build() throws Exception { + ObjectMapper objectMapper = new ObjectMapper(); + + EventTicketObject object = EventTicketObject.builder() + .id("ISSUER_ID.MEMBER_ID") + .classId("ISSUER_ID.EVENT_CLASS_ID") + .ticketHolderName("Alf") + .ticketNumber("123-321-000") + .barcode("123456789") + .build(); + String build = object.build(objectMapper); + + var resource = getClass().getResource("/wallet-json/event-object.json"); + assertNotNull(resource); + var payload = Files.readString(Path.of(resource.toURI())); + assertEquals(objectMapper.readTree(resource), objectMapper.readTree(build)); + } + +} \ No newline at end of file diff --git a/src/test/java/alfio/model/system/ConfigurationKeysTest.java b/src/test/java/alfio/model/system/ConfigurationKeysTest.java index 02043c1b78..c3243ec242 100644 --- a/src/test/java/alfio/model/system/ConfigurationKeysTest.java +++ b/src/test/java/alfio/model/system/ConfigurationKeysTest.java @@ -27,7 +27,7 @@ class ConfigurationKeysTest { @Test void validateAllBooleansHaveDefaultValue() { - var pattern = Pattern.compile(".*?\\(.*?default.*? (true|false).*?\\).*?"); + var pattern = Pattern.compile(".*?\\(.*?default.*?(true|false).*?\\).*?"); Arrays.stream(ConfigurationKeys.values()) .filter(ConfigurationKeys::isBooleanComponentType) .forEach(confKey -> { diff --git a/src/test/resources/wallet-json/event-class.json b/src/test/resources/wallet-json/event-class.json new file mode 100644 index 0000000000..d109018fb2 --- /dev/null +++ b/src/test/resources/wallet-json/event-class.json @@ -0,0 +1,84 @@ +{ + "id": "ISSUER_ID.EVENT_CLASS_ID", + "eventId": "1", + "multipleDevicesAndHoldersAllowedStatus": "ONE_USER_ALL_DEVICES", + "issuerName": "Devoxx Belgium 2022", + "eventName": { + "defaultValue": { + "language": "en-US", + "value": "Speaker" + } + }, + "venue": { + "address": { + "defaultValue": { + "language": "en-US", + "value": "Antwerp Kinepolis Belgium" + } + }, + "name": { + "defaultValue": { + "language": "en-US", + "value": "Antwerp Kinepolis Belgium" + } + } + }, + "dateTime": { + "start": "2022-10-10T08:00:00.00Z", + "end": "2022-10-14T14:00:00.00Z" + }, + "reviewStatus": "UNDER_REVIEW", + "hexBackgroundColor": "#FFFFFF", + "logo": { + "sourceUri": { + "uri": "https://reg.devoxx.be/file/c73315d4890c5fade112165c40338b72271e43939eed4e1e57a4e4891ee19cc8" + } + }, + "classTemplateInfo": { + "cardTemplateOverride": { + "cardRowTemplateInfos": [ + { + "oneItem": { + "item": { + "firstValue": { + "fields": [ + { + "fieldPath": "class.dateTime.start" + } + ] + } + } + } + }, + { + "oneItem": { + "item": { + "firstValue": { + "fields": [ + { + "fieldPath": "class.dateTime.end" + } + ] + } + } + } + } + ] + } + }, + "linksModuleData": { + "uris": [ + { + "uri": "https://alf.io", + "description": "Powered by Alf.io, the Open Source ticket reservation system.", + "id": "alfio" + } + ] + }, + "messages": [ + { + "header": "Event Description", + "body": null + } + ] +} \ No newline at end of file diff --git a/src/test/resources/wallet-json/event-object.json b/src/test/resources/wallet-json/event-object.json new file mode 100644 index 0000000000..d3f15f6d78 --- /dev/null +++ b/src/test/resources/wallet-json/event-object.json @@ -0,0 +1,11 @@ +{ + "id": "ISSUER_ID.MEMBER_ID", + "classId": "ISSUER_ID.EVENT_CLASS_ID", + "state": "ACTIVE", + "ticketHolderName": "Alf", + "ticketNumber": "123-321-000", + "barcode": { + "type": "QR_CODE", + "value": "123456789" + } +} \ No newline at end of file diff --git a/src/test/resources/wallet-json/generic-object.json b/src/test/resources/wallet-json/generic-object.json new file mode 100644 index 0000000000..8dd8f6bd5e --- /dev/null +++ b/src/test/resources/wallet-json/generic-object.json @@ -0,0 +1,50 @@ +{ + "id": "ISSUER_ID.OBJECT_ID", + "classId": "ISSUER_ID.GENERIC_CLASS_ID", + "cardTitle": { + "defaultValue": { + "language": "en-US", + "value": "Test Event" + } + }, + "header": { + "defaultValue": { + "language": "en-US", + "value": "General admission" + } + }, + "subheader": { + "defaultValue": { + "language": "en-US", + "value": "" + } + }, + "logo": { + "sourceUri": { + "uri": "https://devoxx.be/wp-content/uploads/2019/05/DEVOXX-Name-Only-TransparentBackground.png", + "description": "" + } + }, + "hexBackgroundColor": "#ffffff", + "textModulesData": [ + { + "header": "Venue", + "body": "Palazzo dei congressi Lugano, Switzerland", + "id": "Row1Left" + }, + { + "header": "Valid From", + "body": "Mon, Oct 10", + "id": "Row2Left" + }, + { + "header": "Valid Until", + "body": "Tue, Oct 11", + "id": "Row3Left" + } + ], + "barcode": { + "type": "QR_CODE", + "value": "123456789" + } +} \ No newline at end of file diff --git a/website/content/en/docs/Configuration/Wallet integration/_index.md b/website/content/en/docs/Configuration/Wallet integration/_index.md index eabb460b70..65a0faeabe 100644 --- a/website/content/en/docs/Configuration/Wallet integration/_index.md +++ b/website/content/en/docs/Configuration/Wallet integration/_index.md @@ -1,44 +1,7 @@ --- -title: "Apple(tm) Wallet Integration" -linkTitle: "Apple(tm) Wallet" +title: "Mobile Wallet Integration" +linkTitle: "Mobile Wallet" weight: 5 description: > - How to generate Apple(tm) passes for your tickets + How to let your users download their ticket on mobile devices --- - -## How to configure Apple (tm) Pass integration - -### create a new Apple (tm) Pass ID - -access the [create Pass ID](https://developer.apple.com/account/ios/identifier/passTypeId/create) page and follow the on-screen instruction to generate your new Pass ID and the corresponding certificates. - -### Download the certificate on your disk - -download the certificate on your disk, as suggested during the generation process, then double-click on it to install in Keychain Access - -### Export certificate - -make sure to select "My Certificates" under "Category", as shown by the screenshot below - -![](/img/configuration/apple-pass/category.png) - -Select your pass from the list - -![](/img/configuration/apple-pass/export.png) - -open context menu, then select "Export Pass ..." and export it as P12 file. -Please make sure to enter a strong password, you'll need it afterwards. - -### Import certificate in alf.io - -open a terminal, go to the folder where the exported P12 is, then execute the following command: - -> $ base64 certificate.p12 - -and copy the output. - -then open you alf.io instance and set the relevant options: - -![](/img/configuration/apple-pass/alfio-options.png) - -that's it! Enjoy Apple (tm) Pass integration! diff --git a/website/content/en/docs/Configuration/Wallet integration/apple-pass.md b/website/content/en/docs/Configuration/Wallet integration/apple-pass.md new file mode 100644 index 0000000000..6d1d4d0b7b --- /dev/null +++ b/website/content/en/docs/Configuration/Wallet integration/apple-pass.md @@ -0,0 +1,44 @@ +--- +title: "Apple (tm) Pass Integration" +linkTitle: "Apple (tm) Pass" +weight: 5 +description: > +How to generate Apple(tm) passes for your tickets +--- + +## How to configure Apple (tm) Pass integration + +### create a new Apple (tm) Pass ID + +access the [create Pass ID](https://developer.apple.com/account/ios/identifier/passTypeId/create) page and follow the on-screen instruction to generate your new Pass ID and the corresponding certificates. + +### Download the certificate on your disk + +download the certificate on your disk, as suggested during the generation process, then double-click on it to install in Keychain Access + +### Export certificate + +make sure to select "My Certificates" under "Category", as shown by the screenshot below + +![](/img/configuration/apple-pass/category.png) + +Select your pass from the list + +![](/img/configuration/apple-pass/export.png) + +open context menu, then select "Export Pass ..." and export it as P12 file. +Please make sure to enter a strong password, you'll need it afterwards. + +### Import certificate in alf.io + +open a terminal, go to the folder where the exported P12 is, then execute the following command: + +> $ base64 certificate.p12 + +and copy the output. + +then open you alf.io instance and set the relevant options: + +![](/img/configuration/apple-pass/alfio-options.png) + +that's it! Enjoy Apple (tm) Pass integration! \ No newline at end of file diff --git a/website/content/en/docs/Configuration/Wallet integration/google-wallet.md b/website/content/en/docs/Configuration/Wallet integration/google-wallet.md new file mode 100644 index 0000000000..d362c06eca --- /dev/null +++ b/website/content/en/docs/Configuration/Wallet integration/google-wallet.md @@ -0,0 +1,45 @@ +--- +title: "Google(tm) Wallet Integration" +linkTitle: "Google(tm) Wallet" +weight: 6 +description: > +How to generate Google(tm) passes for your tickets +--- + +## How to configure Google (tm) Wallet integration + +Alf.io supports [Google(tm) Wallet](https://developers.google.com/wallet). Once the integration is active, attendees can save their tickets on Wallet, available on all their devices. + +### Configure and activate your issuer account + +follow steps **1 to 4** of the [Official prerequisites](https://developers.google.com/wallet/tickets/events/web/prerequisites); +Alf.io will take care of generating a wallet class for your event when needed. + +### Configure alf.io to enable Wallet integration + +Go to the system configuration, then find the "Mobile wallet integration" section and fill the required configuration: + +![Configuration for Google Wallet](/img/configuration/google-wallet/001-settings.png) + +#### Enable integration + +This flags allows you to enable/disable the integration with Google (tm) Wallet + +#### Overwrite previous EventClass and EventObject definitions + +Activate this flag if you want to force update on the EventClass. For example, if you change properties that have an impact on the attendees' tickets, like event date, ticket validity and so on + +#### Google Wallet issuer ID + +The issuer ID that you see on the Google Wallet API Dashboard + +#### Google Wallet Service Account Key in JSON format + +The service account key alf.io will use to authenticate against the Wallet API + +1. Follow the [Official guide](https://cloud.google.com/iam/docs/creating-managing-service-account-keys) to generate a new Key for the service account you've previously created. +2. Download the key file as json, open it using a text editor and copy its content +3. Paste the content in the alf.io admin + + +after this configuration, your attendees will be able to save their tickets into Google (tm) Wallet! \ No newline at end of file diff --git a/website/static/img/configuration/google-wallet/001-settings.png b/website/static/img/configuration/google-wallet/001-settings.png new file mode 100644 index 0000000000000000000000000000000000000000..1c6c009db91f855b29cce8882b394c1e0f02e571 GIT binary patch literal 60946 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

mRL;S+7M9Mw3llE0il8cCW{8(npyn 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 HAHDi7&ay5- literal 0 HcmV?d00001 From 0acff7e4a1b64da5619402317c07480f46a2bbe4 Mon Sep 17 00:00:00 2001 From: Celestino Bellone <3385346+cbellone@users.noreply.github.com> Date: Fri, 5 May 2023 16:24:45 +0200 Subject: [PATCH 197/218] remove fake (test) data --- src/main/resources/alfio/templates/invoice.ms | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/alfio/templates/invoice.ms b/src/main/resources/alfio/templates/invoice.ms index 60a7bff427..4fd7ddd1dd 100644 --- a/src/main/resources/alfio/templates/invoice.ms +++ b/src/main/resources/alfio/templates/invoice.ms @@ -264,11 +264,11 @@ - {{ticketReservation.vatNr}} 12345678901 + {{ticketReservation.vatNr}} {{fiscalCode}} {{referenceType}} - {{addresseeCode}}ABCDEFG - {{pec}}celestino.bellone@claranet.com + {{addresseeCode}} + {{pec}} {{/italianEInvoicing}} From 9de1ffc7957f0a299a0afa318ec1beac8c3f8a24 Mon Sep 17 00:00:00 2001 From: Celestino Bellone <3385346+cbellone@users.noreply.github.com> Date: Fri, 5 May 2023 16:44:46 +0200 Subject: [PATCH 198/218] fix wrong title --- src/main/resources/alfio/templates/invoice.ms | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/alfio/templates/invoice.ms b/src/main/resources/alfio/templates/invoice.ms index 4fd7ddd1dd..7eff441859 100644 --- a/src/main/resources/alfio/templates/invoice.ms +++ b/src/main/resources/alfio/templates/invoice.ms @@ -3,7 +3,7 @@ {{#proforma}}{{#i18n}}invoice.proforma [{{vatTranslation}}]{{/i18n}}{{/proforma}} - {{^proforma}}{{#i18n}}invoice.proforma [{{vatTranslation}}]{{/i18n}}{{/proforma}} + {{^proforma}}{{#i18n}}invoice.vat-invoice [{{vatTranslation}}]{{/i18n}}{{/proforma}} From 8a740dc63d38cff2da2d066721bc5a64afa57272 Mon Sep 17 00:00:00 2001 From: Celestino Bellone <3385346+cbellone@users.noreply.github.com> Date: Fri, 5 May 2023 18:38:44 +0200 Subject: [PATCH 199/218] fix google wallet button path --- src/main/resources/alfio/mjml/ticket-email-html.mjml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/alfio/mjml/ticket-email-html.mjml b/src/main/resources/alfio/mjml/ticket-email-html.mjml index c2366fe25f..05e9731990 100644 --- a/src/main/resources/alfio/mjml/ticket-email-html.mjml +++ b/src/main/resources/alfio/mjml/ticket-email-html.mjml @@ -131,7 +131,7 @@ {{#googleWalletEnabled}} - + {{/googleWalletEnabled}} {{#appleWalletEnabled}} From 19072bab9dbd13880d3e2e7b7b2726fd44778be3 Mon Sep 17 00:00:00 2001 From: Celestino Bellone <3385346+cbellone@users.noreply.github.com> Date: Sat, 6 May 2023 16:33:28 +0200 Subject: [PATCH 200/218] case insensitive qr code (#1218) * generate QR Code with case insensitive data * add missing license header * add failing test with UTF-8 chars * better handling of non-ascii characters * add more test cases * add empty migration as marker for enabling the new feature * do not preallocate array since we have few special conditions --- .../controller/OnlineCheckInController.java | 2 +- .../api/v2/user/TicketApiV2Controller.java | 4 +- .../java/alfio/manager/CheckInManager.java | 8 +- .../java/alfio/manager/PassKitManager.java | 2 +- .../manager/wallet/GoogleWalletManager.java | 2 +- src/main/java/alfio/model/Event.java | 5 ++ .../java/alfio/model/EventCheckInInfo.java | 7 ++ src/main/java/alfio/model/Ticket.java | 19 ++++- .../alfio/model/checkin/CheckInFullInfo.java | 3 +- .../model/checkin/EventWithCheckInInfo.java | 11 ++- src/main/java/alfio/util/EventUtil.java | 7 ++ .../java/alfio/util/TemplateResource.java | 2 +- .../alfio/util/checkin/NameNormalizer.java | 42 ++++++++++ .../alfio/util/checkin/TicketCheckInUtil.java | 2 +- ...5_2.0.0.50__QR_CASE_INSENSITIVE_MARKER.sql | 18 +++++ ...checkin_ticket_event_and_category_info.sql | 1 + .../reservation/BaseReservationFlowTest.java | 8 +- src/test/java/alfio/model/TicketTest.java | 79 +++++++++++++++++++ .../alfio/test/util/IntegrationTestUtil.java | 2 + src/test/java/alfio/util/EventUtilTest.java | 2 +- .../java/alfio/util/TemplateResourceTest.java | 7 +- 21 files changed, 207 insertions(+), 26 deletions(-) create mode 100644 src/main/java/alfio/util/checkin/NameNormalizer.java create mode 100644 src/main/resources/alfio/db/PGSQL/V205_2.0.0.50__QR_CASE_INSENSITIVE_MARKER.sql create mode 100644 src/test/java/alfio/model/TicketTest.java diff --git a/src/main/java/alfio/controller/OnlineCheckInController.java b/src/main/java/alfio/controller/OnlineCheckInController.java index 344f31fd79..93408c2120 100644 --- a/src/main/java/alfio/controller/OnlineCheckInController.java +++ b/src/main/java/alfio/controller/OnlineCheckInController.java @@ -58,7 +58,7 @@ public String performCheckIn(@PathVariable("shortName") String eventShortName, .flatMap(data -> { var ticket = data.getTicket(); var event = data.getEventWithCheckInInfo(); - String ticketCode = ticket.ticketCode(event.getPrivateKey()); + String ticketCode = ticket.ticketCode(event.getPrivateKey(), event.supportsQRCodeCaseInsensitive()); if(MessageDigest.isEqual(DigestUtils.sha256Hex(ticketCode).getBytes(StandardCharsets.UTF_8), ticketCodeHash.getBytes(StandardCharsets.UTF_8))) { log.debug("code successfully validated for ticket {}", ticketUUID); // check-in can be done. Let's check if there is a redirection URL diff --git a/src/main/java/alfio/controller/api/v2/user/TicketApiV2Controller.java b/src/main/java/alfio/controller/api/v2/user/TicketApiV2Controller.java index e2bd00e664..21464c8bb4 100644 --- a/src/main/java/alfio/controller/api/v2/user/TicketApiV2Controller.java +++ b/src/main/java/alfio/controller/api/v2/user/TicketApiV2Controller.java @@ -121,7 +121,7 @@ public void showQrCode(@PathVariable("eventName") String eventName, var event = oData.get().getLeft(); var ticket = oData.get().getRight(); - String qrCodeText = ticket.ticketCode(event.getPrivateKey()); + String qrCodeText = ticket.ticketCode(event.getPrivateKey(), event.supportsQRCodeCaseInsensitive()); response.setContentType("image/png"); @@ -314,7 +314,7 @@ public ResponseEntity getCheckInInfo(@PathVariable("eventName var ticket = info.getTicket(); var event = info.getEventWithCheckInInfo(); var messageSource = messageSourceManager.getMessageSourceFor(event.getOrganizationId(), event.getId()); - String ticketCode = ticket.ticketCode(event.getPrivateKey()); + String ticketCode = ticket.ticketCode(event.getPrivateKey(), event.supportsQRCodeCaseInsensitive()); if(MessageDigest.isEqual(DigestUtils.sha256Hex(ticketCode).getBytes(StandardCharsets.UTF_8), checkInCode.getBytes(StandardCharsets.UTF_8))) { var categoryConfiguration = info.getCategoryMetadata().getOnlineConfiguration(); var eventConfiguration = event.getMetadata().getOnlineConfiguration(); diff --git a/src/main/java/alfio/manager/CheckInManager.java b/src/main/java/alfio/manager/CheckInManager.java index 80b4f72cf8..c3ef057f57 100644 --- a/src/main/java/alfio/manager/CheckInManager.java +++ b/src/main/java/alfio/manager/CheckInManager.java @@ -335,7 +335,7 @@ private TicketAndCheckInResult extractStatus(Optional isOfflineCheckInAndLabelPrintingEnabled public Map getEncryptedAttendeesInformation(Event ev, Set additionalFields, List ids) { - return Optional.ofNullable(ev).filter(isOfflineCheckInEnabled()).map(event -> { + boolean caseInsensitiveQRCode = ev.supportsQRCodeCaseInsensitive(); Map categories = ticketCategoryRepository.findByEventIdAsMap(event.getId()); String eventKey = event.getPrivateKey(); - Function hashedHMAC = ticket -> DigestUtils.sha256Hex(ticket.hmacTicketInfo(eventKey)); + Function hashedHMAC = ticket -> DigestUtils.sha256Hex(ticket.hmacTicketInfo(eventKey, caseInsensitiveQRCode)); var outputColorConfiguration = getOutputColorConfiguration(event, configurationManager); // fetch polls for event, in order to determine if we have to print PIN or not @@ -503,7 +503,7 @@ public Map getEncryptedAttendeesInformation(Event ev, Set if(!additionalServicesInfo.isEmpty()) { info.put("additionalServicesInfoJson", Json.toJson(additionalServicesInfo)); } - String key = ticket.ticketCode(eventKey); + String key = ticket.ticketCode(eventKey, caseInsensitiveQRCode); return encrypt(key, Json.toJson(info)); }; return ticketRepository.findAllFullTicketInfoAssignedByEventId(event.getId(), ids) diff --git a/src/main/java/alfio/manager/PassKitManager.java b/src/main/java/alfio/manager/PassKitManager.java index 245022fe6d..3eac1170d9 100644 --- a/src/main/java/alfio/manager/PassKitManager.java +++ b/src/main/java/alfio/manager/PassKitManager.java @@ -189,7 +189,7 @@ private void buildPass(Ticket ticket, .relevantDate(Date.from(ticketValidityStart.toInstant())) .expirationDate(Date.from(Optional.ofNullable(category.getTicketValidityEnd(event.getZoneId())).orElse(event.getEnd()).toInstant())) - .barcode(new Barcode(BarcodeFormat.QR, ticket.ticketCode(event.getPrivateKey()))) + .barcode(new Barcode(BarcodeFormat.QR, ticket.ticketCode(event.getPrivateKey(), event.supportsQRCodeCaseInsensitive()))) .labelColor(Color.BLACK) .foregroundColor(Color.BLACK) .backgroundColor(Color.WHITE) diff --git a/src/main/java/alfio/manager/wallet/GoogleWalletManager.java b/src/main/java/alfio/manager/wallet/GoogleWalletManager.java index b473222fdb..e44def6b50 100644 --- a/src/main/java/alfio/manager/wallet/GoogleWalletManager.java +++ b/src/main/java/alfio/manager/wallet/GoogleWalletManager.java @@ -202,7 +202,7 @@ private String buildWalletPassUrl(Ticket ticket, .classId(eventTicketClass.getId()) .ticketHolderName(ticket.getFullName()) .ticketNumber(ticket.getUuid()) - .barcode(ticket.ticketCode(event.getPrivateKey())) + .barcode(ticket.ticketCode(event.getPrivateKey(), event.supportsQRCodeCaseInsensitive())) .build(); GoogleCredentials credentials = retrieveCredentials(serviceAccountKey); diff --git a/src/main/java/alfio/model/Event.java b/src/main/java/alfio/model/Event.java index a4e0a63c15..251df828cb 100644 --- a/src/main/java/alfio/model/Event.java +++ b/src/main/java/alfio/model/Event.java @@ -18,6 +18,7 @@ import alfio.model.transaction.PaymentProxy; import alfio.util.ClockProvider; +import alfio.util.EventUtil; import alfio.util.MonetaryUtil; import ch.digitalfondue.npjt.ConstructorAnnotationRowMapper.Column; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -252,6 +253,10 @@ public boolean mustUseFirstAndLastName() { return mustUseFirstAndLastName(this); } + public boolean supportsQRCodeCaseInsensitive() { + return EventUtil.supportsCaseInsensitiveQRCode(version); + } + private static boolean mustUseFirstAndLastName(Event event) { return event.getVersion() != null diff --git a/src/main/java/alfio/model/EventCheckInInfo.java b/src/main/java/alfio/model/EventCheckInInfo.java index 4c457386b4..27385c50ba 100644 --- a/src/main/java/alfio/model/EventCheckInInfo.java +++ b/src/main/java/alfio/model/EventCheckInInfo.java @@ -16,14 +16,21 @@ */ package alfio.model; +import com.fasterxml.jackson.annotation.JsonIgnore; + import java.time.ZonedDateTime; public interface EventCheckInInfo extends TimeZoneInfo { + String VERSION_FOR_CODE_CASE_INSENSITIVE = "205.2.0.0.50"; + int getId(); String getPrivateKey(); ZonedDateTime getBegin(); ZonedDateTime getEnd(); Event.EventFormat getFormat(); + @JsonIgnore + boolean supportsQRCodeCaseInsensitive(); + } diff --git a/src/main/java/alfio/model/Ticket.java b/src/main/java/alfio/model/Ticket.java index ce4db455dd..caf9d7377a 100644 --- a/src/main/java/alfio/model/Ticket.java +++ b/src/main/java/alfio/model/Ticket.java @@ -18,6 +18,7 @@ import alfio.model.support.Array; import alfio.util.MonetaryUtil; +import alfio.util.checkin.NameNormalizer; import ch.digitalfondue.npjt.ConstructorAnnotationRowMapper.Column; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Getter; @@ -126,12 +127,12 @@ public boolean getLockedAssignment() { * @param eventKey * @return */ - public String ticketCode(String eventKey) { - return uuid + '/' + hmacTicketInfo(eventKey); + public String ticketCode(String eventKey, boolean caseInsensitive) { + return uuid + '/' + hmacTicketInfo(eventKey, caseInsensitive); } - public String hmacTicketInfo(String eventKey) { - return hmacSHA256Base64(eventKey, StringUtils.join(new String[]{ticketsReservationId , uuid, getFullName(), email}, '/')); + public String hmacTicketInfo(String eventKey, boolean caseInsensitive) { + return generateHmacTicketInfo(eventKey, caseInsensitive, getFullName(), email, ticketsReservationId, uuid); } public boolean hasBeenSold() { @@ -143,6 +144,16 @@ public boolean isCheckedIn() { return status == TicketStatus.CHECKED_IN; } + static String generateHmacTicketInfo(String eventKey, boolean caseInsensitive, String fullName, String email, String ticketsReservationId, String uuid) { + var attendeeName = fullName; + var attendeeEmail = email; + if (caseInsensitive) { + attendeeName = NameNormalizer.normalize(attendeeName); + attendeeEmail = email.toLowerCase(Locale.ROOT); + } + return hmacSHA256Base64(eventKey, StringUtils.join(new String[]{ticketsReservationId , uuid, attendeeName, attendeeEmail}, '/')); + } + public static String hmacSHA256Base64(String key, String code) { return Base64.getEncoder().encodeToString(new HmacUtils(HmacAlgorithms.HMAC_SHA_256, key).hmac(code)); } diff --git a/src/main/java/alfio/model/checkin/CheckInFullInfo.java b/src/main/java/alfio/model/checkin/CheckInFullInfo.java index bf576b36f3..569d59fcaf 100644 --- a/src/main/java/alfio/model/checkin/CheckInFullInfo.java +++ b/src/main/java/alfio/model/checkin/CheckInFullInfo.java @@ -138,6 +138,7 @@ public CheckInFullInfo(@Column("t_id") int id, @Column("e_org_id") int eventOrgId, @Column("e_metadata") @JSONData AlfioMetadata eventMetadata, @Column("e_locales") int locales, + @Column("e_version") String eventVersion, @Column("tai_additional_info") @JSONData Map> ticketAdditionalInfo ) { @@ -155,7 +156,7 @@ public CheckInFullInfo(@Column("t_id") int id, this.categoryMetadata = categoryMetadata; this.billingDetails = new BillingDetails(billingAddressCompany, billingAddressLine1, billingAddressLine2, billingAddressZip, billingAddressCity, billingAddressState, vatCountry, vatNr, invoicingAdditionalInfo); - this.eventWithCheckInInfo = new EventWithCheckInInfo(eventId, eventFormat, eventShortName, eventDisplayName, eventStartTs, eventEndTs, timezone, eventPrivateKey, eventOrgId, eventMetadata, locales); + this.eventWithCheckInInfo = new EventWithCheckInInfo(eventId, eventFormat, eventShortName, eventDisplayName, eventStartTs, eventEndTs, timezone, eventPrivateKey, eventOrgId, eventMetadata, locales, eventVersion); this.ticketAdditionalInfo = ticketAdditionalInfo; } } diff --git a/src/main/java/alfio/model/checkin/EventWithCheckInInfo.java b/src/main/java/alfio/model/checkin/EventWithCheckInInfo.java index 48d1b30ffa..fa5f4f793d 100644 --- a/src/main/java/alfio/model/checkin/EventWithCheckInInfo.java +++ b/src/main/java/alfio/model/checkin/EventWithCheckInInfo.java @@ -19,6 +19,7 @@ import alfio.model.*; import alfio.model.metadata.AlfioMetadata; import alfio.model.support.JSONData; +import alfio.util.EventUtil; import lombok.Getter; import org.apache.commons.lang3.tuple.Pair; @@ -41,6 +42,7 @@ public class EventWithCheckInInfo extends EventAndOrganizationId implements Even private final String privateKey; private final AlfioMetadata metadata; private final List contentLanguages; + private final String version; public EventWithCheckInInfo(@Column("id") int id, @@ -53,7 +55,8 @@ public EventWithCheckInInfo(@Column("id") int id, @Column("private_key") String privateKey, @Column("org_id") int organizationId, @Column("metadata") @JSONData AlfioMetadata metadata, - @Column("locales") int locales) { + @Column("locales") int locales, + @Column("version") String version) { super(id, organizationId); this.zoneId = ZoneId.of(timezone); this.format = format; @@ -64,6 +67,7 @@ public EventWithCheckInInfo(@Column("id") int id, this.privateKey = privateKey; this.metadata = metadata; this.contentLanguages = ContentLanguage.findAllFor(locales); + this.version = version; } public boolean isOnline() { @@ -94,4 +98,9 @@ public BigDecimal getVat() { public List getContentLanguages() { return contentLanguages; } + + @Override + public boolean supportsQRCodeCaseInsensitive() { + return EventUtil.supportsCaseInsensitiveQRCode(version); + } } diff --git a/src/main/java/alfio/util/EventUtil.java b/src/main/java/alfio/util/EventUtil.java index 82c4817783..ff97040179 100644 --- a/src/main/java/alfio/util/EventUtil.java +++ b/src/main/java/alfio/util/EventUtil.java @@ -37,6 +37,7 @@ import org.apache.commons.lang3.RegExUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.flywaydb.core.api.MigrationVersion; import org.springframework.jdbc.core.namedparam.MapSqlParameterSource; import org.springframework.web.util.UriComponentsBuilder; @@ -54,6 +55,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; +import static alfio.model.EventCheckInInfo.VERSION_FOR_CODE_CASE_INSENSITIVE; import static alfio.model.TicketFieldConfiguration.Context.ATTENDEE; import static alfio.model.system.ConfigurationKeys.*; import static java.time.temporal.ChronoField.*; @@ -288,4 +290,9 @@ public static String getLocalizedMessage(Map messagesByLang, Str return messagesByLang.values().stream().findFirst().orElseThrow(); } + + public static boolean supportsCaseInsensitiveQRCode(String version) { + return version != null + && MigrationVersion.fromVersion(version).compareTo(MigrationVersion.fromVersion(VERSION_FOR_CODE_CASE_INSENSITIVE)) >= 0; + } } diff --git a/src/main/java/alfio/util/TemplateResource.java b/src/main/java/alfio/util/TemplateResource.java index 182fcccca1..af9ec810d5 100644 --- a/src/main/java/alfio/util/TemplateResource.java +++ b/src/main/java/alfio/util/TemplateResource.java @@ -594,7 +594,7 @@ public static Map buildModelForTicketPDF(Organization organizati Optional imageData, String reservationId, Map additionalFields) { - String qrCodeText = ticketWithMetadata.getTicket().ticketCode(event.getPrivateKey()); + String qrCodeText = ticketWithMetadata.getTicket().ticketCode(event.getPrivateKey(), event.supportsQRCodeCaseInsensitive()); // Map model = new HashMap<>(); model.put(TICKET_KEY, ticketWithMetadata.getTicket()); diff --git a/src/main/java/alfio/util/checkin/NameNormalizer.java b/src/main/java/alfio/util/checkin/NameNormalizer.java new file mode 100644 index 0000000000..d24fd64781 --- /dev/null +++ b/src/main/java/alfio/util/checkin/NameNormalizer.java @@ -0,0 +1,42 @@ +/** + * This file is part of alf.io. + * + * alf.io is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * alf.io is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with alf.io. If not, see . + */ +package alfio.util.checkin; + +// heavily inspired by https://stackoverflow.com/a/5470803 +public class NameNormalizer { + + private NameNormalizer() {} + + public static String normalize(String input) { + StringBuilder sb = new StringBuilder(input.length()); + for (int i=0; i < input.length(); i++) { + sb.append(replaceCharIfNotSupported(input.charAt(i))); + } + return sb.toString(); + } + + private static String replaceCharIfNotSupported(char in) { + if (in == 'Σ') { + return "σς"; + } + char lowercase = Character.toLowerCase(in); + if (lowercase == 'ı') { + return "i"; // special case: we render the turkish ı as i since its uppercase is represented as Latin I + } + return Character.toString(lowercase); + } +} diff --git a/src/main/java/alfio/util/checkin/TicketCheckInUtil.java b/src/main/java/alfio/util/checkin/TicketCheckInUtil.java index c23e9f066c..cf2791d818 100644 --- a/src/main/java/alfio/util/checkin/TicketCheckInUtil.java +++ b/src/main/java/alfio/util/checkin/TicketCheckInUtil.java @@ -40,7 +40,7 @@ private TicketCheckInUtil() { } public static String ticketOnlineCheckInUrl(Event event, Ticket ticket, String baseUrl) { - var ticketCode = DigestUtils.sha256Hex(ticket.ticketCode(event.getPrivateKey())); + var ticketCode = DigestUtils.sha256Hex(ticket.ticketCode(event.getPrivateKey(), event.supportsQRCodeCaseInsensitive())); return StringUtils.removeEnd(baseUrl, "/") + "/event/" + event.getShortName() + "/ticket/" + ticket.getUuid() + "/check-in/"+ticketCode; } diff --git a/src/main/resources/alfio/db/PGSQL/V205_2.0.0.50__QR_CASE_INSENSITIVE_MARKER.sql b/src/main/resources/alfio/db/PGSQL/V205_2.0.0.50__QR_CASE_INSENSITIVE_MARKER.sql new file mode 100644 index 0000000000..94592f8317 --- /dev/null +++ b/src/main/resources/alfio/db/PGSQL/V205_2.0.0.50__QR_CASE_INSENSITIVE_MARKER.sql @@ -0,0 +1,18 @@ +-- +-- This file is part of alf.io. +-- +-- alf.io is free software: you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as published by +-- the Free Software Foundation, either version 3 of the License, or +-- (at your option) any later version. +-- +-- alf.io is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with alf.io. If not, see . +-- + +-- this is only meant to be a marker and act as a baseline for applying the new "case insensitive" QR Code generation \ No newline at end of file diff --git a/src/main/resources/alfio/db/PGSQL/afterMigrate__009_VIEW_checkin_ticket_event_and_category_info.sql b/src/main/resources/alfio/db/PGSQL/afterMigrate__009_VIEW_checkin_ticket_event_and_category_info.sql index eab5f41e4e..7d4511e156 100644 --- a/src/main/resources/alfio/db/PGSQL/afterMigrate__009_VIEW_checkin_ticket_event_and_category_info.sql +++ b/src/main/resources/alfio/db/PGSQL/afterMigrate__009_VIEW_checkin_ticket_event_and_category_info.sql @@ -121,6 +121,7 @@ create view checkin_ticket_event_and_category_info as e.metadata e_metadata, e.org_id e_org_id, e.locales e_locales, + e.version e_version, (select jsonb_object_agg(tfc.field_name, case tfc.field_type when 'checkbox' then tfv.field_value::jsonb else jsonb_build_array(tfv.field_value) end) as additional_info from ticket_field_value tfv inner join ticket_field_configuration tfc on tfv.ticket_field_configuration_id_fk = tfc.id diff --git a/src/test/java/alfio/controller/api/v2/user/reservation/BaseReservationFlowTest.java b/src/test/java/alfio/controller/api/v2/user/reservation/BaseReservationFlowTest.java index 3adb2a4845..7313084ddc 100644 --- a/src/test/java/alfio/controller/api/v2/user/reservation/BaseReservationFlowTest.java +++ b/src/test/java/alfio/controller/api/v2/user/reservation/BaseReservationFlowTest.java @@ -39,7 +39,6 @@ import alfio.manager.*; import alfio.manager.support.CheckInStatus; import alfio.manager.support.IncompatibleStateException; -import alfio.manager.support.SponsorAttendeeData; import alfio.manager.support.TicketAndCheckInResult; import alfio.manager.support.extension.ExtensionEvent; import alfio.model.*; @@ -1024,7 +1023,7 @@ protected void testBasicFlow(Supplier contextSupplier) t var fullTicketInfo = ticketRepository.findByUUID(ticket.getUuid()); var qrCodeReader = new QRCodeReader(); var qrCodeRead = qrCodeReader.decode(new BinaryBitmap(new HybridBinarizer(new BufferedImageLuminanceSource(ImageIO.read(new ByteArrayInputStream(ticketQRCodeResp.getContentAsByteArray()))))), Map.of(DecodeHintType.PURE_BARCODE, Boolean.TRUE)); - assertEquals(fullTicketInfo.ticketCode(context.event.getPrivateKey()), qrCodeRead.getText()); + assertEquals(fullTicketInfo.ticketCode(context.event.getPrivateKey(), context.event.supportsQRCodeCaseInsensitive()), qrCodeRead.getText()); //can only be done for free tickets var releaseTicketFailure = ticketApiV2Controller.releaseTicket(context.event.getShortName(), ticket.getUuid()); @@ -1073,7 +1072,7 @@ protected void testBasicFlow(Supplier contextSupplier) t break; } - String ticketCode = fullTicketInfo.ticketCode(context.event.getPrivateKey()); + String ticketCode = fullTicketInfo.ticketCode(context.event.getPrivateKey(), context.event.supportsQRCodeCaseInsensitive()); TicketAndCheckInResult ticketAndCheckInResult = checkInApiController.findTicketWithUUID(context.event.getId(), ticketIdentifier, ticketCode); assertEquals(CheckInStatus.OK_READY_TO_BE_CHECKED_IN, ticketAndCheckInResult.getResult().getStatus()); CheckInApiController.TicketCode tc = new CheckInApiController.TicketCode(); @@ -1443,7 +1442,8 @@ private TicketWithCategory testEncryptedCheckInPayload(Principal principal, Map payload = checkInApiController.getOfflineEncryptedInfo(context.event.getShortName(), Collections.emptyList(), offlineIdentifiers, principal); assertEquals(1, payload.size()); TicketWithCategory ticketwc = ticketAndcheckInResult.getTicket(); - String ticketKey = ticketwc.hmacTicketInfo(context.event.getPrivateKey()); + String ticketKey = ticketwc.hmacTicketInfo(context.event.getPrivateKey(), true); + assertNotEquals(ticketKey, ticketwc.hmacTicketInfo(context.event.getPrivateKey(), false)); String hashedTicketKey = DigestUtils.sha256Hex(ticketKey); String encJson = payload.get(hashedTicketKey); assertNotNull(encJson); diff --git a/src/test/java/alfio/model/TicketTest.java b/src/test/java/alfio/model/TicketTest.java new file mode 100644 index 0000000000..fd2c5d43c9 --- /dev/null +++ b/src/test/java/alfio/model/TicketTest.java @@ -0,0 +1,79 @@ +/** + * This file is part of alf.io. + * + * alf.io is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * alf.io is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with alf.io. If not, see . + */ +package alfio.model; + +import alfio.util.checkin.NameNormalizer; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ValueSource; + +import java.util.Arrays; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +class TicketTest { + + @ParameterizedTest + @ValueSource(booleans = {true, false}) + void ticketCode(boolean caseInsensitive) { + var fullName = "Full Name"; + var email = "email@example.org"; + var regularCase = Ticket.generateHmacTicketInfo("eventKey", caseInsensitive, fullName, email, "id", "uuid"); + var modifiedCase = Ticket.generateHmacTicketInfo("eventKey", caseInsensitive, fullName.toUpperCase(), email.toUpperCase(), "id", "uuid"); + assertEquals(caseInsensitive, regularCase.equals(modifiedCase)); + } + + @ParameterizedTest + @ValueSource(strings = { + // format: UPPERCASE/lowercase,UPPERCASE/lowercase... + "A/a,B/b,C/c,D/d,E/e,F/f,G/g,H/h,I/i,J/j,K/k,L/l,M/m,N/n,O/o,P/p,Q/q,R/r,S/s,T/t,U/u,V/v,W/w,X/x,Y/y,Z/z", + "Α/α,Β/β,Γ/γ,Δ/δ,Ε/ε,Ζ/ζ,Η/η,Θ/θ,Ι/ι,Κ/κ,Λ/λ,Μ/μ,Ν/ν,Ξ/ξ,Ο/ο,Π/π,Ρ/ρ,Σ/σς,Τ/τ,Υ/υ,Φ/φ,Χ/χ,Ψ/ψ,Ω/ω", //greek, https://en.wikipedia.org/wiki/Greek_alphabet + "Ç/ç,Ğ/ğ,I/i,İ/i,J/j,Ö/ö,Ş/ş,Ü/ü", // turkish https://en.wikipedia.org/wiki/Turkish_alphabet, except character ı, see NameNormalizer + "А/а,Б/б,В/в,Г/г,Д/д,Е/е,Ж/ж,З/з,И/и,Й/й,К/к,Л/л,М/м,Н/н,О/о,П/п,Р/р,С/с,Т/т,У/у,Ф/ф,Х/х,Ц/ц,Ч/ч,Ш/ш,Щ/щ,Ъ/ъ,Ь/ь,Ю/ю,Я/я", // bulgarian, https://en.wikipedia.org/wiki/Bulgarian_alphabet + "Å/å,Ä/ä,Ö/ö", // Swedish https://en.wikipedia.org/wiki/Swedish_alphabet + "Ă/ă,Â/â,I/i,Î/î,Ș/ș,Ț/ț", // Romanian https://en.wikipedia.org/wiki/Romanian_alphabet + "Ä/ä,Ö/ö,Ü/ü,ẞ/ß", // German https://en.wikipedia.org/wiki/German_orthography + "Æ/æ,Ø/ø,Å/å", //Danish / Norwegian https://en.wikipedia.org/wiki/Danish_and_Norwegian_alphabet + "Ą/ą,Ć/ć,Ę/ę,Ł/ł,Ń/ń,Ó/ó,Ś/ś,Ź/ź,Ż/ż", // Polish https://en.wikipedia.org/wiki/Polish_alphabet + "À/à,È/è,É/é,Ì/ì,Ò/ò,Ù/ù", // Italian / French vowels + "万/万,丈/丈,三/三,上/上", // some random characters with no support for lowerCase + "❤/❤,✅/✅" // emojis + }) + void validateCase(String letters) { + var uppercase = new StringBuilder(); + var lowercase = new StringBuilder(); + Arrays.stream(letters.split(",")).forEach(str -> { + var split = str.split("/"); + uppercase.append(split[0]); + lowercase.append(split[1]); + }); + assertEquals(lowercase.toString(), NameNormalizer.normalize(uppercase.toString())); + var unmodifiedLowercase = Ticket.generateHmacTicketInfo("eventKey", false, lowercase.toString(), "mail@example.org", "id", "uuid"); + var processedUppercase = Ticket.generateHmacTicketInfo("eventKey", true, uppercase.toString(), "mail@example.org", "id", "uuid"); + assertEquals(unmodifiedLowercase, processedUppercase); + } + + @ParameterizedTest + @ValueSource(booleans = {true, false}) + void ticketCodeUTF8Chars(boolean caseInsensitive) { + var fullName = "çÇĞğIıİiÖöŞşÜüΑ"; + var fullNameSwappedCase = "ÇçğĞıIiİöÖşŞüÜα"; + var email = "email@example.org"; + var regularCase = Ticket.generateHmacTicketInfo("eventKey", caseInsensitive, fullName, email, "id", "uuid"); + var modifiedCase = Ticket.generateHmacTicketInfo("eventKey", caseInsensitive, fullNameSwappedCase, email.toUpperCase(), "id", "uuid"); + assertEquals(caseInsensitive, regularCase.equals(modifiedCase)); + } +} \ No newline at end of file diff --git a/src/test/java/alfio/test/util/IntegrationTestUtil.java b/src/test/java/alfio/test/util/IntegrationTestUtil.java index 8dbd5d1207..fba777305b 100644 --- a/src/test/java/alfio/test/util/IntegrationTestUtil.java +++ b/src/test/java/alfio/test/util/IntegrationTestUtil.java @@ -139,6 +139,8 @@ public static Pair initEvent(List cat eventManager.createEvent(em, username); Event event = eventManager.getSingleEvent(eventName, username); Assertions.assertEquals(AVAILABLE_SEATS, eventRepository.countExistingTickets(event.getId()).intValue()); + Assertions.assertTrue(event.mustUseFirstAndLastName()); + Assertions.assertTrue(event.supportsQRCodeCaseInsensitive()); return Pair.of(event, username); } diff --git a/src/test/java/alfio/util/EventUtilTest.java b/src/test/java/alfio/util/EventUtilTest.java index 3e50336b5f..19fbef4cb2 100644 --- a/src/test/java/alfio/util/EventUtilTest.java +++ b/src/test/java/alfio/util/EventUtilTest.java @@ -44,7 +44,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -public class EventUtilTest { +class EventUtilTest { private Event event; private SaleableTicketCategory first; diff --git a/src/test/java/alfio/util/TemplateResourceTest.java b/src/test/java/alfio/util/TemplateResourceTest.java index b32b61e6ed..283be561e0 100644 --- a/src/test/java/alfio/util/TemplateResourceTest.java +++ b/src/test/java/alfio/util/TemplateResourceTest.java @@ -30,8 +30,7 @@ import static alfio.test.util.TestUtil.clockProvider; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -65,7 +64,7 @@ void buildModelForTicketEmail() { @Test void buildModelForTicketPDF() { Pair dates = getDates(); - when(ticket.ticketCode(anyString())).thenReturn("abcd"); + when(ticket.ticketCode(anyString(), anyBoolean())).thenReturn("abcd"); when(event.getPrivateKey()).thenReturn("key"); Map model = TemplateResource.buildModelForTicketPDF(organization, event, ticketReservation, ticketCategory, ticketWithMetadata, Optional.empty(), "abcd", Collections.emptyMap()); assertEquals(dates.getLeft(), model.get("validityStart")); @@ -81,7 +80,7 @@ private Pair getDates() { when(event.getZoneId()).thenReturn(ZoneId.systemDefault()); when(event.getEnd()).thenReturn(eventEnd); when(ticketCategory.getTicketValidityStart(eq(ZoneId.systemDefault()))).thenReturn(validityStart); - when(ticket.ticketCode(anyString())).thenReturn("abcd"); + when(ticket.ticketCode(anyString(), anyBoolean())).thenReturn("abcd"); return Pair.of(validityStart, eventEnd); } From ec0549e9c37dffa344072b2923ff2a8b484c5818 Mon Sep 17 00:00:00 2001 From: Celestino Bellone <3385346+cbellone@users.noreply.github.com> Date: Mon, 8 May 2023 18:51:22 +0200 Subject: [PATCH 201/218] fix failing tests --- src/test/java/alfio/TestConfiguration.java | 5 - src/test/resources/api/descriptor.json | 4598 ++++++++++---------- 2 files changed, 2338 insertions(+), 2265 deletions(-) diff --git a/src/test/java/alfio/TestConfiguration.java b/src/test/java/alfio/TestConfiguration.java index 83b09b3f25..ac8089c2f3 100644 --- a/src/test/java/alfio/TestConfiguration.java +++ b/src/test/java/alfio/TestConfiguration.java @@ -61,11 +61,6 @@ ConfigurationManager configurationManager(ConfigurationRepository configurationR cache); } - @Bean - ObjectMapper objectMapper() { - return BaseConfiguration.buildObjectMapper(); - } - @Bean CsrfTokenRepository csrfTokenRepository() { return new CookieCsrfTokenRepository(); diff --git a/src/test/resources/api/descriptor.json b/src/test/resources/api/descriptor.json index f0aae51711..fcd55ce4aa 100644 --- a/src/test/resources/api/descriptor.json +++ b/src/test/resources/api/descriptor.json @@ -49,8 +49,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -59,8 +59,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -130,8 +130,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -140,8 +140,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -201,8 +201,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -211,8 +211,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -268,8 +268,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -278,8 +278,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -334,8 +334,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -344,8 +344,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -412,8 +412,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -422,8 +422,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -486,8 +486,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -496,8 +496,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -568,8 +568,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -578,8 +578,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -650,8 +650,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -660,8 +660,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -722,8 +722,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -732,8 +732,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -796,8 +796,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -806,8 +806,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -854,8 +854,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -864,8 +864,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -910,8 +910,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -920,8 +920,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -991,8 +991,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -1001,8 +1001,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -1082,8 +1082,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -1092,8 +1092,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -1163,8 +1163,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -1173,8 +1173,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -1252,8 +1252,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -1262,8 +1262,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -1339,8 +1339,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -1349,8 +1349,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -1413,8 +1413,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -1423,8 +1423,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -1492,8 +1492,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -1502,8 +1502,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -1558,8 +1558,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -1568,8 +1568,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -1632,8 +1632,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -1642,8 +1642,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -1706,8 +1706,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -1716,8 +1716,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -1780,8 +1780,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -1790,8 +1790,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -1862,8 +1862,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -1872,8 +1872,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -1944,8 +1944,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -1954,8 +1954,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -2012,8 +2012,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -2022,8 +2022,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -2086,8 +2086,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -2096,8 +2096,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -2155,8 +2155,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -2165,8 +2165,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -2232,8 +2232,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -2242,8 +2242,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -2320,8 +2320,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -2330,8 +2330,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -2393,8 +2393,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -2403,8 +2403,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -2468,8 +2468,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -2478,8 +2478,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -2526,8 +2526,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -2536,8 +2536,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -2592,8 +2592,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -2602,8 +2602,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -2665,8 +2665,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -2675,8 +2675,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -2746,8 +2746,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -2756,8 +2756,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -2804,8 +2804,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -2814,8 +2814,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -2870,8 +2870,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -2880,8 +2880,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -2926,8 +2926,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -2936,8 +2936,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -2984,8 +2984,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -2994,8 +2994,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -3050,8 +3050,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -3060,8 +3060,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -3114,8 +3114,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -3124,8 +3124,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -3205,8 +3205,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -3215,8 +3215,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -3296,8 +3296,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -3306,8 +3306,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -3376,8 +3376,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -3386,8 +3386,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -3456,8 +3456,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -3466,8 +3466,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -3522,8 +3522,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -3532,8 +3532,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -3588,8 +3588,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -3598,8 +3598,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -3664,8 +3664,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -3674,8 +3674,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -3730,8 +3730,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -3740,8 +3740,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -3811,8 +3811,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -3821,8 +3821,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -3875,8 +3875,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -3885,8 +3885,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -3941,8 +3941,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -3951,8 +3951,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -4022,8 +4022,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -4032,8 +4032,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -4086,8 +4086,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -4096,8 +4096,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -4162,8 +4162,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -4172,8 +4172,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -4235,8 +4235,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -4245,8 +4245,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -4318,8 +4318,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -4328,8 +4328,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -4402,8 +4402,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -4412,8 +4412,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -4478,8 +4478,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -4488,8 +4488,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -4545,8 +4545,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -4555,8 +4555,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -4620,8 +4620,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -4630,8 +4630,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -4685,8 +4685,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -4695,8 +4695,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -4746,8 +4746,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -4756,8 +4756,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -4823,8 +4823,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -4833,8 +4833,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -4890,8 +4890,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -4900,8 +4900,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -4971,8 +4971,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -4981,8 +4981,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -5050,8 +5050,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -5060,8 +5060,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -5118,8 +5118,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -5128,8 +5128,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -5194,8 +5194,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -5204,8 +5204,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -5260,8 +5260,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -5270,8 +5270,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -5336,8 +5336,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -5346,8 +5346,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -5404,8 +5404,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -5414,8 +5414,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -5643,8 +5643,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -5653,8 +5653,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -5722,8 +5722,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -5732,8 +5732,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -5791,8 +5791,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -5801,8 +5801,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -5868,8 +5868,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -5878,8 +5878,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -5953,8 +5953,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -5963,8 +5963,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -6019,8 +6019,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -6029,8 +6029,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -6093,8 +6093,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -6103,8 +6103,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -6169,8 +6169,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -6179,8 +6179,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -6237,8 +6237,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -6247,8 +6247,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -6305,8 +6305,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -6315,8 +6315,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -6373,8 +6373,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -6383,8 +6383,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -6434,8 +6434,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -6444,8 +6444,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -6783,16 +6783,6 @@ } } }, - "400" : { - "description" : "Bad Request", - "content" : { - "*/*" : { - "schema" : { - "type" : "string" - } - } - } - }, "401" : { "description" : "Unauthorized", "content" : { @@ -6803,75 +6793,6 @@ } } }, - "200" : { - "description" : "OK", - "content" : { - "*/*" : { - "schema" : { - "$ref" : "#/components/schemas/ResultTicketReservationDescriptor" - } - } - } - } - } - }, - "post" : { - "tags" : [ "admin-reservation-api-controller" ], - "operationId" : "updateReservation", - "parameters" : [ { - "name" : "purchaseContextType", - "in" : "path", - "required" : true, - "schema" : { - "type" : "string", - "enum" : [ "subscription", "event" ] - } - }, { - "name" : "publicIdentifier", - "in" : "path", - "required" : true, - "schema" : { - "type" : "string" - } - }, { - "name" : "reservationId", - "in" : "path", - "required" : true, - "schema" : { - "type" : "string" - } - } ], - "requestBody" : { - "content" : { - "application/json" : { - "schema" : { - "$ref" : "#/components/schemas/AdminReservationModification" - } - } - }, - "required" : true - }, - "responses" : { - "500" : { - "description" : "Internal Server Error", - "content" : { - "*/*" : { - "schema" : { - "type" : "string" - } - } - } - }, - "405" : { - "description" : "Method Not Allowed", - "content" : { - "*/*" : { - "schema" : { - "type" : "string" - } - } - } - }, "400" : { "description" : "Bad Request", "content" : { @@ -6882,33 +6803,21 @@ } } }, - "401" : { - "description" : "Unauthorized", - "content" : { - "*/*" : { - "schema" : { - "type" : "string" - } - } - } - }, "200" : { "description" : "OK", "content" : { "*/*" : { "schema" : { - "$ref" : "#/components/schemas/ResultBoolean" + "$ref" : "#/components/schemas/ResultTicketReservationDescriptor" } } } } } - } - }, - "/admin/api/reservation/{purchaseContextType}/{publicIdentifier}/{reservationId}/refund" : { + }, "post" : { "tags" : [ "admin-reservation-api-controller" ], - "operationId" : "refund", + "operationId" : "updateReservation", "parameters" : [ { "name" : "purchaseContextType", "in" : "path", @@ -6936,7 +6845,7 @@ "content" : { "application/json" : { "schema" : { - "$ref" : "#/components/schemas/RefundAmount" + "$ref" : "#/components/schemas/AdminReservationModification" } } }, @@ -6963,6 +6872,16 @@ } } }, + "401" : { + "description" : "Unauthorized", + "content" : { + "*/*" : { + "schema" : { + "type" : "string" + } + } + } + }, "400" : { "description" : "Bad Request", "content" : { @@ -6973,6 +6892,77 @@ } } }, + "200" : { + "description" : "OK", + "content" : { + "*/*" : { + "schema" : { + "$ref" : "#/components/schemas/ResultBoolean" + } + } + } + } + } + } + }, + "/admin/api/reservation/{purchaseContextType}/{publicIdentifier}/{reservationId}/refund" : { + "post" : { + "tags" : [ "admin-reservation-api-controller" ], + "operationId" : "refund", + "parameters" : [ { + "name" : "purchaseContextType", + "in" : "path", + "required" : true, + "schema" : { + "type" : "string", + "enum" : [ "subscription", "event" ] + } + }, { + "name" : "publicIdentifier", + "in" : "path", + "required" : true, + "schema" : { + "type" : "string" + } + }, { + "name" : "reservationId", + "in" : "path", + "required" : true, + "schema" : { + "type" : "string" + } + } ], + "requestBody" : { + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/RefundAmount" + } + } + }, + "required" : true + }, + "responses" : { + "500" : { + "description" : "Internal Server Error", + "content" : { + "*/*" : { + "schema" : { + "type" : "string" + } + } + } + }, + "405" : { + "description" : "Method Not Allowed", + "content" : { + "*/*" : { + "schema" : { + "type" : "string" + } + } + } + }, "401" : { "description" : "Unauthorized", "content" : { @@ -6983,6 +6973,16 @@ } } }, + "400" : { + "description" : "Bad Request", + "content" : { + "*/*" : { + "schema" : { + "type" : "string" + } + } + } + }, "200" : { "description" : "OK", "content" : { @@ -7059,8 +7059,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -7069,8 +7069,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -7163,8 +7163,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -7173,8 +7173,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -7247,8 +7247,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -7257,8 +7257,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -7330,8 +7330,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -7340,8 +7340,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -7398,8 +7398,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -7408,8 +7408,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -7468,8 +7468,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -7478,8 +7478,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -7526,8 +7526,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -7536,8 +7536,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -7586,8 +7586,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -7596,8 +7596,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -7622,7 +7622,7 @@ "required" : true, "schema" : { "type" : "string", - "enum" : [ "GOOGLE_ANALYTICS", "CONFIRMATION_EMAIL_FOR_ORGANIZER", "SEND_RESERVED_CODE", "CONFIRMATION_EMAIL", "CONFIRMATION_EMAIL_SUBSCRIPTION", "OFFLINE_RESERVATION_EXPIRED_EMAIL", "CHARGE_ATTEMPT_FAILED_EMAIL", "CHARGE_ATTEMPT_FAILED_EMAIL_FOR_ORGANIZER", "CREDIT_NOTE_ISSUED_EMAIL", "OFFLINE_RESERVATION_EXPIRING_EMAIL_FOR_ORGANIZER", "OFFLINE_PAYMENT_MATCHES_FOUND", "REMINDER_EMAIL", "REMINDER_TICKET_ADDITIONAL_INFO", "REMINDER_TICKETS_ASSIGNMENT_EMAIL", "TICKET_EMAIL", "TICKET_EMAIL_FOR_ONLINE_EVENT", "TICKET_HAS_CHANGED_OWNER", "TICKET_HAS_BEEN_CANCELLED", "TICKET_HAS_BEEN_CANCELLED_ADMIN", "TICKET_PDF", "RECEIPT_PDF", "INVOICE_PDF", "CREDIT_NOTE_PDF", "SUBSCRIPTION_PDF", "WAITING_QUEUE_JOINED", "WAITING_QUEUE_RESERVATION_EMAIL" ] + "enum" : [ "GOOGLE_ANALYTICS", "CONFIRMATION_EMAIL_FOR_ORGANIZER", "SEND_RESERVED_CODE", "CONFIRMATION_EMAIL", "CONFIRMATION_EMAIL_SUBSCRIPTION", "OFFLINE_RESERVATION_EXPIRED_EMAIL", "CHARGE_ATTEMPT_FAILED_EMAIL", "CHARGE_ATTEMPT_FAILED_EMAIL_FOR_ORGANIZER", "CREDIT_NOTE_ISSUED_EMAIL", "OFFLINE_RESERVATION_EXPIRING_EMAIL_FOR_ORGANIZER", "OFFLINE_PAYMENT_MATCHES_FOUND", "REMINDER_EMAIL", "REMINDER_TICKET_ADDITIONAL_INFO", "REMINDER_TICKETS_ASSIGNMENT_EMAIL", "TICKET_EMAIL", "TICKET_EMAIL_FOR_ONLINE_EVENT", "TICKET_HAS_CHANGED_OWNER", "TICKET_HAS_BEEN_CANCELLED", "TICKET_HAS_BEEN_CANCELLED_ADMIN", "TICKET_PDF", "RECEIPT_PDF", "INVOICE_PDF", "CREDIT_NOTE_PDF", "SUBSCRIPTION_PDF", "WAITING_QUEUE_JOINED", "WAITING_QUEUE_RESERVATION_EMAIL", "CUSTOM_MESSAGE" ] } }, { "name" : "locale", @@ -7748,8 +7748,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -7758,8 +7758,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -7816,8 +7816,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -7826,8 +7826,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -7884,8 +7884,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -7894,8 +7894,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -7952,8 +7952,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -7962,8 +7962,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -8027,8 +8027,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -8037,8 +8037,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -8110,8 +8110,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -8120,8 +8120,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -8184,8 +8184,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -8194,8 +8194,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -8254,8 +8254,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -8264,8 +8264,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -8563,8 +8563,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -8573,8 +8573,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -8621,8 +8621,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -8631,8 +8631,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -8690,8 +8690,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -8700,8 +8700,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -8763,8 +8763,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -8773,8 +8773,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -8844,8 +8844,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -8854,8 +8854,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -8915,8 +8915,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -8925,8 +8925,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -8988,8 +8988,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -8998,8 +8998,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -9052,8 +9052,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -9062,8 +9062,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -9132,8 +9132,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -9142,8 +9142,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -9205,8 +9205,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -9215,8 +9215,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -9275,8 +9275,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -9285,8 +9285,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -9352,8 +9352,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -9362,8 +9362,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -9425,8 +9425,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -9435,8 +9435,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -9501,8 +9501,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -9511,8 +9511,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -9761,8 +9761,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -9771,8 +9771,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -9845,8 +9845,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -9855,8 +9855,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -9935,8 +9935,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -9945,8 +9945,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -10019,8 +10019,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -10029,8 +10029,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -10084,8 +10084,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -10094,8 +10094,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -10159,8 +10159,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -10169,8 +10169,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -10234,8 +10234,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -10244,8 +10244,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -10303,8 +10303,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -10313,8 +10313,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -10374,8 +10374,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -10384,8 +10384,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -10452,8 +10452,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -10462,8 +10462,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -10529,8 +10529,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -10539,8 +10539,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -10597,8 +10597,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -10607,8 +10607,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -10665,8 +10665,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -10675,8 +10675,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -10749,8 +10749,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -10759,8 +10759,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -10816,8 +10816,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -10826,8 +10826,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -10894,8 +10894,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -10904,8 +10904,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -10962,8 +10962,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -10972,8 +10972,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -11036,8 +11036,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -11046,8 +11046,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -11119,8 +11119,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -11129,8 +11129,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -11210,8 +11210,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -11220,8 +11220,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -11301,8 +11301,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -11311,8 +11311,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -11382,8 +11382,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -11392,8 +11392,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -11472,8 +11472,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -11482,8 +11482,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -11556,8 +11556,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -11566,8 +11566,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -11640,8 +11640,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -11650,8 +11650,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -11722,8 +11722,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -11732,8 +11732,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -11796,8 +11796,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -11806,8 +11806,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -11870,8 +11870,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -11880,8 +11880,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -11944,8 +11944,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -11954,8 +11954,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -12024,8 +12024,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -12034,8 +12034,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -12112,8 +12112,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -12122,8 +12122,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -12185,8 +12185,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -12195,8 +12195,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -12258,8 +12258,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -12268,8 +12268,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -12348,8 +12348,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -12358,8 +12358,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -12442,8 +12442,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -12452,8 +12452,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -12513,8 +12513,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -12523,8 +12523,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -12581,8 +12581,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -12591,8 +12591,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -12663,8 +12663,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -12673,8 +12673,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -12696,6 +12696,32 @@ } } }, + "/api/wallet/event/{eventName}/v1/version/passes/{uuid}" : { + "get" : { + "tags" : [ "google-wallet-api-controller" ], + "operationId" : "walletPass", + "parameters" : [ { + "name" : "eventName", + "in" : "path", + "required" : true, + "schema" : { + "type" : "string" + } + }, { + "name" : "uuid", + "in" : "path", + "required" : true, + "schema" : { + "type" : "string" + } + } ], + "responses" : { + "200" : { + "description" : "OK" + } + } + } + }, "/api/v2/public/user/reservations" : { "get" : { "tags" : [ "user-api-v-2-controller" ], @@ -12721,8 +12747,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -12731,8 +12757,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -12782,8 +12808,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -12792,8 +12818,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -12848,8 +12874,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -12858,8 +12884,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -12969,8 +12995,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -12979,8 +13005,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -13035,8 +13061,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -13045,8 +13071,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -13108,8 +13134,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -13118,8 +13144,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -13181,16 +13207,6 @@ } } }, - "400" : { - "description" : "Bad Request", - "content" : { - "*/*" : { - "schema" : { - "type" : "string" - } - } - } - }, "401" : { "description" : "Unauthorized", "content" : { @@ -13201,44 +13217,6 @@ } } }, - "200" : { - "description" : "OK", - "content" : { - "*/*" : { - "schema" : { - "$ref" : "#/components/schemas/ReservationPaymentResult" - } - } - } - } - } - } - }, - "/api/v2/public/i18n/languages" : { - "get" : { - "tags" : [ "translations-api-controller" ], - "operationId" : "getSupportedLanguages", - "responses" : { - "500" : { - "description" : "Internal Server Error", - "content" : { - "*/*" : { - "schema" : { - "type" : "string" - } - } - } - }, - "405" : { - "description" : "Method Not Allowed", - "content" : { - "*/*" : { - "schema" : { - "type" : "string" - } - } - } - }, "400" : { "description" : "Bad Request", "content" : { @@ -13249,25 +13227,12 @@ } } }, - "401" : { - "description" : "Unauthorized", - "content" : { - "*/*" : { - "schema" : { - "type" : "string" - } - } - } - }, "200" : { "description" : "OK", "content" : { "*/*" : { "schema" : { - "type" : "array", - "items" : { - "$ref" : "#/components/schemas/Language" - } + "$ref" : "#/components/schemas/ReservationPaymentResult" } } } @@ -13275,18 +13240,10 @@ } } }, - "/api/v2/public/i18n/eu-countries-vat/{lang}" : { + "/api/v2/public/i18n/languages" : { "get" : { "tags" : [ "translations-api-controller" ], - "operationId" : "getEuCountriesForVat", - "parameters" : [ { - "name" : "lang", - "in" : "path", - "required" : true, - "schema" : { - "type" : "string" - } - } ], + "operationId" : "getSupportedLanguages", "responses" : { "500" : { "description" : "Internal Server Error", @@ -13308,6 +13265,16 @@ } } }, + "401" : { + "description" : "Unauthorized", + "content" : { + "*/*" : { + "schema" : { + "type" : "string" + } + } + } + }, "400" : { "description" : "Bad Request", "content" : { @@ -13318,6 +13285,55 @@ } } }, + "200" : { + "description" : "OK", + "content" : { + "*/*" : { + "schema" : { + "type" : "array", + "items" : { + "$ref" : "#/components/schemas/Language" + } + } + } + } + } + } + } + }, + "/api/v2/public/i18n/eu-countries-vat/{lang}" : { + "get" : { + "tags" : [ "translations-api-controller" ], + "operationId" : "getEuCountriesForVat", + "parameters" : [ { + "name" : "lang", + "in" : "path", + "required" : true, + "schema" : { + "type" : "string" + } + } ], + "responses" : { + "500" : { + "description" : "Internal Server Error", + "content" : { + "*/*" : { + "schema" : { + "type" : "string" + } + } + } + }, + "405" : { + "description" : "Method Not Allowed", + "content" : { + "*/*" : { + "schema" : { + "type" : "string" + } + } + } + }, "401" : { "description" : "Unauthorized", "content" : { @@ -13328,6 +13344,16 @@ } } }, + "400" : { + "description" : "Bad Request", + "content" : { + "*/*" : { + "schema" : { + "type" : "string" + } + } + } + }, "200" : { "description" : "OK", "content" : { @@ -13377,8 +13403,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -13387,8 +13413,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -13446,8 +13472,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -13456,8 +13482,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -13523,8 +13549,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -13533,8 +13559,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -13592,8 +13618,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -13602,8 +13628,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -13661,8 +13687,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -13671,8 +13697,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -13734,8 +13760,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -13744,8 +13770,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -13807,8 +13833,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -13817,8 +13843,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -13880,8 +13906,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -13890,8 +13916,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -13960,8 +13986,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -13970,8 +13996,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -14033,8 +14059,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -14043,8 +14069,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -14099,8 +14125,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -14109,8 +14135,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -14165,8 +14191,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -14175,8 +14201,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -14238,8 +14264,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -14248,8 +14274,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -14304,16 +14330,6 @@ } } }, - "400" : { - "description" : "Bad Request", - "content" : { - "*/*" : { - "schema" : { - "type" : "string" - } - } - } - }, "401" : { "description" : "Unauthorized", "content" : { @@ -14324,52 +14340,6 @@ } } }, - "200" : { - "description" : "OK" - } - } - } - }, - "/api/v2/public/event/{eventName}/poll" : { - "get" : { - "tags" : [ "poll-api-controller" ], - "operationId" : "getAll", - "parameters" : [ { - "name" : "eventName", - "in" : "path", - "required" : true, - "schema" : { - "type" : "string" - } - }, { - "name" : "pin", - "in" : "query", - "required" : true, - "schema" : { - "type" : "string" - } - } ], - "responses" : { - "500" : { - "description" : "Internal Server Error", - "content" : { - "*/*" : { - "schema" : { - "type" : "string" - } - } - } - }, - "405" : { - "description" : "Method Not Allowed", - "content" : { - "*/*" : { - "schema" : { - "type" : "string" - } - } - } - }, "400" : { "description" : "Bad Request", "content" : { @@ -14380,33 +14350,16 @@ } } }, - "401" : { - "description" : "Unauthorized", - "content" : { - "*/*" : { - "schema" : { - "type" : "string" - } - } - } - }, "200" : { - "description" : "OK", - "content" : { - "*/*" : { - "schema" : { - "$ref" : "#/components/schemas/ValidatedResponseListPoll" - } - } - } + "description" : "OK" } } } }, - "/api/v2/public/event/{eventName}/poll/{pollId}" : { + "/api/v2/public/event/{eventName}/poll" : { "get" : { "tags" : [ "poll-api-controller" ], - "operationId" : "getSingle", + "operationId" : "getAll", "parameters" : [ { "name" : "eventName", "in" : "path", @@ -14414,14 +14367,6 @@ "schema" : { "type" : "string" } - }, { - "name" : "pollId", - "in" : "path", - "required" : true, - "schema" : { - "type" : "integer", - "format" : "int64" - } }, { "name" : "pin", "in" : "query", @@ -14451,6 +14396,16 @@ } } }, + "401" : { + "description" : "Unauthorized", + "content" : { + "*/*" : { + "schema" : { + "type" : "string" + } + } + } + }, "400" : { "description" : "Bad Request", "content" : { @@ -14461,6 +14416,67 @@ } } }, + "200" : { + "description" : "OK", + "content" : { + "*/*" : { + "schema" : { + "$ref" : "#/components/schemas/ValidatedResponseListPoll" + } + } + } + } + } + } + }, + "/api/v2/public/event/{eventName}/poll/{pollId}" : { + "get" : { + "tags" : [ "poll-api-controller" ], + "operationId" : "getSingle", + "parameters" : [ { + "name" : "eventName", + "in" : "path", + "required" : true, + "schema" : { + "type" : "string" + } + }, { + "name" : "pollId", + "in" : "path", + "required" : true, + "schema" : { + "type" : "integer", + "format" : "int64" + } + }, { + "name" : "pin", + "in" : "query", + "required" : true, + "schema" : { + "type" : "string" + } + } ], + "responses" : { + "500" : { + "description" : "Internal Server Error", + "content" : { + "*/*" : { + "schema" : { + "type" : "string" + } + } + } + }, + "405" : { + "description" : "Method Not Allowed", + "content" : { + "*/*" : { + "schema" : { + "type" : "string" + } + } + } + }, "401" : { "description" : "Unauthorized", "content" : { @@ -14471,6 +14487,16 @@ } } }, + "400" : { + "description" : "Bad Request", + "content" : { + "*/*" : { + "schema" : { + "type" : "string" + } + } + } + }, "200" : { "description" : "OK", "content" : { @@ -14524,8 +14550,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -14534,8 +14560,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -14604,8 +14630,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -14614,8 +14640,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -14655,8 +14681,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -14665,8 +14691,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -14729,8 +14755,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -14739,8 +14765,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -14790,8 +14816,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -14800,8 +14826,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -14860,8 +14886,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -14870,8 +14896,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -14926,8 +14952,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -14936,8 +14962,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -14992,8 +15018,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -15002,8 +15028,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -15120,6 +15146,32 @@ } } }, + "/api/pass/event/{eventName}/v1/version/passes/{ticketUuid}" : { + "get" : { + "tags" : [ "pass-kit-api-controller" ], + "operationId" : "downloadPassForTicket", + "parameters" : [ { + "name" : "eventName", + "in" : "path", + "required" : true, + "schema" : { + "type" : "string" + } + }, { + "name" : "ticketUuid", + "in" : "path", + "required" : true, + "schema" : { + "type" : "string" + } + } ], + "responses" : { + "200" : { + "description" : "OK" + } + } + } + }, "/api/pass/event/{eventName}/v1/version/passes/{passTypeIdentifier}/{serialNumber}" : { "get" : { "tags" : [ "pass-kit-api-controller" ], @@ -15211,8 +15263,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -15221,8 +15273,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -15284,8 +15336,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -15294,8 +15346,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -15369,8 +15421,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -15379,8 +15431,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -15458,8 +15510,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -15468,8 +15520,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -15532,8 +15584,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -15542,8 +15594,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -15613,8 +15665,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -15623,8 +15675,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -15690,8 +15742,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -15700,8 +15752,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -15775,8 +15827,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -15785,8 +15837,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -15844,8 +15896,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -15854,8 +15906,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -15910,8 +15962,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -15920,8 +15972,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -15968,8 +16020,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -15978,8 +16030,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -16029,8 +16081,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -16039,8 +16091,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -16090,8 +16142,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -16100,8 +16152,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -16151,8 +16203,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -16161,8 +16213,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -16221,8 +16273,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -16231,8 +16283,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -16286,8 +16338,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -16296,8 +16348,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -16344,8 +16396,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -16354,8 +16406,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -16402,8 +16454,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -16412,8 +16464,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -16463,8 +16515,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -16473,8 +16525,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -16521,8 +16573,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -16531,8 +16583,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -17371,8 +17423,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -17381,8 +17433,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -17464,8 +17516,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -17474,8 +17526,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -17552,16 +17604,6 @@ } } }, - "400" : { - "description" : "Bad Request", - "content" : { - "*/*" : { - "schema" : { - "type" : "string" - } - } - } - }, "401" : { "description" : "Unauthorized", "content" : { @@ -17572,67 +17614,6 @@ } } }, - "200" : { - "description" : "OK", - "content" : { - "*/*" : { - "schema" : { - "$ref" : "#/components/schemas/BookingInfoTicket" - } - } - } - } - } - } - }, - "/admin/api/reservation/{purchaseContextType}/{publicIdentifier}/{reservationId}/payment-info" : { - "get" : { - "tags" : [ "admin-reservation-api-controller" ], - "operationId" : "getPaymentInfo", - "parameters" : [ { - "name" : "purchaseContextType", - "in" : "path", - "required" : true, - "schema" : { - "type" : "string", - "enum" : [ "subscription", "event" ] - } - }, { - "name" : "publicIdentifier", - "in" : "path", - "required" : true, - "schema" : { - "type" : "string" - } - }, { - "name" : "reservationId", - "in" : "path", - "required" : true, - "schema" : { - "type" : "string" - } - } ], - "responses" : { - "500" : { - "description" : "Internal Server Error", - "content" : { - "*/*" : { - "schema" : { - "type" : "string" - } - } - } - }, - "405" : { - "description" : "Method Not Allowed", - "content" : { - "*/*" : { - "schema" : { - "type" : "string" - } - } - } - }, "400" : { "description" : "Bad Request", "content" : { @@ -17643,22 +17624,12 @@ } } }, - "401" : { - "description" : "Unauthorized", - "content" : { - "*/*" : { - "schema" : { - "type" : "string" - } - } - } - }, "200" : { "description" : "OK", "content" : { "*/*" : { "schema" : { - "$ref" : "#/components/schemas/ResultTransactionAndPaymentInfo" + "$ref" : "#/components/schemas/BookingInfoTicket" } } } @@ -17666,10 +17637,10 @@ } } }, - "/admin/api/reservation/{purchaseContextType}/{publicIdentifier}/{reservationId}/email-list" : { + "/admin/api/reservation/{purchaseContextType}/{publicIdentifier}/{reservationId}/payment-info" : { "get" : { "tags" : [ "admin-reservation-api-controller" ], - "operationId" : "getEmailList", + "operationId" : "getPaymentInfo", "parameters" : [ { "name" : "purchaseContextType", "in" : "path", @@ -17714,16 +17685,6 @@ } } }, - "400" : { - "description" : "Bad Request", - "content" : { - "*/*" : { - "schema" : { - "type" : "string" - } - } - } - }, "401" : { "description" : "Unauthorized", "content" : { @@ -17734,67 +17695,6 @@ } } }, - "200" : { - "description" : "OK", - "content" : { - "*/*" : { - "schema" : { - "$ref" : "#/components/schemas/ResultListLightweightMailMessage" - } - } - } - } - } - } - }, - "/admin/api/reservation/{purchaseContextType}/{publicIdentifier}/{reservationId}/billing-documents" : { - "get" : { - "tags" : [ "admin-reservation-api-controller" ], - "operationId" : "getBillingDocuments", - "parameters" : [ { - "name" : "purchaseContextType", - "in" : "path", - "required" : true, - "schema" : { - "type" : "string", - "enum" : [ "subscription", "event" ] - } - }, { - "name" : "publicIdentifier", - "in" : "path", - "required" : true, - "schema" : { - "type" : "string" - } - }, { - "name" : "reservationId", - "in" : "path", - "required" : true, - "schema" : { - "type" : "string" - } - } ], - "responses" : { - "500" : { - "description" : "Internal Server Error", - "content" : { - "*/*" : { - "schema" : { - "type" : "string" - } - } - } - }, - "405" : { - "description" : "Method Not Allowed", - "content" : { - "*/*" : { - "schema" : { - "type" : "string" - } - } - } - }, "400" : { "description" : "Bad Request", "content" : { @@ -17805,22 +17705,12 @@ } } }, - "401" : { - "description" : "Unauthorized", - "content" : { - "*/*" : { - "schema" : { - "type" : "string" - } - } - } - }, "200" : { "description" : "OK", "content" : { "*/*" : { "schema" : { - "$ref" : "#/components/schemas/ResultListBillingDocument" + "$ref" : "#/components/schemas/ResultTransactionAndPaymentInfo" } } } @@ -17828,10 +17718,10 @@ } } }, - "/admin/api/reservation/{purchaseContextType}/{publicIdentifier}/{reservationId}/billing-document/{documentId}" : { + "/admin/api/reservation/{purchaseContextType}/{publicIdentifier}/{reservationId}/email-list" : { "get" : { "tags" : [ "admin-reservation-api-controller" ], - "operationId" : "getBillingDocument", + "operationId" : "getEmailList", "parameters" : [ { "name" : "purchaseContextType", "in" : "path", @@ -17854,14 +17744,6 @@ "schema" : { "type" : "string" } - }, { - "name" : "documentId", - "in" : "path", - "required" : true, - "schema" : { - "type" : "integer", - "format" : "int64" - } } ], "responses" : { "500" : { @@ -17884,6 +17766,16 @@ } } }, + "401" : { + "description" : "Unauthorized", + "content" : { + "*/*" : { + "schema" : { + "type" : "string" + } + } + } + }, "400" : { "description" : "Bad Request", "content" : { @@ -17894,6 +17786,67 @@ } } }, + "200" : { + "description" : "OK", + "content" : { + "*/*" : { + "schema" : { + "$ref" : "#/components/schemas/ResultListLightweightMailMessage" + } + } + } + } + } + } + }, + "/admin/api/reservation/{purchaseContextType}/{publicIdentifier}/{reservationId}/billing-documents" : { + "get" : { + "tags" : [ "admin-reservation-api-controller" ], + "operationId" : "getBillingDocuments", + "parameters" : [ { + "name" : "purchaseContextType", + "in" : "path", + "required" : true, + "schema" : { + "type" : "string", + "enum" : [ "subscription", "event" ] + } + }, { + "name" : "publicIdentifier", + "in" : "path", + "required" : true, + "schema" : { + "type" : "string" + } + }, { + "name" : "reservationId", + "in" : "path", + "required" : true, + "schema" : { + "type" : "string" + } + } ], + "responses" : { + "500" : { + "description" : "Internal Server Error", + "content" : { + "*/*" : { + "schema" : { + "type" : "string" + } + } + } + }, + "405" : { + "description" : "Method Not Allowed", + "content" : { + "*/*" : { + "schema" : { + "type" : "string" + } + } + } + }, "401" : { "description" : "Unauthorized", "content" : { @@ -17904,14 +17857,33 @@ } } }, + "400" : { + "description" : "Bad Request", + "content" : { + "*/*" : { + "schema" : { + "type" : "string" + } + } + } + }, "200" : { - "description" : "OK" + "description" : "OK", + "content" : { + "*/*" : { + "schema" : { + "$ref" : "#/components/schemas/ResultListBillingDocument" + } + } + } } } - }, - "delete" : { + } + }, + "/admin/api/reservation/{purchaseContextType}/{publicIdentifier}/{reservationId}/billing-document/{documentId}" : { + "get" : { "tags" : [ "admin-reservation-api-controller" ], - "operationId" : "invalidateBillingDocument", + "operationId" : "getBillingDocument", "parameters" : [ { "name" : "purchaseContextType", "in" : "path", @@ -17964,6 +17936,16 @@ } } }, + "401" : { + "description" : "Unauthorized", + "content" : { + "*/*" : { + "schema" : { + "type" : "string" + } + } + } + }, "400" : { "description" : "Bad Request", "content" : { @@ -17974,6 +17956,66 @@ } } }, + "200" : { + "description" : "OK" + } + } + }, + "delete" : { + "tags" : [ "admin-reservation-api-controller" ], + "operationId" : "invalidateBillingDocument", + "parameters" : [ { + "name" : "purchaseContextType", + "in" : "path", + "required" : true, + "schema" : { + "type" : "string", + "enum" : [ "subscription", "event" ] + } + }, { + "name" : "publicIdentifier", + "in" : "path", + "required" : true, + "schema" : { + "type" : "string" + } + }, { + "name" : "reservationId", + "in" : "path", + "required" : true, + "schema" : { + "type" : "string" + } + }, { + "name" : "documentId", + "in" : "path", + "required" : true, + "schema" : { + "type" : "integer", + "format" : "int64" + } + } ], + "responses" : { + "500" : { + "description" : "Internal Server Error", + "content" : { + "*/*" : { + "schema" : { + "type" : "string" + } + } + } + }, + "405" : { + "description" : "Method Not Allowed", + "content" : { + "*/*" : { + "schema" : { + "type" : "string" + } + } + } + }, "401" : { "description" : "Unauthorized", "content" : { @@ -17984,6 +18026,16 @@ } } }, + "400" : { + "description" : "Bad Request", + "content" : { + "*/*" : { + "schema" : { + "type" : "string" + } + } + } + }, "200" : { "description" : "OK", "content" : { @@ -18045,8 +18097,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -18055,8 +18107,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -18145,8 +18197,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -18155,8 +18207,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -18219,8 +18271,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -18229,8 +18281,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -18297,8 +18349,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -18307,8 +18359,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -18367,8 +18419,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -18377,8 +18429,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -18435,8 +18487,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -18445,8 +18497,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -18481,7 +18533,7 @@ "required" : true, "schema" : { "type" : "string", - "enum" : [ "GOOGLE_ANALYTICS", "CONFIRMATION_EMAIL_FOR_ORGANIZER", "SEND_RESERVED_CODE", "CONFIRMATION_EMAIL", "CONFIRMATION_EMAIL_SUBSCRIPTION", "OFFLINE_RESERVATION_EXPIRED_EMAIL", "CHARGE_ATTEMPT_FAILED_EMAIL", "CHARGE_ATTEMPT_FAILED_EMAIL_FOR_ORGANIZER", "CREDIT_NOTE_ISSUED_EMAIL", "OFFLINE_RESERVATION_EXPIRING_EMAIL_FOR_ORGANIZER", "OFFLINE_PAYMENT_MATCHES_FOUND", "REMINDER_EMAIL", "REMINDER_TICKET_ADDITIONAL_INFO", "REMINDER_TICKETS_ASSIGNMENT_EMAIL", "TICKET_EMAIL", "TICKET_EMAIL_FOR_ONLINE_EVENT", "TICKET_HAS_CHANGED_OWNER", "TICKET_HAS_BEEN_CANCELLED", "TICKET_HAS_BEEN_CANCELLED_ADMIN", "TICKET_PDF", "RECEIPT_PDF", "INVOICE_PDF", "CREDIT_NOTE_PDF", "SUBSCRIPTION_PDF", "WAITING_QUEUE_JOINED", "WAITING_QUEUE_RESERVATION_EMAIL" ] + "enum" : [ "GOOGLE_ANALYTICS", "CONFIRMATION_EMAIL_FOR_ORGANIZER", "SEND_RESERVED_CODE", "CONFIRMATION_EMAIL", "CONFIRMATION_EMAIL_SUBSCRIPTION", "OFFLINE_RESERVATION_EXPIRED_EMAIL", "CHARGE_ATTEMPT_FAILED_EMAIL", "CHARGE_ATTEMPT_FAILED_EMAIL_FOR_ORGANIZER", "CREDIT_NOTE_ISSUED_EMAIL", "OFFLINE_RESERVATION_EXPIRING_EMAIL_FOR_ORGANIZER", "OFFLINE_PAYMENT_MATCHES_FOUND", "REMINDER_EMAIL", "REMINDER_TICKET_ADDITIONAL_INFO", "REMINDER_TICKETS_ASSIGNMENT_EMAIL", "TICKET_EMAIL", "TICKET_EMAIL_FOR_ONLINE_EVENT", "TICKET_HAS_CHANGED_OWNER", "TICKET_HAS_BEEN_CANCELLED", "TICKET_HAS_BEEN_CANCELLED_ADMIN", "TICKET_PDF", "RECEIPT_PDF", "INVOICE_PDF", "CREDIT_NOTE_PDF", "SUBSCRIPTION_PDF", "WAITING_QUEUE_JOINED", "WAITING_QUEUE_RESERVATION_EMAIL", "CUSTOM_MESSAGE" ] } }, { "name" : "locale", @@ -18591,7 +18643,7 @@ "type" : "array", "items" : { "type" : "string", - "enum" : [ "GOOGLE_ANALYTICS", "CONFIRMATION_EMAIL_FOR_ORGANIZER", "SEND_RESERVED_CODE", "CONFIRMATION_EMAIL", "CONFIRMATION_EMAIL_SUBSCRIPTION", "OFFLINE_RESERVATION_EXPIRED_EMAIL", "CHARGE_ATTEMPT_FAILED_EMAIL", "CHARGE_ATTEMPT_FAILED_EMAIL_FOR_ORGANIZER", "CREDIT_NOTE_ISSUED_EMAIL", "OFFLINE_RESERVATION_EXPIRING_EMAIL_FOR_ORGANIZER", "OFFLINE_PAYMENT_MATCHES_FOUND", "REMINDER_EMAIL", "REMINDER_TICKET_ADDITIONAL_INFO", "REMINDER_TICKETS_ASSIGNMENT_EMAIL", "TICKET_EMAIL", "TICKET_EMAIL_FOR_ONLINE_EVENT", "TICKET_HAS_CHANGED_OWNER", "TICKET_HAS_BEEN_CANCELLED", "TICKET_HAS_BEEN_CANCELLED_ADMIN", "TICKET_PDF", "RECEIPT_PDF", "INVOICE_PDF", "CREDIT_NOTE_PDF", "SUBSCRIPTION_PDF", "WAITING_QUEUE_JOINED", "WAITING_QUEUE_RESERVATION_EMAIL" ] + "enum" : [ "GOOGLE_ANALYTICS", "CONFIRMATION_EMAIL_FOR_ORGANIZER", "SEND_RESERVED_CODE", "CONFIRMATION_EMAIL", "CONFIRMATION_EMAIL_SUBSCRIPTION", "OFFLINE_RESERVATION_EXPIRED_EMAIL", "CHARGE_ATTEMPT_FAILED_EMAIL", "CHARGE_ATTEMPT_FAILED_EMAIL_FOR_ORGANIZER", "CREDIT_NOTE_ISSUED_EMAIL", "OFFLINE_RESERVATION_EXPIRING_EMAIL_FOR_ORGANIZER", "OFFLINE_PAYMENT_MATCHES_FOUND", "REMINDER_EMAIL", "REMINDER_TICKET_ADDITIONAL_INFO", "REMINDER_TICKETS_ASSIGNMENT_EMAIL", "TICKET_EMAIL", "TICKET_EMAIL_FOR_ONLINE_EVENT", "TICKET_HAS_CHANGED_OWNER", "TICKET_HAS_BEEN_CANCELLED", "TICKET_HAS_BEEN_CANCELLED_ADMIN", "TICKET_PDF", "RECEIPT_PDF", "INVOICE_PDF", "CREDIT_NOTE_PDF", "SUBSCRIPTION_PDF", "WAITING_QUEUE_JOINED", "WAITING_QUEUE_RESERVATION_EMAIL", "CUSTOM_MESSAGE" ] } } } @@ -18625,8 +18677,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -18635,8 +18687,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -18695,8 +18747,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -18705,8 +18757,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -18770,8 +18822,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -18780,8 +18832,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -18840,8 +18892,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -18850,8 +18902,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -18910,8 +18962,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -18920,8 +18972,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -18980,8 +19032,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -18990,8 +19042,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -19041,8 +19093,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -19051,8 +19103,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -19119,8 +19171,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -19129,8 +19181,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -19192,8 +19244,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -19202,8 +19254,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -19250,8 +19302,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -19260,8 +19312,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -19670,8 +19722,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -19680,8 +19732,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -19743,8 +19795,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -19753,8 +19805,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -19823,8 +19875,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -19833,8 +19885,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -19887,8 +19939,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -19897,8 +19949,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -19977,8 +20029,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -19987,8 +20039,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -20050,8 +20102,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -20060,8 +20112,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -20101,8 +20153,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -20111,8 +20163,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -20177,8 +20229,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -20187,8 +20239,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -20253,8 +20305,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -20263,8 +20315,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -20333,8 +20385,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -20343,8 +20395,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -20407,8 +20459,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -20417,8 +20469,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -20466,8 +20518,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -20476,8 +20528,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -20535,8 +20587,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -20545,8 +20597,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -20602,8 +20654,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -20612,8 +20664,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -20671,8 +20723,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -20681,8 +20733,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -20738,8 +20790,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -20748,8 +20800,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -20815,8 +20867,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -20825,8 +20877,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -20897,8 +20949,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -20907,8 +20959,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -20971,8 +21023,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -20981,8 +21033,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -21040,8 +21092,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -21050,8 +21102,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -21099,8 +21151,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -21109,8 +21161,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -21166,8 +21218,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -21176,8 +21228,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -21225,8 +21277,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -21235,8 +21287,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -21302,8 +21354,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -21312,8 +21364,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -21372,8 +21424,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -21382,8 +21434,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -21442,8 +21494,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -21452,8 +21504,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -21515,8 +21567,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -21525,8 +21577,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -21585,8 +21637,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -21595,8 +21647,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -21643,8 +21695,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -21653,8 +21705,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -21704,8 +21756,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -21714,8 +21766,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -21763,8 +21815,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -21773,8 +21825,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -21832,8 +21884,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -21842,8 +21894,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -21909,8 +21961,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -21919,8 +21971,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -21968,8 +22020,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -21978,8 +22030,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -22042,8 +22094,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -22052,8 +22104,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -22109,8 +22161,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -22119,8 +22171,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -22174,8 +22226,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -22184,8 +22236,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -22235,8 +22287,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -22245,8 +22297,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -22263,7 +22315,7 @@ "type" : "array", "items" : { "type" : "string", - "enum" : [ "GENERAL", "RESERVATION_UI", "RESERVATION_EMBED", "PAYMENT", "PAYMENT_STRIPE", "PAYMENT_SAFERPAY", "PAYMENT_PAYPAL", "PAYMENT_OFFLINE", "PAYMENT_MOLLIE", "INVOICE", "INVOICE_EU", "MAIL", "ALFIO_PI", "MAP", "TRANSLATIONS", "PASS_INTEGRATION", "WAITING_LIST", "IMPORT_ATTENDEE", "OPENID", "SUBSCRIPTIONS" ] + "enum" : [ "GENERAL", "RESERVATION_UI", "RESERVATION_EMBED", "PAYMENT", "PAYMENT_STRIPE", "PAYMENT_SAFERPAY", "PAYMENT_PAYPAL", "PAYMENT_OFFLINE", "PAYMENT_MOLLIE", "INVOICE", "INVOICE_EU", "MAIL", "ALFIO_PI", "MAP", "TRANSLATIONS", "PASS_INTEGRATION", "WALLET_INTEGRATION", "WAITING_LIST", "IMPORT_ATTENDEE", "OPENID", "SUBSCRIPTIONS" ] } } } @@ -22306,8 +22358,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -22316,8 +22368,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -22383,8 +22435,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -22393,8 +22445,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -22450,8 +22502,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -22460,8 +22512,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -22514,8 +22566,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -22524,8 +22576,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -22578,8 +22630,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -22588,8 +22640,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -22651,8 +22703,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -22661,8 +22713,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -22718,8 +22770,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -22728,8 +22780,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -22799,8 +22851,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -22809,8 +22861,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -22888,8 +22940,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -22898,8 +22950,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -22959,8 +23011,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -22969,8 +23021,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -23018,8 +23070,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -23028,8 +23080,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -23079,8 +23131,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -23089,8 +23141,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -23153,8 +23205,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -23163,8 +23215,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -23223,8 +23275,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -23233,8 +23285,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -23298,8 +23350,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -23308,8 +23360,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -23384,8 +23436,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -23394,8 +23446,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -23450,8 +23502,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -23460,8 +23512,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -23517,8 +23569,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -23527,8 +23579,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -23568,8 +23620,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -23578,8 +23630,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -23645,8 +23697,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -23655,8 +23707,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -23718,8 +23770,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -23728,8 +23780,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -23791,8 +23843,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -23801,8 +23853,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -23857,8 +23909,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -23867,8 +23919,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -23923,8 +23975,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -23933,8 +23985,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -23990,8 +24042,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -24000,8 +24052,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -24049,8 +24101,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -24059,8 +24111,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -24131,8 +24183,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -24141,8 +24193,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -24431,8 +24483,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -24441,8 +24493,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -24499,8 +24551,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -24509,8 +24561,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -24574,8 +24626,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -24584,8 +24636,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -24648,8 +24700,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -24658,8 +24710,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -24737,8 +24789,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -24747,8 +24799,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -24811,8 +24863,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -24821,8 +24873,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -24893,8 +24945,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -24903,8 +24955,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -24960,8 +25012,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -24970,8 +25022,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -25027,8 +25079,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -25037,8 +25089,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -25081,7 +25133,7 @@ "required" : true, "schema" : { "type" : "string", - "enum" : [ "NOT_RECOGNIZED", "INIT_COMPLETED", "SYSTEM_API_KEY", "SHOW_PROJECT_BANNER", "SUPPORTED_LANGUAGES", "BASE_URL", "GLOBAL_PRIVACY_POLICY", "GLOBAL_TERMS", "ANNOUNCEMENT_BANNER_CONTENT", "MAPS_PROVIDER", "MAPS_CLIENT_API_KEY", "MAPS_HERE_APP_ID", "MAPS_HERE_APP_CODE", "MAPS_HERE_API_KEY", "RECAPTCHA_API_KEY", "RECAPTCHA_SECRET", "ENABLE_CAPTCHA_FOR_LOGIN", "DISPLAY_STATS_IN_EVENT_DETAIL", "DEMO_MODE_ACCOUNT_EXPIRATION_DAYS", "PLATFORM_MODE_ENABLED", "PLATFORM_FEE", "PLATFORM_FIXED_FEE", "PLATFORM_PERCENTAGE_FEE", "PLATFORM_MINIMUM_FEE", "PLATFORM_MAXIMUM_FEE", "PAYMENT_METHODS_BLACKLIST", "STRIPE_CC_ENABLED", "STRIPE_PUBLIC_KEY", "STRIPE_SECRET_KEY", "STRIPE_CONNECT_CLIENT_ID", "STRIPE_CONNECT_CALLBACK", "STRIPE_WEBHOOK_KEY", "STRIPE_WEBHOOK_PAYMENT_KEY", "STRIPE_CONNECTED_ID", "STRIPE_ENABLE_SCA", "SAFERPAY_ENABLED", "SAFERPAY_LIVE_MODE", "SAFERPAY_API_USERNAME", "SAFERPAY_API_PASSWORD", "SAFERPAY_CUSTOMER_ID", "SAFERPAY_TERMINAL_ID", "SPECIAL_PRICE_CODE_LENGTH", "MAX_AMOUNT_OF_TICKETS_BY_RESERVATION", "ASSIGNMENT_REMINDER_START", "ASSIGNMENT_REMINDER_INTERVAL", "OPTIONAL_DATA_REMINDER_ENABLED", "RESERVATION_TIMEOUT", "RESERVATION_MIN_TIMEOUT_AFTER_FAILED_PAYMENT", "NOTIFY_ALL_FAILED_PAYMENT_ATTEMPTS", "DISPLAY_TICKETS_LEFT_INDICATOR", "ENABLE_CAPTCHA_FOR_TICKET_SELECTION", "DISPLAY_EXPIRED_CATEGORIES", "DISPLAY_DISCOUNT_CODE_BOX", "USE_PARTNER_CODE_INSTEAD_OF_PROMOTIONAL", "ENABLE_CUSTOMER_REFERENCE", "ENABLE_ATTENDEE_AUTOCOMPLETE", "FORCE_TICKET_OWNER_ASSIGNMENT_AT_RESERVATION", "SEND_TICKETS_AUTOMATICALLY", "ALLOW_TICKET_DOWNLOAD", "SEND_RESERVATION_EMAIL_IF_NECESSARY", "ENABLE_TICKET_TRANSFER", "ALLOW_FREE_TICKETS_CANCELLATION", "INCLUDE_CHECK_IN_URL_ICAL", "MAILER_TYPE", "MAX_EMAIL_PER_CYCLE", "MAIL_REPLY_TO", "MAIL_SET_ORG_REPLY_TO", "MAIL_SYSTEM_NOTIFICATION_CC", "MAIL_FOOTER", "SMTP_HOST", "SMTP_PORT", "SMTP_PROTOCOL", "SMTP_USERNAME", "SMTP_PASSWORD", "SMTP_FROM_EMAIL", "SMTP_PROPERTIES", "BANK_TRANSFER_ENABLED", "DEFERRED_BANK_TRANSFER_ENABLED", "SHOW_ONLY_BASIC_INSTRUCTIONS", "DEFERRED_BANK_TRANSFER_SEND_CONFIRMATION_EMAIL", "OFFLINE_PAYMENT_DAYS", "OFFLINE_REMINDER_HOURS", "ENABLE_CAPTCHA_FOR_OFFLINE_PAYMENTS", "BANK_ACCOUNT_NR", "BANK_ACCOUNT_OWNER", "AUTOMATIC_REMOVAL_EXPIRED_OFFLINE_PAYMENT", "PARTIAL_RESERVATION_ID_LENGTH", "REVOLUT_ENABLED", "REVOLUT_MANUAL_REVIEW", "REVOLUT_LIVE_MODE", "REVOLUT_API_KEY", "MAILGUN_KEY", "MAILGUN_DOMAIN", "MAILGUN_FROM", "MAILGUN_EU", "SENDGRID_API_KEY", "SENDGRID_FROM", "MAILJET_APIKEY_PUBLIC", "MAILJET_APIKEY_PRIVATE", "MAILJET_FROM", "GOOGLE_ANALYTICS_KEY", "GOOGLE_ANALYTICS_ANONYMOUS_MODE", "ENABLE_WAITING_QUEUE", "ENABLE_PRE_REGISTRATION", "ENABLE_WAITING_QUEUE_NOTIFICATION", "WAITING_QUEUE_RESERVATION_TIMEOUT", "STOP_WAITING_QUEUE_SUBSCRIPTIONS", "ENABLE_HTML_EMAILS", "MAIL_ATTEMPTS_COUNT", "PAYPAL_ENABLED", "PAYPAL_CLIENT_ID", "PAYPAL_CLIENT_SECRET", "PAYPAL_LIVE_MODE", "PAYPAL_DEMO_MODE_USERNAME", "PAYPAL_DEMO_MODE_PASSWORD", "MOLLIE_CC_ENABLED", "MOLLIE_API_KEY", "MOLLIE_CONNECT_CLIENT_ID", "MOLLIE_CONNECT_REFRESH_TOKEN", "MOLLIE_CONNECT_CLIENT_SECRET", "MOLLIE_CONNECT_CALLBACK", "MOLLIE_CONNECT_PROFILE_ID", "MOLLIE_CONNECT_LIVE_MODE", "ON_SITE_ENABLED", "SEND_TICKETS_AFTER_IMPORT_ATTENDEE", "CREATE_RESERVATION_FOR_EACH_IMPORTED_ATTENDEE", "VAT_NR", "INVOICE_NUMBER_PATTERN", "INVOICE_ADDRESS", "USE_INVOICE_NUMBER_AS_ID", "VAT_NUMBER_IS_REQUIRED", "GENERATE_ONLY_INVOICE", "REUSE_INVOICE_NUMBER_FOR_CREDIT_NOTE", "ENABLE_ITALY_E_INVOICING", "ITALY_E_INVOICING_SEND_PROFORMA", "ENABLE_EU_VAT_DIRECTIVE", "ENABLE_REVERSE_CHARGE_ONLINE", "ENABLE_REVERSE_CHARGE_IN_PERSON", "ENABLE_VIES_VALIDATION", "APPLY_VAT_FOREIGN_BUSINESS", "COUNTRY_OF_BUSINESS", "EU_COUNTRIES_LIST", "EU_VAT_API_ADDRESS", "APPLY_TAX_TO_CATEGORY", "ENABLE_PASS", "PASSBOOK_TYPE_IDENTIFIER", "PASSBOOK_TEAM_IDENTIFIER", "PASSBOOK_KEYSTORE", "PASSBOOK_KEYSTORE_PASSWORD", "PASSBOOK_PRIVATE_KEY_ALIAS", "CHECK_IN_STATS", "ALFIO_PI_INTEGRATION_ENABLED", "OFFLINE_CHECKIN_ENABLED", "LABEL_PRINTING_ENABLED", "LABEL_LAYOUT", "CHECK_IN_COLOR_CONFIGURATION", "SECURITY_CSP_REPORT_ENABLED", "SECURITY_CSP_REPORT_URI", "EMBED_ALLOWED_ORIGINS", "EMBED_POST_MESSAGE_ORIGIN", "TRANSLATION_OVERRIDE", "BASE_CUSTOM_CSS", "EVENT_CUSTOM_CSS", "DESCRIPTION_MAXLENGTH", "OPENID_PUBLIC_ENABLED", "OPENID_CONFIGURATION_JSON", "GENERATE_TICKETS_FOR_SUBSCRIPTIONS" ] + "enum" : [ "NOT_RECOGNIZED", "INIT_COMPLETED", "SYSTEM_API_KEY", "SHOW_PROJECT_BANNER", "SUPPORTED_LANGUAGES", "BASE_URL", "GLOBAL_PRIVACY_POLICY", "GLOBAL_TERMS", "ANNOUNCEMENT_BANNER_CONTENT", "MAPS_PROVIDER", "MAPS_CLIENT_API_KEY", "MAPS_HERE_APP_ID", "MAPS_HERE_APP_CODE", "MAPS_HERE_API_KEY", "RECAPTCHA_API_KEY", "RECAPTCHA_SECRET", "ENABLE_CAPTCHA_FOR_LOGIN", "DISPLAY_STATS_IN_EVENT_DETAIL", "DEMO_MODE_ACCOUNT_EXPIRATION_DAYS", "PLATFORM_MODE_ENABLED", "PLATFORM_FEE", "PLATFORM_FIXED_FEE", "PLATFORM_PERCENTAGE_FEE", "PLATFORM_MINIMUM_FEE", "PLATFORM_MAXIMUM_FEE", "PAYMENT_METHODS_BLACKLIST", "STRIPE_CC_ENABLED", "STRIPE_PUBLIC_KEY", "STRIPE_SECRET_KEY", "STRIPE_CONNECT_CLIENT_ID", "STRIPE_CONNECT_CALLBACK", "STRIPE_WEBHOOK_KEY", "STRIPE_WEBHOOK_PAYMENT_KEY", "STRIPE_CONNECTED_ID", "STRIPE_ENABLE_SCA", "SAFERPAY_ENABLED", "SAFERPAY_LIVE_MODE", "SAFERPAY_API_USERNAME", "SAFERPAY_API_PASSWORD", "SAFERPAY_CUSTOMER_ID", "SAFERPAY_TERMINAL_ID", "SPECIAL_PRICE_CODE_LENGTH", "MAX_AMOUNT_OF_TICKETS_BY_RESERVATION", "ASSIGNMENT_REMINDER_START", "ASSIGNMENT_REMINDER_INTERVAL", "OPTIONAL_DATA_REMINDER_ENABLED", "RESERVATION_TIMEOUT", "RESERVATION_MIN_TIMEOUT_AFTER_FAILED_PAYMENT", "NOTIFY_ALL_FAILED_PAYMENT_ATTEMPTS", "DISPLAY_TICKETS_LEFT_INDICATOR", "ENABLE_CAPTCHA_FOR_TICKET_SELECTION", "DISPLAY_EXPIRED_CATEGORIES", "DISPLAY_DISCOUNT_CODE_BOX", "USE_PARTNER_CODE_INSTEAD_OF_PROMOTIONAL", "ENABLE_CUSTOMER_REFERENCE", "ENABLE_ATTENDEE_AUTOCOMPLETE", "FORCE_TICKET_OWNER_ASSIGNMENT_AT_RESERVATION", "SEND_TICKETS_AUTOMATICALLY", "ALLOW_TICKET_DOWNLOAD", "SEND_RESERVATION_EMAIL_IF_NECESSARY", "ENABLE_TICKET_TRANSFER", "ALLOW_FREE_TICKETS_CANCELLATION", "INCLUDE_CHECK_IN_URL_ICAL", "MAILER_TYPE", "MAX_EMAIL_PER_CYCLE", "MAIL_REPLY_TO", "MAIL_SET_ORG_REPLY_TO", "MAIL_SYSTEM_NOTIFICATION_CC", "MAIL_FOOTER", "SMTP_HOST", "SMTP_PORT", "SMTP_PROTOCOL", "SMTP_USERNAME", "SMTP_PASSWORD", "SMTP_FROM_EMAIL", "SMTP_PROPERTIES", "BANK_TRANSFER_ENABLED", "DEFERRED_BANK_TRANSFER_ENABLED", "SHOW_ONLY_BASIC_INSTRUCTIONS", "DEFERRED_BANK_TRANSFER_SEND_CONFIRMATION_EMAIL", "OFFLINE_PAYMENT_DAYS", "OFFLINE_REMINDER_HOURS", "ENABLE_CAPTCHA_FOR_OFFLINE_PAYMENTS", "BANK_ACCOUNT_NR", "BANK_ACCOUNT_OWNER", "AUTOMATIC_REMOVAL_EXPIRED_OFFLINE_PAYMENT", "PARTIAL_RESERVATION_ID_LENGTH", "REVOLUT_ENABLED", "REVOLUT_MANUAL_REVIEW", "REVOLUT_LIVE_MODE", "REVOLUT_API_KEY", "MAILGUN_KEY", "MAILGUN_DOMAIN", "MAILGUN_FROM", "MAILGUN_EU", "SENDGRID_API_KEY", "SENDGRID_FROM", "MAILJET_APIKEY_PUBLIC", "MAILJET_APIKEY_PRIVATE", "MAILJET_FROM", "GOOGLE_ANALYTICS_KEY", "GOOGLE_ANALYTICS_ANONYMOUS_MODE", "ENABLE_WAITING_QUEUE", "ENABLE_PRE_REGISTRATION", "ENABLE_WAITING_QUEUE_NOTIFICATION", "WAITING_QUEUE_RESERVATION_TIMEOUT", "STOP_WAITING_QUEUE_SUBSCRIPTIONS", "ENABLE_HTML_EMAILS", "MAIL_ATTEMPTS_COUNT", "PAYPAL_ENABLED", "PAYPAL_CLIENT_ID", "PAYPAL_CLIENT_SECRET", "PAYPAL_LIVE_MODE", "PAYPAL_DEMO_MODE_USERNAME", "PAYPAL_DEMO_MODE_PASSWORD", "MOLLIE_CC_ENABLED", "MOLLIE_API_KEY", "MOLLIE_CONNECT_CLIENT_ID", "MOLLIE_CONNECT_REFRESH_TOKEN", "MOLLIE_CONNECT_CLIENT_SECRET", "MOLLIE_CONNECT_CALLBACK", "MOLLIE_CONNECT_PROFILE_ID", "MOLLIE_CONNECT_LIVE_MODE", "ON_SITE_ENABLED", "SEND_TICKETS_AFTER_IMPORT_ATTENDEE", "CREATE_RESERVATION_FOR_EACH_IMPORTED_ATTENDEE", "VAT_NR", "INVOICE_NUMBER_PATTERN", "INVOICE_ADDRESS", "USE_INVOICE_NUMBER_AS_ID", "VAT_NUMBER_IS_REQUIRED", "GENERATE_ONLY_INVOICE", "REUSE_INVOICE_NUMBER_FOR_CREDIT_NOTE", "ENABLE_ITALY_E_INVOICING", "ITALY_E_INVOICING_SEND_PROFORMA", "ENABLE_EU_VAT_DIRECTIVE", "ENABLE_REVERSE_CHARGE_ONLINE", "ENABLE_REVERSE_CHARGE_IN_PERSON", "ENABLE_VIES_VALIDATION", "APPLY_VAT_FOREIGN_BUSINESS", "COUNTRY_OF_BUSINESS", "EU_COUNTRIES_LIST", "EU_VAT_API_ADDRESS", "APPLY_TAX_TO_CATEGORY", "ENABLE_PASS", "PASSBOOK_TYPE_IDENTIFIER", "PASSBOOK_TEAM_IDENTIFIER", "PASSBOOK_KEYSTORE", "PASSBOOK_KEYSTORE_PASSWORD", "PASSBOOK_PRIVATE_KEY_ALIAS", "ENABLE_WALLET", "WALLET_ISSUER_IDENTIFIER", "WALLET_SERVICE_ACCOUNT_KEY", "WALLET_OVERWRITE_PREVIOUS_CLASSES_AND_EVENTS", "CHECK_IN_STATS", "ALFIO_PI_INTEGRATION_ENABLED", "OFFLINE_CHECKIN_ENABLED", "LABEL_PRINTING_ENABLED", "LABEL_LAYOUT", "CHECK_IN_COLOR_CONFIGURATION", "SECURITY_CSP_REPORT_ENABLED", "SECURITY_CSP_REPORT_URI", "EMBED_ALLOWED_ORIGINS", "EMBED_POST_MESSAGE_ORIGIN", "TRANSLATION_OVERRIDE", "BASE_CUSTOM_CSS", "EVENT_CUSTOM_CSS", "DESCRIPTION_MAXLENGTH", "OPENID_PUBLIC_ENABLED", "OPENID_CONFIGURATION_JSON", "GENERATE_TICKETS_FOR_SUBSCRIPTIONS" ] } } ], "responses" : { @@ -25105,8 +25157,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -25115,8 +25167,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -25171,8 +25223,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -25181,8 +25233,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -25222,7 +25274,7 @@ "required" : true, "schema" : { "type" : "string", - "enum" : [ "NOT_RECOGNIZED", "INIT_COMPLETED", "SYSTEM_API_KEY", "SHOW_PROJECT_BANNER", "SUPPORTED_LANGUAGES", "BASE_URL", "GLOBAL_PRIVACY_POLICY", "GLOBAL_TERMS", "ANNOUNCEMENT_BANNER_CONTENT", "MAPS_PROVIDER", "MAPS_CLIENT_API_KEY", "MAPS_HERE_APP_ID", "MAPS_HERE_APP_CODE", "MAPS_HERE_API_KEY", "RECAPTCHA_API_KEY", "RECAPTCHA_SECRET", "ENABLE_CAPTCHA_FOR_LOGIN", "DISPLAY_STATS_IN_EVENT_DETAIL", "DEMO_MODE_ACCOUNT_EXPIRATION_DAYS", "PLATFORM_MODE_ENABLED", "PLATFORM_FEE", "PLATFORM_FIXED_FEE", "PLATFORM_PERCENTAGE_FEE", "PLATFORM_MINIMUM_FEE", "PLATFORM_MAXIMUM_FEE", "PAYMENT_METHODS_BLACKLIST", "STRIPE_CC_ENABLED", "STRIPE_PUBLIC_KEY", "STRIPE_SECRET_KEY", "STRIPE_CONNECT_CLIENT_ID", "STRIPE_CONNECT_CALLBACK", "STRIPE_WEBHOOK_KEY", "STRIPE_WEBHOOK_PAYMENT_KEY", "STRIPE_CONNECTED_ID", "STRIPE_ENABLE_SCA", "SAFERPAY_ENABLED", "SAFERPAY_LIVE_MODE", "SAFERPAY_API_USERNAME", "SAFERPAY_API_PASSWORD", "SAFERPAY_CUSTOMER_ID", "SAFERPAY_TERMINAL_ID", "SPECIAL_PRICE_CODE_LENGTH", "MAX_AMOUNT_OF_TICKETS_BY_RESERVATION", "ASSIGNMENT_REMINDER_START", "ASSIGNMENT_REMINDER_INTERVAL", "OPTIONAL_DATA_REMINDER_ENABLED", "RESERVATION_TIMEOUT", "RESERVATION_MIN_TIMEOUT_AFTER_FAILED_PAYMENT", "NOTIFY_ALL_FAILED_PAYMENT_ATTEMPTS", "DISPLAY_TICKETS_LEFT_INDICATOR", "ENABLE_CAPTCHA_FOR_TICKET_SELECTION", "DISPLAY_EXPIRED_CATEGORIES", "DISPLAY_DISCOUNT_CODE_BOX", "USE_PARTNER_CODE_INSTEAD_OF_PROMOTIONAL", "ENABLE_CUSTOMER_REFERENCE", "ENABLE_ATTENDEE_AUTOCOMPLETE", "FORCE_TICKET_OWNER_ASSIGNMENT_AT_RESERVATION", "SEND_TICKETS_AUTOMATICALLY", "ALLOW_TICKET_DOWNLOAD", "SEND_RESERVATION_EMAIL_IF_NECESSARY", "ENABLE_TICKET_TRANSFER", "ALLOW_FREE_TICKETS_CANCELLATION", "INCLUDE_CHECK_IN_URL_ICAL", "MAILER_TYPE", "MAX_EMAIL_PER_CYCLE", "MAIL_REPLY_TO", "MAIL_SET_ORG_REPLY_TO", "MAIL_SYSTEM_NOTIFICATION_CC", "MAIL_FOOTER", "SMTP_HOST", "SMTP_PORT", "SMTP_PROTOCOL", "SMTP_USERNAME", "SMTP_PASSWORD", "SMTP_FROM_EMAIL", "SMTP_PROPERTIES", "BANK_TRANSFER_ENABLED", "DEFERRED_BANK_TRANSFER_ENABLED", "SHOW_ONLY_BASIC_INSTRUCTIONS", "DEFERRED_BANK_TRANSFER_SEND_CONFIRMATION_EMAIL", "OFFLINE_PAYMENT_DAYS", "OFFLINE_REMINDER_HOURS", "ENABLE_CAPTCHA_FOR_OFFLINE_PAYMENTS", "BANK_ACCOUNT_NR", "BANK_ACCOUNT_OWNER", "AUTOMATIC_REMOVAL_EXPIRED_OFFLINE_PAYMENT", "PARTIAL_RESERVATION_ID_LENGTH", "REVOLUT_ENABLED", "REVOLUT_MANUAL_REVIEW", "REVOLUT_LIVE_MODE", "REVOLUT_API_KEY", "MAILGUN_KEY", "MAILGUN_DOMAIN", "MAILGUN_FROM", "MAILGUN_EU", "SENDGRID_API_KEY", "SENDGRID_FROM", "MAILJET_APIKEY_PUBLIC", "MAILJET_APIKEY_PRIVATE", "MAILJET_FROM", "GOOGLE_ANALYTICS_KEY", "GOOGLE_ANALYTICS_ANONYMOUS_MODE", "ENABLE_WAITING_QUEUE", "ENABLE_PRE_REGISTRATION", "ENABLE_WAITING_QUEUE_NOTIFICATION", "WAITING_QUEUE_RESERVATION_TIMEOUT", "STOP_WAITING_QUEUE_SUBSCRIPTIONS", "ENABLE_HTML_EMAILS", "MAIL_ATTEMPTS_COUNT", "PAYPAL_ENABLED", "PAYPAL_CLIENT_ID", "PAYPAL_CLIENT_SECRET", "PAYPAL_LIVE_MODE", "PAYPAL_DEMO_MODE_USERNAME", "PAYPAL_DEMO_MODE_PASSWORD", "MOLLIE_CC_ENABLED", "MOLLIE_API_KEY", "MOLLIE_CONNECT_CLIENT_ID", "MOLLIE_CONNECT_REFRESH_TOKEN", "MOLLIE_CONNECT_CLIENT_SECRET", "MOLLIE_CONNECT_CALLBACK", "MOLLIE_CONNECT_PROFILE_ID", "MOLLIE_CONNECT_LIVE_MODE", "ON_SITE_ENABLED", "SEND_TICKETS_AFTER_IMPORT_ATTENDEE", "CREATE_RESERVATION_FOR_EACH_IMPORTED_ATTENDEE", "VAT_NR", "INVOICE_NUMBER_PATTERN", "INVOICE_ADDRESS", "USE_INVOICE_NUMBER_AS_ID", "VAT_NUMBER_IS_REQUIRED", "GENERATE_ONLY_INVOICE", "REUSE_INVOICE_NUMBER_FOR_CREDIT_NOTE", "ENABLE_ITALY_E_INVOICING", "ITALY_E_INVOICING_SEND_PROFORMA", "ENABLE_EU_VAT_DIRECTIVE", "ENABLE_REVERSE_CHARGE_ONLINE", "ENABLE_REVERSE_CHARGE_IN_PERSON", "ENABLE_VIES_VALIDATION", "APPLY_VAT_FOREIGN_BUSINESS", "COUNTRY_OF_BUSINESS", "EU_COUNTRIES_LIST", "EU_VAT_API_ADDRESS", "APPLY_TAX_TO_CATEGORY", "ENABLE_PASS", "PASSBOOK_TYPE_IDENTIFIER", "PASSBOOK_TEAM_IDENTIFIER", "PASSBOOK_KEYSTORE", "PASSBOOK_KEYSTORE_PASSWORD", "PASSBOOK_PRIVATE_KEY_ALIAS", "CHECK_IN_STATS", "ALFIO_PI_INTEGRATION_ENABLED", "OFFLINE_CHECKIN_ENABLED", "LABEL_PRINTING_ENABLED", "LABEL_LAYOUT", "CHECK_IN_COLOR_CONFIGURATION", "SECURITY_CSP_REPORT_ENABLED", "SECURITY_CSP_REPORT_URI", "EMBED_ALLOWED_ORIGINS", "EMBED_POST_MESSAGE_ORIGIN", "TRANSLATION_OVERRIDE", "BASE_CUSTOM_CSS", "EVENT_CUSTOM_CSS", "DESCRIPTION_MAXLENGTH", "OPENID_PUBLIC_ENABLED", "OPENID_CONFIGURATION_JSON", "GENERATE_TICKETS_FOR_SUBSCRIPTIONS" ] + "enum" : [ "NOT_RECOGNIZED", "INIT_COMPLETED", "SYSTEM_API_KEY", "SHOW_PROJECT_BANNER", "SUPPORTED_LANGUAGES", "BASE_URL", "GLOBAL_PRIVACY_POLICY", "GLOBAL_TERMS", "ANNOUNCEMENT_BANNER_CONTENT", "MAPS_PROVIDER", "MAPS_CLIENT_API_KEY", "MAPS_HERE_APP_ID", "MAPS_HERE_APP_CODE", "MAPS_HERE_API_KEY", "RECAPTCHA_API_KEY", "RECAPTCHA_SECRET", "ENABLE_CAPTCHA_FOR_LOGIN", "DISPLAY_STATS_IN_EVENT_DETAIL", "DEMO_MODE_ACCOUNT_EXPIRATION_DAYS", "PLATFORM_MODE_ENABLED", "PLATFORM_FEE", "PLATFORM_FIXED_FEE", "PLATFORM_PERCENTAGE_FEE", "PLATFORM_MINIMUM_FEE", "PLATFORM_MAXIMUM_FEE", "PAYMENT_METHODS_BLACKLIST", "STRIPE_CC_ENABLED", "STRIPE_PUBLIC_KEY", "STRIPE_SECRET_KEY", "STRIPE_CONNECT_CLIENT_ID", "STRIPE_CONNECT_CALLBACK", "STRIPE_WEBHOOK_KEY", "STRIPE_WEBHOOK_PAYMENT_KEY", "STRIPE_CONNECTED_ID", "STRIPE_ENABLE_SCA", "SAFERPAY_ENABLED", "SAFERPAY_LIVE_MODE", "SAFERPAY_API_USERNAME", "SAFERPAY_API_PASSWORD", "SAFERPAY_CUSTOMER_ID", "SAFERPAY_TERMINAL_ID", "SPECIAL_PRICE_CODE_LENGTH", "MAX_AMOUNT_OF_TICKETS_BY_RESERVATION", "ASSIGNMENT_REMINDER_START", "ASSIGNMENT_REMINDER_INTERVAL", "OPTIONAL_DATA_REMINDER_ENABLED", "RESERVATION_TIMEOUT", "RESERVATION_MIN_TIMEOUT_AFTER_FAILED_PAYMENT", "NOTIFY_ALL_FAILED_PAYMENT_ATTEMPTS", "DISPLAY_TICKETS_LEFT_INDICATOR", "ENABLE_CAPTCHA_FOR_TICKET_SELECTION", "DISPLAY_EXPIRED_CATEGORIES", "DISPLAY_DISCOUNT_CODE_BOX", "USE_PARTNER_CODE_INSTEAD_OF_PROMOTIONAL", "ENABLE_CUSTOMER_REFERENCE", "ENABLE_ATTENDEE_AUTOCOMPLETE", "FORCE_TICKET_OWNER_ASSIGNMENT_AT_RESERVATION", "SEND_TICKETS_AUTOMATICALLY", "ALLOW_TICKET_DOWNLOAD", "SEND_RESERVATION_EMAIL_IF_NECESSARY", "ENABLE_TICKET_TRANSFER", "ALLOW_FREE_TICKETS_CANCELLATION", "INCLUDE_CHECK_IN_URL_ICAL", "MAILER_TYPE", "MAX_EMAIL_PER_CYCLE", "MAIL_REPLY_TO", "MAIL_SET_ORG_REPLY_TO", "MAIL_SYSTEM_NOTIFICATION_CC", "MAIL_FOOTER", "SMTP_HOST", "SMTP_PORT", "SMTP_PROTOCOL", "SMTP_USERNAME", "SMTP_PASSWORD", "SMTP_FROM_EMAIL", "SMTP_PROPERTIES", "BANK_TRANSFER_ENABLED", "DEFERRED_BANK_TRANSFER_ENABLED", "SHOW_ONLY_BASIC_INSTRUCTIONS", "DEFERRED_BANK_TRANSFER_SEND_CONFIRMATION_EMAIL", "OFFLINE_PAYMENT_DAYS", "OFFLINE_REMINDER_HOURS", "ENABLE_CAPTCHA_FOR_OFFLINE_PAYMENTS", "BANK_ACCOUNT_NR", "BANK_ACCOUNT_OWNER", "AUTOMATIC_REMOVAL_EXPIRED_OFFLINE_PAYMENT", "PARTIAL_RESERVATION_ID_LENGTH", "REVOLUT_ENABLED", "REVOLUT_MANUAL_REVIEW", "REVOLUT_LIVE_MODE", "REVOLUT_API_KEY", "MAILGUN_KEY", "MAILGUN_DOMAIN", "MAILGUN_FROM", "MAILGUN_EU", "SENDGRID_API_KEY", "SENDGRID_FROM", "MAILJET_APIKEY_PUBLIC", "MAILJET_APIKEY_PRIVATE", "MAILJET_FROM", "GOOGLE_ANALYTICS_KEY", "GOOGLE_ANALYTICS_ANONYMOUS_MODE", "ENABLE_WAITING_QUEUE", "ENABLE_PRE_REGISTRATION", "ENABLE_WAITING_QUEUE_NOTIFICATION", "WAITING_QUEUE_RESERVATION_TIMEOUT", "STOP_WAITING_QUEUE_SUBSCRIPTIONS", "ENABLE_HTML_EMAILS", "MAIL_ATTEMPTS_COUNT", "PAYPAL_ENABLED", "PAYPAL_CLIENT_ID", "PAYPAL_CLIENT_SECRET", "PAYPAL_LIVE_MODE", "PAYPAL_DEMO_MODE_USERNAME", "PAYPAL_DEMO_MODE_PASSWORD", "MOLLIE_CC_ENABLED", "MOLLIE_API_KEY", "MOLLIE_CONNECT_CLIENT_ID", "MOLLIE_CONNECT_REFRESH_TOKEN", "MOLLIE_CONNECT_CLIENT_SECRET", "MOLLIE_CONNECT_CALLBACK", "MOLLIE_CONNECT_PROFILE_ID", "MOLLIE_CONNECT_LIVE_MODE", "ON_SITE_ENABLED", "SEND_TICKETS_AFTER_IMPORT_ATTENDEE", "CREATE_RESERVATION_FOR_EACH_IMPORTED_ATTENDEE", "VAT_NR", "INVOICE_NUMBER_PATTERN", "INVOICE_ADDRESS", "USE_INVOICE_NUMBER_AS_ID", "VAT_NUMBER_IS_REQUIRED", "GENERATE_ONLY_INVOICE", "REUSE_INVOICE_NUMBER_FOR_CREDIT_NOTE", "ENABLE_ITALY_E_INVOICING", "ITALY_E_INVOICING_SEND_PROFORMA", "ENABLE_EU_VAT_DIRECTIVE", "ENABLE_REVERSE_CHARGE_ONLINE", "ENABLE_REVERSE_CHARGE_IN_PERSON", "ENABLE_VIES_VALIDATION", "APPLY_VAT_FOREIGN_BUSINESS", "COUNTRY_OF_BUSINESS", "EU_COUNTRIES_LIST", "EU_VAT_API_ADDRESS", "APPLY_TAX_TO_CATEGORY", "ENABLE_PASS", "PASSBOOK_TYPE_IDENTIFIER", "PASSBOOK_TEAM_IDENTIFIER", "PASSBOOK_KEYSTORE", "PASSBOOK_KEYSTORE_PASSWORD", "PASSBOOK_PRIVATE_KEY_ALIAS", "ENABLE_WALLET", "WALLET_ISSUER_IDENTIFIER", "WALLET_SERVICE_ACCOUNT_KEY", "WALLET_OVERWRITE_PREVIOUS_CLASSES_AND_EVENTS", "CHECK_IN_STATS", "ALFIO_PI_INTEGRATION_ENABLED", "OFFLINE_CHECKIN_ENABLED", "LABEL_PRINTING_ENABLED", "LABEL_LAYOUT", "CHECK_IN_COLOR_CONFIGURATION", "SECURITY_CSP_REPORT_ENABLED", "SECURITY_CSP_REPORT_URI", "EMBED_ALLOWED_ORIGINS", "EMBED_POST_MESSAGE_ORIGIN", "TRANSLATION_OVERRIDE", "BASE_CUSTOM_CSS", "EVENT_CUSTOM_CSS", "DESCRIPTION_MAXLENGTH", "OPENID_PUBLIC_ENABLED", "OPENID_CONFIGURATION_JSON", "GENERATE_TICKETS_FOR_SUBSCRIPTIONS" ] } } ], "responses" : { @@ -25246,8 +25298,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -25256,8 +25308,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -25305,7 +25357,7 @@ "required" : true, "schema" : { "type" : "string", - "enum" : [ "NOT_RECOGNIZED", "INIT_COMPLETED", "SYSTEM_API_KEY", "SHOW_PROJECT_BANNER", "SUPPORTED_LANGUAGES", "BASE_URL", "GLOBAL_PRIVACY_POLICY", "GLOBAL_TERMS", "ANNOUNCEMENT_BANNER_CONTENT", "MAPS_PROVIDER", "MAPS_CLIENT_API_KEY", "MAPS_HERE_APP_ID", "MAPS_HERE_APP_CODE", "MAPS_HERE_API_KEY", "RECAPTCHA_API_KEY", "RECAPTCHA_SECRET", "ENABLE_CAPTCHA_FOR_LOGIN", "DISPLAY_STATS_IN_EVENT_DETAIL", "DEMO_MODE_ACCOUNT_EXPIRATION_DAYS", "PLATFORM_MODE_ENABLED", "PLATFORM_FEE", "PLATFORM_FIXED_FEE", "PLATFORM_PERCENTAGE_FEE", "PLATFORM_MINIMUM_FEE", "PLATFORM_MAXIMUM_FEE", "PAYMENT_METHODS_BLACKLIST", "STRIPE_CC_ENABLED", "STRIPE_PUBLIC_KEY", "STRIPE_SECRET_KEY", "STRIPE_CONNECT_CLIENT_ID", "STRIPE_CONNECT_CALLBACK", "STRIPE_WEBHOOK_KEY", "STRIPE_WEBHOOK_PAYMENT_KEY", "STRIPE_CONNECTED_ID", "STRIPE_ENABLE_SCA", "SAFERPAY_ENABLED", "SAFERPAY_LIVE_MODE", "SAFERPAY_API_USERNAME", "SAFERPAY_API_PASSWORD", "SAFERPAY_CUSTOMER_ID", "SAFERPAY_TERMINAL_ID", "SPECIAL_PRICE_CODE_LENGTH", "MAX_AMOUNT_OF_TICKETS_BY_RESERVATION", "ASSIGNMENT_REMINDER_START", "ASSIGNMENT_REMINDER_INTERVAL", "OPTIONAL_DATA_REMINDER_ENABLED", "RESERVATION_TIMEOUT", "RESERVATION_MIN_TIMEOUT_AFTER_FAILED_PAYMENT", "NOTIFY_ALL_FAILED_PAYMENT_ATTEMPTS", "DISPLAY_TICKETS_LEFT_INDICATOR", "ENABLE_CAPTCHA_FOR_TICKET_SELECTION", "DISPLAY_EXPIRED_CATEGORIES", "DISPLAY_DISCOUNT_CODE_BOX", "USE_PARTNER_CODE_INSTEAD_OF_PROMOTIONAL", "ENABLE_CUSTOMER_REFERENCE", "ENABLE_ATTENDEE_AUTOCOMPLETE", "FORCE_TICKET_OWNER_ASSIGNMENT_AT_RESERVATION", "SEND_TICKETS_AUTOMATICALLY", "ALLOW_TICKET_DOWNLOAD", "SEND_RESERVATION_EMAIL_IF_NECESSARY", "ENABLE_TICKET_TRANSFER", "ALLOW_FREE_TICKETS_CANCELLATION", "INCLUDE_CHECK_IN_URL_ICAL", "MAILER_TYPE", "MAX_EMAIL_PER_CYCLE", "MAIL_REPLY_TO", "MAIL_SET_ORG_REPLY_TO", "MAIL_SYSTEM_NOTIFICATION_CC", "MAIL_FOOTER", "SMTP_HOST", "SMTP_PORT", "SMTP_PROTOCOL", "SMTP_USERNAME", "SMTP_PASSWORD", "SMTP_FROM_EMAIL", "SMTP_PROPERTIES", "BANK_TRANSFER_ENABLED", "DEFERRED_BANK_TRANSFER_ENABLED", "SHOW_ONLY_BASIC_INSTRUCTIONS", "DEFERRED_BANK_TRANSFER_SEND_CONFIRMATION_EMAIL", "OFFLINE_PAYMENT_DAYS", "OFFLINE_REMINDER_HOURS", "ENABLE_CAPTCHA_FOR_OFFLINE_PAYMENTS", "BANK_ACCOUNT_NR", "BANK_ACCOUNT_OWNER", "AUTOMATIC_REMOVAL_EXPIRED_OFFLINE_PAYMENT", "PARTIAL_RESERVATION_ID_LENGTH", "REVOLUT_ENABLED", "REVOLUT_MANUAL_REVIEW", "REVOLUT_LIVE_MODE", "REVOLUT_API_KEY", "MAILGUN_KEY", "MAILGUN_DOMAIN", "MAILGUN_FROM", "MAILGUN_EU", "SENDGRID_API_KEY", "SENDGRID_FROM", "MAILJET_APIKEY_PUBLIC", "MAILJET_APIKEY_PRIVATE", "MAILJET_FROM", "GOOGLE_ANALYTICS_KEY", "GOOGLE_ANALYTICS_ANONYMOUS_MODE", "ENABLE_WAITING_QUEUE", "ENABLE_PRE_REGISTRATION", "ENABLE_WAITING_QUEUE_NOTIFICATION", "WAITING_QUEUE_RESERVATION_TIMEOUT", "STOP_WAITING_QUEUE_SUBSCRIPTIONS", "ENABLE_HTML_EMAILS", "MAIL_ATTEMPTS_COUNT", "PAYPAL_ENABLED", "PAYPAL_CLIENT_ID", "PAYPAL_CLIENT_SECRET", "PAYPAL_LIVE_MODE", "PAYPAL_DEMO_MODE_USERNAME", "PAYPAL_DEMO_MODE_PASSWORD", "MOLLIE_CC_ENABLED", "MOLLIE_API_KEY", "MOLLIE_CONNECT_CLIENT_ID", "MOLLIE_CONNECT_REFRESH_TOKEN", "MOLLIE_CONNECT_CLIENT_SECRET", "MOLLIE_CONNECT_CALLBACK", "MOLLIE_CONNECT_PROFILE_ID", "MOLLIE_CONNECT_LIVE_MODE", "ON_SITE_ENABLED", "SEND_TICKETS_AFTER_IMPORT_ATTENDEE", "CREATE_RESERVATION_FOR_EACH_IMPORTED_ATTENDEE", "VAT_NR", "INVOICE_NUMBER_PATTERN", "INVOICE_ADDRESS", "USE_INVOICE_NUMBER_AS_ID", "VAT_NUMBER_IS_REQUIRED", "GENERATE_ONLY_INVOICE", "REUSE_INVOICE_NUMBER_FOR_CREDIT_NOTE", "ENABLE_ITALY_E_INVOICING", "ITALY_E_INVOICING_SEND_PROFORMA", "ENABLE_EU_VAT_DIRECTIVE", "ENABLE_REVERSE_CHARGE_ONLINE", "ENABLE_REVERSE_CHARGE_IN_PERSON", "ENABLE_VIES_VALIDATION", "APPLY_VAT_FOREIGN_BUSINESS", "COUNTRY_OF_BUSINESS", "EU_COUNTRIES_LIST", "EU_VAT_API_ADDRESS", "APPLY_TAX_TO_CATEGORY", "ENABLE_PASS", "PASSBOOK_TYPE_IDENTIFIER", "PASSBOOK_TEAM_IDENTIFIER", "PASSBOOK_KEYSTORE", "PASSBOOK_KEYSTORE_PASSWORD", "PASSBOOK_PRIVATE_KEY_ALIAS", "CHECK_IN_STATS", "ALFIO_PI_INTEGRATION_ENABLED", "OFFLINE_CHECKIN_ENABLED", "LABEL_PRINTING_ENABLED", "LABEL_LAYOUT", "CHECK_IN_COLOR_CONFIGURATION", "SECURITY_CSP_REPORT_ENABLED", "SECURITY_CSP_REPORT_URI", "EMBED_ALLOWED_ORIGINS", "EMBED_POST_MESSAGE_ORIGIN", "TRANSLATION_OVERRIDE", "BASE_CUSTOM_CSS", "EVENT_CUSTOM_CSS", "DESCRIPTION_MAXLENGTH", "OPENID_PUBLIC_ENABLED", "OPENID_CONFIGURATION_JSON", "GENERATE_TICKETS_FOR_SUBSCRIPTIONS" ] + "enum" : [ "NOT_RECOGNIZED", "INIT_COMPLETED", "SYSTEM_API_KEY", "SHOW_PROJECT_BANNER", "SUPPORTED_LANGUAGES", "BASE_URL", "GLOBAL_PRIVACY_POLICY", "GLOBAL_TERMS", "ANNOUNCEMENT_BANNER_CONTENT", "MAPS_PROVIDER", "MAPS_CLIENT_API_KEY", "MAPS_HERE_APP_ID", "MAPS_HERE_APP_CODE", "MAPS_HERE_API_KEY", "RECAPTCHA_API_KEY", "RECAPTCHA_SECRET", "ENABLE_CAPTCHA_FOR_LOGIN", "DISPLAY_STATS_IN_EVENT_DETAIL", "DEMO_MODE_ACCOUNT_EXPIRATION_DAYS", "PLATFORM_MODE_ENABLED", "PLATFORM_FEE", "PLATFORM_FIXED_FEE", "PLATFORM_PERCENTAGE_FEE", "PLATFORM_MINIMUM_FEE", "PLATFORM_MAXIMUM_FEE", "PAYMENT_METHODS_BLACKLIST", "STRIPE_CC_ENABLED", "STRIPE_PUBLIC_KEY", "STRIPE_SECRET_KEY", "STRIPE_CONNECT_CLIENT_ID", "STRIPE_CONNECT_CALLBACK", "STRIPE_WEBHOOK_KEY", "STRIPE_WEBHOOK_PAYMENT_KEY", "STRIPE_CONNECTED_ID", "STRIPE_ENABLE_SCA", "SAFERPAY_ENABLED", "SAFERPAY_LIVE_MODE", "SAFERPAY_API_USERNAME", "SAFERPAY_API_PASSWORD", "SAFERPAY_CUSTOMER_ID", "SAFERPAY_TERMINAL_ID", "SPECIAL_PRICE_CODE_LENGTH", "MAX_AMOUNT_OF_TICKETS_BY_RESERVATION", "ASSIGNMENT_REMINDER_START", "ASSIGNMENT_REMINDER_INTERVAL", "OPTIONAL_DATA_REMINDER_ENABLED", "RESERVATION_TIMEOUT", "RESERVATION_MIN_TIMEOUT_AFTER_FAILED_PAYMENT", "NOTIFY_ALL_FAILED_PAYMENT_ATTEMPTS", "DISPLAY_TICKETS_LEFT_INDICATOR", "ENABLE_CAPTCHA_FOR_TICKET_SELECTION", "DISPLAY_EXPIRED_CATEGORIES", "DISPLAY_DISCOUNT_CODE_BOX", "USE_PARTNER_CODE_INSTEAD_OF_PROMOTIONAL", "ENABLE_CUSTOMER_REFERENCE", "ENABLE_ATTENDEE_AUTOCOMPLETE", "FORCE_TICKET_OWNER_ASSIGNMENT_AT_RESERVATION", "SEND_TICKETS_AUTOMATICALLY", "ALLOW_TICKET_DOWNLOAD", "SEND_RESERVATION_EMAIL_IF_NECESSARY", "ENABLE_TICKET_TRANSFER", "ALLOW_FREE_TICKETS_CANCELLATION", "INCLUDE_CHECK_IN_URL_ICAL", "MAILER_TYPE", "MAX_EMAIL_PER_CYCLE", "MAIL_REPLY_TO", "MAIL_SET_ORG_REPLY_TO", "MAIL_SYSTEM_NOTIFICATION_CC", "MAIL_FOOTER", "SMTP_HOST", "SMTP_PORT", "SMTP_PROTOCOL", "SMTP_USERNAME", "SMTP_PASSWORD", "SMTP_FROM_EMAIL", "SMTP_PROPERTIES", "BANK_TRANSFER_ENABLED", "DEFERRED_BANK_TRANSFER_ENABLED", "SHOW_ONLY_BASIC_INSTRUCTIONS", "DEFERRED_BANK_TRANSFER_SEND_CONFIRMATION_EMAIL", "OFFLINE_PAYMENT_DAYS", "OFFLINE_REMINDER_HOURS", "ENABLE_CAPTCHA_FOR_OFFLINE_PAYMENTS", "BANK_ACCOUNT_NR", "BANK_ACCOUNT_OWNER", "AUTOMATIC_REMOVAL_EXPIRED_OFFLINE_PAYMENT", "PARTIAL_RESERVATION_ID_LENGTH", "REVOLUT_ENABLED", "REVOLUT_MANUAL_REVIEW", "REVOLUT_LIVE_MODE", "REVOLUT_API_KEY", "MAILGUN_KEY", "MAILGUN_DOMAIN", "MAILGUN_FROM", "MAILGUN_EU", "SENDGRID_API_KEY", "SENDGRID_FROM", "MAILJET_APIKEY_PUBLIC", "MAILJET_APIKEY_PRIVATE", "MAILJET_FROM", "GOOGLE_ANALYTICS_KEY", "GOOGLE_ANALYTICS_ANONYMOUS_MODE", "ENABLE_WAITING_QUEUE", "ENABLE_PRE_REGISTRATION", "ENABLE_WAITING_QUEUE_NOTIFICATION", "WAITING_QUEUE_RESERVATION_TIMEOUT", "STOP_WAITING_QUEUE_SUBSCRIPTIONS", "ENABLE_HTML_EMAILS", "MAIL_ATTEMPTS_COUNT", "PAYPAL_ENABLED", "PAYPAL_CLIENT_ID", "PAYPAL_CLIENT_SECRET", "PAYPAL_LIVE_MODE", "PAYPAL_DEMO_MODE_USERNAME", "PAYPAL_DEMO_MODE_PASSWORD", "MOLLIE_CC_ENABLED", "MOLLIE_API_KEY", "MOLLIE_CONNECT_CLIENT_ID", "MOLLIE_CONNECT_REFRESH_TOKEN", "MOLLIE_CONNECT_CLIENT_SECRET", "MOLLIE_CONNECT_CALLBACK", "MOLLIE_CONNECT_PROFILE_ID", "MOLLIE_CONNECT_LIVE_MODE", "ON_SITE_ENABLED", "SEND_TICKETS_AFTER_IMPORT_ATTENDEE", "CREATE_RESERVATION_FOR_EACH_IMPORTED_ATTENDEE", "VAT_NR", "INVOICE_NUMBER_PATTERN", "INVOICE_ADDRESS", "USE_INVOICE_NUMBER_AS_ID", "VAT_NUMBER_IS_REQUIRED", "GENERATE_ONLY_INVOICE", "REUSE_INVOICE_NUMBER_FOR_CREDIT_NOTE", "ENABLE_ITALY_E_INVOICING", "ITALY_E_INVOICING_SEND_PROFORMA", "ENABLE_EU_VAT_DIRECTIVE", "ENABLE_REVERSE_CHARGE_ONLINE", "ENABLE_REVERSE_CHARGE_IN_PERSON", "ENABLE_VIES_VALIDATION", "APPLY_VAT_FOREIGN_BUSINESS", "COUNTRY_OF_BUSINESS", "EU_COUNTRIES_LIST", "EU_VAT_API_ADDRESS", "APPLY_TAX_TO_CATEGORY", "ENABLE_PASS", "PASSBOOK_TYPE_IDENTIFIER", "PASSBOOK_TEAM_IDENTIFIER", "PASSBOOK_KEYSTORE", "PASSBOOK_KEYSTORE_PASSWORD", "PASSBOOK_PRIVATE_KEY_ALIAS", "ENABLE_WALLET", "WALLET_ISSUER_IDENTIFIER", "WALLET_SERVICE_ACCOUNT_KEY", "WALLET_OVERWRITE_PREVIOUS_CLASSES_AND_EVENTS", "CHECK_IN_STATS", "ALFIO_PI_INTEGRATION_ENABLED", "OFFLINE_CHECKIN_ENABLED", "LABEL_PRINTING_ENABLED", "LABEL_LAYOUT", "CHECK_IN_COLOR_CONFIGURATION", "SECURITY_CSP_REPORT_ENABLED", "SECURITY_CSP_REPORT_URI", "EMBED_ALLOWED_ORIGINS", "EMBED_POST_MESSAGE_ORIGIN", "TRANSLATION_OVERRIDE", "BASE_CUSTOM_CSS", "EVENT_CUSTOM_CSS", "DESCRIPTION_MAXLENGTH", "OPENID_PUBLIC_ENABLED", "OPENID_CONFIGURATION_JSON", "GENERATE_TICKETS_FOR_SUBSCRIPTIONS" ] } } ], "responses" : { @@ -25329,8 +25381,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -25339,8 +25391,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -25417,24 +25469,24 @@ "value" : { "type" : "boolean" }, - "errorCount" : { - "type" : "integer", - "format" : "int32" + "warnings" : { + "type" : "array", + "items" : { + "$ref" : "#/components/schemas/WarningMessage" + } }, "success" : { "type" : "boolean" }, + "errorCount" : { + "type" : "integer", + "format" : "int32" + }, "validationErrors" : { "type" : "array", "items" : { "$ref" : "#/components/schemas/ErrorDescriptor" } - }, - "warnings" : { - "type" : "array", - "items" : { - "$ref" : "#/components/schemas/WarningMessage" - } } } }, @@ -25571,13 +25623,12 @@ "enabled" : { "type" : "boolean" }, - "validTo" : { - "type" : "string", - "format" : "date-time" - }, "description" : { "type" : "string" }, + "username" : { + "type" : "string" + }, "firstName" : { "type" : "string" }, @@ -25587,12 +25638,13 @@ "emailAddress" : { "type" : "string" }, - "username" : { - "type" : "string" - }, "validToEpochSecond" : { "type" : "integer", "format" : "int64" + }, + "validTo" : { + "type" : "string", + "format" : "date-time" } } }, @@ -25635,11 +25687,11 @@ "success" : { "type" : "boolean" }, - "firstErrorOrNull" : { - "$ref" : "#/components/schemas/ErrorCode" - }, "formattedErrors" : { "type" : "string" + }, + "firstErrorOrNull" : { + "$ref" : "#/components/schemas/ErrorCode" } } }, @@ -26001,23 +26053,20 @@ "refundedAmount" : { "type" : "string" }, - "vatExempt" : { - "type" : "boolean" - }, "priceInCents" : { "type" : "integer", "format" : "int32" }, + "notYetPaid" : { + "type" : "boolean" + }, + "vatExempt" : { + "type" : "boolean" + }, "ticketAmount" : { "type" : "integer", "format" : "int32" }, - "descriptionForPayment" : { - "type" : "string" - }, - "notYetPaid" : { - "type" : "boolean" - }, "singleTicketOrder" : { "type" : "boolean" }, @@ -26027,6 +26076,9 @@ "totalNetPrice" : { "type" : "string" }, + "descriptionForPayment" : { + "type" : "string" + }, "displaySplitPaymentNote" : { "type" : "boolean" }, @@ -26098,10 +26150,10 @@ "currencyCode" : { "type" : "string" }, - "fixedAmount" : { + "dynamic" : { "type" : "boolean" }, - "dynamic" : { + "fixedAmount" : { "type" : "boolean" } } @@ -26125,11 +26177,11 @@ "success" : { "type" : "boolean" }, - "firstErrorOrNull" : { - "$ref" : "#/components/schemas/ErrorCode" - }, "formattedErrors" : { "type" : "string" + }, + "firstErrorOrNull" : { + "$ref" : "#/components/schemas/ErrorCode" } } }, @@ -26145,14 +26197,14 @@ "key" : { "$ref" : "#/components/schemas/TicketCategory" }, + "left" : { + "$ref" : "#/components/schemas/TicketCategory" + }, "right" : { "type" : "array", "items" : { "$ref" : "#/components/schemas/Ticket" } - }, - "left" : { - "$ref" : "#/components/schemas/TicketCategory" } } }, @@ -26290,14 +26342,14 @@ "type" : "string", "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "CUSTOM_INCLUDED_EXEMPT", "CUSTOM_NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] }, - "descriptionForPayment" : { - "type" : "string" - }, "discount" : { "type" : "boolean" }, "taxDetail" : { "type" : "boolean" + }, + "descriptionForPayment" : { + "type" : "string" } } }, @@ -26384,16 +26436,16 @@ "type" : "string", "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "CUSTOM_INCLUDED_EXEMPT", "CUSTOM_NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] }, - "assigned" : { - "type" : "boolean" - }, - "formattedFinalPrice" : { + "formattedNetPrice" : { "type" : "string" }, "checkedIn" : { "type" : "boolean" }, - "formattedNetPrice" : { + "assigned" : { + "type" : "boolean" + }, + "formattedFinalPrice" : { "type" : "string" } } @@ -26592,14 +26644,20 @@ "cancelled" : { "type" : "boolean" }, + "paidAmount" : { + "type" : "string" + }, "hasInvoiceNumber" : { "type" : "boolean" }, - "stuck" : { + "pendingOfflinePayment" : { "type" : "boolean" }, - "hasBillingAddress" : { - "type" : "boolean" + "lineSplittedBillingAddress" : { + "type" : "array", + "items" : { + "type" : "string" + } }, "hasInvoiceOrReceiptDocument" : { "type" : "boolean" @@ -26607,29 +26665,23 @@ "hasBeenPaid" : { "type" : "boolean" }, - "hasVatNumber" : { + "stuck" : { "type" : "boolean" }, - "lineSplittedBillingAddress" : { - "type" : "array", - "items" : { - "type" : "string" - } - }, - "paidAmount" : { - "type" : "string" - }, - "pendingOfflinePayment" : { + "hasBillingAddress" : { "type" : "boolean" }, - "taxablePrice" : { - "type" : "number" + "hasVatNumber" : { + "type" : "boolean" }, "finalPrice" : { "type" : "number" }, "netPrice" : { "type" : "number" + }, + "taxablePrice" : { + "type" : "number" } } }, @@ -26721,34 +26773,62 @@ "currencyCode" : { "type" : "string" }, + "paidAmount" : { + "type" : "string" + }, "status" : { "type" : "string", "enum" : [ "PENDING", "IN_PAYMENT", "EXTERNAL_PROCESSING_PAYMENT", "WAITING_EXTERNAL_CONFIRMATION", "OFFLINE_PAYMENT", "DEFERRED_OFFLINE_PAYMENT", "FINALIZING", "OFFLINE_FINALIZING", "COMPLETE", "STUCK", "CANCELLED", "CREDIT_NOTE_ISSUED" ] }, + "confirmationTimestamp" : { + "type" : "string", + "format" : "date-time" + }, + "discount" : { + "$ref" : "#/components/schemas/PromoCodeDiscount" + }, + "registrationTimestamp" : { + "type" : "string", + "format" : "date-time" + }, + "promoCodeDiscountId" : { + "type" : "integer", + "format" : "int32" + }, "firstName" : { "type" : "string" }, "lastName" : { "type" : "string" }, - "email" : { - "type" : "string" + "hasInvoiceNumber" : { + "type" : "boolean" }, "invoiceNumber" : { "type" : "string" }, + "paymentMethod" : { + "type" : "string", + "enum" : [ "STRIPE", "ON_SITE", "OFFLINE", "NONE", "ADMIN", "PAYPAL", "MOLLIE", "SAFERPAY" ] + }, "vatStatus" : { "type" : "string", "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "CUSTOM_INCLUDED_EXEMPT", "CUSTOM_NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] }, - "invoiceRequested" : { - "type" : "boolean" - }, - "finalPriceCts" : { + "srcPriceCts" : { "type" : "integer", "format" : "int32" }, - "srcPriceCts" : { + "finalPrice" : { + "type" : "number" + }, + "vat" : { + "type" : "number" + }, + "appliedDiscount" : { + "type" : "number" + }, + "finalPriceCts" : { "type" : "integer", "format" : "int32" }, @@ -26760,117 +26840,89 @@ "type" : "integer", "format" : "int32" }, - "paymentMethod" : { - "type" : "string", - "enum" : [ "STRIPE", "ON_SITE", "OFFLINE", "NONE", "ADMIN", "PAYPAL", "MOLLIE", "SAFERPAY" ] - }, "vatNr" : { "type" : "string" }, - "taxablePrice" : { + "vatCountryCode" : { + "type" : "string" + }, + "invoiceRequested" : { + "type" : "boolean" + }, + "vatPercentageOrZero" : { "type" : "number" }, - "appliedDiscount" : { + "netPrice" : { "type" : "number" }, - "userLanguage" : { + "email" : { "type" : "string" }, - "validity" : { - "type" : "string", - "format" : "date-time" + "userLanguage" : { + "type" : "string" }, - "promoCodeDiscountId" : { - "type" : "integer", - "format" : "int32" + "pendingOfflinePayment" : { + "type" : "boolean" }, - "confirmationTimestamp" : { + "validity" : { "type" : "string", "format" : "date-time" }, - "invoiceModel" : { - "type" : "string" - }, "billingAddress" : { "type" : "string" }, - "latestReminder" : { - "type" : "string", - "format" : "date-time" + "customerReference" : { + "type" : "string" }, - "reminderSent" : { - "type" : "boolean" + "lineSplittedBillingAddress" : { + "type" : "array", + "items" : { + "type" : "string" + } }, "directAssignmentRequested" : { "type" : "boolean" }, - "vatCountryCode" : { - "type" : "string" - }, - "usedVatPercent" : { - "type" : "number" - }, "vatIncluded" : { "type" : "boolean" }, - "creationTimestamp" : { - "type" : "string", - "format" : "date-time" - }, - "customerReference" : { - "type" : "string" - }, - "registrationTimestamp" : { - "type" : "string", - "format" : "date-time" - }, - "finalPrice" : { - "type" : "number" - }, - "vat" : { - "type" : "number" - }, - "discount" : { - "$ref" : "#/components/schemas/PromoCodeDiscount" - }, - "netPrice" : { - "type" : "number" - }, - "vatPercentageOrZero" : { - "type" : "number" - }, - "optionalVatPercentage" : { - "type" : "number" - }, - "hasInvoiceNumber" : { + "hasInvoiceOrReceiptDocument" : { "type" : "boolean" }, - "stuck" : { + "hasBeenPaid" : { "type" : "boolean" }, - "hasBillingAddress" : { + "stuck" : { "type" : "boolean" }, - "hasInvoiceOrReceiptDocument" : { + "reminderSent" : { "type" : "boolean" }, - "hasBeenPaid" : { + "hasBillingAddress" : { "type" : "boolean" }, "hasVatNumber" : { "type" : "boolean" }, - "lineSplittedBillingAddress" : { - "type" : "array", - "items" : { - "type" : "string" - } + "latestReminder" : { + "type" : "string", + "format" : "date-time" }, - "paidAmount" : { + "invoiceModel" : { "type" : "string" }, - "pendingOfflinePayment" : { - "type" : "boolean" + "usedVatPercent" : { + "type" : "number" + }, + "creationTimestamp" : { + "type" : "string", + "format" : "date-time" + }, + "optionalVatPercentage" : { + "type" : "number" + }, + "taxablePrice" : { + "type" : "number" } } }, @@ -27373,24 +27425,24 @@ "value" : { "$ref" : "#/components/schemas/User" }, - "errorCount" : { - "type" : "integer", - "format" : "int32" + "warnings" : { + "type" : "array", + "items" : { + "$ref" : "#/components/schemas/WarningMessage" + } }, "success" : { "type" : "boolean" }, + "errorCount" : { + "type" : "integer", + "format" : "int32" + }, "validationErrors" : { "type" : "array", "items" : { "$ref" : "#/components/schemas/ErrorDescriptor" } - }, - "warnings" : { - "type" : "array", - "items" : { - "$ref" : "#/components/schemas/WarningMessage" - } } } }, @@ -27411,24 +27463,24 @@ "value" : { "type" : "string" }, - "errorCount" : { - "type" : "integer", - "format" : "int32" + "warnings" : { + "type" : "array", + "items" : { + "$ref" : "#/components/schemas/WarningMessage" + } }, "success" : { "type" : "boolean" }, + "errorCount" : { + "type" : "integer", + "format" : "int32" + }, "validationErrors" : { "type" : "array", "items" : { "$ref" : "#/components/schemas/ErrorDescriptor" } - }, - "warnings" : { - "type" : "array", - "items" : { - "$ref" : "#/components/schemas/WarningMessage" - } } } }, @@ -27562,12 +27614,12 @@ "type" : "string", "enum" : [ "CREDIT_CARD", "PAYPAL", "IDEAL", "BANK_TRANSFER", "ON_SITE", "NONE", "APPLE_PAY", "BANCONTACT", "ING_HOME_PAY", "BELFIUS", "KBC", "PRZELEWY_24", "ALIPAY", "POSTFINANCE", "TWINT" ] }, - "token" : { - "type" : "string" - }, "paymentProvider" : { "type" : "string", "enum" : [ "STRIPE", "ON_SITE", "OFFLINE", "NONE", "ADMIN", "PAYPAL", "MOLLIE", "SAFERPAY" ] + }, + "token" : { + "type" : "string" } } }, @@ -27648,24 +27700,24 @@ "value" : { "$ref" : "#/components/schemas/ReservationPaymentResult" }, - "errorCount" : { - "type" : "integer", - "format" : "int32" + "warnings" : { + "type" : "array", + "items" : { + "$ref" : "#/components/schemas/WarningMessage" + } }, "success" : { "type" : "boolean" }, + "errorCount" : { + "type" : "integer", + "format" : "int32" + }, "validationErrors" : { "type" : "array", "items" : { "$ref" : "#/components/schemas/ErrorDescriptor" } - }, - "warnings" : { - "type" : "array", - "items" : { - "$ref" : "#/components/schemas/WarningMessage" - } } } }, @@ -27812,16 +27864,16 @@ "captcha" : { "type" : "string" }, - "tickets" : { + "additionalServices" : { "type" : "array", "items" : { - "$ref" : "#/components/schemas/TicketReservationModification" + "$ref" : "#/components/schemas/AdditionalServiceReservationModification" } }, - "additionalServices" : { + "tickets" : { "type" : "array", "items" : { - "$ref" : "#/components/schemas/AdditionalServiceReservationModification" + "$ref" : "#/components/schemas/TicketReservationModification" } } } @@ -28053,14 +28105,6 @@ "type" : "integer", "format" : "int32" }, - "timeUnit" : { - "type" : "string", - "enum" : [ "DAYS", "MONTHS", "YEARS" ] - }, - "numEntries" : { - "type" : "integer", - "format" : "int32" - }, "validityFrom" : { "type" : "string", "format" : "date-time" @@ -28068,6 +28112,14 @@ "validityTo" : { "type" : "string", "format" : "date-time" + }, + "timeUnit" : { + "type" : "string", + "enum" : [ "DAYS", "MONTHS", "YEARS" ] + }, + "numEntries" : { + "type" : "integer", + "format" : "int32" } } }, @@ -28076,6 +28128,12 @@ "properties" : { "hideContactData" : { "type" : "boolean" + }, + "hideConfirmationButtons" : { + "type" : "boolean" + }, + "lockEmailEdit" : { + "type" : "boolean" } } }, @@ -28610,33 +28668,51 @@ "currencyCode" : { "type" : "string" }, + "formattedNetPrice" : { + "type" : "string" + }, + "extReference" : { + "type" : "string" + }, "status" : { "type" : "string", "enum" : [ "FREE", "PENDING", "TO_BE_PAID", "ACQUIRED", "CANCELLED", "CHECKED_IN", "EXPIRED", "INVALIDATED", "RELEASED", "PRE_RESERVED" ] }, - "firstName" : { - "type" : "string" + "checkedIn" : { + "type" : "boolean" }, - "lastName" : { - "type" : "string" + "creation" : { + "type" : "string", + "format" : "date-time" }, - "email" : { - "type" : "string" + "tags" : { + "type" : "array", + "items" : { + "type" : "string" + } }, "assigned" : { "type" : "boolean" }, - "formattedFinalPrice" : { + "eventId" : { + "type" : "integer", + "format" : "int32" + }, + "firstName" : { + "type" : "string" + }, + "lastName" : { "type" : "string" }, + "subscriptionId" : { + "type" : "string", + "format" : "uuid" + }, "vatStatus" : { "type" : "string", "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "CUSTOM_INCLUDED_EXEMPT", "CUSTOM_NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] }, - "uuid" : { - "type" : "string" - }, - "categoryId" : { + "srcPriceCts" : { "type" : "integer", "format" : "int32" }, @@ -28644,10 +28720,6 @@ "type" : "integer", "format" : "int32" }, - "srcPriceCts" : { - "type" : "integer", - "format" : "int32" - }, "vatCts" : { "type" : "integer", "format" : "int32" @@ -28656,42 +28728,28 @@ "type" : "integer", "format" : "int32" }, - "ticketsReservationId" : { + "email" : { "type" : "string" }, - "eventId" : { + "userLanguage" : { + "type" : "string" + }, + "categoryId" : { "type" : "integer", "format" : "int32" }, - "userLanguage" : { + "ticketsReservationId" : { "type" : "string" }, - "tags" : { - "type" : "array", - "items" : { - "type" : "string" - } + "uuid" : { + "type" : "string" }, "lockedAssignment" : { "type" : "boolean" }, - "checkedIn" : { - "type" : "boolean" - }, - "formattedNetPrice" : { - "type" : "string" - }, - "creation" : { - "type" : "string", - "format" : "date-time" - }, - "extReference" : { + "formattedFinalPrice" : { "type" : "string" }, - "subscriptionId" : { - "type" : "string", - "format" : "uuid" - }, "categoryName" : { "type" : "string" } @@ -28857,11 +28915,11 @@ "success" : { "type" : "boolean" }, - "firstErrorOrNull" : { - "$ref" : "#/components/schemas/ErrorCode" - }, "formattedErrors" : { "type" : "string" + }, + "firstErrorOrNull" : { + "$ref" : "#/components/schemas/ErrorCode" } } }, @@ -28919,11 +28977,11 @@ "success" : { "type" : "boolean" }, - "firstErrorOrNull" : { - "$ref" : "#/components/schemas/ErrorCode" - }, "formattedErrors" : { "type" : "string" + }, + "firstErrorOrNull" : { + "$ref" : "#/components/schemas/ErrorCode" } } }, @@ -29258,13 +29316,13 @@ "supportsTicketsGeneration" : { "type" : "boolean" }, - "publicIdentifier" : { - "type" : "string" - }, "priceCts" : { "type" : "integer", "format" : "int32" }, + "publicIdentifier" : { + "type" : "string" + }, "validityFromModel" : { "$ref" : "#/components/schemas/DateTimeModification" }, @@ -29378,11 +29436,11 @@ "key" : { "type" : "boolean" }, - "right" : { - "type" : "string" - }, "left" : { "type" : "boolean" + }, + "right" : { + "type" : "string" } } }, @@ -29570,16 +29628,16 @@ "locationDescriptor" : { "$ref" : "#/components/schemas/LocationDescriptor" }, - "vatStatus" : { - "type" : "string", - "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "CUSTOM_INCLUDED_EXEMPT", "CUSTOM_NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] + "online" : { + "type" : "boolean" }, "priceInCents" : { "type" : "integer", "format" : "int32" }, - "online" : { - "type" : "boolean" + "vatStatus" : { + "type" : "string", + "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "CUSTOM_INCLUDED_EXEMPT", "CUSTOM_NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] } } }, @@ -29712,12 +29770,12 @@ "TripleBooleanStringString" : { "type" : "object", "properties" : { - "right" : { - "type" : "string" - }, "left" : { "type" : "boolean" }, + "right" : { + "type" : "string" + }, "middle" : { "type" : "string" } @@ -29936,33 +29994,51 @@ "currencyCode" : { "type" : "string" }, + "formattedNetPrice" : { + "type" : "string" + }, + "extReference" : { + "type" : "string" + }, "status" : { "type" : "string", "enum" : [ "FREE", "PENDING", "TO_BE_PAID", "ACQUIRED", "CANCELLED", "CHECKED_IN", "EXPIRED", "INVALIDATED", "RELEASED", "PRE_RESERVED" ] }, - "firstName" : { - "type" : "string" + "checkedIn" : { + "type" : "boolean" }, - "lastName" : { - "type" : "string" + "creation" : { + "type" : "string", + "format" : "date-time" }, - "email" : { - "type" : "string" + "tags" : { + "type" : "array", + "items" : { + "type" : "string" + } }, "assigned" : { "type" : "boolean" }, - "formattedFinalPrice" : { + "eventId" : { + "type" : "integer", + "format" : "int32" + }, + "firstName" : { + "type" : "string" + }, + "lastName" : { "type" : "string" }, + "subscriptionId" : { + "type" : "string", + "format" : "uuid" + }, "vatStatus" : { "type" : "string", "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "CUSTOM_INCLUDED_EXEMPT", "CUSTOM_NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] }, - "uuid" : { - "type" : "string" - }, - "categoryId" : { + "srcPriceCts" : { "type" : "integer", "format" : "int32" }, @@ -29970,10 +30046,6 @@ "type" : "integer", "format" : "int32" }, - "srcPriceCts" : { - "type" : "integer", - "format" : "int32" - }, "vatCts" : { "type" : "integer", "format" : "int32" @@ -29982,41 +30054,27 @@ "type" : "integer", "format" : "int32" }, - "ticketsReservationId" : { + "email" : { "type" : "string" }, - "eventId" : { + "userLanguage" : { + "type" : "string" + }, + "categoryId" : { "type" : "integer", "format" : "int32" }, - "userLanguage" : { + "ticketsReservationId" : { "type" : "string" }, - "tags" : { - "type" : "array", - "items" : { - "type" : "string" - } + "uuid" : { + "type" : "string" }, "lockedAssignment" : { "type" : "boolean" }, - "checkedIn" : { - "type" : "boolean" - }, - "formattedNetPrice" : { - "type" : "string" - }, - "creation" : { - "type" : "string", - "format" : "date-time" - }, - "extReference" : { + "formattedFinalPrice" : { "type" : "string" - }, - "subscriptionId" : { - "type" : "string", - "format" : "uuid" } } }, @@ -30681,15 +30739,21 @@ "currency" : { "type" : "string" }, + "validityType" : { + "type" : "string", + "enum" : [ "STANDARD", "CUSTOM", "NOT_SET" ] + }, "description" : { "type" : "object", "additionalProperties" : { "type" : "string" } }, - "usageType" : { - "type" : "string", - "enum" : [ "ONCE_PER_EVENT", "UNLIMITED" ] + "title" : { + "type" : "object", + "additionalProperties" : { + "type" : "string" + } }, "vat" : { "type" : "string" @@ -30698,38 +30762,35 @@ "type" : "integer", "format" : "int32" }, - "free" : { - "type" : "boolean" - }, "vatIncluded" : { "type" : "boolean" }, - "fileBlobId" : { - "type" : "string" - }, - "title" : { - "type" : "object", - "additionalProperties" : { - "type" : "string" - } - }, "termsAndConditionsUrl" : { "type" : "string" }, "privacyPolicyUrl" : { "type" : "string" }, - "validityType" : { - "type" : "string", - "enum" : [ "STANDARD", "CUSTOM", "NOT_SET" ] + "validityUnits" : { + "type" : "integer", + "format" : "int32" }, "validityTimeUnit" : { "type" : "string", "enum" : [ "DAYS", "MONTHS", "YEARS" ] }, - "validityUnits" : { - "type" : "integer", - "format" : "int32" + "usageType" : { + "type" : "string", + "enum" : [ "ONCE_PER_EVENT", "UNLIMITED" ] + }, + "free" : { + "type" : "boolean" + }, + "fileBlobId" : { + "type" : "string" + }, + "formattedPrice" : { + "type" : "string" }, "assignmentConfiguration" : { "$ref" : "#/components/schemas/AssignmentConfiguration" @@ -30740,9 +30801,6 @@ "canApplySubscriptions" : { "type" : "boolean" }, - "formattedPrice" : { - "type" : "string" - }, "contentLanguages" : { "type" : "array", "items" : { @@ -30760,20 +30818,20 @@ "redirectUrl" : { "type" : "string" }, - "redirect" : { + "initialized" : { "type" : "boolean" }, - "gatewayIdOrNull" : { - "type" : "string" - }, "successful" : { "type" : "boolean" }, "failed" : { "type" : "boolean" }, - "initialized" : { + "redirect" : { "type" : "boolean" + }, + "gatewayIdOrNull" : { + "type" : "string" } } }, @@ -31048,6 +31106,12 @@ }, "finalized" : { "type" : "boolean" + }, + "hideConfirmationButtons" : { + "type" : "boolean" + }, + "lockEmailEdit" : { + "type" : "boolean" } } }, @@ -31282,19 +31346,7 @@ "websiteUrl" : { "type" : "string" }, - "vat" : { - "type" : "string" - }, - "free" : { - "type" : "boolean" - }, - "sameDay" : { - "type" : "boolean" - }, - "vatIncluded" : { - "type" : "boolean" - }, - "fileBlobId" : { + "shortName" : { "type" : "string" }, "title" : { @@ -31303,21 +31355,33 @@ "type" : "string" } }, - "shortName" : { + "vat" : { "type" : "string" }, + "vatIncluded" : { + "type" : "boolean" + }, "termsAndConditionsUrl" : { "type" : "string" }, "privacyPolicyUrl" : { "type" : "string" }, + "free" : { + "type" : "boolean" + }, + "fileBlobId" : { + "type" : "string" + }, "organizationName" : { "type" : "string" }, "organizationEmail" : { "type" : "string" }, + "sameDay" : { + "type" : "boolean" + }, "datesWithOffset" : { "$ref" : "#/components/schemas/DatesWithTimeZoneOffset" }, @@ -31368,24 +31432,24 @@ "value" : { "$ref" : "#/components/schemas/EventCode" }, - "errorCount" : { - "type" : "integer", - "format" : "int32" + "warnings" : { + "type" : "array", + "items" : { + "$ref" : "#/components/schemas/WarningMessage" + } }, "success" : { "type" : "boolean" }, + "errorCount" : { + "type" : "integer", + "format" : "int32" + }, "validationErrors" : { "type" : "array", "items" : { "$ref" : "#/components/schemas/ErrorDescriptor" } - }, - "warnings" : { - "type" : "array", - "items" : { - "$ref" : "#/components/schemas/WarningMessage" - } } } }, @@ -31585,24 +31649,24 @@ "$ref" : "#/components/schemas/Poll" } }, - "errorCount" : { - "type" : "integer", - "format" : "int32" + "warnings" : { + "type" : "array", + "items" : { + "$ref" : "#/components/schemas/WarningMessage" + } }, "success" : { "type" : "boolean" }, + "errorCount" : { + "type" : "integer", + "format" : "int32" + }, "validationErrors" : { "type" : "array", "items" : { "$ref" : "#/components/schemas/ErrorDescriptor" } - }, - "warnings" : { - "type" : "array", - "items" : { - "$ref" : "#/components/schemas/WarningMessage" - } } } }, @@ -31651,24 +31715,24 @@ "value" : { "$ref" : "#/components/schemas/PollWithOptions" }, - "errorCount" : { - "type" : "integer", - "format" : "int32" + "warnings" : { + "type" : "array", + "items" : { + "$ref" : "#/components/schemas/WarningMessage" + } }, "success" : { "type" : "boolean" }, + "errorCount" : { + "type" : "integer", + "format" : "int32" + }, "validationErrors" : { "type" : "array", "items" : { "$ref" : "#/components/schemas/ErrorDescriptor" } - }, - "warnings" : { - "type" : "array", - "items" : { - "$ref" : "#/components/schemas/WarningMessage" - } } } }, @@ -31698,6 +31762,20 @@ }, "announcementBannerContentHTML" : { "type" : "string" + }, + "walletConfiguration" : { + "$ref" : "#/components/schemas/WalletConfiguration" + } + } + }, + "WalletConfiguration" : { + "type" : "object", + "properties" : { + "isgWalletEnabled" : { + "type" : "boolean" + }, + "passEnabled" : { + "type" : "boolean" } } }, @@ -31884,12 +31962,18 @@ "displayName" : { "type" : "string" }, + "freeOfCharge" : { + "type" : "boolean" + }, "contentLanguages" : { "type" : "array", "items" : { "$ref" : "#/components/schemas/ContentLanguage" } }, + "publicIdentifier" : { + "type" : "string" + }, "allowedPaymentProxies" : { "type" : "array", "items" : { @@ -31901,12 +31985,6 @@ "type" : "string", "format" : "date-time" }, - "freeOfCharge" : { - "type" : "boolean" - }, - "publicIdentifier" : { - "type" : "string" - }, "privacyPolicyLinkOrNull" : { "type" : "string" }, @@ -31961,6 +32039,42 @@ } } }, + "Configuration" : { + "type" : "object", + "properties" : { + "id" : { + "type" : "integer", + "format" : "int32" + }, + "key" : { + "type" : "string" + }, + "value" : { + "type" : "string" + }, + "configurationPathLevel" : { + "type" : "string", + "enum" : [ "EXTERNAL", "SYSTEM", "ORGANIZATION", "EVENT", "TICKET_CATEGORY" ] + }, + "description" : { + "type" : "string" + }, + "configurationKey" : { + "type" : "string", + "enum" : [ "NOT_RECOGNIZED", "INIT_COMPLETED", "SYSTEM_API_KEY", "SHOW_PROJECT_BANNER", "SUPPORTED_LANGUAGES", "BASE_URL", "GLOBAL_PRIVACY_POLICY", "GLOBAL_TERMS", "ANNOUNCEMENT_BANNER_CONTENT", "MAPS_PROVIDER", "MAPS_CLIENT_API_KEY", "MAPS_HERE_APP_ID", "MAPS_HERE_APP_CODE", "MAPS_HERE_API_KEY", "RECAPTCHA_API_KEY", "RECAPTCHA_SECRET", "ENABLE_CAPTCHA_FOR_LOGIN", "DISPLAY_STATS_IN_EVENT_DETAIL", "DEMO_MODE_ACCOUNT_EXPIRATION_DAYS", "PLATFORM_MODE_ENABLED", "PLATFORM_FEE", "PLATFORM_FIXED_FEE", "PLATFORM_PERCENTAGE_FEE", "PLATFORM_MINIMUM_FEE", "PLATFORM_MAXIMUM_FEE", "PAYMENT_METHODS_BLACKLIST", "STRIPE_CC_ENABLED", "STRIPE_PUBLIC_KEY", "STRIPE_SECRET_KEY", "STRIPE_CONNECT_CLIENT_ID", "STRIPE_CONNECT_CALLBACK", "STRIPE_WEBHOOK_KEY", "STRIPE_WEBHOOK_PAYMENT_KEY", "STRIPE_CONNECTED_ID", "STRIPE_ENABLE_SCA", "SAFERPAY_ENABLED", "SAFERPAY_LIVE_MODE", "SAFERPAY_API_USERNAME", "SAFERPAY_API_PASSWORD", "SAFERPAY_CUSTOMER_ID", "SAFERPAY_TERMINAL_ID", "SPECIAL_PRICE_CODE_LENGTH", "MAX_AMOUNT_OF_TICKETS_BY_RESERVATION", "ASSIGNMENT_REMINDER_START", "ASSIGNMENT_REMINDER_INTERVAL", "OPTIONAL_DATA_REMINDER_ENABLED", "RESERVATION_TIMEOUT", "RESERVATION_MIN_TIMEOUT_AFTER_FAILED_PAYMENT", "NOTIFY_ALL_FAILED_PAYMENT_ATTEMPTS", "DISPLAY_TICKETS_LEFT_INDICATOR", "ENABLE_CAPTCHA_FOR_TICKET_SELECTION", "DISPLAY_EXPIRED_CATEGORIES", "DISPLAY_DISCOUNT_CODE_BOX", "USE_PARTNER_CODE_INSTEAD_OF_PROMOTIONAL", "ENABLE_CUSTOMER_REFERENCE", "ENABLE_ATTENDEE_AUTOCOMPLETE", "FORCE_TICKET_OWNER_ASSIGNMENT_AT_RESERVATION", "SEND_TICKETS_AUTOMATICALLY", "ALLOW_TICKET_DOWNLOAD", "SEND_RESERVATION_EMAIL_IF_NECESSARY", "ENABLE_TICKET_TRANSFER", "ALLOW_FREE_TICKETS_CANCELLATION", "INCLUDE_CHECK_IN_URL_ICAL", "MAILER_TYPE", "MAX_EMAIL_PER_CYCLE", "MAIL_REPLY_TO", "MAIL_SET_ORG_REPLY_TO", "MAIL_SYSTEM_NOTIFICATION_CC", "MAIL_FOOTER", "SMTP_HOST", "SMTP_PORT", "SMTP_PROTOCOL", "SMTP_USERNAME", "SMTP_PASSWORD", "SMTP_FROM_EMAIL", "SMTP_PROPERTIES", "BANK_TRANSFER_ENABLED", "DEFERRED_BANK_TRANSFER_ENABLED", "SHOW_ONLY_BASIC_INSTRUCTIONS", "DEFERRED_BANK_TRANSFER_SEND_CONFIRMATION_EMAIL", "OFFLINE_PAYMENT_DAYS", "OFFLINE_REMINDER_HOURS", "ENABLE_CAPTCHA_FOR_OFFLINE_PAYMENTS", "BANK_ACCOUNT_NR", "BANK_ACCOUNT_OWNER", "AUTOMATIC_REMOVAL_EXPIRED_OFFLINE_PAYMENT", "PARTIAL_RESERVATION_ID_LENGTH", "REVOLUT_ENABLED", "REVOLUT_MANUAL_REVIEW", "REVOLUT_LIVE_MODE", "REVOLUT_API_KEY", "MAILGUN_KEY", "MAILGUN_DOMAIN", "MAILGUN_FROM", "MAILGUN_EU", "SENDGRID_API_KEY", "SENDGRID_FROM", "MAILJET_APIKEY_PUBLIC", "MAILJET_APIKEY_PRIVATE", "MAILJET_FROM", "GOOGLE_ANALYTICS_KEY", "GOOGLE_ANALYTICS_ANONYMOUS_MODE", "ENABLE_WAITING_QUEUE", "ENABLE_PRE_REGISTRATION", "ENABLE_WAITING_QUEUE_NOTIFICATION", "WAITING_QUEUE_RESERVATION_TIMEOUT", "STOP_WAITING_QUEUE_SUBSCRIPTIONS", "ENABLE_HTML_EMAILS", "MAIL_ATTEMPTS_COUNT", "PAYPAL_ENABLED", "PAYPAL_CLIENT_ID", "PAYPAL_CLIENT_SECRET", "PAYPAL_LIVE_MODE", "PAYPAL_DEMO_MODE_USERNAME", "PAYPAL_DEMO_MODE_PASSWORD", "MOLLIE_CC_ENABLED", "MOLLIE_API_KEY", "MOLLIE_CONNECT_CLIENT_ID", "MOLLIE_CONNECT_REFRESH_TOKEN", "MOLLIE_CONNECT_CLIENT_SECRET", "MOLLIE_CONNECT_CALLBACK", "MOLLIE_CONNECT_PROFILE_ID", "MOLLIE_CONNECT_LIVE_MODE", "ON_SITE_ENABLED", "SEND_TICKETS_AFTER_IMPORT_ATTENDEE", "CREATE_RESERVATION_FOR_EACH_IMPORTED_ATTENDEE", "VAT_NR", "INVOICE_NUMBER_PATTERN", "INVOICE_ADDRESS", "USE_INVOICE_NUMBER_AS_ID", "VAT_NUMBER_IS_REQUIRED", "GENERATE_ONLY_INVOICE", "REUSE_INVOICE_NUMBER_FOR_CREDIT_NOTE", "ENABLE_ITALY_E_INVOICING", "ITALY_E_INVOICING_SEND_PROFORMA", "ENABLE_EU_VAT_DIRECTIVE", "ENABLE_REVERSE_CHARGE_ONLINE", "ENABLE_REVERSE_CHARGE_IN_PERSON", "ENABLE_VIES_VALIDATION", "APPLY_VAT_FOREIGN_BUSINESS", "COUNTRY_OF_BUSINESS", "EU_COUNTRIES_LIST", "EU_VAT_API_ADDRESS", "APPLY_TAX_TO_CATEGORY", "ENABLE_PASS", "PASSBOOK_TYPE_IDENTIFIER", "PASSBOOK_TEAM_IDENTIFIER", "PASSBOOK_KEYSTORE", "PASSBOOK_KEYSTORE_PASSWORD", "PASSBOOK_PRIVATE_KEY_ALIAS", "ENABLE_WALLET", "WALLET_ISSUER_IDENTIFIER", "WALLET_SERVICE_ACCOUNT_KEY", "WALLET_OVERWRITE_PREVIOUS_CLASSES_AND_EVENTS", "CHECK_IN_STATS", "ALFIO_PI_INTEGRATION_ENABLED", "OFFLINE_CHECKIN_ENABLED", "LABEL_PRINTING_ENABLED", "LABEL_LAYOUT", "CHECK_IN_COLOR_CONFIGURATION", "SECURITY_CSP_REPORT_ENABLED", "SECURITY_CSP_REPORT_URI", "EMBED_ALLOWED_ORIGINS", "EMBED_POST_MESSAGE_ORIGIN", "TRANSLATION_OVERRIDE", "BASE_CUSTOM_CSS", "EVENT_CUSTOM_CSS", "DESCRIPTION_MAXLENGTH", "OPENID_PUBLIC_ENABLED", "OPENID_CONFIGURATION_JSON", "GENERATE_TICKETS_FOR_SUBSCRIPTIONS" ] + }, + "basic" : { + "type" : "boolean" + }, + "internal" : { + "type" : "boolean" + }, + "componentType" : { + "type" : "string", + "enum" : [ "TEXT", "BOOLEAN", "LIST", "TEXTAREA" ] + } + } + }, "SpecialPrice" : { "type" : "object", "properties" : { @@ -32022,41 +32136,61 @@ "currencyCode" : { "type" : "string" }, + "formattedNetPrice" : { + "type" : "string" + }, + "extReference" : { + "type" : "string" + }, "status" : { "type" : "string", "enum" : [ "FREE", "PENDING", "TO_BE_PAID", "ACQUIRED", "CANCELLED", "CHECKED_IN", "EXPIRED", "INVALIDATED", "RELEASED", "PRE_RESERVED" ] }, - "firstName" : { - "type" : "string" + "checkedIn" : { + "type" : "boolean" }, - "lastName" : { - "type" : "string" + "creation" : { + "type" : "string", + "format" : "date-time" }, - "email" : { - "type" : "string" + "tags" : { + "type" : "array", + "items" : { + "type" : "string" + } }, "assigned" : { "type" : "boolean" }, - "formattedFinalPrice" : { + "transaction" : { + "$ref" : "#/components/schemas/Transaction" + }, + "eventId" : { + "type" : "integer", + "format" : "int32" + }, + "firstName" : { + "type" : "string" + }, + "lastName" : { "type" : "string" }, + "subscriptionId" : { + "type" : "string", + "format" : "uuid" + }, "vatStatus" : { "type" : "string", "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "CUSTOM_INCLUDED_EXEMPT", "CUSTOM_NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] }, - "uuid" : { - "type" : "string" - }, - "categoryId" : { + "srcPriceCts" : { "type" : "integer", "format" : "int32" }, - "finalPriceCts" : { - "type" : "integer", - "format" : "int32" + "finalPrice" : { + "type" : "number" }, - "srcPriceCts" : { + "finalPriceCts" : { "type" : "integer", "format" : "int32" }, @@ -32068,51 +32202,28 @@ "type" : "integer", "format" : "int32" }, - "ticketsReservationId" : { + "email" : { "type" : "string" }, - "eventId" : { - "type" : "integer", - "format" : "int32" - }, "userLanguage" : { "type" : "string" }, - "transaction" : { - "$ref" : "#/components/schemas/Transaction" + "categoryId" : { + "type" : "integer", + "format" : "int32" }, - "finalPrice" : { - "type" : "number" + "ticketsReservationId" : { + "type" : "string" }, - "tags" : { - "type" : "array", - "items" : { - "type" : "string" - } + "uuid" : { + "type" : "string" }, "lockedAssignment" : { "type" : "boolean" }, - "checkedIn" : { - "type" : "boolean" - }, - "formattedNetPrice" : { - "type" : "string" - }, - "creation" : { - "type" : "string", - "format" : "date-time" - }, - "extReference" : { + "formattedFinalPrice" : { "type" : "string" }, - "subscriptionId" : { - "type" : "string", - "format" : "uuid" - }, - "paid" : { - "type" : "boolean" - }, "stuck" : { "type" : "boolean" }, @@ -32120,13 +32231,16 @@ "type" : "string", "format" : "date-time" }, + "paid" : { + "type" : "boolean" + }, "pending" : { "type" : "boolean" }, - "taxablePrice" : { + "netPrice" : { "type" : "number" }, - "netPrice" : { + "taxablePrice" : { "type" : "number" } } @@ -32183,14 +32297,14 @@ "type" : "string" } }, + "formattedAmount" : { + "type" : "string" + }, "complete" : { "type" : "boolean" }, "potentialMatch" : { "type" : "boolean" - }, - "formattedAmount" : { - "type" : "string" } } }, @@ -32253,11 +32367,11 @@ "success" : { "type" : "boolean" }, - "firstErrorOrNull" : { - "$ref" : "#/components/schemas/ErrorCode" - }, "formattedErrors" : { "type" : "string" + }, + "firstErrorOrNull" : { + "$ref" : "#/components/schemas/ErrorCode" } } }, @@ -32270,39 +32384,51 @@ "currencyCode" : { "type" : "string" }, + "formattedNetPrice" : { + "type" : "string" + }, + "extReference" : { + "type" : "string" + }, "status" : { "type" : "string", "enum" : [ "FREE", "PENDING", "TO_BE_PAID", "ACQUIRED", "CANCELLED", "CHECKED_IN", "EXPIRED", "INVALIDATED", "RELEASED", "PRE_RESERVED" ] }, - "additionalFields" : { - "type" : "object", - "additionalProperties" : { + "checkedIn" : { + "type" : "boolean" + }, + "creation" : { + "type" : "string", + "format" : "date-time" + }, + "tags" : { + "type" : "array", + "items" : { "type" : "string" } }, + "assigned" : { + "type" : "boolean" + }, + "eventId" : { + "type" : "integer", + "format" : "int32" + }, "firstName" : { "type" : "string" }, "lastName" : { "type" : "string" }, - "email" : { - "type" : "string" - }, - "assigned" : { - "type" : "boolean" - }, - "formattedFinalPrice" : { - "type" : "string" + "subscriptionId" : { + "type" : "string", + "format" : "uuid" }, "vatStatus" : { "type" : "string", "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "CUSTOM_INCLUDED_EXEMPT", "CUSTOM_NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] }, - "uuid" : { - "type" : "string" - }, - "categoryId" : { + "srcPriceCts" : { "type" : "integer", "format" : "int32" }, @@ -32310,10 +32436,6 @@ "type" : "integer", "format" : "int32" }, - "srcPriceCts" : { - "type" : "integer", - "format" : "int32" - }, "vatCts" : { "type" : "integer", "format" : "int32" @@ -32322,41 +32444,33 @@ "type" : "integer", "format" : "int32" }, - "ticketsReservationId" : { + "email" : { "type" : "string" }, - "eventId" : { + "userLanguage" : { + "type" : "string" + }, + "categoryId" : { "type" : "integer", "format" : "int32" }, - "userLanguage" : { + "ticketsReservationId" : { "type" : "string" }, - "tags" : { - "type" : "array", - "items" : { - "type" : "string" - } + "uuid" : { + "type" : "string" }, "lockedAssignment" : { "type" : "boolean" }, - "checkedIn" : { - "type" : "boolean" - }, - "formattedNetPrice" : { - "type" : "string" - }, - "creation" : { - "type" : "string", - "format" : "date-time" - }, - "extReference" : { + "formattedFinalPrice" : { "type" : "string" }, - "subscriptionId" : { - "type" : "string", - "format" : "uuid" + "additionalFields" : { + "type" : "object", + "additionalProperties" : { + "type" : "string" + } } } }, @@ -32391,29 +32505,20 @@ "type" : "string", "enum" : [ "WAITING", "RETRY", "IN_PROCESS", "SENT", "ERROR" ] }, - "organizationId" : { + "eventId" : { "type" : "integer", "format" : "int32" }, - "requestTimestamp" : { - "type" : "string", - "format" : "date-time" - }, - "attempts" : { + "organizationId" : { "type" : "integer", "format" : "int32" }, - "subscriptionDescriptorId" : { - "type" : "string", - "format" : "uuid" - }, - "eventId" : { + "attempts" : { "type" : "integer", "format" : "int32" }, - "purchaseContextType" : { - "type" : "string", - "enum" : [ "subscription", "event" ] + "checksum" : { + "type" : "string" }, "recipient" : { "type" : "string" @@ -32433,8 +32538,17 @@ "attachments" : { "type" : "string" }, - "checksum" : { - "type" : "string" + "purchaseContextType" : { + "type" : "string", + "enum" : [ "subscription", "event" ] + }, + "subscriptionDescriptorId" : { + "type" : "string", + "format" : "uuid" + }, + "requestTimestamp" : { + "type" : "string", + "format" : "date-time" }, "sentTimestamp" : { "type" : "string", @@ -32468,14 +32582,14 @@ "type" : "integer", "format" : "int32" }, + "participationPercentage" : { + "type" : "string" + }, "optionStatistics" : { "type" : "array", "items" : { "$ref" : "#/components/schemas/StatisticDetail" } - }, - "participationPercentage" : { - "type" : "string" } } }, @@ -32543,13 +32657,12 @@ "enabled" : { "type" : "boolean" }, - "validTo" : { - "type" : "string", - "format" : "date-time" - }, "description" : { "type" : "string" }, + "username" : { + "type" : "string" + }, "firstName" : { "type" : "string" }, @@ -32559,12 +32672,13 @@ "emailAddress" : { "type" : "string" }, - "username" : { - "type" : "string" - }, "validToEpochSecond" : { "type" : "integer", "format" : "int64" + }, + "validTo" : { + "type" : "string", + "format" : "date-time" } } }, @@ -32637,11 +32751,11 @@ "success" : { "type" : "boolean" }, - "firstErrorOrNull" : { - "$ref" : "#/components/schemas/ErrorCode" - }, "formattedErrors" : { "type" : "string" + }, + "firstErrorOrNull" : { + "$ref" : "#/components/schemas/ErrorCode" } } }, @@ -32684,11 +32798,11 @@ "success" : { "type" : "boolean" }, - "firstErrorOrNull" : { - "$ref" : "#/components/schemas/ErrorCode" - }, "formattedErrors" : { "type" : "string" + }, + "firstErrorOrNull" : { + "$ref" : "#/components/schemas/ErrorCode" } } }, @@ -32797,11 +32911,11 @@ "success" : { "type" : "boolean" }, - "firstErrorOrNull" : { - "$ref" : "#/components/schemas/ErrorCode" - }, "formattedErrors" : { "type" : "string" + }, + "firstErrorOrNull" : { + "$ref" : "#/components/schemas/ErrorCode" } } }, @@ -32867,11 +32981,11 @@ "success" : { "type" : "boolean" }, - "firstErrorOrNull" : { - "$ref" : "#/components/schemas/ErrorCode" - }, "formattedErrors" : { "type" : "string" + }, + "firstErrorOrNull" : { + "$ref" : "#/components/schemas/ErrorCode" } } }, @@ -32941,11 +33055,11 @@ "success" : { "type" : "boolean" }, - "firstErrorOrNull" : { - "$ref" : "#/components/schemas/ErrorCode" - }, "formattedErrors" : { "type" : "string" + }, + "firstErrorOrNull" : { + "$ref" : "#/components/schemas/ErrorCode" } } }, @@ -33068,13 +33182,13 @@ "currencyCode" : { "type" : "string" }, - "description" : { - "type" : "string" + "dynamic" : { + "type" : "boolean" }, "currentlyValid" : { "type" : "boolean" }, - "formattedDiscountAmount" : { + "description" : { "type" : "string" }, "categories" : { @@ -33085,25 +33199,33 @@ "format" : "int32" } }, - "promoCode" : { - "type" : "string" - }, - "organizationId" : { + "eventId" : { "type" : "integer", "format" : "int32" }, - "eventId" : { + "organizationId" : { "type" : "integer", "format" : "int32" }, - "discountType" : { + "promoCode" : { + "type" : "string" + }, + "utcStart" : { "type" : "string", - "enum" : [ "FIXED_AMOUNT", "PERCENTAGE", "FIXED_AMOUNT_RESERVATION", "NONE" ] + "format" : "date-time" + }, + "utcEnd" : { + "type" : "string", + "format" : "date-time" }, "discountAmount" : { "type" : "integer", "format" : "int32" }, + "discountType" : { + "type" : "string", + "enum" : [ "FIXED_AMOUNT", "PERCENTAGE", "FIXED_AMOUNT_RESERVATION", "NONE" ] + }, "codeType" : { "type" : "string", "enum" : [ "DISCOUNT", "ACCESS", "DYNAMIC" ] @@ -33112,35 +33234,27 @@ "type" : "integer", "format" : "int32" }, - "fixedAmount" : { - "type" : "boolean" - }, - "expired" : { - "type" : "boolean" - }, - "dynamic" : { - "type" : "boolean" + "maxUsage" : { + "type" : "integer", + "format" : "int32" }, "emailReference" : { "type" : "string" }, - "utcStart" : { - "type" : "string", - "format" : "date-time" - }, - "utcEnd" : { - "type" : "string", - "format" : "date-time" + "expired" : { + "type" : "boolean" }, - "maxUsage" : { - "type" : "integer", - "format" : "int32" + "fixedAmount" : { + "type" : "boolean" }, "formattedStart" : { "type" : "string" }, "formattedEnd" : { "type" : "string" + }, + "formattedDiscountAmount" : { + "type" : "string" } } }, @@ -33423,10 +33537,29 @@ "displayName" : { "type" : "string" }, + "checkedInTickets" : { + "type" : "integer", + "format" : "int32" + }, + "availableSeats" : { + "type" : "integer", + "format" : "int32" + }, "status" : { "type" : "string", "enum" : [ "DRAFT", "PUBLIC", "DISABLED" ] }, + "notAllocatedTickets" : { + "type" : "integer", + "format" : "int32" + }, + "shortName" : { + "type" : "string" + }, + "organizationId" : { + "type" : "integer", + "format" : "int32" + }, "allowedPaymentProxies" : { "type" : "array", "items" : { @@ -33434,29 +33567,21 @@ "enum" : [ "STRIPE", "ON_SITE", "OFFLINE", "NONE", "ADMIN", "PAYPAL", "MOLLIE", "SAFERPAY" ] } }, - "notSoldTickets" : { - "type" : "integer", - "format" : "int32" + "fileBlobId" : { + "type" : "string" }, - "soldTickets" : { - "type" : "integer", - "format" : "int32" + "expired" : { + "type" : "boolean" }, - "availableSeats" : { + "notSoldTickets" : { "type" : "integer", "format" : "int32" }, - "fileBlobId" : { - "type" : "string" - }, - "organizationId" : { + "soldTickets" : { "type" : "integer", "format" : "int32" }, - "shortName" : { - "type" : "string" - }, - "checkedInTickets" : { + "pendingTickets" : { "type" : "integer", "format" : "int32" }, @@ -33464,17 +33589,14 @@ "type" : "integer", "format" : "int32" }, - "expired" : { - "type" : "boolean" - }, - "notAllocatedTickets" : { + "releasedTickets" : { "type" : "integer", "format" : "int32" }, - "visibleForCurrentUser" : { - "type" : "boolean" + "formattedEnd" : { + "type" : "string" }, - "warningNeeded" : { + "visibleForCurrentUser" : { "type" : "boolean" }, "formattedBegin" : { @@ -33483,16 +33605,8 @@ "displayStatistics" : { "type" : "boolean" }, - "pendingTickets" : { - "type" : "integer", - "format" : "int32" - }, - "releasedTickets" : { - "type" : "integer", - "format" : "int32" - }, - "formattedEnd" : { - "type" : "string" + "warningNeeded" : { + "type" : "boolean" } } }, @@ -33515,22 +33629,22 @@ "type" : "integer", "format" : "int32" }, - "end" : { + "latitude" : { "type" : "string" }, - "begin" : { + "longitude" : { "type" : "string" }, - "url" : { + "imageUrl" : { "type" : "string" }, - "imageUrl" : { + "end" : { "type" : "string" }, - "latitude" : { + "url" : { "type" : "string" }, - "longitude" : { + "begin" : { "type" : "string" }, "descriptions" : { @@ -33634,10 +33748,10 @@ "key" : { "type" : "string" }, - "right" : { + "left" : { "type" : "string" }, - "left" : { + "right" : { "type" : "string" } } @@ -33726,15 +33840,12 @@ "type" : "integer", "format" : "int32" }, - "checkboxField" : { - "type" : "boolean" + "inputType" : { + "type" : "string" }, "countryField" : { "type" : "boolean" }, - "inputType" : { - "type" : "string" - }, "inputField" : { "type" : "boolean" }, @@ -33744,6 +33855,9 @@ "selectField" : { "type" : "boolean" }, + "checkboxField" : { + "type" : "boolean" + }, "euVat" : { "type" : "boolean" }, @@ -33788,10 +33902,10 @@ "type" : "integer", "format" : "int32" }, - "editable" : { - "type" : "boolean" + "inputType" : { + "type" : "string" }, - "checkboxField" : { + "countryField" : { "type" : "boolean" }, "restrictedValues" : { @@ -33804,37 +33918,28 @@ "type" : "integer", "format" : "int32" }, - "eventId" : { + "minLength" : { "type" : "integer", "format" : "int32" }, - "additionalServiceId" : { + "maxLength" : { "type" : "integer", "format" : "int32" }, "required" : { "type" : "boolean" }, - "maxLength" : { + "eventId" : { "type" : "integer", "format" : "int32" }, - "minLength" : { + "additionalServiceId" : { "type" : "integer", "format" : "int32" }, - "countryField" : { + "editable" : { "type" : "boolean" }, - "inputType" : { - "type" : "string" - }, - "disabledValues" : { - "type" : "array", - "items" : { - "type" : "string" - } - }, "inputField" : { "type" : "boolean" }, @@ -33844,6 +33949,9 @@ "selectField" : { "type" : "boolean" }, + "checkboxField" : { + "type" : "boolean" + }, "euVat" : { "type" : "boolean" }, @@ -33859,6 +33967,12 @@ "type" : "integer", "format" : "int32" } + }, + "disabledValues" : { + "type" : "array", + "items" : { + "type" : "string" + } } } }, @@ -33991,19 +34105,13 @@ "type" : "string", "enum" : [ "subscription", "event" ] }, - "contentLanguages" : { - "type" : "array", - "items" : { - "$ref" : "#/components/schemas/ContentLanguage" - } - }, - "fileBlobIdIsPresent" : { + "sameDay" : { "type" : "boolean" }, - "regularPrice" : { - "type" : "number" + "online" : { + "type" : "boolean" }, - "sameDay" : { + "freeOfCharge" : { "type" : "boolean" }, "title" : { @@ -34012,21 +34120,27 @@ "type" : "string" } }, - "freeOfCharge" : { - "type" : "boolean" + "contentLanguages" : { + "type" : "array", + "items" : { + "$ref" : "#/components/schemas/ContentLanguage" + } }, "publicIdentifier" : { "type" : "string" }, - "online" : { - "type" : "boolean" - }, "free" : { "type" : "boolean" }, + "regularPrice" : { + "type" : "number" + }, "imageIsPresent" : { "type" : "boolean" }, + "fileBlobIdIsPresent" : { + "type" : "boolean" + }, "multiplePaymentMethods" : { "type" : "boolean" }, @@ -34212,11 +34326,11 @@ "success" : { "type" : "boolean" }, - "firstErrorOrNull" : { - "$ref" : "#/components/schemas/ErrorCode" - }, "formattedErrors" : { "type" : "string" + }, + "firstErrorOrNull" : { + "$ref" : "#/components/schemas/ErrorCode" } } }, @@ -34255,42 +34369,6 @@ } } }, - "Configuration" : { - "type" : "object", - "properties" : { - "id" : { - "type" : "integer", - "format" : "int32" - }, - "key" : { - "type" : "string" - }, - "value" : { - "type" : "string" - }, - "description" : { - "type" : "string" - }, - "configurationKey" : { - "type" : "string", - "enum" : [ "NOT_RECOGNIZED", "INIT_COMPLETED", "SYSTEM_API_KEY", "SHOW_PROJECT_BANNER", "SUPPORTED_LANGUAGES", "BASE_URL", "GLOBAL_PRIVACY_POLICY", "GLOBAL_TERMS", "ANNOUNCEMENT_BANNER_CONTENT", "MAPS_PROVIDER", "MAPS_CLIENT_API_KEY", "MAPS_HERE_APP_ID", "MAPS_HERE_APP_CODE", "MAPS_HERE_API_KEY", "RECAPTCHA_API_KEY", "RECAPTCHA_SECRET", "ENABLE_CAPTCHA_FOR_LOGIN", "DISPLAY_STATS_IN_EVENT_DETAIL", "DEMO_MODE_ACCOUNT_EXPIRATION_DAYS", "PLATFORM_MODE_ENABLED", "PLATFORM_FEE", "PLATFORM_FIXED_FEE", "PLATFORM_PERCENTAGE_FEE", "PLATFORM_MINIMUM_FEE", "PLATFORM_MAXIMUM_FEE", "PAYMENT_METHODS_BLACKLIST", "STRIPE_CC_ENABLED", "STRIPE_PUBLIC_KEY", "STRIPE_SECRET_KEY", "STRIPE_CONNECT_CLIENT_ID", "STRIPE_CONNECT_CALLBACK", "STRIPE_WEBHOOK_KEY", "STRIPE_WEBHOOK_PAYMENT_KEY", "STRIPE_CONNECTED_ID", "STRIPE_ENABLE_SCA", "SAFERPAY_ENABLED", "SAFERPAY_LIVE_MODE", "SAFERPAY_API_USERNAME", "SAFERPAY_API_PASSWORD", "SAFERPAY_CUSTOMER_ID", "SAFERPAY_TERMINAL_ID", "SPECIAL_PRICE_CODE_LENGTH", "MAX_AMOUNT_OF_TICKETS_BY_RESERVATION", "ASSIGNMENT_REMINDER_START", "ASSIGNMENT_REMINDER_INTERVAL", "OPTIONAL_DATA_REMINDER_ENABLED", "RESERVATION_TIMEOUT", "RESERVATION_MIN_TIMEOUT_AFTER_FAILED_PAYMENT", "NOTIFY_ALL_FAILED_PAYMENT_ATTEMPTS", "DISPLAY_TICKETS_LEFT_INDICATOR", "ENABLE_CAPTCHA_FOR_TICKET_SELECTION", "DISPLAY_EXPIRED_CATEGORIES", "DISPLAY_DISCOUNT_CODE_BOX", "USE_PARTNER_CODE_INSTEAD_OF_PROMOTIONAL", "ENABLE_CUSTOMER_REFERENCE", "ENABLE_ATTENDEE_AUTOCOMPLETE", "FORCE_TICKET_OWNER_ASSIGNMENT_AT_RESERVATION", "SEND_TICKETS_AUTOMATICALLY", "ALLOW_TICKET_DOWNLOAD", "SEND_RESERVATION_EMAIL_IF_NECESSARY", "ENABLE_TICKET_TRANSFER", "ALLOW_FREE_TICKETS_CANCELLATION", "INCLUDE_CHECK_IN_URL_ICAL", "MAILER_TYPE", "MAX_EMAIL_PER_CYCLE", "MAIL_REPLY_TO", "MAIL_SET_ORG_REPLY_TO", "MAIL_SYSTEM_NOTIFICATION_CC", "MAIL_FOOTER", "SMTP_HOST", "SMTP_PORT", "SMTP_PROTOCOL", "SMTP_USERNAME", "SMTP_PASSWORD", "SMTP_FROM_EMAIL", "SMTP_PROPERTIES", "BANK_TRANSFER_ENABLED", "DEFERRED_BANK_TRANSFER_ENABLED", "SHOW_ONLY_BASIC_INSTRUCTIONS", "DEFERRED_BANK_TRANSFER_SEND_CONFIRMATION_EMAIL", "OFFLINE_PAYMENT_DAYS", "OFFLINE_REMINDER_HOURS", "ENABLE_CAPTCHA_FOR_OFFLINE_PAYMENTS", "BANK_ACCOUNT_NR", "BANK_ACCOUNT_OWNER", "AUTOMATIC_REMOVAL_EXPIRED_OFFLINE_PAYMENT", "PARTIAL_RESERVATION_ID_LENGTH", "REVOLUT_ENABLED", "REVOLUT_MANUAL_REVIEW", "REVOLUT_LIVE_MODE", "REVOLUT_API_KEY", "MAILGUN_KEY", "MAILGUN_DOMAIN", "MAILGUN_FROM", "MAILGUN_EU", "SENDGRID_API_KEY", "SENDGRID_FROM", "MAILJET_APIKEY_PUBLIC", "MAILJET_APIKEY_PRIVATE", "MAILJET_FROM", "GOOGLE_ANALYTICS_KEY", "GOOGLE_ANALYTICS_ANONYMOUS_MODE", "ENABLE_WAITING_QUEUE", "ENABLE_PRE_REGISTRATION", "ENABLE_WAITING_QUEUE_NOTIFICATION", "WAITING_QUEUE_RESERVATION_TIMEOUT", "STOP_WAITING_QUEUE_SUBSCRIPTIONS", "ENABLE_HTML_EMAILS", "MAIL_ATTEMPTS_COUNT", "PAYPAL_ENABLED", "PAYPAL_CLIENT_ID", "PAYPAL_CLIENT_SECRET", "PAYPAL_LIVE_MODE", "PAYPAL_DEMO_MODE_USERNAME", "PAYPAL_DEMO_MODE_PASSWORD", "MOLLIE_CC_ENABLED", "MOLLIE_API_KEY", "MOLLIE_CONNECT_CLIENT_ID", "MOLLIE_CONNECT_REFRESH_TOKEN", "MOLLIE_CONNECT_CLIENT_SECRET", "MOLLIE_CONNECT_CALLBACK", "MOLLIE_CONNECT_PROFILE_ID", "MOLLIE_CONNECT_LIVE_MODE", "ON_SITE_ENABLED", "SEND_TICKETS_AFTER_IMPORT_ATTENDEE", "CREATE_RESERVATION_FOR_EACH_IMPORTED_ATTENDEE", "VAT_NR", "INVOICE_NUMBER_PATTERN", "INVOICE_ADDRESS", "USE_INVOICE_NUMBER_AS_ID", "VAT_NUMBER_IS_REQUIRED", "GENERATE_ONLY_INVOICE", "REUSE_INVOICE_NUMBER_FOR_CREDIT_NOTE", "ENABLE_ITALY_E_INVOICING", "ITALY_E_INVOICING_SEND_PROFORMA", "ENABLE_EU_VAT_DIRECTIVE", "ENABLE_REVERSE_CHARGE_ONLINE", "ENABLE_REVERSE_CHARGE_IN_PERSON", "ENABLE_VIES_VALIDATION", "APPLY_VAT_FOREIGN_BUSINESS", "COUNTRY_OF_BUSINESS", "EU_COUNTRIES_LIST", "EU_VAT_API_ADDRESS", "APPLY_TAX_TO_CATEGORY", "ENABLE_PASS", "PASSBOOK_TYPE_IDENTIFIER", "PASSBOOK_TEAM_IDENTIFIER", "PASSBOOK_KEYSTORE", "PASSBOOK_KEYSTORE_PASSWORD", "PASSBOOK_PRIVATE_KEY_ALIAS", "CHECK_IN_STATS", "ALFIO_PI_INTEGRATION_ENABLED", "OFFLINE_CHECKIN_ENABLED", "LABEL_PRINTING_ENABLED", "LABEL_LAYOUT", "CHECK_IN_COLOR_CONFIGURATION", "SECURITY_CSP_REPORT_ENABLED", "SECURITY_CSP_REPORT_URI", "EMBED_ALLOWED_ORIGINS", "EMBED_POST_MESSAGE_ORIGIN", "TRANSLATION_OVERRIDE", "BASE_CUSTOM_CSS", "EVENT_CUSTOM_CSS", "DESCRIPTION_MAXLENGTH", "OPENID_PUBLIC_ENABLED", "OPENID_CONFIGURATION_JSON", "GENERATE_TICKETS_FOR_SUBSCRIPTIONS" ] - }, - "configurationPathLevel" : { - "type" : "string", - "enum" : [ "EXTERNAL", "SYSTEM", "ORGANIZATION", "EVENT", "TICKET_CATEGORY" ] - }, - "basic" : { - "type" : "boolean" - }, - "internal" : { - "type" : "boolean" - }, - "componentType" : { - "type" : "string", - "enum" : [ "TEXT", "BOOLEAN", "LIST", "TEXTAREA" ] - } - } - }, "InstanceSettings" : { "type" : "object", "properties" : { @@ -34312,10 +34390,10 @@ "key" : { "type" : "string" }, - "right" : { + "left" : { "type" : "string" }, - "left" : { + "right" : { "type" : "string" } } From 416be204e2ca53b969caef5b9d08e50b71a1fa12 Mon Sep 17 00:00:00 2001 From: Celestino Bellone <3385346+cbellone@users.noreply.github.com> Date: Tue, 9 May 2023 19:07:50 +0200 Subject: [PATCH 202/218] cherry-pick wallet-related modifications --- .../additional-field.component.html | 12 +++++-- .../additional-field.component.ts | 3 ++ .../projects/public/src/app/app.module.ts | 8 +++-- .../projects/public/src/app/model/info.ts | 6 ++++ .../public/src/app/model/reservation-info.ts | 2 ++ .../booking/booking.component.html | 2 +- .../download-ticket.component.html | 29 ++++++++++++++++ .../download-ticket.component.ts | 34 +++++++++++++++++++ .../invoice-form/invoice-form.component.html | 9 +++-- .../invoice-form/invoice-form.component.ts | 4 +++ .../offline-payment.component.ts | 3 +- .../success-subscription.component.ts | 3 +- .../success/success.component.html | 10 +++--- .../reservation/success/success.component.ts | 21 ++++++++++-- .../ticket-form/ticket-form.component.html | 2 +- .../ticket-form/ticket-form.component.ts | 8 +++++ .../public/src/app/shared/ticket.service.ts | 14 +++++++- .../projects/public/src/app/shared/util.ts | 1 + .../view-ticket/view-ticket.component.html | 26 ++++++++++---- .../view-ticket/view-ticket.component.scss | 12 +++++++ .../app/view-ticket/view-ticket.component.ts | 27 ++++++++++++--- 21 files changed, 206 insertions(+), 30 deletions(-) create mode 100644 frontend/projects/public/src/app/reservation/download-ticket/download-ticket.component.html create mode 100644 frontend/projects/public/src/app/reservation/download-ticket/download-ticket.component.ts create mode 100644 frontend/projects/public/src/app/view-ticket/view-ticket.component.scss diff --git a/frontend/projects/public/src/app/additional-field/additional-field.component.html b/frontend/projects/public/src/app/additional-field/additional-field.component.html index 2ee5d30ee2..43940714cc 100644 --- a/frontend/projects/public/src/app/additional-field/additional-field.component.html +++ b/frontend/projects/public/src/app/additional-field/additional-field.component.html @@ -6,9 +6,15 @@ - - - + + + + + + + + + +

diff --git a/frontend/projects/public/src/app/reservation/invoice-form/invoice-form.component.ts b/frontend/projects/public/src/app/reservation/invoice-form/invoice-form.component.ts index f5c099bfc8..5f521ef334 100644 --- a/frontend/projects/public/src/app/reservation/invoice-form/invoice-form.component.ts +++ b/frontend/projects/public/src/app/reservation/invoice-form/invoice-form.component.ts @@ -6,6 +6,7 @@ import {Subscription} from 'rxjs'; import {LocalizedCountry} from '../../model/localized-country'; import {PurchaseContext} from '../../model/purchase-context'; import {InvoicingConfiguration} from '../../model/event'; +import {mobile} from '../../shared/util'; @Component({ selector: 'app-invoice-form', @@ -28,6 +29,8 @@ export class InvoiceFormComponent implements OnInit, OnDestroy { taxIdIsRequired = true; + isMobile = mobile; + constructor(private translate: TranslateService, private i18nService: I18nService) { } ngOnInit(): void { @@ -119,4 +122,5 @@ export class InvoiceFormComponent implements OnInit, OnDestroy { return true; } + protected readonly mobile = mobile; } diff --git a/frontend/projects/public/src/app/reservation/offline-payment/offline-payment.component.ts b/frontend/projects/public/src/app/reservation/offline-payment/offline-payment.component.ts index 5e808a5173..cfafb8b835 100644 --- a/frontend/projects/public/src/app/reservation/offline-payment/offline-payment.component.ts +++ b/frontend/projects/public/src/app/reservation/offline-payment/offline-payment.component.ts @@ -62,8 +62,9 @@ export class OfflinePaymentComponent implements OnInit { this.reservationInfo = res; this.reservationFinalized = true; }); + } else { + this.reservationFinalized = true; } - }); }); } diff --git a/frontend/projects/public/src/app/reservation/success-subscription/success-subscription.component.ts b/frontend/projects/public/src/app/reservation/success-subscription/success-subscription.component.ts index 7f29f522f9..24f5a9b9f2 100644 --- a/frontend/projects/public/src/app/reservation/success-subscription/success-subscription.component.ts +++ b/frontend/projects/public/src/app/reservation/success-subscription/success-subscription.component.ts @@ -127,7 +127,8 @@ export class SuccessSubscriptionComponent implements OnInit { get showReservationButtons(): boolean { return this.reservationFinalized - && (!embedded || !this.purchaseContext.embeddingConfiguration.enabled); + && (!embedded || !this.purchaseContext.embeddingConfiguration.enabled) + && !this.reservationInfo.metadata.hideConfirmationButtons; } } diff --git a/frontend/projects/public/src/app/reservation/success/success.component.html b/frontend/projects/public/src/app/reservation/success/success.component.html index 047db83a36..71572b7229 100644 --- a/frontend/projects/public/src/app/reservation/success/success.component.html +++ b/frontend/projects/public/src/app/reservation/success/success.component.html @@ -53,13 +53,13 @@

{{'reservation-page-c

- -
+
{{'reservation-page-complete.show-ticket'|translate}}
- {{'reservation-page-complete.download-ticket'|translate}} + + {{'reservation-page-complete.download-ticket'|translate}}
@@ -71,11 +71,12 @@

{{'reservation-page-c

+
- +
@@ -93,7 +94,6 @@

{{'reservation-page-c

-
diff --git a/frontend/projects/public/src/app/reservation/success/success.component.ts b/frontend/projects/public/src/app/reservation/success/success.component.ts index 2114d2d546..54d914959c 100644 --- a/frontend/projects/public/src/app/reservation/success/success.component.ts +++ b/frontend/projects/public/src/app/reservation/success/success.component.ts @@ -11,6 +11,9 @@ import {AnalyticsService} from '../../shared/analytics.service'; import {handleServerSideValidationError} from '../../shared/validation-helper'; import {UntypedFormGroup} from '@angular/forms'; import {TranslateService} from '@ngx-translate/core'; +import {InfoService} from '../../shared/info.service'; +import {first} from 'rxjs/operators'; +import {WalletConfiguration} from '../../model/info'; import {ReservationStatusChanged} from '../../model/embedding-configuration'; import {embedded, pollReservationStatus} from '../../shared/util'; @@ -37,6 +40,7 @@ export class SuccessComponent implements OnInit { ticketsAllAssigned = true; reservationFinalized = true; invoiceReceiptReady = true; + private walletConfiguration: WalletConfiguration; constructor( private route: ActivatedRoute, @@ -46,12 +50,15 @@ export class SuccessComponent implements OnInit { private i18nService: I18nService, private analytics: AnalyticsService, private router: Router, - private translateService: TranslateService) { } + private translateService: TranslateService, + private infoService: InfoService) { } public ngOnInit(): void { this.route.params.subscribe(params => { this.eventShortName = params['eventShortName']; this.reservationId = params['reservationId']; + this.infoService.getInfo().pipe(first()) + .subscribe(info => this.walletConfiguration = info.walletConfiguration); this.eventService.getEvent(this.eventShortName).subscribe(ev => { this.event = ev; this.i18nService.setPageTitle('reservation-page-complete.header.title', ev); @@ -165,7 +172,17 @@ export class SuccessComponent implements OnInit { get showReservationButtons(): boolean { return this.reservationFinalized - && (!embedded || !this.event.embeddingConfiguration.enabled); + && (!embedded || !this.event.embeddingConfiguration.enabled) + && !this.reservationInfo.metadata.hideConfirmationButtons; } + get walletIntegrationEnabled(): boolean { + return this.walletConfiguration != null && + (this.walletConfiguration.gWalletEnabled || this.walletConfiguration.passEnabled); + } + + downloadTicket(ticket: Ticket): void { + this.ticketService.openDownloadTicket(ticket, this.eventShortName, this.walletConfiguration) + .subscribe(() => {}); + } } diff --git a/frontend/projects/public/src/app/reservation/ticket-form/ticket-form.component.html b/frontend/projects/public/src/app/reservation/ticket-form/ticket-form.component.html index 0864872a37..fb7642468f 100644 --- a/frontend/projects/public/src/app/reservation/ticket-form/ticket-form.component.html +++ b/frontend/projects/public/src/app/reservation/ticket-form/ticket-form.component.html @@ -24,7 +24,7 @@
- +
diff --git a/frontend/projects/public/src/app/reservation/ticket-form/ticket-form.component.ts b/frontend/projects/public/src/app/reservation/ticket-form/ticket-form.component.ts index bc34642096..9088ac79fa 100644 --- a/frontend/projects/public/src/app/reservation/ticket-form/ticket-form.component.ts +++ b/frontend/projects/public/src/app/reservation/ticket-form/ticket-form.component.ts @@ -2,6 +2,7 @@ import {Component, Input, OnInit} from '@angular/core'; import {UntypedFormGroup} from '@angular/forms'; import {Ticket} from '../../model/ticket'; import {PurchaseContext} from '../../model/purchase-context'; +import {ReservationMetadata} from '../../model/reservation-info'; @Component({ selector: 'app-ticket-form', @@ -18,6 +19,9 @@ export class TicketFormComponent implements OnInit { @Input() purchaseContext: PurchaseContext; + @Input() + reservationMetadata: ReservationMetadata; + constructor() { } public ngOnInit(): void { @@ -29,4 +33,8 @@ export class TicketFormComponent implements OnInit { getAdditional(form: UntypedFormGroup) { return form.get('additional') as UntypedFormGroup; } + + get emailEditForbidden(): boolean { + return this.ticket.locked || (this.reservationMetadata?.lockEmailEdit && this.ticket.email != null); + } } diff --git a/frontend/projects/public/src/app/shared/ticket.service.ts b/frontend/projects/public/src/app/shared/ticket.service.ts index a2cd9ef2d7..09ec6bebdf 100644 --- a/frontend/projects/public/src/app/shared/ticket.service.ts +++ b/frontend/projects/public/src/app/shared/ticket.service.ts @@ -8,9 +8,11 @@ import {ValidatedResponse} from '../model/validated-response'; import {TicketsByTicketCategory} from '../model/reservation-info'; import {NgbModal} from '@ng-bootstrap/ng-bootstrap'; import {ReleaseTicketComponent} from '../reservation/release-ticket/release-ticket.component'; -import {mergeMap} from 'rxjs/operators'; +import {map, mergeMap} from 'rxjs/operators'; import {User, UserAdditionalData} from '../model/user'; import {DateValidity} from '../model/date-validity'; +import {DownloadTicketComponent} from '../reservation/download-ticket/download-ticket.component'; +import {WalletConfiguration} from '../model/info'; @Injectable({ providedIn: 'root' @@ -70,6 +72,16 @@ export class TicketService { })); } + openDownloadTicket(ticket: Ticket, eventName: string, walletConfiguration: WalletConfiguration): Observable { + const modal = this.modalService.open(DownloadTicketComponent, {centered: true}); + const instance: DownloadTicketComponent = modal.componentInstance; + instance.ticket = ticket; + instance.eventName = eventName; + instance.walletConfiguration = walletConfiguration; + return from(modal.result) + .pipe(map(_ => true)); + } + releaseTicket(eventName: string, ticketIdentifier: string): Observable { return this.http.delete(`/api/v2/public/event/${eventName}/ticket/${ticketIdentifier}`, {}); } diff --git a/frontend/projects/public/src/app/shared/util.ts b/frontend/projects/public/src/app/shared/util.ts index c56be238f2..311d09b2df 100644 --- a/frontend/projects/public/src/app/shared/util.ts +++ b/frontend/projects/public/src/app/shared/util.ts @@ -32,6 +32,7 @@ export function removeFromSessionStorage(key: string): void { } } +export const mobile = window.matchMedia('(max-width: 767px)').matches; export const embedded = window.parent !== window; export function notifyPaymentErrorToParent(purchaseContext: PurchaseContext, diff --git a/frontend/projects/public/src/app/view-ticket/view-ticket.component.html b/frontend/projects/public/src/app/view-ticket/view-ticket.component.html index 6c23716978..fb58186229 100644 --- a/frontend/projects/public/src/app/view-ticket/view-ticket.component.html +++ b/frontend/projects/public/src/app/view-ticket/view-ticket.component.html @@ -39,13 +39,25 @@

-
-
- - - {{'reservation-page-complete.download-ticket'|translate}} +
+ +
+
+ + Add to Google Wallet + +
+ +
+ + Add to Apple Wallet + +
+ +
+ +
+
{{'reservation-page-complete.download-ticket'|translate}} PDF
diff --git a/frontend/projects/public/src/app/view-ticket/view-ticket.component.scss b/frontend/projects/public/src/app/view-ticket/view-ticket.component.scss new file mode 100644 index 0000000000..69813edd3a --- /dev/null +++ b/frontend/projects/public/src/app/view-ticket/view-ticket.component.scss @@ -0,0 +1,12 @@ +@import "~bootstrap/scss/mixins"; +@import "~bootstrap/scss/functions"; +@import "~bootstrap/scss/variables"; + +img.wallet-link { + @include media-breakpoint-up(md) { + max-height: 56px; + } + @include media-breakpoint-down(md) { + max-width: 250px; + } +} diff --git a/frontend/projects/public/src/app/view-ticket/view-ticket.component.ts b/frontend/projects/public/src/app/view-ticket/view-ticket.component.ts index 9131be79ae..7d1cc25ca5 100644 --- a/frontend/projects/public/src/app/view-ticket/view-ticket.component.ts +++ b/frontend/projects/public/src/app/view-ticket/view-ticket.component.ts @@ -8,16 +8,20 @@ import {zip} from 'rxjs'; import {I18nService} from '../shared/i18n.service'; import {AnalyticsService} from '../shared/analytics.service'; import {HttpErrorResponse} from '@angular/common/http'; +import {InfoService} from '../shared/info.service'; +import {WalletConfiguration} from '../model/info'; @Component({ selector: 'app-view-ticket', - templateUrl: './view-ticket.component.html' + templateUrl: './view-ticket.component.html', + styleUrls: ['./view-ticket.component.scss'] }) export class ViewTicketComponent implements OnInit { event: Event; ticketIdentifier: string; ticketInfo: TicketInfo; + private walletConfiguration: WalletConfiguration; constructor( private ticketService: TicketService, @@ -25,7 +29,8 @@ export class ViewTicketComponent implements OnInit { private router: Router, private eventService: EventService, private i18nService: I18nService, - private analytics: AnalyticsService) { } + private analytics: AnalyticsService, + private infoService: InfoService) { } public ngOnInit(): void { this.route.params.subscribe(params => { @@ -33,12 +38,13 @@ export class ViewTicketComponent implements OnInit { const eventShortName = params['eventShortName']; - zip(this.eventService.getEvent(eventShortName), this.ticketService.getTicketInfo(eventShortName, this.ticketIdentifier)) - .subscribe(([event, ticketInfo]) => { + zip(this.eventService.getEvent(eventShortName), this.ticketService.getTicketInfo(eventShortName, this.ticketIdentifier), this.infoService.getInfo()) + .subscribe(([event, ticketInfo, generalInfo]) => { this.event = event; this.ticketInfo = ticketInfo; this.i18nService.setPageTitle('show-ticket.header.title', event); this.analytics.pageView(event.analyticsConfiguration); + this.walletConfiguration = generalInfo.walletConfiguration; }, e => { if (e instanceof HttpErrorResponse && e.status === 404) { this.router.navigate(['']); @@ -46,4 +52,17 @@ export class ViewTicketComponent implements OnInit { }); }); } + + get walletIntegrationEnabled(): boolean { + return this.walletConfiguration != null && + (this.walletConfiguration.gWalletEnabled || this.walletConfiguration.passEnabled); + } + + get gWalletEnabled(): boolean { + return this.walletConfiguration != null && this.walletConfiguration.gWalletEnabled; + } + + get passEnabled(): boolean { + return this.walletConfiguration != null && this.walletConfiguration.passEnabled; + } } From d7e319c871db54a2cb975f1fd7a18cfb758d03c5 Mon Sep 17 00:00:00 2001 From: Celestino Bellone <3385346+cbellone@users.noreply.github.com> Date: Tue, 9 May 2023 16:19:00 +0200 Subject: [PATCH 203/218] fix reverse proxy error when description is too long. Truncate to 1024 chars --- src/main/java/alfio/util/EventUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/alfio/util/EventUtil.java b/src/main/java/alfio/util/EventUtil.java index ff97040179..e9f9c8ab1e 100644 --- a/src/main/java/alfio/util/EventUtil.java +++ b/src/main/java/alfio/util/EventUtil.java @@ -37,6 +37,7 @@ import org.apache.commons.lang3.RegExUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.apache.commons.lang3.StringUtils; import org.flywaydb.core.api.MigrationVersion; import org.springframework.jdbc.core.namedparam.MapSqlParameterSource; import org.springframework.web.util.UriComponentsBuilder; @@ -211,7 +212,7 @@ public static String getGoogleCalendarURL(Event event, TicketCategory category, .queryParam("ctz", event.getTimeZone()) .queryParam("text", event.getDisplayName()) .queryParam("location", event.getLocation()) - .queryParam("details", description) + .queryParam("details", StringUtils.abbreviate(description, 1024)) .toUriString(); } From 2c4c671db6d5ca6a9d99465f926bcb2ca01e68dd Mon Sep 17 00:00:00 2001 From: Celestino Bellone <3385346+cbellone@users.noreply.github.com> Date: Thu, 11 May 2023 17:09:11 +0200 Subject: [PATCH 204/218] fix load user type --- .../js/admin/feature/apikey-bulk-import/apikey-bulk-import.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/resources/js/admin/feature/apikey-bulk-import/apikey-bulk-import.js b/src/main/webapp/resources/js/admin/feature/apikey-bulk-import/apikey-bulk-import.js index 8edf83117d..7782e7cb17 100644 --- a/src/main/webapp/resources/js/admin/feature/apikey-bulk-import/apikey-bulk-import.js +++ b/src/main/webapp/resources/js/admin/feature/apikey-bulk-import/apikey-bulk-import.js @@ -27,7 +27,7 @@ $q.all([OrganizationService.getAllOrganizations(), UserService.getAllRoles()]).then(function(results) { ctrl.organizations = results[0].data; - ctrl.roles = _.filter(results[1].data, function(r) { return r.target === 'API_KEY'; }); + ctrl.roles = _.filter(results[1].data, function(r) { return r.target.indexOf('API_KEY') > -1; }); }); }; From 27fee32c50287aeef45bef12ae715a0b31977b33 Mon Sep 17 00:00:00 2001 From: Lorena Mondini <60662357+Lorslux@users.noreply.github.com> Date: Fri, 12 May 2023 17:09:10 +0200 Subject: [PATCH 205/218] UI Apikey management (#1219) * api key system components working * api-key-system bulk * apikey bulk file * Disable button if not valid form * Remove console.log --- .../api-key-system-bulk.component.html | 108 ++++++++++++++ .../api-key-system-bulk.component.scss | 0 .../api-key-system-bulk.component.ts | 67 +++++++++ .../api-key-system-edit.component.html | 74 ++++++++++ .../api-key-system-edit.component.scss | 0 .../api-key-system-edit.component.ts | 86 +++++++++++ .../api-key-system.component.html | 133 ++++++++++++++++++ .../api-key-system.component.scss | 0 .../api-key-system.component.ts | 75 ++++++++++ .../admin/src/app/app-routing.module.ts | 18 +++ .../projects/admin/src/app/app.component.html | 3 + frontend/projects/admin/src/app/app.module.ts | 10 +- .../admin/src/app/model/apikey-bulk.ts | 5 + .../projects/admin/src/app/shared/icons.ts | 5 +- .../admin/src/app/shared/shared.module.ts | 3 + .../admin/src/app/shared/user.service.ts | 7 +- .../src/app/shared/users-filter-org.pipe.ts | 26 ++++ frontend/projects/admin/src/app/svg/key.ts | 4 + .../user-system-edit.component.html | 2 +- .../user-system/user-system.component.html | 14 +- .../app/user-system/user-system.component.ts | 21 ++- .../projects/admin/src/assets/svg/key.svg | 1 + 22 files changed, 652 insertions(+), 10 deletions(-) create mode 100644 frontend/projects/admin/src/app/api-key-system-bulk/api-key-system-bulk.component.html create mode 100644 frontend/projects/admin/src/app/api-key-system-bulk/api-key-system-bulk.component.scss create mode 100644 frontend/projects/admin/src/app/api-key-system-bulk/api-key-system-bulk.component.ts create mode 100644 frontend/projects/admin/src/app/api-key-system-edit/api-key-system-edit.component.html create mode 100644 frontend/projects/admin/src/app/api-key-system-edit/api-key-system-edit.component.scss create mode 100644 frontend/projects/admin/src/app/api-key-system-edit/api-key-system-edit.component.ts create mode 100644 frontend/projects/admin/src/app/api-key-system/api-key-system.component.html create mode 100644 frontend/projects/admin/src/app/api-key-system/api-key-system.component.scss create mode 100644 frontend/projects/admin/src/app/api-key-system/api-key-system.component.ts create mode 100644 frontend/projects/admin/src/app/model/apikey-bulk.ts create mode 100644 frontend/projects/admin/src/app/shared/users-filter-org.pipe.ts create mode 100644 frontend/projects/admin/src/app/svg/key.ts create mode 100644 frontend/projects/admin/src/assets/svg/key.svg diff --git a/frontend/projects/admin/src/app/api-key-system-bulk/api-key-system-bulk.component.html b/frontend/projects/admin/src/app/api-key-system-bulk/api-key-system-bulk.component.html new file mode 100644 index 0000000000..2c2c3a1791 --- /dev/null +++ b/frontend/projects/admin/src/app/api-key-system-bulk/api-key-system-bulk.component.html @@ -0,0 +1,108 @@ +
+

Bulk creation

+
+
+ + +
+
+ + +
+ +
+ + +
+
+
+

File Specifications:

+
General
+ Please create a CSV file without header, using commas (,) as separator, + double quotes (") as quote character and backslash (\) as escaping + character +
Row specification
+ 
+    name
+    where:
+    name
+    is the name of the client, to be displayed in the QR-Code and statistics
+
+
+ +
+ + + + + + + + + + + + + + + + + +
Name
+ {{ description }} +
Total + {{ bulkDescriptions.length }} +
+ +
+
+ +
+
+ +
+
+
+ diff --git a/frontend/projects/admin/src/app/api-key-system-bulk/api-key-system-bulk.component.scss b/frontend/projects/admin/src/app/api-key-system-bulk/api-key-system-bulk.component.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/frontend/projects/admin/src/app/api-key-system-bulk/api-key-system-bulk.component.ts b/frontend/projects/admin/src/app/api-key-system-bulk/api-key-system-bulk.component.ts new file mode 100644 index 0000000000..9eed03db96 --- /dev/null +++ b/frontend/projects/admin/src/app/api-key-system-bulk/api-key-system-bulk.component.ts @@ -0,0 +1,67 @@ +import { Component, OnInit } from '@angular/core'; +import { ActivatedRoute, Router } from '@angular/router'; +import { Organization } from '../model/organization'; +import { Observable, map } from 'rxjs'; +import { Role } from '../model/role'; +import { OrganizationService } from '../shared/organization.service'; +import { UserService } from '../shared/user.service'; +import { FormBuilder, FormGroup, Validators } from '@angular/forms'; + +@Component({ + selector: 'app-api-key-system-bulk', + templateUrl: './api-key-system-bulk.component.html', + styleUrls: ['./api-key-system-bulk.component.scss'], +}) +export class ApiKeySystemBulkComponent implements OnInit { + public organizations$?: Observable; + public roles$?: Observable; + public bulkForm: FormGroup; + + constructor( + private readonly route: ActivatedRoute, + private readonly organizationService: OrganizationService, + private readonly userService: UserService, + private readonly router: Router, + formBuilder: FormBuilder + ) { + this.bulkForm = formBuilder.group({ + organizationId: [null, Validators.required], + role: [null, Validators.required], + descriptions: [[]], + }); + } + + get bulkDescriptions(): string[] { + return this.bulkForm.value.descriptions; + } + + get userOrganizationId(){return this.bulkForm.get('organizationId')} + get userRole(){return this.bulkForm.get('role')} + + ngOnInit(): void { + this.organizations$ = this.organizationService.getOrganizations(); + this.roles$ = this.userService.getAllRoles(); + } + + save(): void { + this.userService.createApiBulk(this.bulkForm.value).subscribe((res) => { + if (res === 'OK') { + this.router.navigate(['/access-control/api-keys']); + } + }); + } + + onFileSelected(event: Event) { + const input = event.target as HTMLInputElement; + if (input && input.files) { + const file: File = input.files[0]; + file.text().then((res) => { + const descriptions = res + .split('\n') + .map((es) => es.trim()) + .filter((es) => es !== null && es.length > 0); + this.bulkForm.get('descriptions')?.patchValue(descriptions); + }); + } + } +} diff --git a/frontend/projects/admin/src/app/api-key-system-edit/api-key-system-edit.component.html b/frontend/projects/admin/src/app/api-key-system-edit/api-key-system-edit.component.html new file mode 100644 index 0000000000..9eea01ba03 --- /dev/null +++ b/frontend/projects/admin/src/app/api-key-system-edit/api-key-system-edit.component.html @@ -0,0 +1,74 @@ +
+

User

+ +
+
+ + + +
+ +
+ + + +
+ +
+ + + +
+ +
+
+ +
+ +
+ +
+
+
+
diff --git a/frontend/projects/admin/src/app/api-key-system-edit/api-key-system-edit.component.scss b/frontend/projects/admin/src/app/api-key-system-edit/api-key-system-edit.component.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/frontend/projects/admin/src/app/api-key-system-edit/api-key-system-edit.component.ts b/frontend/projects/admin/src/app/api-key-system-edit/api-key-system-edit.component.ts new file mode 100644 index 0000000000..6c89cd1a40 --- /dev/null +++ b/frontend/projects/admin/src/app/api-key-system-edit/api-key-system-edit.component.ts @@ -0,0 +1,86 @@ +import { Component, OnInit } from '@angular/core'; +import { FormBuilder, FormGroup, Validators } from '@angular/forms'; +import { Organization } from '../model/organization'; +import { Observable, map, of } from 'rxjs'; +import { User } from '../model/user'; +import { OrganizationService } from '../shared/organization.service'; +import { UserService } from '../shared/user.service'; +import { ActivatedRoute, Router } from '@angular/router'; +import { Role } from '../model/role'; + +@Component({ + selector: 'app-api-key-system-edit', + templateUrl: './api-key-system-edit.component.html', + styleUrls: ['./api-key-system-edit.component.scss'], +}) +export class ApiKeySystemEditComponent implements OnInit { + public userForm: FormGroup; + public editMode: boolean | undefined; + public organizations$?: Observable; + public user$: Observable = of(); + public roles$?: Observable; + public userId: string | null = null; + + constructor( + formBuilder: FormBuilder, + private readonly organizationService: OrganizationService, + private readonly userService: UserService, + private readonly router: Router, + private readonly route: ActivatedRoute + ) { + this.userForm = formBuilder.group({ + id: [null], + organizationId: [null, Validators.required], + role: [null, Validators.required], + description: [null], + username: [null], + lastName: [null], + firstName: [null], + emailAddress: [null], + type: ['API_KEY'], + }); + } + get organizationDescription() { + return this.userForm.get('description'); + } + + get organizationName() { + return this.userForm.get('organizationId'); + } + + get role() { + return this.userForm.get('role'); + } + + ngOnInit(): void { + this.userId = this.route.snapshot.paramMap.get('userId'); + this.organizations$ = this.organizationService.getOrganizations(); + this.roles$ = this.userService.getAllRoles().pipe( + map((roles) => { + return roles.filter((role) => role.target.includes('USER')); + }) + ); + + if (this.userId !== null) { + this.editMode = true; + this.user$ = this.userService.getUser(this.userId); + this.user$.subscribe((user) => { + if (user) this.userForm.patchValue(user); + }); + } else { + this.editMode = false; + } + } + + save(): void { + let result: Observable; + if (this.editMode) { + result = this.userService.update(this.userForm.value); + } else { + result = this.userService.create(this.userForm.value); + } + result.subscribe((res) => { + this.router.navigate(['/access-control/api-keys']); + }); + } +} diff --git a/frontend/projects/admin/src/app/api-key-system/api-key-system.component.html b/frontend/projects/admin/src/app/api-key-system/api-key-system.component.html new file mode 100644 index 0000000000..ac043de9e4 --- /dev/null +++ b/frontend/projects/admin/src/app/api-key-system/api-key-system.component.html @@ -0,0 +1,133 @@ +

api-key-system works!

+
+

System API Key

+

+ System API Key can be used from external application to create/modify/delete + organizations and to create API Keys +

+
+ +
+ +
+ +
+ +
+ + Bulk creation + + +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
Api keyDescriptionRoleMember ofQR CodeEditEnable / DisableDelete
{{ user.username }} + + {{ org.description }} + + + {{ + roleDescription(role) | async + }} + + {{ + org.name + }} + view qr code + + + + + + +
+
+
diff --git a/frontend/projects/admin/src/app/api-key-system/api-key-system.component.scss b/frontend/projects/admin/src/app/api-key-system/api-key-system.component.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/frontend/projects/admin/src/app/api-key-system/api-key-system.component.ts b/frontend/projects/admin/src/app/api-key-system/api-key-system.component.ts new file mode 100644 index 0000000000..cbe84d3acd --- /dev/null +++ b/frontend/projects/admin/src/app/api-key-system/api-key-system.component.ts @@ -0,0 +1,75 @@ +import { Component, OnInit } from '@angular/core'; +import { UserService } from '../shared/user.service'; +import { Observable, map, of, shareReplay } from 'rxjs'; +import { RoleType, User } from '../model/user'; +import { Organization } from '../model/organization'; +import { Role } from '../model/role'; + +@Component({ + selector: 'app-api-key-system', + templateUrl: './api-key-system.component.html', + styleUrls: ['./api-key-system.component.scss'], +}) +export class ApiKeySystemComponent implements OnInit { + public users$?: Observable; + public organizations$?: Observable; + public roles$: Observable> = of(); + public selectedOrganization?: Organization; + + constructor(private readonly userService: UserService) {} + + ngOnInit(): void { + this.loadApiKey(); + this.roles$ = this.userService.getAllRoles().pipe( + map((roles) => { + const map: Map = new Map(); + roles.forEach((role) => { + map.set(role.role, role); + }); + return map; + }), + shareReplay(1) + ); + } + + private loadApiKey() { + this.users$ = this.userService.getAllApiKey(); + this.users$.subscribe((users) => { + const orgIdToOrg = new Map(); + users.forEach((user) => { + user.memberOf.forEach((org) => { + orgIdToOrg.set(org.id, org); + }); + }); + + const organizations = Array.from(orgIdToOrg.values()); + this.organizations$ = of(organizations); + }); + } + + roleDescription(role: RoleType): Observable { + return this.roles$.pipe(map((roles) => roles.get(role)?.description)); + } + + enable(user: User) { + this.userService.enable(user, !user.enabled).subscribe((result) => { + this.loadApiKey(); + }); + } + + deleteUserApikey(user: User) { + if ( + window.confirm( + `The apikey ${user.username} will be deleted. Are you sure?` + ) + ) { + this.userService.deleteUser(user).subscribe((result) => { + this.loadApiKey(); + }); + } + } + + downloadAllApiKeys(orgId: number) { + window.open(`/admin/api/api-keys/organization/${orgId}/all`); + } +} diff --git a/frontend/projects/admin/src/app/app-routing.module.ts b/frontend/projects/admin/src/app/app-routing.module.ts index f9308b96bb..147066eb1b 100644 --- a/frontend/projects/admin/src/app/app-routing.module.ts +++ b/frontend/projects/admin/src/app/app-routing.module.ts @@ -6,6 +6,9 @@ import { OrganizationEditComponent } from './organization-edit/organization-edit import { AccessControlComponent } from './access-control/access-control.component'; import { UserSystemComponent } from './user-system/user-system.component'; import { UserSystemEditComponent } from './user-system-edit/user-system-edit.component'; +import { ApiKeySystemEditComponent } from './api-key-system-edit/api-key-system-edit.component'; +import { ApiKeySystemBulkComponent } from './api-key-system-bulk/api-key-system-bulk.component'; +import { ApiKeySystemComponent } from './api-key-system/api-key-system.component'; const routes: Routes = [ { @@ -48,6 +51,21 @@ const routes: Routes = [ path: 'access-control/users/:userId/edit', component : UserSystemEditComponent, }, + {path: 'access-control/api-keys', + component: ApiKeySystemComponent, +}, + { + path: 'access-control/api-keys/new', + component: ApiKeySystemEditComponent, + }, + { + path: 'access-control/api-keys/:userId/edit', + component: ApiKeySystemEditComponent, + }, + { + path: 'access-control/api-keys/bulk', + component: ApiKeySystemBulkComponent, + }, { path: '', component: MissingOrgComponent, diff --git a/frontend/projects/admin/src/app/app.component.html b/frontend/projects/admin/src/app/app.component.html index ebef60a56e..675f96d6dc 100644 --- a/frontend/projects/admin/src/app/app.component.html +++ b/frontend/projects/admin/src/app/app.component.html @@ -69,6 +69,9 @@ Users + + Api Keys + diff --git a/frontend/projects/admin/src/app/app.module.ts b/frontend/projects/admin/src/app/app.module.ts index b297c329ce..e22eac0813 100644 --- a/frontend/projects/admin/src/app/app.module.ts +++ b/frontend/projects/admin/src/app/app.module.ts @@ -21,10 +21,12 @@ import {HttpLoginInterceptor, redirectToLogin} from "./shared/http-login.interce import {AlfioCommonModule} from "common"; import { OrganizationsComponent } from './organizations/organizations.component'; import { OrganizationEditComponent } from './organization-edit/organization-edit.component'; -import { ReactiveFormsModule } from '@angular/forms'; -import { AccessControlComponent } from './access-control/access-control.component'; +import { FormsModule, ReactiveFormsModule } from '@angular/forms';import { AccessControlComponent } from './access-control/access-control.component'; import { UserSystemComponent } from './user-system/user-system.component'; import { UserSystemEditComponent } from './user-system-edit/user-system-edit.component'; +import { ApiKeySystemComponent } from './api-key-system/api-key-system.component'; +import { ApiKeySystemEditComponent } from './api-key-system-edit/api-key-system-edit.component'; +import { ApiKeySystemBulkComponent } from './api-key-system-bulk/api-key-system-bulk.component'; export function RedirectToLoginIfNeeded(userService: UserService, router: Router): () => Promise { return async () => { @@ -51,6 +53,9 @@ export function HttpLoaderFactory(http: HttpClient) { AccessControlComponent, UserSystemComponent, UserSystemEditComponent, + ApiKeySystemComponent, + ApiKeySystemEditComponent, + ApiKeySystemBulkComponent, ], imports: [ BrowserModule, @@ -58,6 +63,7 @@ export function HttpLoaderFactory(http: HttpClient) { AuthenticationModule, HttpClientModule, ReactiveFormsModule, + FormsModule, HttpClientXsrfModule.withOptions({ cookieName: 'XSRF-TOKEN', headerName: 'X-CSRF-TOKEN', diff --git a/frontend/projects/admin/src/app/model/apikey-bulk.ts b/frontend/projects/admin/src/app/model/apikey-bulk.ts new file mode 100644 index 0000000000..afdbe34227 --- /dev/null +++ b/frontend/projects/admin/src/app/model/apikey-bulk.ts @@ -0,0 +1,5 @@ +export interface ApiKeyBulk{ + organizationId : number; + role: string; + descriptions: string[]; +} diff --git a/frontend/projects/admin/src/app/shared/icons.ts b/frontend/projects/admin/src/app/shared/icons.ts index 3f0aa778e7..e8ba166c01 100644 --- a/frontend/projects/admin/src/app/shared/icons.ts +++ b/frontend/projects/admin/src/app/shared/icons.ts @@ -15,6 +15,7 @@ import { resetIcon } from '../svg/reset'; import { deleteIcon } from '../svg/delete'; import { visibilityoffIcon } from '../svg/visibilityoff'; import { visibilityOnIcon } from '../svg/visibility-on'; +import { keyIcon } from '../svg/key'; const ICONS = [ checkIcon, @@ -35,9 +36,7 @@ const ICONS = [ deleteIcon, visibilityoffIcon, visibilityOnIcon, - - - + keyIcon, ]; export const ICON_CONFIG = { sizes: { diff --git a/frontend/projects/admin/src/app/shared/shared.module.ts b/frontend/projects/admin/src/app/shared/shared.module.ts index a8b0505459..49cf86aae1 100644 --- a/frontend/projects/admin/src/app/shared/shared.module.ts +++ b/frontend/projects/admin/src/app/shared/shared.module.ts @@ -2,11 +2,13 @@ import {NgModule} from "@angular/core"; import {SectionDashboardComponent} from "./section-dashboard/section-dashboard.component"; import {UserNamePipe} from "./user-name.pipe"; import {NgIf} from "@angular/common"; +import { UsersFilterOrgPipe } from "./users-filter-org.pipe"; @NgModule({ declarations: [ SectionDashboardComponent, UserNamePipe, + UsersFilterOrgPipe, ], imports: [ NgIf @@ -14,6 +16,7 @@ import {NgIf} from "@angular/common"; exports: [ SectionDashboardComponent, UserNamePipe, + UsersFilterOrgPipe, ] }) export class SharedModule {} diff --git a/frontend/projects/admin/src/app/shared/user.service.ts b/frontend/projects/admin/src/app/shared/user.service.ts index 0d1ac5317b..853f06fb7b 100644 --- a/frontend/projects/admin/src/app/shared/user.service.ts +++ b/frontend/projects/admin/src/app/shared/user.service.ts @@ -1,8 +1,9 @@ import { Injectable } from '@angular/core'; import { HttpClient } from '@angular/common/http'; import { catchError, filter, map, Observable, of } from 'rxjs'; -import { User, UserInfo } from '../model/user'; +import { User, UserInfo} from '../model/user'; import { Role } from '../model/role'; +import { ApiKeyBulk } from '../model/apikey-bulk'; @Injectable() export class UserService { @@ -72,4 +73,8 @@ export class UserService { update(user: User) : Observable{ return this.httpClient.post('/admin/api/users/edit', user); } + + createApiBulk(apiKeyBulk: ApiKeyBulk): Observable{ + return this.httpClient.post('/admin/api/api-keys/bulk', apiKeyBulk); + } } diff --git a/frontend/projects/admin/src/app/shared/users-filter-org.pipe.ts b/frontend/projects/admin/src/app/shared/users-filter-org.pipe.ts new file mode 100644 index 0000000000..ea2789bb49 --- /dev/null +++ b/frontend/projects/admin/src/app/shared/users-filter-org.pipe.ts @@ -0,0 +1,26 @@ +import { Pipe, PipeTransform } from '@angular/core'; +import { User } from '../model/user'; +import { Organization } from '../model/organization'; + +@Pipe({ + name: 'usersFilterOrg', + pure: true, +}) +export class UsersFilterOrgPipe implements PipeTransform { + transform( + value: User[] | null, + org: Organization | undefined + ): User[] | null { + if (!value) { + return value; + } + return value.filter((user) => { + if (!org) { + return true; + } + return user.memberOf.some( + (userOrganization) => userOrganization.id === org.id + ); + }); + } +} diff --git a/frontend/projects/admin/src/app/svg/key.ts b/frontend/projects/admin/src/app/svg/key.ts new file mode 100644 index 0000000000..21b3337ae0 --- /dev/null +++ b/frontend/projects/admin/src/app/svg/key.ts @@ -0,0 +1,4 @@ +export const keyIcon = { + data: ``, + name: 'key' as const +}; \ No newline at end of file diff --git a/frontend/projects/admin/src/app/user-system-edit/user-system-edit.component.html b/frontend/projects/admin/src/app/user-system-edit/user-system-edit.component.html index f182047ea6..d87968a479 100644 --- a/frontend/projects/admin/src/app/user-system-edit/user-system-edit.component.html +++ b/frontend/projects/admin/src/app/user-system-edit/user-system-edit.component.html @@ -1,4 +1,4 @@ -
+

User

diff --git a/frontend/projects/admin/src/app/user-system/user-system.component.html b/frontend/projects/admin/src/app/user-system/user-system.component.html index f018fe8a43..e48ddc4dc9 100644 --- a/frontend/projects/admin/src/app/user-system/user-system.component.html +++ b/frontend/projects/admin/src/app/user-system/user-system.component.html @@ -1,7 +1,17 @@

Users

-
+
+ + +
+ + +
+

Active

+
    +
  • +
    • -
- - -

Past

- +
+ + +
+

Past

+ - + +
+ +
diff --git a/frontend/projects/admin/src/app/dashboard/dashboard.component.ts b/frontend/projects/admin/src/app/dashboard/dashboard.component.ts index c72443202b..a7dcfd0bdf 100644 --- a/frontend/projects/admin/src/app/dashboard/dashboard.component.ts +++ b/frontend/projects/admin/src/app/dashboard/dashboard.component.ts @@ -1,22 +1,29 @@ -import {Component, OnInit} from "@angular/core"; -import {ActivatedRoute} from "@angular/router"; -import {map, mergeMap, Observable, of} from "rxjs"; -import {EventInfo} from "../model/event"; -import {EventService} from "../shared/event.service"; +import { Component, OnInit } from '@angular/core'; +import { ActivatedRoute } from '@angular/router'; +import { map, mergeMap, Observable, of } from 'rxjs'; +import { EventInfo } from '../model/event'; +import { EventService } from '../shared/event.service'; +import { NgbModal, NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; +import { ExportDateSelectorComponent } from './export-date-selector/export-date-selector.component'; @Component({ - templateUrl: './dashboard.component.html' + templateUrl: './dashboard.component.html', }) export class DashboardComponent implements OnInit { - public organizationId$: Observable = of(); public activeEvents$: Observable = of(); public expiredEvents$: Observable = of(); public activeFilter: boolean = true; public inactiveFilter: boolean = false; - constructor(route: ActivatedRoute, private readonly eventService: EventService) { - this.organizationId$ = route.paramMap.pipe(map((pm) => pm.get('organizationId'))) + constructor( + route: ActivatedRoute, + private readonly eventService: EventService, + private readonly modalService: NgbModal + ) { + this.organizationId$ = route.paramMap.pipe( + map((pm) => pm.get('organizationId')) + ); } public ngOnInit(): void { @@ -24,11 +31,19 @@ export class DashboardComponent implements OnInit { } private loadActiveEvents() { - return this.organizationId$.pipe(mergeMap(orgId => orgId != null ? this.eventService.getActiveEvents(orgId) : [])); + return this.organizationId$.pipe( + mergeMap((orgId) => + orgId != null ? this.eventService.getActiveEvents(orgId) : [] + ) + ); } private loadInactiveEvents() { - return this.organizationId$.pipe(mergeMap(orgId => orgId != null ? this.eventService.getExpiredEvents(orgId) : [])); + return this.organizationId$.pipe( + mergeMap((orgId) => + orgId != null ? this.eventService.getExpiredEvents(orgId) : [] + ) + ); } public toggleActiveFilter(toggle: boolean): void { @@ -48,4 +63,9 @@ export class DashboardComponent implements OnInit { this.expiredEvents$ = of(); } } + public openExportDateSelector(): void { + const modalRef = this.modalService.open(ExportDateSelectorComponent, { + size: 'lg', + }); + } } diff --git a/frontend/projects/admin/src/app/dashboard/dashboard.module.ts b/frontend/projects/admin/src/app/dashboard/dashboard.module.ts index 73b5c8e446..bd57c89813 100644 --- a/frontend/projects/admin/src/app/dashboard/dashboard.module.ts +++ b/frontend/projects/admin/src/app/dashboard/dashboard.module.ts @@ -1,18 +1,21 @@ -import {NgModule} from "@angular/core"; -import {NgbModule} from "@ng-bootstrap/ng-bootstrap"; -import {DashboardComponent} from "./dashboard.component"; -import {RouterModule} from "@angular/router"; -import {OrganizationService} from "../shared/organization.service"; -import {CommonModule} from "@angular/common"; -import {EventService} from "../shared/event.service"; -import {OrganizationConfigurationComponent} from './organization-configuration/organization-configuration.component'; -import {provideSvgIconsConfig, SvgIconComponent} from '@ngneat/svg-icon'; -import {TranslateModule} from '@ngx-translate/core' -import {ICON_CONFIG} from "../shared/icons"; -import {SubscriptionsComponent} from './subscriptions/subscriptions.component'; -import {OrganizationInfoComponent} from './organization-info/organization-info.component'; -import {GroupsComponent} from './groups/groups.component'; -import {FilterButtonComponent} from '../shared/filter-button/filter-button.component'; +import { NgModule } from '@angular/core'; +import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; +import { DashboardComponent } from './dashboard.component'; +import { RouterModule } from '@angular/router'; +import { OrganizationService } from '../shared/organization.service'; +import { CommonModule } from '@angular/common'; +import { EventService } from '../shared/event.service'; +import { OrganizationConfigurationComponent } from './organization-configuration/organization-configuration.component'; +import { provideSvgIconsConfig, SvgIconComponent } from '@ngneat/svg-icon'; +import { TranslateModule } from '@ngx-translate/core'; +import { ICON_CONFIG } from '../shared/icons'; +import { SubscriptionsComponent } from './subscriptions/subscriptions.component'; +import { OrganizationInfoComponent } from './organization-info/organization-info.component'; +import { GroupsComponent } from './groups/groups.component'; +import { FilterButtonComponent } from '../shared/filter-button/filter-button.component'; +import { EventItemComponent } from './event-item/event-item.component'; +import { ExportDateSelectorComponent } from './export-date-selector/export-date-selector.component'; +import { ReactiveFormsModule, FormsModule } from '@angular/forms'; @NgModule({ imports: [ @@ -20,15 +23,16 @@ import {FilterButtonComponent} from '../shared/filter-button/filter-button.compo CommonModule, NgbModule, RouterModule.forChild([ - { path: 'event', component: DashboardComponent}, - { path: 'configuration', component: OrganizationConfigurationComponent}, + { path: 'event', component: DashboardComponent }, + { path: 'configuration', component: OrganizationConfigurationComponent }, { path: 'subscriptions', component: SubscriptionsComponent }, { path: 'organization-info', component: OrganizationInfoComponent }, { path: 'groups', component: GroupsComponent }, - ]), SvgIconComponent, FilterButtonComponent, + ReactiveFormsModule, + FormsModule, ], declarations: [ DashboardComponent, @@ -36,11 +40,13 @@ import {FilterButtonComponent} from '../shared/filter-button/filter-button.compo SubscriptionsComponent, OrganizationInfoComponent, GroupsComponent, + EventItemComponent, + ExportDateSelectorComponent, ], providers: [ OrganizationService, EventService, - provideSvgIconsConfig(ICON_CONFIG) - ] + provideSvgIconsConfig(ICON_CONFIG), + ], }) export class DashboardModule {} diff --git a/frontend/projects/admin/src/app/dashboard/event-item/event-item.component.html b/frontend/projects/admin/src/app/dashboard/event-item/event-item.component.html new file mode 100644 index 0000000000..0ffb9fd7b1 --- /dev/null +++ b/frontend/projects/admin/src/app/dashboard/event-item/event-item.component.html @@ -0,0 +1,52 @@ +
+
+ +
+
+

+ {{ event.displayName }} +

+ {{ event.formattedBegin }} / {{ event.formattedEnd }} +
+ +
+
+ + + {{ event.soldTickets + event.checkedInTickets }} / + {{ event.availableSeats }} + + + + + Check-In + + + Pending payments{{ event.shortName }} + +
+
+
diff --git a/frontend/projects/admin/src/app/dashboard/event-item/event-item.component.scss b/frontend/projects/admin/src/app/dashboard/event-item/event-item.component.scss new file mode 100644 index 0000000000..b8cd06c537 --- /dev/null +++ b/frontend/projects/admin/src/app/dashboard/event-item/event-item.component.scss @@ -0,0 +1,5 @@ +.text-overflow { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} diff --git a/frontend/projects/admin/src/app/dashboard/event-item/event-item.component.ts b/frontend/projects/admin/src/app/dashboard/event-item/event-item.component.ts new file mode 100644 index 0000000000..0587ea356d --- /dev/null +++ b/frontend/projects/admin/src/app/dashboard/event-item/event-item.component.ts @@ -0,0 +1,19 @@ +import { Component, Input, OnInit } from '@angular/core'; +import { EventInfo } from '../../model/event'; + +@Component({ + selector: 'app-event-item', + templateUrl: './event-item.component.html', + styleUrls: ['./event-item.component.scss'], +}) +export class EventItemComponent implements OnInit { + @Input() + public event: EventInfo | undefined; + + @Input() + showImage: boolean = true; + + constructor() {} + + ngOnInit(): void {} +} diff --git a/frontend/projects/admin/src/app/dashboard/export-date-selector/export-date-selector.component.html b/frontend/projects/admin/src/app/dashboard/export-date-selector/export-date-selector.component.html new file mode 100644 index 0000000000..619243579c --- /dev/null +++ b/frontend/projects/admin/src/app/dashboard/export-date-selector/export-date-selector.component.html @@ -0,0 +1,78 @@ +
+

Export Reservations

+ +
+
+
+

Reservations can be exported for a given period of time.

+

The export will produce an "Excel" file with one sheet per Event

+
+

Reservation date

+ +
+ +
+ + +
+
+ + +
+ +
+
+
+
+ +
+
+ Download +
+
+
diff --git a/frontend/projects/admin/src/app/dashboard/export-date-selector/export-date-selector.component.scss b/frontend/projects/admin/src/app/dashboard/export-date-selector/export-date-selector.component.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/frontend/projects/admin/src/app/dashboard/export-date-selector/export-date-selector.component.ts b/frontend/projects/admin/src/app/dashboard/export-date-selector/export-date-selector.component.ts new file mode 100644 index 0000000000..f075ece92b --- /dev/null +++ b/frontend/projects/admin/src/app/dashboard/export-date-selector/export-date-selector.component.ts @@ -0,0 +1,33 @@ +import { Component, OnInit } from '@angular/core'; +import { FormBuilder, Validators } from '@angular/forms'; +import { FormGroup } from '@angular/forms'; +import { NgbActiveModal, NgbModal } from '@ng-bootstrap/ng-bootstrap'; + +@Component({ + selector: 'app-export-date-selector', + templateUrl: './export-date-selector.component.html', + styleUrls: ['./export-date-selector.component.scss'], +}) +export class ExportDateSelectorComponent implements OnInit { + public dateForm: FormGroup; + constructor( + private readonly modalService: NgbModal, + public activeModal: NgbActiveModal, + formBuilder: FormBuilder + ) { + this.dateForm = formBuilder.group({ + fromDate: [null, Validators.required], + toDate: [null, Validators.required], + }); + } + + get fromDate() { + return this.dateForm.get('fromDate'); + } + + get toDate() { + return this.dateForm.get('toDate'); + } + + ngOnInit(): void {} +} diff --git a/frontend/projects/admin/src/app/event/event-dashboard/event-dashboard.component.html b/frontend/projects/admin/src/app/event/event-dashboard/event-dashboard.component.html index 4d239cf697..deb32d20f9 100644 --- a/frontend/projects/admin/src/app/event/event-dashboard/event-dashboard.component.html +++ b/frontend/projects/admin/src/app/event/event-dashboard/event-dashboard.component.html @@ -3,7 +3,6 @@
-

{{event.displayName}}

- {{event | json}} +

{{ event.displayName }}

diff --git a/frontend/projects/admin/src/app/event/event.module.ts b/frontend/projects/admin/src/app/event/event.module.ts index b585f1bca0..fe70b38ee1 100644 --- a/frontend/projects/admin/src/app/event/event.module.ts +++ b/frontend/projects/admin/src/app/event/event.module.ts @@ -10,10 +10,12 @@ import {EventDashboardComponent} from './event-dashboard/event-dashboard.compone import {EventMenuComponent} from './event-menu/event-menu.component'; import {SharedModule} from "../shared/shared.module"; + @NgModule({ declarations: [ EventMenuComponent, - EventDashboardComponent + EventDashboardComponent, + ], imports: [ TranslateModule.forChild(), @@ -28,6 +30,7 @@ import {SharedModule} from "../shared/shared.module"; OrganizationService, EventService, provideSvgIconsConfig(ICON_CONFIG) - ] + ], + }) export class EventModule { } diff --git a/frontend/projects/admin/src/app/shared/event.service.ts b/frontend/projects/admin/src/app/shared/event.service.ts index 727225ffee..e3a80bd6eb 100644 --- a/frontend/projects/admin/src/app/shared/event.service.ts +++ b/frontend/projects/admin/src/app/shared/event.service.ts @@ -1,24 +1,24 @@ -import {HttpClient} from "@angular/common/http"; -import {Injectable} from "@angular/core"; -import {map, Observable} from "rxjs"; -import {Event, EventInfo} from "../model/event"; +import { HttpClient } from '@angular/common/http'; +import { Injectable } from '@angular/core'; +import { map, Observable } from 'rxjs'; +import { Event, EventInfo } from '../model/event'; @Injectable() export class EventService { - constructor(private httpClient: HttpClient) { - } + constructor(private httpClient: HttpClient) {} getActiveEvents(organizationId: string): Observable { const orgId = parseInt(organizationId); - return this.httpClient.get('/admin/api/active-events') - .pipe(map(events => events.filter(e => e.organizationId === orgId))); + return this.httpClient + .get('/admin/api/active-events') + .pipe(map((events) => events.filter((e) => e.organizationId === orgId))); } - getExpiredEvents(organizationId: string): Observable { const orgId = parseInt(organizationId); - return this.httpClient.get('/admin/api/expired-events') - .pipe(map(events => events.filter(e => e.organizationId == orgId))); + return this.httpClient + .get('/admin/api/expired-events') + .pipe(map((events) => events.filter((e) => e.organizationId == orgId))); } getEvent(eventId: string): Observable { diff --git a/frontend/projects/admin/src/app/shared/icons.ts b/frontend/projects/admin/src/app/shared/icons.ts index e8ba166c01..e971cab8aa 100644 --- a/frontend/projects/admin/src/app/shared/icons.ts +++ b/frontend/projects/admin/src/app/shared/icons.ts @@ -1,14 +1,14 @@ -import {addIcon} from '../svg/add'; -import {arrowdropdownIcon} from '../svg/arrowdropdown'; -import {checkIcon} from '../svg/check'; -import {homeIcon} from '../svg/home'; -import {organizationIcon} from '../svg/organization'; -import {settingsIcon} from '../svg/settings'; -import {eventIcon} from "../svg/event"; -import {accessIcon} from "../svg/access"; -import {groupsIcon} from "../svg/groups"; -import {subscriptionIcon} from "../svg/subscription"; -import {accountcircleIcon} from "../svg/accountcircle"; +import { addIcon } from '../svg/add'; +import { arrowdropdownIcon } from '../svg/arrowdropdown'; +import { checkIcon } from '../svg/check'; +import { homeIcon } from '../svg/home'; +import { organizationIcon } from '../svg/organization'; +import { settingsIcon } from '../svg/settings'; +import { eventIcon } from '../svg/event'; +import { accessIcon } from '../svg/access'; +import { groupsIcon } from '../svg/groups'; +import { subscriptionIcon } from '../svg/subscription'; +import { accountcircleIcon } from '../svg/accountcircle'; import { addCircleNewIcon } from '../svg/add-circle-new'; import { editIcon } from '../svg/edit'; import { resetIcon } from '../svg/reset'; @@ -16,6 +16,10 @@ import { deleteIcon } from '../svg/delete'; import { visibilityoffIcon } from '../svg/visibilityoff'; import { visibilityOnIcon } from '../svg/visibility-on'; import { keyIcon } from '../svg/key'; +import { detailsIcon } from '../svg/details'; +import { paymentsIcon } from '../svg/payments'; +import { ticketIcon } from '../svg/ticket'; +import { downloadIcon } from '../svg/download'; const ICONS = [ checkIcon, @@ -37,6 +41,10 @@ const ICONS = [ visibilityoffIcon, visibilityOnIcon, keyIcon, + detailsIcon, + paymentsIcon, + ticketIcon, + downloadIcon, ]; export const ICON_CONFIG = { sizes: { @@ -48,5 +56,5 @@ export const ICON_CONFIG = { xxl: '30px', }, defaultSize: 'xl', - icons: ICONS + icons: ICONS, }; diff --git a/frontend/projects/admin/src/app/svg/details.ts b/frontend/projects/admin/src/app/svg/details.ts new file mode 100644 index 0000000000..df49ed70ef --- /dev/null +++ b/frontend/projects/admin/src/app/svg/details.ts @@ -0,0 +1,4 @@ +export const detailsIcon = { + data: ``, + name: 'details' as const +}; \ No newline at end of file diff --git a/frontend/projects/admin/src/app/svg/download.ts b/frontend/projects/admin/src/app/svg/download.ts new file mode 100644 index 0000000000..934ea6c6a6 --- /dev/null +++ b/frontend/projects/admin/src/app/svg/download.ts @@ -0,0 +1,4 @@ +export const downloadIcon = { + data: ``, + name: 'download' as const +}; \ No newline at end of file diff --git a/frontend/projects/admin/src/app/svg/payments.ts b/frontend/projects/admin/src/app/svg/payments.ts new file mode 100644 index 0000000000..a3efc9f14f --- /dev/null +++ b/frontend/projects/admin/src/app/svg/payments.ts @@ -0,0 +1,4 @@ +export const paymentsIcon = { + data: ``, + name: 'payments' as const +}; \ No newline at end of file diff --git a/frontend/projects/admin/src/app/svg/ticket.ts b/frontend/projects/admin/src/app/svg/ticket.ts new file mode 100644 index 0000000000..c53182ab43 --- /dev/null +++ b/frontend/projects/admin/src/app/svg/ticket.ts @@ -0,0 +1,4 @@ +export const ticketIcon = { + data: ``, + name: 'ticket' as const +}; \ No newline at end of file diff --git a/frontend/projects/admin/src/assets/svg/details.svg b/frontend/projects/admin/src/assets/svg/details.svg new file mode 100644 index 0000000000..f5efea3c66 --- /dev/null +++ b/frontend/projects/admin/src/assets/svg/details.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/projects/admin/src/assets/svg/download.svg b/frontend/projects/admin/src/assets/svg/download.svg new file mode 100644 index 0000000000..f8c4fdc6c5 --- /dev/null +++ b/frontend/projects/admin/src/assets/svg/download.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/projects/admin/src/assets/svg/payments.svg b/frontend/projects/admin/src/assets/svg/payments.svg new file mode 100644 index 0000000000..49cb64615a --- /dev/null +++ b/frontend/projects/admin/src/assets/svg/payments.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/projects/admin/src/assets/svg/ticket.svg b/frontend/projects/admin/src/assets/svg/ticket.svg new file mode 100644 index 0000000000..01b18f9860 --- /dev/null +++ b/frontend/projects/admin/src/assets/svg/ticket.svg @@ -0,0 +1 @@ + \ No newline at end of file From 5180a584c301bff6aca76cdc43f09803306777eb Mon Sep 17 00:00:00 2001 From: Celestino Bellone <3385346+cbellone@users.noreply.github.com> Date: Fri, 26 May 2023 09:18:24 +0200 Subject: [PATCH 208/218] Payments list (#1240) - cherry-picked from 51c2edabc4f01cb7154d700ba5178071bcc34ac8 --- .../api/admin/AdminPaymentsApiController.java | 144 ++++++++++++++++++ .../api/admin/EventApiController.java | 7 +- .../java/alfio/manager/CheckInManager.java | 2 +- .../java/alfio/manager/PaymentManager.java | 18 +++ .../alfio/manager/PurchaseContextManager.java | 14 +- .../manager/PurchaseContextSearchManager.java | 45 +++++- .../alfio/manager/ReservationFinalizer.java | 36 ++++- .../manager/TicketReservationManager.java | 17 +-- .../alfio/model/ReservationPaymentDetail.java | 97 ++++++++++++ .../TransactionMetadataModification.java | 40 +++++ .../alfio/model/transaction/Transaction.java | 9 ++ .../repository/TicketSearchRepository.java | 26 ++++ .../repository/TransactionRepository.java | 5 + .../alfio/web-templates/admin-index.ms | 4 + .../admin/partials/main/sidebar.html | 9 +- .../payment/edit-transaction-modal.html | 24 +++ .../js/admin/directive/admin-directive.js | 2 + .../feature/payments-list/payments-list.html | 59 +++++++ .../feature/payments-list/payments-list.js | 73 +++++++++ .../js/admin/ng-app/admin-application.js | 22 ++- .../resources/js/admin/service/service.js | 83 +++++++++- .../reservation/BaseReservationFlowTest.java | 2 +- ...illingDocumentCreationIntegrationTest.java | 2 +- ...countedReservationFlowIntegrationTest.java | 2 +- .../CheckInManagerIntegrationTest.java | 2 +- ...cketReservationManagerIntegrationTest.java | 2 +- .../manager/TicketReservationManagerTest.java | 4 +- 27 files changed, 707 insertions(+), 43 deletions(-) create mode 100644 src/main/java/alfio/controller/api/admin/AdminPaymentsApiController.java create mode 100644 src/main/java/alfio/model/ReservationPaymentDetail.java create mode 100644 src/main/java/alfio/model/modification/TransactionMetadataModification.java create mode 100644 src/main/webapp/resources/angular-templates/admin/partials/payment/edit-transaction-modal.html create mode 100644 src/main/webapp/resources/js/admin/feature/payments-list/payments-list.html create mode 100644 src/main/webapp/resources/js/admin/feature/payments-list/payments-list.js diff --git a/src/main/java/alfio/controller/api/admin/AdminPaymentsApiController.java b/src/main/java/alfio/controller/api/admin/AdminPaymentsApiController.java new file mode 100644 index 0000000000..7350e7eb62 --- /dev/null +++ b/src/main/java/alfio/controller/api/admin/AdminPaymentsApiController.java @@ -0,0 +1,144 @@ +/** + * This file is part of alf.io. + * + * alf.io is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * alf.io is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with alf.io. If not, see . + */ +package alfio.controller.api.admin; + +import alfio.controller.api.support.PageAndContent; +import alfio.manager.PaymentManager; +import alfio.manager.PurchaseContextManager; +import alfio.manager.PurchaseContextSearchManager; +import alfio.manager.system.ConfigurationManager; +import alfio.model.PurchaseContext; +import alfio.model.ReservationPaymentDetail; +import alfio.model.modification.TransactionMetadataModification; +import alfio.model.system.ConfigurationKeys; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.security.Principal; +import java.time.ZonedDateTime; +import java.time.format.DateTimeFormatter; +import java.util.List; + +import static alfio.util.ExportUtils.exportExcel; +import static java.util.Objects.requireNonNullElse; +import static org.apache.commons.lang3.StringUtils.trimToNull; + +@RestController +@RequestMapping("/admin/api/payments") +public class AdminPaymentsApiController { + + private static final String[] EXPORT_COLUMNS = new String[] { + "ID", + "Name", + "Email", + "Type", + "Amount", + "Currency", + "Payment Date/Time", + "Notes" + }; + private static final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + + private final PurchaseContextSearchManager purchaseContextSearchManager; + private final PurchaseContextManager purchaseContextManager; + private final PaymentManager paymentManager; + private final ConfigurationManager configurationManager; + + public AdminPaymentsApiController(PurchaseContextSearchManager purchaseContextSearchManager, + PurchaseContextManager purchaseContextManager, + PaymentManager paymentManager, + ConfigurationManager configurationManager) { + this.purchaseContextSearchManager = purchaseContextSearchManager; + this.purchaseContextManager = purchaseContextManager; + this.paymentManager = paymentManager; + this.configurationManager = configurationManager; + } + + @GetMapping("/{purchaseContextType}/{publicIdentifier}/list") + PageAndContent> getPaymentsForPurchaseContext(@PathVariable("purchaseContextType") PurchaseContext.PurchaseContextType purchaseContextType, + @PathVariable("publicIdentifier") String publicIdentifier, + @RequestParam(value = "page", required = false) Integer page, + @RequestParam(value = "search", required = false) String search, + Principal principal) { + return purchaseContextManager.findBy(purchaseContextType, publicIdentifier) + .filter(purchaseContext -> purchaseContextManager.validateAccess(purchaseContext, principal)) + .map(purchaseContext -> { + var res = purchaseContextSearchManager.findAllPaymentsFor(purchaseContext, page, search); + return new PageAndContent<>(res.getLeft(), res.getRight()); + }).orElseGet(() -> new PageAndContent<>(List.of(), 0)); + } + + @PutMapping("/{purchaseContextType}/{publicIdentifier}/reservation/{reservationId}") + ResponseEntity updateTransactionData(@PathVariable("purchaseContextType") PurchaseContext.PurchaseContextType purchaseContextType, + @PathVariable("publicIdentifier") String publicIdentifier, + @PathVariable("reservationId") String reservationId, + @RequestBody TransactionMetadataModification transactionMetadataModification, + Principal principal) { + try { + return ResponseEntity.of(purchaseContextManager.findBy(purchaseContextType, publicIdentifier) + .filter(purchaseContext -> purchaseContextManager.validateAccess(purchaseContext, principal)) + .map(purchaseContext -> { + var timestampModification = transactionMetadataModification.getTimestamp(); + var timestamp = timestampModification != null ? timestampModification.toZonedDateTime(purchaseContext.getZoneId()) : null; + paymentManager.updateTransactionDetails(reservationId, transactionMetadataModification.getNotes(), timestamp, principal); + return "OK"; + })); + } catch (IllegalArgumentException ex) { + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(ex.getMessage()); + } + } + + @GetMapping("/{purchaseContextType}/{publicIdentifier}/download") + void exportPayments(@PathVariable("purchaseContextType") PurchaseContext.PurchaseContextType purchaseContextType, + @PathVariable("publicIdentifier") String publicIdentifier, + @RequestParam(value = "search", required = false) String search, + Principal principal, + HttpServletResponse response) throws IOException { + var purchaseContextOptional = purchaseContextManager.findBy(purchaseContextType, publicIdentifier); + if (purchaseContextOptional.isPresent() && purchaseContextManager.validateAccess(purchaseContextOptional.get(), principal)) { + var purchaseContext = purchaseContextOptional.get(); + boolean useInvoiceNumber = configurationManager.getFor(ConfigurationKeys.USE_INVOICE_NUMBER_AS_ID, purchaseContext.getConfigurationLevel()) + .getValueAsBooleanOrDefault(); + var data = purchaseContextSearchManager.findAllPaymentsForExport(purchaseContext, search) + .stream() + .map(d -> new String[] { + useInvoiceNumber ? requireNonNullElse(trimToNull(d.getInvoiceNumber()), "N/A") : d.getId(), + d.getFirstName() + " " + d.getLastName(), + d.getEmail(), + d.getPaymentMethod(), + d.getPaidAmount(), + d.getCurrencyCode(), + formatTimestamp(purchaseContext, d.getTransactionTimestamp()), + d.getTransactionNotes() + }); + exportExcel(purchaseContext.getDisplayName()+" payments.xlsx", "Payments", EXPORT_COLUMNS, data, response); + } else { + response.setContentType("text/plain"); + response.setStatus(HttpStatus.PRECONDITION_REQUIRED.value()); + response.getWriter().write("No payments found"); + } + } + + private static String formatTimestamp(PurchaseContext purchaseContext, String timestamp) { + return ZonedDateTime.parse(timestamp) + .withZoneSameInstant(purchaseContext.getZoneId()) + .format(DATE_TIME_FORMATTER); + } +} diff --git a/src/main/java/alfio/controller/api/admin/EventApiController.java b/src/main/java/alfio/controller/api/admin/EventApiController.java index f952bb35d4..8b4dfa0314 100644 --- a/src/main/java/alfio/controller/api/admin/EventApiController.java +++ b/src/main/java/alfio/controller/api/admin/EventApiController.java @@ -597,9 +597,12 @@ public Integer getPendingPaymentsCount(@PathVariable("eventName") String eventNa } @PostMapping("/events/{eventName}/pending-payments/{reservationId}/confirm") - public String confirmPayment(@PathVariable("eventName") String eventName, @PathVariable("reservationId") String reservationId, Principal principal) { + public String confirmPayment(@PathVariable("eventName") String eventName, + @PathVariable("reservationId") String reservationId, + @RequestBody TransactionMetadataModification transactionMetadataModification, + Principal principal) { var event = loadEvent(eventName, principal); - ticketReservationManager.confirmOfflinePayment(event, reservationId, principal.getName()); + ticketReservationManager.confirmOfflinePayment(event, reservationId, transactionMetadataModification, principal.getName()); ticketReservationManager.findById(reservationId) .filter(TicketReservation::isDirectAssignmentRequested) .ifPresent(reservation -> { diff --git a/src/main/java/alfio/manager/CheckInManager.java b/src/main/java/alfio/manager/CheckInManager.java index c3ef057f57..cb1f1f1c23 100644 --- a/src/main/java/alfio/manager/CheckInManager.java +++ b/src/main/java/alfio/manager/CheckInManager.java @@ -135,7 +135,7 @@ private void acquire(String uuid) { Ticket ticket = ticketRepository.findByUUID(uuid); Validate.isTrue(ticket.getStatus() == TicketStatus.TO_BE_PAID); ticketRepository.updateTicketStatusWithUUID(uuid, TicketStatus.ACQUIRED.toString()); - ticketReservationManager.registerAlfioTransaction(eventRepository.findById(ticket.getEventId()), ticket.getTicketsReservationId(), PaymentProxy.ON_SITE); + ticketReservationManager.registerAlfioTransactionForOnsitePayment(eventRepository.findById(ticket.getEventId()), ticket.getTicketsReservationId()); } public AttendeeSearchResults searchAttendees(Event event, String query, int page) { diff --git a/src/main/java/alfio/manager/PaymentManager.java b/src/main/java/alfio/manager/PaymentManager.java index c3d3a7c289..fb0a0d6bf1 100644 --- a/src/main/java/alfio/manager/PaymentManager.java +++ b/src/main/java/alfio/manager/PaymentManager.java @@ -30,15 +30,20 @@ import alfio.repository.TransactionRepository; import alfio.repository.user.UserRepository; import org.apache.commons.lang3.tuple.Pair; +import org.apache.commons.lang3.Validate; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; +import java.security.Principal; +import java.time.ZonedDateTime; import java.util.*; import java.util.function.Predicate; import java.util.stream.Collectors; import java.util.stream.Stream; +import static java.util.Objects.requireNonNullElse; + @Component public class PaymentManager { @@ -200,6 +205,19 @@ public TransactionAndPaymentInfo getInfo(TicketReservation reservation, Purchase return maybeTransaction.orElseGet(() -> new TransactionAndPaymentInfo(reservation.getPaymentMethod(),null, new PaymentInformation(reservation.getPaidAmount(), null, null, null))); } + public void updateTransactionDetails(String reservationId, + String notes, + ZonedDateTime timestamp, + Principal principal) { + // TODO check if user can modify transaction once we have a centralized service. + var existingTransaction = transactionRepository.loadByReservationId(reservationId); + Validate.isTrue(existingTransaction.isTimestampEditable() || timestamp == null, "Cannot modify timestamp"); + var existingMetadata = new HashMap<>(existingTransaction.getMetadata()); + existingMetadata.put(Transaction.NOTES_KEY, notes); + int result = transactionRepository.updateDetailsById(existingTransaction.getId(), existingMetadata, requireNonNullElse(timestamp, existingTransaction.getTimestamp())); + Validate.isTrue(result == 1, "Expected 1, got " + result); + } + private boolean feesUpdated(Transaction transaction, PaymentInformation paymentInformation) { return transaction.getPlatformFee() != safeParseLong(paymentInformation.getPlatformFee()) || transaction.getGatewayFee() != safeParseLong(paymentInformation.getFee()); diff --git a/src/main/java/alfio/manager/PurchaseContextManager.java b/src/main/java/alfio/manager/PurchaseContextManager.java index 2830104557..0a4d8112de 100644 --- a/src/main/java/alfio/manager/PurchaseContextManager.java +++ b/src/main/java/alfio/manager/PurchaseContextManager.java @@ -22,6 +22,7 @@ import alfio.repository.EventRepository; import alfio.repository.SubscriptionRepository; import alfio.repository.TicketReservationRepository; +import alfio.repository.user.OrganizationRepository; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.Pair; import org.slf4j.Logger; @@ -29,6 +30,8 @@ import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import java.security.Principal; +import java.util.Objects; import java.util.Optional; import java.util.UUID; @@ -41,13 +44,16 @@ public class PurchaseContextManager { private final EventRepository eventRepository; private final SubscriptionRepository subscriptionRepository; private final TicketReservationRepository ticketReservationRepository; + private final OrganizationRepository organizationRepository; public PurchaseContextManager(EventRepository eventRepository, SubscriptionRepository subscriptionRepository, - TicketReservationRepository ticketReservationRepository) { + TicketReservationRepository ticketReservationRepository, + OrganizationRepository organizationRepository) { this.eventRepository = eventRepository; this.subscriptionRepository = subscriptionRepository; this.ticketReservationRepository = ticketReservationRepository; + this.organizationRepository = organizationRepository; } public Optional findBy(PurchaseContext.PurchaseContextType purchaseContextType, String publicIdentifier) { @@ -58,6 +64,12 @@ public Optional findBy(PurchaseContext.PurchaseContex }; } + // temporary until we have a proper ownership check service (WIP) + public boolean validateAccess(PurchaseContext purchaseContext, Principal principal) { + var username = Objects.requireNonNull(principal).getName(); + return organizationRepository.findOrganizationForUser(username, purchaseContext.getOrganizationId()).isPresent(); + } + Optional findById(PurchaseContext.PurchaseContextType purchaseContextType, String idAsString) { return switch (purchaseContextType) { case event -> eventRepository.findOptionalById(Integer.parseInt(idAsString)); diff --git a/src/main/java/alfio/manager/PurchaseContextSearchManager.java b/src/main/java/alfio/manager/PurchaseContextSearchManager.java index b9b6c71fc0..f8ca3285a2 100644 --- a/src/main/java/alfio/manager/PurchaseContextSearchManager.java +++ b/src/main/java/alfio/manager/PurchaseContextSearchManager.java @@ -18,8 +18,10 @@ import alfio.model.Event; import alfio.model.PurchaseContext; +import alfio.model.ReservationPaymentDetail; import alfio.model.TicketReservation; import alfio.model.subscription.SubscriptionDescriptor; +import alfio.model.transaction.PaymentProxy; import alfio.repository.TicketSearchRepository; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.Pair; @@ -27,7 +29,9 @@ import org.springframework.transaction.annotation.Transactional; import java.util.Arrays; +import java.util.EnumSet; import java.util.List; +import java.util.stream.Collectors; import static java.util.stream.Collectors.toList; @@ -35,6 +39,11 @@ @Transactional(readOnly = true) public class PurchaseContextSearchManager { + private static final int PAGE_SIZE = 50; + private static final List SUPPORTED_PAYMENT_METHODS = EnumSet.complementOf(EnumSet.of(PaymentProxy.NONE, PaymentProxy.ADMIN)) + .stream() + .map(PaymentProxy::name) + .collect(Collectors.toUnmodifiableList()); private final TicketSearchRepository ticketSearchRepository; public PurchaseContextSearchManager(TicketSearchRepository ticketSearchRepository) { @@ -42,19 +51,47 @@ public PurchaseContextSearchManager(TicketSearchRepository ticketSearchRepositor } public Pair, Integer> findAllReservationsFor(PurchaseContext purchaseContext, Integer page, String search, List status) { - final int pageSize = 50; - int offset = page == null ? 0 : page * pageSize; + int offset = page == null ? 0 : page * PAGE_SIZE; String toSearch = StringUtils.trimToNull(search); toSearch = toSearch == null ? null : ("%" + toSearch + "%"); List toFilter = (status == null || status.isEmpty() ? Arrays.asList(TicketReservation.TicketReservationStatus.values()) : status).stream().map(TicketReservation.TicketReservationStatus::toString).collect(toList()); if(purchaseContext.ofType(PurchaseContext.PurchaseContextType.event)) { var event = (Event)purchaseContext; - List reservationsForEvent = ticketSearchRepository.findReservationsForEvent(event.getId(), offset, pageSize, toSearch, toFilter); + List reservationsForEvent = ticketSearchRepository.findReservationsForEvent(event.getId(), offset, PAGE_SIZE, toSearch, toFilter); return Pair.of(reservationsForEvent, ticketSearchRepository.countReservationsForEvent(event.getId(), toSearch, toFilter)); } else { var subscription = (SubscriptionDescriptor) purchaseContext; - List reservationsForSubscription = ticketSearchRepository.findReservationsForSubscription(subscription.getId(), offset, pageSize, toSearch, toFilter); + List reservationsForSubscription = ticketSearchRepository.findReservationsForSubscription(subscription.getId(), offset, PAGE_SIZE, toSearch, toFilter); return Pair.of(reservationsForSubscription, ticketSearchRepository.countReservationsForSubscription(subscription.getId(), toSearch, toFilter)); } } + + public Pair, Integer> findAllPaymentsFor(PurchaseContext purchaseContext, Integer page, String search) { + int offset = page == null ? 0 : page * PAGE_SIZE; + String toSearch = StringUtils.trimToNull(search); + toSearch = toSearch == null ? null : ("%" + toSearch + "%"); + var toFilter = List.of(TicketReservation.TicketReservationStatus.COMPLETE.name()); + + if(purchaseContext.ofType(PurchaseContext.PurchaseContextType.event)) { + var event = (Event)purchaseContext; + List reservationsForEvent = ticketSearchRepository.findAllPaymentsForEvent(event.getId(), offset, PAGE_SIZE, toSearch, toFilter, SUPPORTED_PAYMENT_METHODS); + return Pair.of(reservationsForEvent, ticketSearchRepository.countConfirmedPaymentsForEvent(event.getId(), toSearch, toFilter, SUPPORTED_PAYMENT_METHODS)); + } else { + // functionality is not yet available for subscriptions + throw new UnsupportedOperationException("not implemented"); + } + } + + public List findAllPaymentsForExport(PurchaseContext purchaseContext, String search) { + String toSearch = StringUtils.trimToNull(search); + toSearch = toSearch == null ? null : ("%" + toSearch + "%"); + var toFilter = List.of(TicketReservation.TicketReservationStatus.COMPLETE.name()); + if(purchaseContext.ofType(PurchaseContext.PurchaseContextType.event)) { + var event = (Event)purchaseContext; + return ticketSearchRepository.findAllEventPaymentsForExport(event.getId(), toSearch, toFilter, SUPPORTED_PAYMENT_METHODS); + } else { + // functionality is not yet available for subscriptions + throw new UnsupportedOperationException("not implemented"); + } + } } diff --git a/src/main/java/alfio/manager/ReservationFinalizer.java b/src/main/java/alfio/manager/ReservationFinalizer.java index 87fc304c60..ae80e85d95 100644 --- a/src/main/java/alfio/manager/ReservationFinalizer.java +++ b/src/main/java/alfio/manager/ReservationFinalizer.java @@ -30,6 +30,7 @@ import alfio.model.*; import alfio.model.metadata.TicketMetadata; import alfio.model.metadata.TicketMetadataContainer; +import alfio.model.modification.TransactionMetadataModification; import alfio.model.subscription.SubscriptionDescriptor; import alfio.model.support.UserIdAndOrganizationId; import alfio.model.system.command.FinalizeReservation; @@ -397,7 +398,10 @@ private void acquireEventTickets(PaymentProxy paymentProxy, String reservationId Validate.isTrue(updatedTickets + updatedAS > 0, "no items have been updated"); } - public void confirmOfflinePayment(Event event, String reservationId, String username) { + public void confirmOfflinePayment(Event event, + String reservationId, + TransactionMetadataModification transactionMetadataModification, + String username) { TicketReservation ticketReservation = findById(reservationId).orElseThrow(IllegalArgumentException::new); ticketReservationRepository.lockReservationForUpdate(reservationId); var metadata = ticketReservationRepository.getMetadata(reservationId); @@ -410,7 +414,7 @@ public void confirmOfflinePayment(Event event, String reservationId, String user ticketReservationRepository.confirmOfflinePayment(reservationId, COMPLETE.name(), event.now(clockProvider)); - registerAlfioTransaction(event, reservationId, PaymentProxy.OFFLINE); + registerAlfioTransaction(event, reservationId, transactionMetadataModification, PaymentProxy.OFFLINE); auditingRepository.insert(reservationId, userRepository.findIdByUserName(username).orElse(null), event.getId(), Audit.EventType.RESERVATION_OFFLINE_PAYMENT_CONFIRMED, new Date(), Audit.EntityType.RESERVATION, ticketReservation.getId()); @@ -430,7 +434,10 @@ public void confirmOfflinePayment(Event event, String reservationId, String user extensionManager.handleReservationConfirmation(finalReservation, ticketReservationRepository.getBillingDetailsForReservation(reservationId), event); } - public void registerAlfioTransaction(Event event, String reservationId, PaymentProxy paymentProxy) { + public void registerAlfioTransaction(Event event, + String reservationId, + TransactionMetadataModification transactionMetadataModification, + PaymentProxy paymentProxy) { var totalPrice = reservationCostCalculator.totalReservationCostWithVAT(reservationId).getLeft(); int priceWithVAT = totalPrice.priceWithVAT(); long platformFee = FeeCalculator.getCalculator(event, configurationManager, requireNonNullElse(totalPrice.currencyCode(), event.getCurrency())) @@ -441,19 +448,34 @@ public void registerAlfioTransaction(Event event, String reservationId, PaymentP var transactionOptional = transactionRepository.loadOptionalByReservationId(reservationId); String transactionId = paymentProxy.getKey() + "-" + System.currentTimeMillis(); + var transactionTimestamp = getTransactionTimestamp(event, transactionMetadataModification); if(transactionOptional.isEmpty()) { - transactionRepository.insert(transactionId, null, reservationId, event.now(clockProvider), + transactionRepository.insert(transactionId, null, reservationId, transactionTimestamp, priceWithVAT, event.getCurrency(), "Offline payment confirmed for "+reservationId, paymentProxy.getKey(), - platformFee, 0L, Transaction.Status.COMPLETE, Map.of()); + platformFee, 0L, Transaction.Status.COMPLETE, buildTransactionMetadata(transactionMetadataModification)); } else if(paymentProxy == PaymentProxy.OFFLINE) { var transaction = transactionOptional.get(); - transactionRepository.update(transaction.getId(), transactionId, null, event.now(clockProvider), - platformFee, 0L, Transaction.Status.COMPLETE, Map.of()); + transactionRepository.update(transaction.getId(), transactionId, null, transactionTimestamp, + platformFee, 0L, Transaction.Status.COMPLETE, buildTransactionMetadata(transactionMetadataModification)); } else { log.warn("ON-Site check-in: ignoring transaction registration for reservationId {}", reservationId); } } + private ZonedDateTime getTransactionTimestamp(Event event, TransactionMetadataModification transactionMetadataModification) { + if (transactionMetadataModification != null && transactionMetadataModification.getTimestamp() != null) { + return transactionMetadataModification.getTimestamp().toLocalDateTime().atZone(event.getZoneId()); + } + return event.now(clockProvider); + } + + private Map buildTransactionMetadata(TransactionMetadataModification transactionMetadataModification) { + if (transactionMetadataModification != null && StringUtils.isNotBlank(transactionMetadataModification.getNotes())) { + return Map.of(Transaction.NOTES_KEY, transactionMetadataModification.getNotes()); + } + return Map.of(); + } + private Optional findById(String reservationId) { return ticketReservationRepository.findOptionalReservationById(reservationId); } diff --git a/src/main/java/alfio/manager/TicketReservationManager.java b/src/main/java/alfio/manager/TicketReservationManager.java index f318a46793..c464fc9e50 100644 --- a/src/main/java/alfio/manager/TicketReservationManager.java +++ b/src/main/java/alfio/manager/TicketReservationManager.java @@ -43,10 +43,7 @@ import alfio.model.metadata.SubscriptionMetadata; import alfio.model.metadata.TicketMetadata; import alfio.model.metadata.TicketMetadataContainer; -import alfio.model.modification.ASReservationWithOptionalCodeModification; -import alfio.model.modification.AdditionalServiceReservationModification; -import alfio.model.modification.AttendeeData; -import alfio.model.modification.TicketReservationWithOptionalCodeModification; +import alfio.model.modification.*; import alfio.model.result.ErrorCode; import alfio.model.result.Result; import alfio.model.result.WarningMessage; @@ -801,12 +798,12 @@ private boolean acquireGroupMembers(String reservationId, PurchaseContext purcha return true; } - public void confirmOfflinePayment(Event event, String reservationId, String username) { - reservationFinalizer.confirmOfflinePayment(event, reservationId, username); + public void confirmOfflinePayment(Event event, String reservationId, TransactionMetadataModification transactionMetadataModification, String username) { + reservationFinalizer.confirmOfflinePayment(event, reservationId, transactionMetadataModification, username); } - void registerAlfioTransaction(Event event, String reservationId, PaymentProxy paymentProxy) { - reservationFinalizer.registerAlfioTransaction(event, reservationId, paymentProxy); + void registerAlfioTransactionForOnsitePayment(Event event, String reservationId) { + reservationFinalizer.registerAlfioTransaction(event, reservationId, null, PaymentProxy.ON_SITE); } @@ -1645,7 +1642,7 @@ public void validateAndConfirmOfflinePayment(String reservationId, Event event, OrderSummary orderSummary = optionalOrderSummary.orElseThrow(); var currencyCode = orderSummary.getOriginalTotalPrice().currencyCode(); Validate.isTrue(MonetaryUtil.centsToUnit(orderSummary.getOriginalTotalPrice().priceWithVAT(), currencyCode).compareTo(paidAmount) == 0, "paid price differs from due price"); - confirmOfflinePayment(event, reservation.getId(), username); + confirmOfflinePayment(event, reservation.getId(), null, username); } public List getPendingPayments(String eventName) { @@ -2226,7 +2223,7 @@ private void processResults(Event event, Map. + */ +package alfio.model; + +import alfio.util.MonetaryUtil; +import ch.digitalfondue.npjt.ConstructorAnnotationRowMapper.Column; + +import java.time.ZonedDateTime; + +public class ReservationPaymentDetail { + private final String id; + private final String firstName; + private final String lastName; + private final String email; + private final String paymentMethod; + private final String paidAmount; + private final String currencyCode; + private final String transactionTimestamp; + private final String transactionNotes; + private final String invoiceNumber; + + public ReservationPaymentDetail(@Column("tr_id") String id, + @Column("tr_first_name") String firstName, + @Column("tr_last_name") String lastName, + @Column("tr_email_address") String email, + @Column("tr_payment_method") String paymentMethod, + @Column("bt_price_cts") Integer paidAmount, + @Column("bt_currency") String currencyCode, + @Column("bt_t_timestamp") ZonedDateTime transactionTimestamp, + @Column("bt_notes") String transactionNotes, + @Column("tr_invoice_number") String invoiceNumber) { + this.id = id; + this.firstName = firstName; + this.lastName = lastName; + this.email = email; + this.paymentMethod = paymentMethod; + this.paidAmount = MonetaryUtil.formatCents(paidAmount, currencyCode); + this.currencyCode = currencyCode; + this.transactionTimestamp = transactionTimestamp.toString(); + this.transactionNotes = transactionNotes; + this.invoiceNumber = invoiceNumber; + } + + public String getId() { + return id; + } + + public String getFirstName() { + return firstName; + } + + public String getLastName() { + return lastName; + } + + public String getEmail() { + return email; + } + + public String getPaymentMethod() { + return paymentMethod; + } + + public String getPaidAmount() { + return paidAmount; + } + + public String getCurrencyCode() { + return currencyCode; + } + + public String getTransactionTimestamp() { + return transactionTimestamp; + } + + public String getTransactionNotes() { + return transactionNotes; + } + + public String getInvoiceNumber() { + return invoiceNumber; + } +} diff --git a/src/main/java/alfio/model/modification/TransactionMetadataModification.java b/src/main/java/alfio/model/modification/TransactionMetadataModification.java new file mode 100644 index 0000000000..09fcd23b2d --- /dev/null +++ b/src/main/java/alfio/model/modification/TransactionMetadataModification.java @@ -0,0 +1,40 @@ +/** + * This file is part of alf.io. + * + * alf.io is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * alf.io is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with alf.io. If not, see . + */ +package alfio.model.modification; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; + +public class TransactionMetadataModification { + private final DateTimeModification timestamp; + private final String notes; + + @JsonCreator + public TransactionMetadataModification(@JsonProperty("timestamp") DateTimeModification timestamp, + @JsonProperty("notes") String notes) { + this.timestamp = timestamp; + this.notes = notes; + } + + public DateTimeModification getTimestamp() { + return timestamp; + } + + public String getNotes() { + return notes; + } +} diff --git a/src/main/java/alfio/model/transaction/Transaction.java b/src/main/java/alfio/model/transaction/Transaction.java index 40db3845cc..1effc739bc 100644 --- a/src/main/java/alfio/model/transaction/Transaction.java +++ b/src/main/java/alfio/model/transaction/Transaction.java @@ -28,6 +28,7 @@ @Getter public class Transaction { + public static final String NOTES_KEY = "transactionNotes"; public enum Status { PENDING, OFFLINE_MATCHING_PAYMENT_FOUND, @@ -94,4 +95,12 @@ public boolean isPotentialMatch() { public String getFormattedAmount() { return MonetaryUtil.formatCents(priceInCents, currency); } + + public String getNotes() { + return metadata == null ? null : metadata.get(NOTES_KEY); + } + + public boolean isTimestampEditable() { + return paymentProxy == PaymentProxy.OFFLINE || paymentProxy == PaymentProxy.ON_SITE; + } } diff --git a/src/main/java/alfio/repository/TicketSearchRepository.java b/src/main/java/alfio/repository/TicketSearchRepository.java index bcedac1f61..a71602595e 100644 --- a/src/main/java/alfio/repository/TicketSearchRepository.java +++ b/src/main/java/alfio/repository/TicketSearchRepository.java @@ -16,11 +16,13 @@ */ package alfio.repository; +import alfio.model.ReservationPaymentDetail; import alfio.model.TicketReservation; import alfio.model.TicketReservationWithTransaction; import alfio.model.TicketWithReservationAndTransaction; import alfio.model.poll.PollParticipant; import alfio.model.support.Array; +import alfio.model.transaction.Transaction; import ch.digitalfondue.npjt.Bind; import ch.digitalfondue.npjt.Query; import ch.digitalfondue.npjt.QueryRepository; @@ -45,6 +47,8 @@ public interface TicketSearchRepository { String FIND_ALL_CONFIRMED_TICKETS_FOR_EVENT = "select * from reservation_and_ticket_and_tx where t_id is not null and t_status in ('ACQUIRED', 'TO_BE_PAID', 'CHECKED_IN') and t_event_id = :eventId and " + APPLY_FILTER; + String FIND_ALL_PAYMENTS_FOR_EVENT = "select * from reservation_and_ticket_and_tx where tr_status in (:reservationStatus) and tr_payment_method in (:paymentMethods) and t_id is not null and t_status in ('ACQUIRED', 'TO_BE_PAID', 'CHECKED_IN') and t_event_id = :eventId and " + APPLY_FILTER; + String FIND_ALL_TICKETS_INCLUDING_NEW = "select * from reservation_and_ticket_and_tx where tr_event_id = :eventId and tr_id is not null and tr_status in (:status) and " + APPLY_FILTER; String FIND_ALL_SUBSCRIPTION_INCLUDING_NEW = "select * from reservation_and_subscription_and_tx where s_descriptor_id = :subscriptionDescriptorId::uuid and tr_id is not null and tr_status in (:status) and " + APPLY_FILTER_SUBSCRIPTION; @@ -93,6 +97,22 @@ List findReservationsForEvent(@Bind("eventId") int eventId, @Bind("search") String search, @Bind("status") List toFilter); + @Query("select distinct tr_id, tr_first_name, tr_last_name, tr_email_address, tr_payment_method, bt_price_cts, bt_currency, bt_t_timestamp, bt_metadata ->> '"+ Transaction.NOTES_KEY + "'" + + " as bt_notes, tr_invoice_number from (" + FIND_ALL_PAYMENTS_FOR_EVENT + ") as d_tbl order by bt_t_timestamp desc nulls last limit :pageSize offset :page") + List findAllPaymentsForEvent(@Bind("eventId") int eventId, + @Bind("page") int page, + @Bind("pageSize") int pageSize, + @Bind("search") String search, + @Bind("reservationStatus") List toFilter, + @Bind("paymentMethods") List paymentMethods); + + @Query("select distinct tr_id, tr_first_name, tr_last_name, tr_email_address, tr_payment_method, bt_price_cts, bt_currency, bt_t_timestamp, bt_metadata ->> '"+ Transaction.NOTES_KEY + "'" + + " as bt_notes, tr_invoice_number from (" + FIND_ALL_PAYMENTS_FOR_EVENT + ") as d_tbl order by bt_t_timestamp desc nulls last") + List findAllEventPaymentsForExport(@Bind("eventId") int eventId, + @Bind("search") String search, + @Bind("reservationStatus") List toFilter, + @Bind("paymentMethods") List paymentMethods); + @Query("select distinct "+RESERVATION_FIELDS+" from (" + FIND_ALL_SUBSCRIPTION_INCLUDING_NEW + ") as d_tbl order by tr_confirmation_ts desc nulls last, tr_validity limit :pageSize offset :page") List findReservationsForSubscription(@Bind("subscriptionDescriptorId") UUID subscriptionDescriptorId, @Bind("page") int page, @@ -122,6 +142,12 @@ Integer countReservationsForSubscription(@Bind("subscriptionDescriptorId") UUID @Bind("search") String search, @Bind("status") List toFilter); + @Query("select count(distinct tr_id) from (" + FIND_ALL_PAYMENTS_FOR_EVENT +") as d_tbl") + Integer countConfirmedPaymentsForEvent(@Bind("eventId") int eventId, + @Bind("search") String search, + @Bind("reservationStatus") List toFilter, + @Bind("paymentMethods") List paymentMethods); + @Query("select * from reservation_and_ticket_and_tx where tr_event_id = :eventId and tickets_count > 0 and tr_id in (:reservationIds)") List loadAllReservationsWithTickets(@Bind("eventId") int eventId, @Bind("reservationIds") Collection reservationIds); diff --git a/src/main/java/alfio/repository/TransactionRepository.java b/src/main/java/alfio/repository/TransactionRepository.java index 021a93ab03..2fefe9a809 100644 --- a/src/main/java/alfio/repository/TransactionRepository.java +++ b/src/main/java/alfio/repository/TransactionRepository.java @@ -122,4 +122,9 @@ int updateFees(@Bind("transactionId") String transactionId, @Query("update b_transaction set status = 'INVALID' where id = :id") int invalidateById(@Bind("id") int id); + + @Query("update b_transaction set metadata = :metadata::jsonb, t_timestamp = :timestamp where id = :id") + int updateDetailsById(@Bind("id") int id, + @Bind("metadata") @JSONData Map metadata, + @Bind("timestamp") ZonedDateTime timestamp); } diff --git a/src/main/resources/alfio/web-templates/admin-index.ms b/src/main/resources/alfio/web-templates/admin-index.ms index 26d677d129..a8dc4809a6 100644 --- a/src/main/resources/alfio/web-templates/admin-index.ms +++ b/src/main/resources/alfio/web-templates/admin-index.ms @@ -89,6 +89,7 @@ + @@ -188,6 +189,9 @@
  • Reservations
    • +
  • + Confirmed Payments +
  • E-mail log
    • diff --git a/src/main/webapp/resources/angular-templates/admin/partials/main/sidebar.html b/src/main/webapp/resources/angular-templates/admin/partials/main/sidebar.html index b83956a0fb..8ee7693a93 100644 --- a/src/main/webapp/resources/angular-templates/admin/partials/main/sidebar.html +++ b/src/main/webapp/resources/angular-templates/admin/partials/main/sidebar.html @@ -72,18 +72,21 @@

    Details

  • {{ctrl.promoCodeDescription}} Codes
    • -
  • +
  • Additional options
  • Polls
    • -
  • +
  • Donation options
  • Reservations
    • +
  • + Confirmed Payments +
  • E-mail log
    • @@ -95,7 +98,7 @@

    Details

    • -
  • +
    • diff --git a/src/main/webapp/resources/angular-templates/admin/partials/payment/edit-transaction-modal.html b/src/main/webapp/resources/angular-templates/admin/partials/payment/edit-transaction-modal.html new file mode 100644 index 0000000000..fada41cd0f --- /dev/null +++ b/src/main/webapp/resources/angular-templates/admin/partials/payment/edit-transaction-modal.html @@ -0,0 +1,24 @@ +
    +

    {{$ctrl.actionText}} Payment for {{$ctrl.reservationId | limitTo:8 | uppercase}}

    +
    +
    +
    + + +
    {{$ctrl.transaction.timestamp.date}} {{$ctrl.transaction.timestamp.time}}
    +
    +
    + + +
    +
    +
    +
    +
    + +
    +
    + +
    +
    +
    \ No newline at end of file diff --git a/src/main/webapp/resources/js/admin/directive/admin-directive.js b/src/main/webapp/resources/js/admin/directive/admin-directive.js index dec6826a5b..e79448a8a7 100644 --- a/src/main/webapp/resources/js/admin/directive/admin-directive.js +++ b/src/main/webapp/resources/js/admin/directive/admin-directive.js @@ -1151,6 +1151,8 @@ }); ctrl.event = event.event; ctrl.internal = true; + ctrl.freeOfCharge = ctrl.event.free; + ctrl.offlineEnabled = !ctrl.freeOfCharge && ctrl.event.allowedPaymentProxies.includes('OFFLINE'); ctrl.owner = ctrl.event.visibleForCurrentUser; ctrl.openDeleteWarning = function() { EventService.deleteEvent(ctrl.event).then(function(result) { diff --git a/src/main/webapp/resources/js/admin/feature/payments-list/payments-list.html b/src/main/webapp/resources/js/admin/feature/payments-list/payments-list.html new file mode 100644 index 0000000000..6554d778f7 --- /dev/null +++ b/src/main/webapp/resources/js/admin/feature/payments-list/payments-list.html @@ -0,0 +1,59 @@ +
    +
    +

    Confirmed Payments for {{$ctrl.purchaseContextTitle}}

    +
    + +
    +
    +
    + +
    +
    + +
    + +
    + +
    +
    +
    +
    +
    + Export +
    +
    + +
    No payments found
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + +
    IdNameEmailPaymentAmountDateNotes 
    +
    + +
    +
    +
    \ No newline at end of file diff --git a/src/main/webapp/resources/js/admin/feature/payments-list/payments-list.js b/src/main/webapp/resources/js/admin/feature/payments-list/payments-list.js new file mode 100644 index 0000000000..a08cd402dd --- /dev/null +++ b/src/main/webapp/resources/js/admin/feature/payments-list/payments-list.js @@ -0,0 +1,73 @@ +(function() { + 'use strict'; + + angular.module('adminApplication').component('paymentsList', { + bindings: { + purchaseContext: '<', + purchaseContextType: '<' + }, + controller: ['PurchaseContextService', '$filter', '$location', '$stateParams', 'AdminReservationService', PaymentsListCtrl], + templateUrl: window.ALFIO_CONTEXT_PATH + '/resources/js/admin/feature/payments-list/payments-list.html' + }); + + + + function PaymentsListCtrl(PurchaseContextService, $filter, $location, $stateParams, AdminReservationService) { + var ctrl = this; + + var currentSearch = $location.search(); + + ctrl.currentPage = currentSearch.page || 1; + ctrl.toSearch = currentSearch.search || $stateParams.search || ''; + + if(!ctrl.targetContextType) { + ctrl.targetContextType = ctrl.purchaseContextType; + } + + ctrl.itemsPerPage = 50; + ctrl.formatFullName = formatFullName; + ctrl.updateFilteredData = loadData; + ctrl.editPaymentDetails = editPaymentDetails; + + this.$onInit = function() { + loadData(); + }; + + function loadData() { + + $location.search({ + page: ctrl.currentPage, + search: ctrl.toSearch + }); + + PurchaseContextService.findAllPayments(ctrl.purchaseContextType, ctrl.purchaseContext.publicIdentifier, ctrl.currentPage - 1, ctrl.toSearch) + .then(function (res) { + ctrl.reservations = res.data.left; + ctrl.foundReservations = res.data.right; + setTimeout(function() { + document.getElementById('filter-reservations').focus(); + }); + }); + + var keys = Object.keys(ctrl.purchaseContext.title); + ctrl.purchaseContextTitle = ctrl.purchaseContext.title[keys[0]]; + } + + function formatFullName(r) { + if(r.firstName && r.lastName) { + return r.firstName + ' ' + r.lastName; + } else { + return r.fullName; + } + } + + function editPaymentDetails(reservationId) { + PurchaseContextService.editPaymentDetails(reservationId, ctrl.purchaseContextType, ctrl.purchaseContext.publicIdentifier) + .then(function(){ + loadData(); + }, function(err) { + console.error('error', err); + }); + } + } +})(); \ No newline at end of file diff --git a/src/main/webapp/resources/js/admin/ng-app/admin-application.js b/src/main/webapp/resources/js/admin/ng-app/admin-application.js index 047364ba87..9aa7d0864b 100644 --- a/src/main/webapp/resources/js/admin/ng-app/admin-application.js +++ b/src/main/webapp/resources/js/admin/ng-app/admin-application.js @@ -222,6 +222,15 @@ }, controllerAs: 'ctrl' }) + .state('events.single.paymentsList', { + url: '/transactions/?search', + template: '', + controller: function(getEvent) { + this.event = getEvent.data.event; + this.purchaseContextType = 'event'; + }, + controllerAs: 'ctrl' + }) .state('events.single.ticketsList', { url: '/category/:categoryId/tickets', template: '', @@ -2054,11 +2063,14 @@ $scope.registerPayment = function(eventName, id) { $scope.loading = true; - EventService.registerPayment(eventName, id).success(function() { - getPendingPayments(true); - }).error(function() { - $scope.loading = false; - }); + EventService.registerPayment(eventName, id).then( + function() { + getPendingPayments(true); + }, + function() { + $scope.loading = false; + } + ); }; $scope.showTransactionDialog = function(pendingPaymentDescriptor) { diff --git a/src/main/webapp/resources/js/admin/service/service.js b/src/main/webapp/resources/js/admin/service/service.js index 620e224eec..7fd2cdf0f2 100644 --- a/src/main/webapp/resources/js/admin/service/service.js +++ b/src/main/webapp/resources/js/admin/service/service.js @@ -34,7 +34,7 @@ }; }); - baseServices.service('PurchaseContextService', function(EventService, SubscriptionService) { + baseServices.service('PurchaseContextService', function(EventService, SubscriptionService, AdminReservationService, $http, HttpErrorHandler) { return { findAllReservations: function(type, contextName, page, search, status) { if(type === 'event') { @@ -42,9 +42,19 @@ } else { return SubscriptionService.findAllReservations(contextName, page, search, status); } + }, + findAllPayments: function(type, contextName, page, search) { + return $http.get('/admin/api/payments/'+ type + '/' + contextName + '/list', {params: {page: page, search: search}}); + }, + editPaymentDetails: function(reservationId, purchaseContextType, publicIdentifier) { + var infoLoader = AdminReservationService.paymentInfo(purchaseContextType, publicIdentifier, reservationId); + return EventService.editTransactionModal(reservationId, 'edit', infoLoader, function(res) { + return $http.put('/admin/api/payments/'+ purchaseContextType + '/' + publicIdentifier + '/reservation/' + reservationId, res) + .error(HttpErrorHandler.handle); + }); } }; - }) + }); baseServices.service('EventService', function($http, HttpErrorHandler, $uibModal, $window, $rootScope, $q, LocationService, $timeout) { @@ -173,8 +183,75 @@ getPendingPaymentsCount: function(eventName) { return $http.get('/admin/api/events/'+eventName+'/pending-payments-count').error(HttpErrorHandler.handle).then(function(res) {var v = parseInt(res.data); return isNaN(v) ? 0 : v; }); }, + editTransactionModal: function(reservationId, type, transactionLoader, callback) { + var preloadPromise; + if (transactionLoader) { + preloadPromise = transactionLoader.then(function(container) { + var transaction = container.data.data.transaction; + return { + timestamp: { + date: moment(transaction.timestamp).format('YYYY-MM-DD'), + time: moment(transaction.timestamp).format('HH:mm') + }, + timestampEditable: transaction.timestampEditable, + notes: transaction.notes + } + }); + } else { + preloadPromise = $q.resolve({ + timestamp: { + date: moment().format('YYYY-MM-DD'), + time: moment().format('HH:mm') + }, + timestampEditable: true, + notes: '' + }); + } + + var modal = $uibModal.open({ + size:'md', + templateUrl: window.ALFIO_CONTEXT_PATH + '/resources/angular-templates/admin/partials/payment/edit-transaction-modal.html', + backdrop: 'static', + controllerAs: '$ctrl', + controller: function() { + var ctrl = this; + ctrl.actionText = type === 'pending-payment' ? 'Confirm' : 'Edit'; + ctrl.confirmText = type === 'pending-payment' ? 'Confirm' : 'Save'; + ctrl.reservationId = reservationId; + ctrl.minDate = moment().subtract(1, 'years').format('YYYY-MM-DD'); + ctrl.isLoading = true; + preloadPromise.then(function(res) { + ctrl.isLoading = false; + ctrl.transaction = res; + }, function(err) { + modal.dismiss('error'); + }); + + ctrl.cancel = function() { + modal.dismiss('cancelled'); + }; + ctrl.confirm = function() { + var result = { + timestamp: ctrl.transaction.timestampEditable ? ctrl.transaction.timestamp : null, + notes: ctrl.transaction.notes + }; + if (callback) { + callback(result).then(function() { + modal.close(result); + }); + } else { + modal.close(result); + } + } + } + }); + return modal.result; + }, registerPayment: function(eventName, reservationId) { - return $http['post']('/admin/api/events/'+eventName+'/pending-payments/'+reservationId+'/confirm').error(HttpErrorHandler.handle); + return service.editTransactionModal(reservationId, 'pending-payment').then(function(metadata) { + return $http['post']('/admin/api/events/'+eventName+'/pending-payments/'+reservationId+'/confirm', metadata) + .error(HttpErrorHandler.handle); + }); }, cancelPayment: function(eventName, reservationId, credit, notify) { return $http['delete']('/admin/api/events/'+eventName+'/pending-payments/'+reservationId, { diff --git a/src/test/java/alfio/controller/api/v2/user/reservation/BaseReservationFlowTest.java b/src/test/java/alfio/controller/api/v2/user/reservation/BaseReservationFlowTest.java index 7313084ddc..f79421a870 100644 --- a/src/test/java/alfio/controller/api/v2/user/reservation/BaseReservationFlowTest.java +++ b/src/test/java/alfio/controller/api/v2/user/reservation/BaseReservationFlowTest.java @@ -1613,7 +1613,7 @@ protected void validatePayment(String eventName, String reservationIdentifier, R } private void confirmPayment(String eventName, String reservationIdentifier, Principal principal) { - assertEquals("OK", eventApiController.confirmPayment(eventName, reservationIdentifier, principal)); + assertEquals("OK", eventApiController.confirmPayment(eventName, reservationIdentifier, null, principal)); } private void checkCalendar(String eventName) { diff --git a/src/test/java/alfio/controller/api/v2/user/reservation/BillingDocumentCreationIntegrationTest.java b/src/test/java/alfio/controller/api/v2/user/reservation/BillingDocumentCreationIntegrationTest.java index 5a09bea621..bb60bdc287 100644 --- a/src/test/java/alfio/controller/api/v2/user/reservation/BillingDocumentCreationIntegrationTest.java +++ b/src/test/java/alfio/controller/api/v2/user/reservation/BillingDocumentCreationIntegrationTest.java @@ -310,7 +310,7 @@ private String createReservation(Consumer formCustomizer) } private void confirmPaymentForReservation(String reservationId) { - ticketReservationManager.confirmOfflinePayment(event, reservationId, username); + ticketReservationManager.confirmOfflinePayment(event, reservationId, null, username); } private void expectInvoiceToBeGenerated(String reservationId) { diff --git a/src/test/java/alfio/controller/api/v2/user/reservation/DiscountedReservationFlowIntegrationTest.java b/src/test/java/alfio/controller/api/v2/user/reservation/DiscountedReservationFlowIntegrationTest.java index 24beb96688..f90462388a 100644 --- a/src/test/java/alfio/controller/api/v2/user/reservation/DiscountedReservationFlowIntegrationTest.java +++ b/src/test/java/alfio/controller/api/v2/user/reservation/DiscountedReservationFlowIntegrationTest.java @@ -192,7 +192,7 @@ protected void validatePayment(String eventName, String reservationIdentifier, R assertEquals(9, reservation.getVatCts()); assertEquals(100, reservation.getDiscountCts()); assertEquals(1, eventApiController.getPendingPayments(eventName).size()); - assertEquals("OK", eventApiController.confirmPayment(eventName, reservationIdentifier, principal)); + assertEquals("OK", eventApiController.confirmPayment(eventName, reservationIdentifier, null, principal)); assertEquals(0, eventApiController.getPendingPayments(eventName).size()); assertEquals(900, eventRepository.getGrossIncome(context.event.getId())); } diff --git a/src/test/java/alfio/manager/CheckInManagerIntegrationTest.java b/src/test/java/alfio/manager/CheckInManagerIntegrationTest.java index 0a7de5b6f3..52dabcfa9e 100644 --- a/src/test/java/alfio/manager/CheckInManagerIntegrationTest.java +++ b/src/test/java/alfio/manager/CheckInManagerIntegrationTest.java @@ -131,7 +131,7 @@ void testReturnOnlyOnce() { "billing address", null, Locale.ENGLISH, true, false, null, "IT", "123456", PriceContainer.VatStatus.INCLUDED, true, false); PaymentResult result = ticketReservationManager.performPayment(specification, reservationCost, PaymentProxy.OFFLINE, PaymentMethod.BANK_TRANSFER, null); assertTrue(result.isSuccessful()); - ticketReservationManager.confirmOfflinePayment(event, reservationId, eventAndUser.getRight()); + ticketReservationManager.confirmOfflinePayment(event, reservationId, null, eventAndUser.getRight()); var returnedAdditionalServices = ticketReservationManager.findTicketsInReservation(reservationId).stream() .filter(ticket -> !checkInManager.getAdditionalServicesForTicket(ticket).isEmpty()).toList(); diff --git a/src/test/java/alfio/manager/TicketReservationManagerIntegrationTest.java b/src/test/java/alfio/manager/TicketReservationManagerIntegrationTest.java index 94556a3d89..b9cd49b000 100644 --- a/src/test/java/alfio/manager/TicketReservationManagerIntegrationTest.java +++ b/src/test/java/alfio/manager/TicketReservationManagerIntegrationTest.java @@ -276,7 +276,7 @@ void deferredOfflinePayment() { assertEquals(TicketReservation.TicketReservationStatus.DEFERRED_OFFLINE_PAYMENT, status); // confirm deferred payment - ticketReservationManager.confirmOfflinePayment(event, reservationId, null); + ticketReservationManager.confirmOfflinePayment(event, reservationId, null, null); reservationId = ticketReservationManager.createTicketReservation(event, Collections.singletonList(modForDeferred), Collections.emptyList(), DateUtils.addDays(new Date(), 1), Optional.empty(), Locale.ENGLISH, false, null); diff --git a/src/test/java/alfio/manager/TicketReservationManagerTest.java b/src/test/java/alfio/manager/TicketReservationManagerTest.java index 3d83b34ac4..23133b3cf5 100644 --- a/src/test/java/alfio/manager/TicketReservationManagerTest.java +++ b/src/test/java/alfio/manager/TicketReservationManagerTest.java @@ -1057,9 +1057,9 @@ void confirmOfflinePayments() { when(json.asJsonString(any())).thenReturn("{}"); when(configurationManager.getFor(eq(EnumSet.of(DEFERRED_BANK_TRANSFER_ENABLED, DEFERRED_BANK_TRANSFER_SEND_CONFIRMATION_EMAIL)), any())).thenReturn(Map.of(DEFERRED_BANK_TRANSFER_ENABLED, new MaybeConfiguration(DEFERRED_BANK_TRANSFER_ENABLED))); when(reservationCostCalculator.totalReservationCostWithVAT(RESERVATION_ID)).thenReturn(Pair.of(new TotalPrice(0, 0, 0, 0, "CHF"), Optional.empty())); - assertThrows(IncompatibleStateException.class, () -> trm.confirmOfflinePayment(event, RESERVATION_ID, "username")); + assertThrows(IncompatibleStateException.class, () -> trm.confirmOfflinePayment(event, RESERVATION_ID, null, "username")); when(metadata.isReadyForConfirmation()).thenReturn(true); - trm.confirmOfflinePayment(event, RESERVATION_ID, "username"); + trm.confirmOfflinePayment(event, RESERVATION_ID, null, "username"); verify(ticketReservationRepository, atLeastOnce()).findOptionalReservationById(RESERVATION_ID); verify(ticketReservationRepository, atLeastOnce()).findReservationById(RESERVATION_ID); verify(ticketReservationRepository, times(2)).lockReservationForUpdate(eq(RESERVATION_ID)); From 34c400a07931525267f5a5b4b4c8a979e7a6f758 Mon Sep 17 00:00:00 2001 From: Celestino Bellone <3385346+cbellone@users.noreply.github.com> Date: Tue, 30 May 2023 15:15:29 +0200 Subject: [PATCH 209/218] fix test --- src/test/resources/api/descriptor.json | 4553 +++++++++++++----------- 1 file changed, 2442 insertions(+), 2111 deletions(-) diff --git a/src/test/resources/api/descriptor.json b/src/test/resources/api/descriptor.json index fcd55ce4aa..a7a92c3125 100644 --- a/src/test/resources/api/descriptor.json +++ b/src/test/resources/api/descriptor.json @@ -39,8 +39,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -49,8 +49,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -59,8 +59,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -120,8 +120,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -130,8 +130,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -140,8 +140,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -191,8 +191,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -201,8 +201,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -211,8 +211,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -258,8 +258,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -268,8 +268,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -278,8 +278,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -324,8 +324,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -334,8 +334,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -344,8 +344,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -402,8 +402,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -412,8 +412,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -422,8 +422,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -476,8 +476,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -486,8 +486,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -496,8 +496,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -558,8 +558,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -568,8 +568,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -578,8 +578,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -640,8 +640,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -650,8 +650,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -660,8 +660,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -712,8 +712,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -722,8 +722,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -732,8 +732,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -786,8 +786,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -796,8 +796,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -806,8 +806,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -844,8 +844,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -854,8 +854,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -864,8 +864,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -900,8 +900,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -910,8 +910,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -920,8 +920,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -981,8 +981,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -991,8 +991,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -1001,8 +1001,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -1072,8 +1072,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -1082,8 +1082,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -1092,8 +1092,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -1153,8 +1153,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -1163,8 +1163,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -1173,8 +1173,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -1242,8 +1242,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -1252,8 +1252,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -1262,8 +1262,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -1329,8 +1329,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -1339,8 +1339,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -1349,8 +1349,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -1372,26 +1372,43 @@ } } }, - "/admin/api/events/{id}/status" : { + "/admin/api/payments/{purchaseContextType}/{publicIdentifier}/reservation/{reservationId}" : { "put" : { - "tags" : [ "event-api-controller" ], - "operationId" : "activateEvent", + "tags" : [ "admin-payments-api-controller" ], + "operationId" : "updateTransactionData", "parameters" : [ { - "name" : "id", + "name" : "purchaseContextType", "in" : "path", "required" : true, "schema" : { - "type" : "integer", - "format" : "int32" + "type" : "string", + "enum" : [ "subscription", "event" ] } }, { - "name" : "active", - "in" : "query", + "name" : "publicIdentifier", + "in" : "path", "required" : true, "schema" : { - "type" : "boolean" + "type" : "string" + } + }, { + "name" : "reservationId", + "in" : "path", + "required" : true, + "schema" : { + "type" : "string" } } ], + "requestBody" : { + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/TransactionMetadataModification" + } + } + }, + "required" : true + }, "responses" : { "500" : { "description" : "Internal Server Error", @@ -1403,8 +1420,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -1413,8 +1430,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -1423,8 +1440,82 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", + "content" : { + "*/*" : { + "schema" : { + "type" : "string" + } + } + } + }, + "200" : { + "description" : "OK", + "content" : { + "*/*" : { + "schema" : { + "type" : "string" + } + } + } + } + } + } + }, + "/admin/api/events/{id}/status" : { + "put" : { + "tags" : [ "event-api-controller" ], + "operationId" : "activateEvent", + "parameters" : [ { + "name" : "id", + "in" : "path", + "required" : true, + "schema" : { + "type" : "integer", + "format" : "int32" + } + }, { + "name" : "active", + "in" : "query", + "required" : true, + "schema" : { + "type" : "boolean" + } + } ], + "responses" : { + "500" : { + "description" : "Internal Server Error", + "content" : { + "*/*" : { + "schema" : { + "type" : "string" + } + } + } + }, + "400" : { + "description" : "Bad Request", + "content" : { + "*/*" : { + "schema" : { + "type" : "string" + } + } + } + }, + "405" : { + "description" : "Method Not Allowed", + "content" : { + "*/*" : { + "schema" : { + "type" : "string" + } + } + } + }, + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -1482,8 +1573,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -1492,8 +1583,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -1502,8 +1593,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -1548,8 +1639,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -1558,8 +1649,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -1568,8 +1659,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -1622,8 +1713,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -1632,8 +1723,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -1642,8 +1733,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -1696,8 +1787,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -1706,8 +1797,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -1716,8 +1807,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -1770,8 +1861,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -1780,8 +1871,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -1790,8 +1881,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -1852,8 +1943,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -1862,8 +1953,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -1872,8 +1963,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -1934,8 +2025,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -1944,8 +2035,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -1954,8 +2045,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -2002,8 +2093,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -2012,8 +2103,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -2022,8 +2113,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -2076,8 +2167,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -2086,8 +2177,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -2096,8 +2187,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -2145,8 +2236,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -2155,8 +2246,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -2165,8 +2256,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -2222,8 +2313,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -2232,8 +2323,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -2242,8 +2333,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -2310,8 +2401,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -2320,8 +2411,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -2330,8 +2421,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -2383,8 +2474,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -2393,8 +2484,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -2403,8 +2494,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -2458,8 +2549,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -2468,8 +2559,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -2478,8 +2569,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -2516,8 +2607,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -2526,8 +2617,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -2536,8 +2627,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -2582,6 +2673,16 @@ } } }, + "400" : { + "description" : "Bad Request", + "content" : { + "*/*" : { + "schema" : { + "type" : "string" + } + } + } + }, "405" : { "description" : "Method Not Allowed", "content" : { @@ -2602,16 +2703,6 @@ } } }, - "400" : { - "description" : "Bad Request", - "content" : { - "*/*" : { - "schema" : { - "type" : "string" - } - } - } - }, "200" : { "description" : "OK", "content" : { @@ -2655,8 +2746,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -2665,8 +2756,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -2675,8 +2766,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -2736,8 +2827,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -2746,8 +2837,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -2756,8 +2847,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -2794,8 +2885,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -2804,8 +2895,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -2814,8 +2905,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -2860,8 +2951,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -2870,8 +2961,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -2880,8 +2971,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -2916,8 +3007,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -2926,8 +3017,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -2936,8 +3027,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -2974,8 +3065,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -2984,8 +3075,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -2994,8 +3085,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -3040,8 +3131,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -3050,8 +3141,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -3060,8 +3151,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -3104,8 +3195,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -3114,8 +3205,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -3124,8 +3215,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -3195,8 +3286,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -3205,8 +3296,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -3215,8 +3306,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -3286,8 +3377,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -3296,8 +3387,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -3306,8 +3397,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -3366,8 +3457,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -3376,8 +3467,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -3386,8 +3477,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -3446,8 +3537,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -3456,8 +3547,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -3466,8 +3557,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -3512,8 +3603,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -3522,8 +3613,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -3532,8 +3623,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -3578,8 +3669,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -3588,8 +3679,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -3598,8 +3689,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -3654,8 +3745,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -3664,8 +3755,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -3674,8 +3765,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -3720,8 +3811,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -3730,8 +3821,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -3740,8 +3831,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -3801,8 +3892,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -3811,8 +3902,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -3821,8 +3912,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -3865,8 +3956,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -3875,8 +3966,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -3885,8 +3976,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -3931,8 +4022,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -3941,8 +4032,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -3951,8 +4042,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -4012,8 +4103,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -4022,8 +4113,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -4032,8 +4123,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -4076,8 +4167,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -4086,8 +4177,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -4096,8 +4187,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -4152,8 +4243,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -4162,8 +4253,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -4172,8 +4263,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -4225,8 +4316,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -4235,8 +4326,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -4245,8 +4336,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -4308,8 +4399,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -4318,8 +4409,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -4328,8 +4419,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -4392,8 +4483,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -4402,8 +4493,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -4412,8 +4503,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -4468,8 +4559,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -4478,8 +4569,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -4488,8 +4579,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -4535,8 +4626,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -4545,8 +4636,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -4555,8 +4646,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -4610,8 +4701,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -4620,8 +4711,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -4630,8 +4721,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -4675,8 +4766,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -4685,8 +4776,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -4695,8 +4786,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -4736,8 +4827,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -4746,8 +4837,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -4756,8 +4847,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -4813,8 +4904,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -4823,8 +4914,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -4833,8 +4924,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -4880,8 +4971,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -4890,8 +4981,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -4900,8 +4991,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -4961,8 +5052,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -4971,8 +5062,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -4981,8 +5072,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -5040,8 +5131,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -5050,8 +5141,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -5060,8 +5151,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -5108,8 +5199,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -5118,8 +5209,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -5128,8 +5219,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -5184,8 +5275,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -5194,8 +5285,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -5204,8 +5295,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -5250,8 +5341,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -5260,8 +5351,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -5270,8 +5361,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -5326,8 +5417,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -5336,8 +5427,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -5346,8 +5437,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -5394,8 +5485,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -5404,8 +5495,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -5414,8 +5505,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -5633,8 +5724,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -5643,8 +5734,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -5653,8 +5744,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -5712,8 +5803,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -5722,8 +5813,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -5732,8 +5823,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -5781,8 +5872,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -5791,8 +5882,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -5801,8 +5892,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -5858,8 +5949,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -5868,8 +5959,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -5878,8 +5969,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -5943,8 +6034,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -5953,8 +6044,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -5963,8 +6054,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -6009,8 +6100,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -6019,8 +6110,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -6029,8 +6120,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -6083,8 +6174,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -6093,8 +6184,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -6103,8 +6194,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -6159,8 +6250,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -6169,8 +6260,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -6179,8 +6270,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -6227,8 +6318,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -6237,8 +6328,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -6247,8 +6338,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -6295,8 +6386,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -6305,8 +6396,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -6315,8 +6406,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -6363,8 +6454,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -6373,8 +6464,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -6383,8 +6474,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -6424,8 +6515,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -6434,8 +6525,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -6444,8 +6535,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -6773,8 +6864,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -6783,8 +6874,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -6793,8 +6884,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -6862,8 +6953,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -6872,8 +6963,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -6882,8 +6973,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -6953,8 +7044,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -6963,8 +7054,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -6973,8 +7064,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -7049,8 +7140,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -7059,8 +7150,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -7069,8 +7160,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -7153,8 +7244,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -7163,8 +7254,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -7173,8 +7264,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -7237,8 +7328,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -7247,8 +7338,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -7257,8 +7348,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -7320,8 +7411,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -7330,8 +7421,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -7340,8 +7431,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -7388,8 +7479,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -7398,8 +7489,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -7408,8 +7499,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -7458,8 +7549,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -7468,8 +7559,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -7478,8 +7569,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -7516,8 +7607,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -7526,8 +7617,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -7536,8 +7627,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -7576,8 +7667,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -7586,8 +7677,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -7596,8 +7687,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -7738,8 +7829,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -7748,8 +7839,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -7758,8 +7849,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -7806,8 +7897,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -7816,8 +7907,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -7826,8 +7917,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -7874,6 +7965,16 @@ } } }, + "400" : { + "description" : "Bad Request", + "content" : { + "*/*" : { + "schema" : { + "type" : "string" + } + } + } + }, "405" : { "description" : "Method Not Allowed", "content" : { @@ -7894,16 +7995,6 @@ } } }, - "400" : { - "description" : "Bad Request", - "content" : { - "*/*" : { - "schema" : { - "type" : "string" - } - } - } - }, "200" : { "description" : "OK", "content" : { @@ -7942,8 +8033,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -7952,8 +8043,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -7962,8 +8053,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -8017,8 +8108,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -8027,8 +8118,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -8037,8 +8128,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -8100,8 +8191,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -8110,8 +8201,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -8120,8 +8211,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -8174,8 +8265,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -8184,8 +8275,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -8194,8 +8285,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -8244,8 +8335,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -8254,8 +8345,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -8264,8 +8355,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -8553,8 +8644,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -8563,8 +8654,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -8573,8 +8664,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -8611,8 +8702,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -8621,8 +8712,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -8631,8 +8722,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -8680,8 +8771,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -8690,8 +8781,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -8700,8 +8791,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -8753,8 +8844,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -8763,8 +8854,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -8773,8 +8864,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -8834,8 +8925,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -8844,8 +8935,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -8854,8 +8945,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -8905,8 +8996,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -8915,8 +9006,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -8925,8 +9016,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -8978,8 +9069,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -8988,8 +9079,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -8998,8 +9089,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -9042,8 +9133,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -9052,8 +9143,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -9062,8 +9153,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -9122,8 +9213,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -9132,8 +9223,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -9142,8 +9233,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -9195,8 +9286,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -9205,8 +9296,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -9215,8 +9306,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -9265,8 +9356,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -9275,8 +9366,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -9285,8 +9376,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -9342,8 +9433,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -9352,8 +9443,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -9362,8 +9453,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -9404,6 +9495,16 @@ "type" : "string" } } ], + "requestBody" : { + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/TransactionMetadataModification" + } + } + }, + "required" : true + }, "responses" : { "500" : { "description" : "Internal Server Error", @@ -9415,8 +9516,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -9425,8 +9526,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -9435,8 +9536,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -9491,8 +9592,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -9501,8 +9602,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -9511,8 +9612,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -9751,8 +9852,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -9761,8 +9862,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -9771,8 +9872,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -9835,8 +9936,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -9845,8 +9946,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -9855,8 +9956,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -9925,8 +10026,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -9935,8 +10036,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -9945,8 +10046,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -10009,8 +10110,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -10019,8 +10120,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -10029,8 +10130,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -10074,8 +10175,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -10084,8 +10185,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -10094,8 +10195,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -10149,8 +10250,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -10159,8 +10260,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -10169,8 +10270,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -10224,8 +10325,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -10234,8 +10335,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -10244,8 +10345,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -10293,8 +10394,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -10303,8 +10404,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -10313,8 +10414,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -10364,8 +10465,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -10374,8 +10475,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -10384,8 +10485,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -10442,8 +10543,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -10452,8 +10553,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -10462,8 +10563,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -10519,8 +10620,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -10529,8 +10630,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -10539,8 +10640,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -10587,8 +10688,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -10597,8 +10698,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -10607,8 +10708,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -10655,8 +10756,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -10665,8 +10766,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -10675,8 +10776,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -10739,8 +10840,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -10749,8 +10850,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -10759,8 +10860,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -10806,8 +10907,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -10816,8 +10917,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -10826,8 +10927,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -10884,8 +10985,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -10894,8 +10995,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -10904,8 +11005,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -10952,8 +11053,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -10962,8 +11063,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -10972,8 +11073,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -11026,8 +11127,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -11036,8 +11137,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -11046,8 +11147,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -11109,8 +11210,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -11119,8 +11220,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -11129,8 +11230,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -11200,8 +11301,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -11210,8 +11311,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -11220,8 +11321,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -11291,8 +11392,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -11301,8 +11402,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -11311,8 +11412,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -11372,8 +11473,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -11382,8 +11483,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -11392,8 +11493,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -11462,8 +11563,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -11472,8 +11573,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -11482,8 +11583,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -11546,8 +11647,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -11556,8 +11657,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -11566,8 +11667,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -11630,8 +11731,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -11640,8 +11741,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -11650,8 +11751,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -11712,8 +11813,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -11722,8 +11823,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -11732,8 +11833,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -11786,8 +11887,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -11796,8 +11897,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -11806,8 +11907,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -11860,8 +11961,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -11870,8 +11971,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -11880,8 +11981,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -11934,8 +12035,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -11944,8 +12045,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -11954,8 +12055,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -12014,8 +12115,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -12024,8 +12125,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -12034,8 +12135,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -12102,8 +12203,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -12112,8 +12213,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -12122,8 +12223,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -12175,8 +12276,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -12185,8 +12286,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -12195,8 +12296,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -12248,8 +12349,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -12258,8 +12359,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -12268,8 +12369,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -12338,8 +12439,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -12348,8 +12449,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -12358,8 +12459,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -12432,8 +12533,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -12442,8 +12543,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -12452,8 +12553,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -12503,8 +12604,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -12513,8 +12614,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -12523,8 +12624,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -12571,8 +12672,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -12581,8 +12682,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -12591,8 +12692,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -12653,8 +12754,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -12663,8 +12764,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -12673,8 +12774,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -12737,8 +12838,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -12747,8 +12848,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -12757,8 +12858,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -12798,8 +12899,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -12808,8 +12909,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -12818,8 +12919,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -12864,8 +12965,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -12874,8 +12975,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -12884,8 +12985,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -12985,8 +13086,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -12995,8 +13096,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -13005,8 +13106,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -13051,8 +13152,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -13061,8 +13162,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -13071,8 +13172,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -13124,8 +13225,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -13134,8 +13235,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -13144,8 +13245,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -13197,8 +13298,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -13207,8 +13308,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -13217,8 +13318,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -13255,8 +13356,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -13265,8 +13366,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -13275,8 +13376,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -13324,8 +13425,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -13334,8 +13435,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -13344,8 +13445,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -13393,8 +13494,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -13403,8 +13504,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -13413,8 +13514,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -13462,8 +13563,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -13472,8 +13573,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -13482,8 +13583,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -13539,8 +13640,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -13549,8 +13650,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -13559,8 +13660,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -13608,8 +13709,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -13618,8 +13719,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -13628,8 +13729,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -13677,8 +13778,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -13687,8 +13788,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -13697,8 +13798,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -13750,8 +13851,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -13760,8 +13861,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -13770,8 +13871,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -13823,8 +13924,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -13833,8 +13934,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -13843,8 +13944,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -13896,8 +13997,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -13906,8 +14007,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -13916,8 +14017,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -13976,8 +14077,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -13986,8 +14087,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -13996,8 +14097,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -14049,8 +14150,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -14059,8 +14160,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -14069,8 +14170,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -14115,8 +14216,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -14125,8 +14226,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -14135,8 +14236,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -14181,8 +14282,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -14191,8 +14292,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -14201,8 +14302,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -14254,8 +14355,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -14264,8 +14365,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -14274,8 +14375,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -14320,8 +14421,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -14330,8 +14431,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -14340,8 +14441,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -14386,8 +14487,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -14396,8 +14497,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -14406,8 +14507,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -14467,8 +14568,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -14477,8 +14578,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -14487,8 +14588,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -14540,8 +14641,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -14550,8 +14651,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -14560,8 +14661,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -14620,8 +14721,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -14630,8 +14731,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -14640,8 +14741,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -14671,8 +14772,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -14681,8 +14782,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -14691,8 +14792,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -14745,8 +14846,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -14755,8 +14856,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -14765,8 +14866,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -14806,8 +14907,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -14816,8 +14917,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -14826,8 +14927,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -14876,8 +14977,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -14886,8 +14987,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -14896,8 +14997,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -14942,8 +15043,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -14952,8 +15053,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -14962,8 +15063,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -15008,8 +15109,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -15018,8 +15119,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -15028,8 +15129,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -15253,8 +15354,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -15263,8 +15364,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -15273,8 +15374,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -15326,8 +15427,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -15336,8 +15437,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -15346,8 +15447,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -15411,8 +15512,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -15421,8 +15522,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -15431,8 +15532,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -15500,8 +15601,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -15510,8 +15611,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -15520,8 +15621,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -15574,8 +15675,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -15584,8 +15685,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -15594,8 +15695,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -15655,8 +15756,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -15665,8 +15766,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -15675,8 +15776,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -15732,8 +15833,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -15742,8 +15843,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -15752,8 +15853,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -15817,8 +15918,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -15827,8 +15928,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -15837,8 +15938,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -15886,8 +15987,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -15896,8 +15997,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -15906,8 +16007,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -15952,8 +16053,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -15962,8 +16063,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -15972,8 +16073,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -16010,8 +16111,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -16020,8 +16121,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -16030,8 +16131,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -16071,8 +16172,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -16081,8 +16182,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -16091,8 +16192,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -16132,8 +16233,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -16142,8 +16243,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -16152,8 +16253,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -16193,8 +16294,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -16203,8 +16304,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -16213,8 +16314,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -16263,8 +16364,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -16273,8 +16374,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -16283,8 +16384,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -16328,8 +16429,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -16338,8 +16439,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -16348,8 +16449,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -16386,8 +16487,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -16396,8 +16497,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -16406,8 +16507,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -16444,8 +16545,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -16454,8 +16555,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -16464,8 +16565,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -16505,8 +16606,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -16515,8 +16616,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -16525,8 +16626,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -16563,8 +16664,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -16573,8 +16674,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -16583,8 +16684,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -17413,8 +17514,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -17423,8 +17524,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -17433,8 +17534,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -17506,8 +17607,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -17516,8 +17617,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -17526,8 +17627,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -17594,8 +17695,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -17604,8 +17705,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -17614,8 +17715,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -17675,8 +17776,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -17685,8 +17786,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -17695,8 +17796,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -17756,8 +17857,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -17766,8 +17867,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -17776,8 +17877,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -17837,8 +17938,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -17847,8 +17948,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -17857,8 +17958,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -17926,8 +18027,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -17936,8 +18037,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -17946,8 +18047,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -18006,8 +18107,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -18016,8 +18117,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -18026,8 +18127,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -18087,8 +18188,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -18097,8 +18198,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -18107,8 +18208,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -18187,8 +18288,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -18197,8 +18298,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -18207,8 +18308,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -18261,8 +18362,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -18271,8 +18372,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -18281,8 +18382,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -18339,8 +18440,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -18349,8 +18450,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -18359,8 +18460,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -18409,6 +18510,16 @@ } } }, + "400" : { + "description" : "Bad Request", + "content" : { + "*/*" : { + "schema" : { + "type" : "string" + } + } + } + }, "405" : { "description" : "Method Not Allowed", "content" : { @@ -18429,6 +18540,66 @@ } } }, + "200" : { + "description" : "OK", + "content" : { + "*/*" : { + "schema" : { + "type" : "integer", + "format" : "int32" + } + } + } + } + } + } + }, + "/admin/api/payments/{purchaseContextType}/{publicIdentifier}/list" : { + "get" : { + "tags" : [ "admin-payments-api-controller" ], + "operationId" : "getPaymentsForPurchaseContext", + "parameters" : [ { + "name" : "purchaseContextType", + "in" : "path", + "required" : true, + "schema" : { + "type" : "string", + "enum" : [ "subscription", "event" ] + } + }, { + "name" : "publicIdentifier", + "in" : "path", + "required" : true, + "schema" : { + "type" : "string" + } + }, { + "name" : "page", + "in" : "query", + "required" : false, + "schema" : { + "type" : "integer", + "format" : "int32" + } + }, { + "name" : "search", + "in" : "query", + "required" : false, + "schema" : { + "type" : "string" + } + } ], + "responses" : { + "500" : { + "description" : "Internal Server Error", + "content" : { + "*/*" : { + "schema" : { + "type" : "string" + } + } + } + }, "400" : { "description" : "Bad Request", "content" : { @@ -18439,16 +18610,109 @@ } } }, + "405" : { + "description" : "Method Not Allowed", + "content" : { + "*/*" : { + "schema" : { + "type" : "string" + } + } + } + }, + "401" : { + "description" : "Unauthorized", + "content" : { + "*/*" : { + "schema" : { + "type" : "string" + } + } + } + }, "200" : { "description" : "OK", "content" : { "*/*" : { "schema" : { - "type" : "integer", - "format" : "int32" + "$ref" : "#/components/schemas/PageAndContentListReservationPaymentDetail" + } + } + } + } + } + } + }, + "/admin/api/payments/{purchaseContextType}/{publicIdentifier}/download" : { + "get" : { + "tags" : [ "admin-payments-api-controller" ], + "operationId" : "exportPayments", + "parameters" : [ { + "name" : "purchaseContextType", + "in" : "path", + "required" : true, + "schema" : { + "type" : "string", + "enum" : [ "subscription", "event" ] + } + }, { + "name" : "publicIdentifier", + "in" : "path", + "required" : true, + "schema" : { + "type" : "string" + } + }, { + "name" : "search", + "in" : "query", + "required" : false, + "schema" : { + "type" : "string" + } + } ], + "responses" : { + "500" : { + "description" : "Internal Server Error", + "content" : { + "*/*" : { + "schema" : { + "type" : "string" } } } + }, + "400" : { + "description" : "Bad Request", + "content" : { + "*/*" : { + "schema" : { + "type" : "string" + } + } + } + }, + "405" : { + "description" : "Method Not Allowed", + "content" : { + "*/*" : { + "schema" : { + "type" : "string" + } + } + } + }, + "401" : { + "description" : "Unauthorized", + "content" : { + "*/*" : { + "schema" : { + "type" : "string" + } + } + } + }, + "200" : { + "description" : "OK" } } } @@ -18477,8 +18741,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -18487,8 +18751,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -18497,8 +18761,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -18667,8 +18931,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -18677,8 +18941,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -18687,8 +18951,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -18737,8 +19001,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -18747,8 +19011,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -18757,8 +19021,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -18812,8 +19076,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -18822,8 +19086,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -18832,8 +19096,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -18882,8 +19146,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -18892,8 +19156,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -18902,8 +19166,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -18952,8 +19216,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -18962,8 +19226,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -18972,8 +19236,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -19022,8 +19286,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -19032,8 +19296,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -19042,8 +19306,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -19083,8 +19347,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -19093,8 +19357,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -19103,8 +19367,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -19161,8 +19425,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -19171,8 +19435,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -19181,8 +19445,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -19234,8 +19498,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -19244,8 +19508,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -19254,8 +19518,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -19292,8 +19556,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -19302,8 +19566,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -19312,8 +19576,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -19712,8 +19976,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -19722,8 +19986,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -19732,8 +19996,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -19785,8 +20049,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -19795,8 +20059,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -19805,8 +20069,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -19865,8 +20129,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -19875,8 +20139,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -19885,8 +20149,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -19929,8 +20193,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -19939,8 +20203,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -19949,8 +20213,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -20019,8 +20283,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -20029,8 +20293,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -20039,8 +20303,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -20092,8 +20356,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -20102,8 +20366,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -20112,8 +20376,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -20143,8 +20407,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -20153,8 +20417,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -20163,8 +20427,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -20219,8 +20483,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -20229,8 +20493,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -20239,8 +20503,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -20295,8 +20559,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -20305,8 +20569,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -20315,8 +20579,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -20375,8 +20639,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -20385,8 +20649,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -20395,8 +20659,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -20449,8 +20713,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -20459,8 +20723,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -20469,8 +20733,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -20508,8 +20772,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -20518,8 +20782,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -20528,8 +20792,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -20577,8 +20841,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -20587,8 +20851,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -20597,8 +20861,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -20644,8 +20908,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -20654,8 +20918,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -20664,8 +20928,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -20713,8 +20977,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -20723,8 +20987,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -20733,8 +20997,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -20780,8 +21044,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -20790,8 +21054,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -20800,8 +21064,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -20857,8 +21121,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -20867,8 +21131,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -20877,8 +21141,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -20939,8 +21203,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -20949,8 +21213,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -20959,8 +21223,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -21013,8 +21277,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -21023,8 +21287,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -21033,8 +21297,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -21082,8 +21346,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -21092,8 +21356,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -21102,8 +21366,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -21141,8 +21405,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -21151,8 +21415,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -21161,8 +21425,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -21208,8 +21472,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -21218,8 +21482,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -21228,8 +21492,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -21267,8 +21531,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -21277,8 +21541,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -21287,8 +21551,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -21344,8 +21608,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -21354,8 +21618,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -21364,8 +21628,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -21414,8 +21678,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -21424,8 +21688,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -21434,8 +21698,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -21484,8 +21748,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -21494,8 +21758,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -21504,8 +21768,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -21557,8 +21821,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -21567,8 +21831,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -21577,8 +21841,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -21627,8 +21891,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -21637,8 +21901,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -21647,8 +21911,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -21685,8 +21949,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -21695,8 +21959,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -21705,8 +21969,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -21746,8 +22010,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -21756,8 +22020,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -21766,8 +22030,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -21805,8 +22069,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -21815,8 +22079,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -21825,8 +22089,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -21874,8 +22138,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -21884,8 +22148,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -21894,8 +22158,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -21951,8 +22215,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -21961,8 +22225,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -21971,8 +22235,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -22010,8 +22274,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -22020,8 +22284,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -22030,8 +22294,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -22084,8 +22348,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -22094,8 +22358,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -22104,8 +22368,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -22151,8 +22415,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -22161,8 +22425,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -22171,8 +22435,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -22216,8 +22480,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -22226,8 +22490,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -22236,8 +22500,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -22277,8 +22541,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -22287,8 +22551,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -22297,8 +22561,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -22348,8 +22612,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -22358,8 +22622,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -22368,8 +22632,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -22425,8 +22689,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -22435,8 +22699,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -22445,8 +22709,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -22492,8 +22756,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -22502,8 +22766,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -22512,8 +22776,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -22556,8 +22820,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -22566,8 +22830,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -22576,8 +22840,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -22620,8 +22884,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -22630,8 +22894,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -22640,8 +22904,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -22693,8 +22957,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -22703,8 +22967,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -22713,8 +22977,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -22760,8 +23024,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -22770,8 +23034,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -22780,8 +23044,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -22841,8 +23105,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -22851,8 +23115,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -22861,8 +23125,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -22930,8 +23194,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -22940,8 +23204,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -22950,8 +23214,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -23001,8 +23265,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -23011,8 +23275,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -23021,8 +23285,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -23060,8 +23324,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -23070,8 +23334,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -23080,8 +23344,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -23121,8 +23385,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -23131,8 +23395,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -23141,8 +23405,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -23195,8 +23459,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -23205,8 +23469,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -23215,8 +23479,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -23265,8 +23529,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -23275,8 +23539,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -23285,8 +23549,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -23340,8 +23604,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -23350,8 +23614,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -23360,8 +23624,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -23426,8 +23690,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -23436,8 +23700,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -23446,8 +23710,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -23492,8 +23756,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -23502,8 +23766,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -23512,8 +23776,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -23559,8 +23823,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -23569,8 +23833,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -23579,8 +23843,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -23610,8 +23874,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -23620,8 +23884,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -23630,8 +23894,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -23687,8 +23951,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -23697,8 +23961,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -23707,8 +23971,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -23760,8 +24024,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -23770,8 +24034,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -23780,8 +24044,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -23833,8 +24097,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -23843,8 +24107,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -23853,8 +24117,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -23899,8 +24163,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -23909,8 +24173,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -23919,8 +24183,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -23965,8 +24229,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -23975,8 +24239,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -23985,8 +24249,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -24032,8 +24296,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -24042,8 +24306,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -24052,8 +24316,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -24091,8 +24355,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -24101,8 +24365,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -24111,8 +24375,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -24173,8 +24437,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -24183,8 +24447,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -24193,8 +24457,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -24473,8 +24737,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -24483,8 +24747,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -24493,8 +24757,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -24541,8 +24805,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -24551,8 +24815,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -24561,8 +24825,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -24616,8 +24880,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -24626,8 +24890,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -24636,8 +24900,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -24690,8 +24954,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -24700,8 +24964,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -24710,8 +24974,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -24779,8 +25043,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -24789,8 +25053,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -24799,8 +25063,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -24853,8 +25117,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -24863,8 +25127,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -24873,8 +25137,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -24935,8 +25199,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -24945,8 +25209,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -24955,8 +25219,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -25002,8 +25266,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -25012,8 +25276,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -25022,8 +25286,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -25069,8 +25333,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -25079,8 +25343,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -25089,8 +25353,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -25147,8 +25411,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -25157,8 +25421,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -25167,8 +25431,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -25213,8 +25477,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -25223,8 +25487,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -25233,8 +25497,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -25288,8 +25552,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -25298,8 +25562,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -25308,8 +25572,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -25371,8 +25635,8 @@ } } }, - "405" : { - "description" : "Method Not Allowed", + "400" : { + "description" : "Bad Request", "content" : { "*/*" : { "schema" : { @@ -25381,8 +25645,8 @@ } } }, - "401" : { - "description" : "Unauthorized", + "405" : { + "description" : "Method Not Allowed", "content" : { "*/*" : { "schema" : { @@ -25391,8 +25655,8 @@ } } }, - "400" : { - "description" : "Bad Request", + "401" : { + "description" : "Unauthorized", "content" : { "*/*" : { "schema" : { @@ -26053,15 +26317,15 @@ "refundedAmount" : { "type" : "string" }, - "priceInCents" : { - "type" : "integer", - "format" : "int32" + "vatExempt" : { + "type" : "boolean" }, "notYetPaid" : { "type" : "boolean" }, - "vatExempt" : { - "type" : "boolean" + "priceInCents" : { + "type" : "integer", + "format" : "int32" }, "ticketAmount" : { "type" : "integer", @@ -26197,14 +26461,14 @@ "key" : { "$ref" : "#/components/schemas/TicketCategory" }, - "left" : { - "$ref" : "#/components/schemas/TicketCategory" - }, "right" : { "type" : "array", "items" : { "$ref" : "#/components/schemas/Ticket" } + }, + "left" : { + "$ref" : "#/components/schemas/TicketCategory" } } }, @@ -26436,17 +26700,17 @@ "type" : "string", "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "CUSTOM_INCLUDED_EXEMPT", "CUSTOM_NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] }, - "formattedNetPrice" : { - "type" : "string" - }, - "checkedIn" : { + "assigned" : { "type" : "boolean" }, - "assigned" : { + "checkedIn" : { "type" : "boolean" }, "formattedFinalPrice" : { "type" : "string" + }, + "formattedNetPrice" : { + "type" : "string" } } }, @@ -26644,15 +26908,15 @@ "cancelled" : { "type" : "boolean" }, - "paidAmount" : { - "type" : "string" - }, "hasInvoiceNumber" : { "type" : "boolean" }, "pendingOfflinePayment" : { "type" : "boolean" }, + "paidAmount" : { + "type" : "string" + }, "lineSplittedBillingAddress" : { "type" : "array", "items" : { @@ -26773,34 +27037,14 @@ "currencyCode" : { "type" : "string" }, - "paidAmount" : { - "type" : "string" - }, "status" : { "type" : "string", "enum" : [ "PENDING", "IN_PAYMENT", "EXTERNAL_PROCESSING_PAYMENT", "WAITING_EXTERNAL_CONFIRMATION", "OFFLINE_PAYMENT", "DEFERRED_OFFLINE_PAYMENT", "FINALIZING", "OFFLINE_FINALIZING", "COMPLETE", "STUCK", "CANCELLED", "CREDIT_NOTE_ISSUED" ] }, - "confirmationTimestamp" : { - "type" : "string", - "format" : "date-time" - }, - "discount" : { - "$ref" : "#/components/schemas/PromoCodeDiscount" - }, - "registrationTimestamp" : { - "type" : "string", - "format" : "date-time" - }, "promoCodeDiscountId" : { "type" : "integer", "format" : "int32" }, - "firstName" : { - "type" : "string" - }, - "lastName" : { - "type" : "string" - }, "hasInvoiceNumber" : { "type" : "boolean" }, @@ -26811,6 +27055,12 @@ "type" : "string", "enum" : [ "STRIPE", "ON_SITE", "OFFLINE", "NONE", "ADMIN", "PAYPAL", "MOLLIE", "SAFERPAY" ] }, + "firstName" : { + "type" : "string" + }, + "lastName" : { + "type" : "string" + }, "vatStatus" : { "type" : "string", "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "CUSTOM_INCLUDED_EXEMPT", "CUSTOM_NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] @@ -26874,16 +27124,30 @@ "customerReference" : { "type" : "string" }, + "discount" : { + "$ref" : "#/components/schemas/PromoCodeDiscount" + }, + "registrationTimestamp" : { + "type" : "string", + "format" : "date-time" + }, + "confirmationTimestamp" : { + "type" : "string", + "format" : "date-time" + }, + "paidAmount" : { + "type" : "string" + }, "lineSplittedBillingAddress" : { "type" : "array", "items" : { "type" : "string" } }, - "directAssignmentRequested" : { + "vatIncluded" : { "type" : "boolean" }, - "vatIncluded" : { + "directAssignmentRequested" : { "type" : "boolean" }, "hasInvoiceOrReceiptDocument" : { @@ -26892,6 +27156,12 @@ "hasBeenPaid" : { "type" : "boolean" }, + "optionalVatPercentage" : { + "type" : "number" + }, + "taxablePrice" : { + "type" : "number" + }, "stuck" : { "type" : "boolean" }, @@ -26917,12 +27187,6 @@ "creationTimestamp" : { "type" : "string", "format" : "date-time" - }, - "optionalVatPercentage" : { - "type" : "number" - }, - "taxablePrice" : { - "type" : "number" } } }, @@ -26967,6 +27231,17 @@ } } }, + "TransactionMetadataModification" : { + "type" : "object", + "properties" : { + "timestamp" : { + "$ref" : "#/components/schemas/DateTimeModification" + }, + "notes" : { + "type" : "string" + } + } + }, "CategoryOrdinalModification" : { "type" : "object", "properties" : { @@ -28668,23 +28943,10 @@ "currencyCode" : { "type" : "string" }, - "formattedNetPrice" : { - "type" : "string" - }, - "extReference" : { - "type" : "string" - }, "status" : { "type" : "string", "enum" : [ "FREE", "PENDING", "TO_BE_PAID", "ACQUIRED", "CANCELLED", "CHECKED_IN", "EXPIRED", "INVALIDATED", "RELEASED", "PRE_RESERVED" ] }, - "checkedIn" : { - "type" : "boolean" - }, - "creation" : { - "type" : "string", - "format" : "date-time" - }, "tags" : { "type" : "array", "items" : { @@ -28694,6 +28956,10 @@ "assigned" : { "type" : "boolean" }, + "subscriptionId" : { + "type" : "string", + "format" : "uuid" + }, "eventId" : { "type" : "integer", "format" : "int32" @@ -28704,10 +28970,6 @@ "lastName" : { "type" : "string" }, - "subscriptionId" : { - "type" : "string", - "format" : "uuid" - }, "vatStatus" : { "type" : "string", "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "CUSTOM_INCLUDED_EXEMPT", "CUSTOM_NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] @@ -28747,9 +29009,22 @@ "lockedAssignment" : { "type" : "boolean" }, + "checkedIn" : { + "type" : "boolean" + }, + "creation" : { + "type" : "string", + "format" : "date-time" + }, "formattedFinalPrice" : { "type" : "string" }, + "formattedNetPrice" : { + "type" : "string" + }, + "extReference" : { + "type" : "string" + }, "categoryName" : { "type" : "string" } @@ -29316,13 +29591,13 @@ "supportsTicketsGeneration" : { "type" : "boolean" }, + "publicIdentifier" : { + "type" : "string" + }, "priceCts" : { "type" : "integer", "format" : "int32" }, - "publicIdentifier" : { - "type" : "string" - }, "validityFromModel" : { "$ref" : "#/components/schemas/DateTimeModification" }, @@ -29436,11 +29711,11 @@ "key" : { "type" : "boolean" }, - "left" : { - "type" : "boolean" - }, "right" : { "type" : "string" + }, + "left" : { + "type" : "boolean" } } }, @@ -29628,16 +29903,16 @@ "locationDescriptor" : { "$ref" : "#/components/schemas/LocationDescriptor" }, - "online" : { - "type" : "boolean" + "vatStatus" : { + "type" : "string", + "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "CUSTOM_INCLUDED_EXEMPT", "CUSTOM_NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] }, "priceInCents" : { "type" : "integer", "format" : "int32" }, - "vatStatus" : { - "type" : "string", - "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "CUSTOM_INCLUDED_EXEMPT", "CUSTOM_NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] + "online" : { + "type" : "boolean" } } }, @@ -29770,14 +30045,14 @@ "TripleBooleanStringString" : { "type" : "object", "properties" : { - "left" : { - "type" : "boolean" - }, "right" : { "type" : "string" }, "middle" : { "type" : "string" + }, + "left" : { + "type" : "boolean" } } }, @@ -29994,23 +30269,10 @@ "currencyCode" : { "type" : "string" }, - "formattedNetPrice" : { - "type" : "string" - }, - "extReference" : { - "type" : "string" - }, "status" : { "type" : "string", "enum" : [ "FREE", "PENDING", "TO_BE_PAID", "ACQUIRED", "CANCELLED", "CHECKED_IN", "EXPIRED", "INVALIDATED", "RELEASED", "PRE_RESERVED" ] }, - "checkedIn" : { - "type" : "boolean" - }, - "creation" : { - "type" : "string", - "format" : "date-time" - }, "tags" : { "type" : "array", "items" : { @@ -30020,6 +30282,10 @@ "assigned" : { "type" : "boolean" }, + "subscriptionId" : { + "type" : "string", + "format" : "uuid" + }, "eventId" : { "type" : "integer", "format" : "int32" @@ -30030,10 +30296,6 @@ "lastName" : { "type" : "string" }, - "subscriptionId" : { - "type" : "string", - "format" : "uuid" - }, "vatStatus" : { "type" : "string", "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "CUSTOM_INCLUDED_EXEMPT", "CUSTOM_NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] @@ -30073,8 +30335,21 @@ "lockedAssignment" : { "type" : "boolean" }, + "checkedIn" : { + "type" : "boolean" + }, + "creation" : { + "type" : "string", + "format" : "date-time" + }, "formattedFinalPrice" : { "type" : "string" + }, + "formattedNetPrice" : { + "type" : "string" + }, + "extReference" : { + "type" : "string" } } }, @@ -30739,10 +31014,6 @@ "currency" : { "type" : "string" }, - "validityType" : { - "type" : "string", - "enum" : [ "STANDARD", "CUSTOM", "NOT_SET" ] - }, "description" : { "type" : "object", "additionalProperties" : { @@ -30789,6 +31060,10 @@ "fileBlobId" : { "type" : "string" }, + "validityType" : { + "type" : "string", + "enum" : [ "STANDARD", "CUSTOM", "NOT_SET" ] + }, "formattedPrice" : { "type" : "string" }, @@ -31343,9 +31618,6 @@ "currency" : { "type" : "string" }, - "websiteUrl" : { - "type" : "string" - }, "shortName" : { "type" : "string" }, @@ -31373,6 +31645,9 @@ "fileBlobId" : { "type" : "string" }, + "websiteUrl" : { + "type" : "string" + }, "organizationName" : { "type" : "string" }, @@ -31962,15 +32237,6 @@ "displayName" : { "type" : "string" }, - "freeOfCharge" : { - "type" : "boolean" - }, - "contentLanguages" : { - "type" : "array", - "items" : { - "$ref" : "#/components/schemas/ContentLanguage" - } - }, "publicIdentifier" : { "type" : "string" }, @@ -31981,10 +32247,19 @@ "enum" : [ "STRIPE", "ON_SITE", "OFFLINE", "NONE", "ADMIN", "PAYPAL", "MOLLIE", "SAFERPAY" ] } }, + "contentLanguages" : { + "type" : "array", + "items" : { + "$ref" : "#/components/schemas/ContentLanguage" + } + }, "begin" : { "type" : "string", "format" : "date-time" }, + "freeOfCharge" : { + "type" : "boolean" + }, "privacyPolicyLinkOrNull" : { "type" : "string" }, @@ -32030,12 +32305,12 @@ "descriptor" : { "$ref" : "#/components/schemas/SubscriptionDescriptor" }, + "unitPrice" : { + "type" : "number" + }, "availableCount" : { "type" : "integer", "format" : "int32" - }, - "unitPrice" : { - "type" : "number" } } }, @@ -32136,23 +32411,10 @@ "currencyCode" : { "type" : "string" }, - "formattedNetPrice" : { - "type" : "string" - }, - "extReference" : { - "type" : "string" - }, "status" : { "type" : "string", "enum" : [ "FREE", "PENDING", "TO_BE_PAID", "ACQUIRED", "CANCELLED", "CHECKED_IN", "EXPIRED", "INVALIDATED", "RELEASED", "PRE_RESERVED" ] }, - "checkedIn" : { - "type" : "boolean" - }, - "creation" : { - "type" : "string", - "format" : "date-time" - }, "tags" : { "type" : "array", "items" : { @@ -32165,6 +32427,10 @@ "transaction" : { "$ref" : "#/components/schemas/Transaction" }, + "subscriptionId" : { + "type" : "string", + "format" : "uuid" + }, "eventId" : { "type" : "integer", "format" : "int32" @@ -32175,10 +32441,6 @@ "lastName" : { "type" : "string" }, - "subscriptionId" : { - "type" : "string", - "format" : "uuid" - }, "vatStatus" : { "type" : "string", "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "CUSTOM_INCLUDED_EXEMPT", "CUSTOM_NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] @@ -32215,22 +32477,35 @@ "ticketsReservationId" : { "type" : "string" }, + "transactionTimestamp" : { + "type" : "string", + "format" : "date-time" + }, "uuid" : { "type" : "string" }, "lockedAssignment" : { "type" : "boolean" }, + "checkedIn" : { + "type" : "boolean" + }, + "creation" : { + "type" : "string", + "format" : "date-time" + }, "formattedFinalPrice" : { "type" : "string" }, + "formattedNetPrice" : { + "type" : "string" + }, + "extReference" : { + "type" : "string" + }, "stuck" : { "type" : "boolean" }, - "transactionTimestamp" : { - "type" : "string", - "format" : "date-time" - }, "paid" : { "type" : "boolean" }, @@ -32297,14 +32572,20 @@ "type" : "string" } }, - "formattedAmount" : { - "type" : "string" - }, "complete" : { "type" : "boolean" }, "potentialMatch" : { "type" : "boolean" + }, + "notes" : { + "type" : "string" + }, + "timestampEditable" : { + "type" : "boolean" + }, + "formattedAmount" : { + "type" : "string" } } }, @@ -32384,32 +32665,29 @@ "currencyCode" : { "type" : "string" }, - "formattedNetPrice" : { - "type" : "string" - }, - "extReference" : { - "type" : "string" - }, "status" : { "type" : "string", "enum" : [ "FREE", "PENDING", "TO_BE_PAID", "ACQUIRED", "CANCELLED", "CHECKED_IN", "EXPIRED", "INVALIDATED", "RELEASED", "PRE_RESERVED" ] }, - "checkedIn" : { - "type" : "boolean" - }, - "creation" : { - "type" : "string", - "format" : "date-time" - }, "tags" : { "type" : "array", "items" : { "type" : "string" } }, + "additionalFields" : { + "type" : "object", + "additionalProperties" : { + "type" : "string" + } + }, "assigned" : { "type" : "boolean" }, + "subscriptionId" : { + "type" : "string", + "format" : "uuid" + }, "eventId" : { "type" : "integer", "format" : "int32" @@ -32420,10 +32698,6 @@ "lastName" : { "type" : "string" }, - "subscriptionId" : { - "type" : "string", - "format" : "uuid" - }, "vatStatus" : { "type" : "string", "enum" : [ "NONE", "INCLUDED", "NOT_INCLUDED", "INCLUDED_EXEMPT", "NOT_INCLUDED_EXEMPT", "CUSTOM_INCLUDED_EXEMPT", "CUSTOM_NOT_INCLUDED_EXEMPT", "INCLUDED_NOT_CHARGED", "NOT_INCLUDED_NOT_CHARGED" ] @@ -32463,14 +32737,21 @@ "lockedAssignment" : { "type" : "boolean" }, + "checkedIn" : { + "type" : "boolean" + }, + "creation" : { + "type" : "string", + "format" : "date-time" + }, "formattedFinalPrice" : { "type" : "string" }, - "additionalFields" : { - "type" : "object", - "additionalProperties" : { - "type" : "string" - } + "formattedNetPrice" : { + "type" : "string" + }, + "extReference" : { + "type" : "string" } } }, @@ -33109,6 +33390,56 @@ } } }, + "PageAndContentListReservationPaymentDetail" : { + "type" : "object", + "properties" : { + "left" : { + "type" : "array", + "items" : { + "$ref" : "#/components/schemas/ReservationPaymentDetail" + } + }, + "right" : { + "type" : "integer", + "format" : "int32" + } + } + }, + "ReservationPaymentDetail" : { + "type" : "object", + "properties" : { + "id" : { + "type" : "string" + }, + "firstName" : { + "type" : "string" + }, + "lastName" : { + "type" : "string" + }, + "email" : { + "type" : "string" + }, + "paymentMethod" : { + "type" : "string" + }, + "paidAmount" : { + "type" : "string" + }, + "currencyCode" : { + "type" : "string" + }, + "transactionTimestamp" : { + "type" : "string" + }, + "transactionNotes" : { + "type" : "string" + }, + "invoiceNumber" : { + "type" : "string" + } + } + }, "PaymentMethodDTO" : { "type" : "object", "properties" : { @@ -33185,20 +33516,9 @@ "dynamic" : { "type" : "boolean" }, - "currentlyValid" : { - "type" : "boolean" - }, "description" : { "type" : "string" }, - "categories" : { - "uniqueItems" : true, - "type" : "array", - "items" : { - "type" : "integer", - "format" : "int32" - } - }, "eventId" : { "type" : "integer", "format" : "int32" @@ -33238,6 +33558,17 @@ "type" : "integer", "format" : "int32" }, + "categories" : { + "uniqueItems" : true, + "type" : "array", + "items" : { + "type" : "integer", + "format" : "int32" + } + }, + "currentlyValid" : { + "type" : "boolean" + }, "emailReference" : { "type" : "string" }, @@ -33250,10 +33581,10 @@ "formattedStart" : { "type" : "string" }, - "formattedEnd" : { + "formattedDiscountAmount" : { "type" : "string" }, - "formattedDiscountAmount" : { + "formattedEnd" : { "type" : "string" } } @@ -33537,25 +33868,16 @@ "displayName" : { "type" : "string" }, - "checkedInTickets" : { - "type" : "integer", - "format" : "int32" - }, - "availableSeats" : { - "type" : "integer", - "format" : "int32" - }, "status" : { "type" : "string", "enum" : [ "DRAFT", "PUBLIC", "DISABLED" ] }, - "notAllocatedTickets" : { - "type" : "integer", - "format" : "int32" - }, "shortName" : { "type" : "string" }, + "warningNeeded" : { + "type" : "boolean" + }, "organizationId" : { "type" : "integer", "format" : "int32" @@ -33570,6 +33892,18 @@ "fileBlobId" : { "type" : "string" }, + "notAllocatedTickets" : { + "type" : "integer", + "format" : "int32" + }, + "availableSeats" : { + "type" : "integer", + "format" : "int32" + }, + "checkedInTickets" : { + "type" : "integer", + "format" : "int32" + }, "expired" : { "type" : "boolean" }, @@ -33604,9 +33938,6 @@ }, "displayStatistics" : { "type" : "boolean" - }, - "warningNeeded" : { - "type" : "boolean" } } }, @@ -33625,28 +33956,28 @@ "timeZone" : { "type" : "string" }, - "apiVersion" : { - "type" : "integer", - "format" : "int32" - }, - "latitude" : { + "url" : { "type" : "string" }, - "longitude" : { + "begin" : { "type" : "string" }, - "imageUrl" : { + "end" : { "type" : "string" }, - "end" : { + "latitude" : { "type" : "string" }, - "url" : { + "longitude" : { "type" : "string" }, - "begin" : { + "imageUrl" : { "type" : "string" }, + "apiVersion" : { + "type" : "integer", + "format" : "int32" + }, "descriptions" : { "type" : "array", "items" : { @@ -33748,10 +34079,10 @@ "key" : { "type" : "string" }, - "left" : { + "right" : { "type" : "string" }, - "right" : { + "left" : { "type" : "string" } } @@ -33905,15 +34236,6 @@ "inputType" : { "type" : "string" }, - "countryField" : { - "type" : "boolean" - }, - "restrictedValues" : { - "type" : "array", - "items" : { - "type" : "string" - } - }, "order" : { "type" : "integer", "format" : "int32" @@ -33937,9 +34259,24 @@ "type" : "integer", "format" : "int32" }, + "countryField" : { + "type" : "boolean" + }, + "restrictedValues" : { + "type" : "array", + "items" : { + "type" : "string" + } + }, "editable" : { "type" : "boolean" }, + "disabledValues" : { + "type" : "array", + "items" : { + "type" : "string" + } + }, "inputField" : { "type" : "boolean" }, @@ -33967,12 +34304,6 @@ "type" : "integer", "format" : "int32" } - }, - "disabledValues" : { - "type" : "array", - "items" : { - "type" : "string" - } } } }, @@ -34105,33 +34436,33 @@ "type" : "string", "enum" : [ "subscription", "event" ] }, - "sameDay" : { - "type" : "boolean" - }, - "online" : { - "type" : "boolean" - }, - "freeOfCharge" : { - "type" : "boolean" - }, "title" : { "type" : "object", "additionalProperties" : { "type" : "string" } }, + "publicIdentifier" : { + "type" : "string" + }, "contentLanguages" : { "type" : "array", "items" : { "$ref" : "#/components/schemas/ContentLanguage" } }, - "publicIdentifier" : { - "type" : "string" - }, "free" : { "type" : "boolean" }, + "freeOfCharge" : { + "type" : "boolean" + }, + "sameDay" : { + "type" : "boolean" + }, + "online" : { + "type" : "boolean" + }, "regularPrice" : { "type" : "number" }, @@ -34390,10 +34721,10 @@ "key" : { "type" : "string" }, - "left" : { + "right" : { "type" : "string" }, - "right" : { + "left" : { "type" : "string" } } From 444c573448ad57a02531d0f12eb4b37cda4e0abf Mon Sep 17 00:00:00 2001 From: Celestino Bellone <3385346+cbellone@users.noreply.github.com> Date: Tue, 30 May 2023 15:35:13 +0200 Subject: [PATCH 210/218] fix styling --- .../additional-service-quantity-selector.html | 4 +--- .../download-ticket/download-ticket.component.html | 4 ++-- .../app/reservation/invoice-form/invoice-form.component.html | 4 ++-- .../public/src/app/reservation/success/success.component.html | 2 +- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/frontend/projects/public/src/app/additional-service-quantity-selector/additional-service-quantity-selector.html b/frontend/projects/public/src/app/additional-service-quantity-selector/additional-service-quantity-selector.html index 8edc795455..347a6efe30 100644 --- a/frontend/projects/public/src/app/additional-service-quantity-selector/additional-service-quantity-selector.html +++ b/frontend/projects/public/src/app/additional-service-quantity-selector/additional-service-quantity-selector.html @@ -12,9 +12,7 @@
    -
    - {{event.currency}} -
    + {{event.currency}}
    diff --git a/frontend/projects/public/src/app/reservation/download-ticket/download-ticket.component.html b/frontend/projects/public/src/app/reservation/download-ticket/download-ticket.component.html index 58740ac589..dc420f8aed 100644 --- a/frontend/projects/public/src/app/reservation/download-ticket/download-ticket.component.html +++ b/frontend/projects/public/src/app/reservation/download-ticket/download-ticket.component.html @@ -16,7 +16,7 @@

    {{ticket.fullName}}

    - +
    {{'reservation-page-complete.download-ticket'|translate}} PDF
     @@ -25,5 +25,5 @@

    {{ticket.fullName}}

    - +
    diff --git a/frontend/projects/public/src/app/reservation/invoice-form/invoice-form.component.html b/frontend/projects/public/src/app/reservation/invoice-form/invoice-form.component.html index 66b430ae77..b1cb57c550 100644 --- a/frontend/projects/public/src/app/reservation/invoice-form/invoice-form.component.html +++ b/frontend/projects/public/src/app/reservation/invoice-form/invoice-form.component.html @@ -86,8 +86,8 @@

    -
    -
    {{form.value.vatCountryCode}}
    +
    + {{form.value.vatCountryCode}}
    diff --git a/frontend/projects/public/src/app/reservation/success/success.component.html b/frontend/projects/public/src/app/reservation/success/success.component.html index 71572b7229..8c461fa8bc 100644 --- a/frontend/projects/public/src/app/reservation/success/success.component.html +++ b/frontend/projects/public/src/app/reservation/success/success.component.html @@ -58,7 +58,7 @@

    {{'reservation-page-c {{'reservation-page-complete.show-ticket'|translate}}

    - + {{'reservation-page-complete.download-ticket'|translate}}
    From c6f06bb87eff8e4c657920426509a67f40063dad Mon Sep 17 00:00:00 2001 From: Stan <84271654+StanMar-bit@users.noreply.github.com> Date: Wed, 7 Jun 2023 18:29:22 +0200 Subject: [PATCH 211/218] Added docs for Mollie (#1236) * Added docs for Mollie Added a simple guide how to configure Mollie for use in Alf.io as payment method. * Added section supported payment methods --- .../en/docs/Configuration/Payment/Mollie.md | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 website/content/en/docs/Configuration/Payment/Mollie.md diff --git a/website/content/en/docs/Configuration/Payment/Mollie.md b/website/content/en/docs/Configuration/Payment/Mollie.md new file mode 100644 index 0000000000..4e469198dc --- /dev/null +++ b/website/content/en/docs/Configuration/Payment/Mollie.md @@ -0,0 +1,35 @@ +--- +title: "How-to set-up Mollie" +linkTitle: "Mollie" +date: 2022-05-20 +weight: 2 +description: > + How-to set-up Mollie as payment provider +--- +#### Support +Not all the payment methods supported by Mollie are supported by Alf.io + +The following payment methods are supported by Alf.io: +- IDEAL +- Creditcard +- Apple Pay +- Bankcontact +- ING home pay +- Belfius +- Przelewy24 +- KBC + +## How-to set-up Mollie as payment provider +To start using Mollie as your payment provider in Alf.io you first have to obtain two things from your Mollie dashboard. Your profile id and your api key (test or live). + +### Obtaining the required info from your Mollie dashboard +To obtain the Profile ID and API-key, go to your [Mollie dashboard](https://my.mollie.com/dashboard/) In the left navigational-column of the dashboard click on Developers, then choose API-keys. Now select the appropriate website profile and copy the Profile-ID and API-key. +![developers section in Mollie dashboard](/website/static/img/configuration/Mollie/API-keys.png) +### Configuring Alf.io for Mollie +To set-up Alf.io for Mollie usage, go to Configuration and click on Payment. Then scroll to Mollie configuration. +1. Enable the configuration +2. If you have a Live-API key enable Live mode, if you have a test key disable Live mode. +3. Paste the API key +4. Paste your Profile ID in the box. + +#### Dont forget to save the configurations by clicking on save on the bottom of the page. And test Mollie by making a reservation, before production use. From ecc82769df7ad79e4160df25ba13a168305dbe9e Mon Sep 17 00:00:00 2001 From: Lorena Mondini <60662357+Lorslux@users.noreply.github.com> Date: Mon, 12 Jun 2023 14:52:19 +0200 Subject: [PATCH 212/218] UI event detail with graphs (#1243) * Fix button cancel from export modal * Added cards * Clean * Add ng2-charts library * Fixed cards using cols * Improve event detail view * Added panel with even info and language description * Logic pieChart * Added ticketStatistics call and model * Added lineChart logic and formated data user friendly * Added pipe and logics for cards event * Added a few menu voices * various fixes --- frontend/.gitignore | 2 +- frontend/projects/admin/package-lock.json | 109 ++++++ frontend/projects/admin/package.json | 4 +- frontend/projects/admin/src/app/app.module.ts | 95 +++--- .../export-date-selector.component.html | 2 +- .../event-dashboard.component.html | 314 +++++++++++++++++- .../event-dashboard.component.scss | 1 + .../event-dashboard.component.ts | 175 +++++++++- .../event-menu/event-menu.component.html | 9 +- .../admin/src/app/event/event.module.ts | 44 ++- .../event/translate-payment-proxies.pipe.ts | 22 ++ .../projects/admin/src/app/model/event.ts | 80 +++-- .../organization-edit.component.html | 2 - .../admin/src/app/shared/event.service.ts | 23 +- .../projects/admin/src/app/shared/icons.ts | 65 ++-- .../admin/src/app/svg/calendar-event.ts | 4 + .../admin/src/app/svg/hourglass-top.ts | 4 + .../projects/admin/src/app/svg/piggy-bank.ts | 4 + .../admin/src/assets/svg/calendar-event.svg | 1 + .../admin/src/assets/svg/hourglass-top.svg | 1 + .../admin/src/assets/svg/piggy-bank.svg | 1 + 21 files changed, 828 insertions(+), 134 deletions(-) create mode 100644 frontend/projects/admin/src/app/event/translate-payment-proxies.pipe.ts create mode 100644 frontend/projects/admin/src/app/svg/calendar-event.ts create mode 100644 frontend/projects/admin/src/app/svg/hourglass-top.ts create mode 100644 frontend/projects/admin/src/app/svg/piggy-bank.ts create mode 100644 frontend/projects/admin/src/assets/svg/calendar-event.svg create mode 100644 frontend/projects/admin/src/assets/svg/hourglass-top.svg create mode 100644 frontend/projects/admin/src/assets/svg/piggy-bank.svg diff --git a/frontend/.gitignore b/frontend/.gitignore index 0711527ef9..65859eec36 100644 --- a/frontend/.gitignore +++ b/frontend/.gitignore @@ -21,7 +21,7 @@ yarn-error.log *.sublime-workspace # Visual Studio Code -.vscode/* +.vscode !.vscode/settings.json !.vscode/tasks.json !.vscode/launch.json diff --git a/frontend/projects/admin/package-lock.json b/frontend/projects/admin/package-lock.json index 6f8454a684..fcf1ac95ff 100644 --- a/frontend/projects/admin/package-lock.json +++ b/frontend/projects/admin/package-lock.json @@ -9,6 +9,7 @@ "version": "0.0.0", "dependencies": { "@angular/animations": "^14.2.0", + "@angular/cdk": "^14.2.7", "@angular/common": "^14.2.0", "@angular/compiler": "^14.2.0", "@angular/core": "^14.2.0", @@ -23,6 +24,7 @@ "@ngx-translate/http-loader": "^7.0.0", "@popperjs/core": "^2.10.2", "bootstrap": "^5.2.0", + "ng2-charts": "^4.1.1", "rxjs": "~7.5.0", "tslib": "^2.3.0", "zone.js": "~0.11.4" @@ -491,6 +493,28 @@ "@angular/core": "14.2.11" } }, + "node_modules/@angular/cdk": { + "version": "14.2.7", + "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-14.2.7.tgz", + "integrity": "sha512-/tEsYaUbDSnfEmKVvAMramIptmhI67O+9STjOV0i+74XR2NospeK0fkbywIANu1n3w6AHGMotvRWJrjmbCElFg==", + "dependencies": { + "tslib": "^2.3.0" + }, + "optionalDependencies": { + "parse5": "^5.0.0" + }, + "peerDependencies": { + "@angular/common": "^14.0.0 || ^15.0.0", + "@angular/core": "^14.0.0 || ^15.0.0", + "rxjs": "^6.5.3 || ^7.4.0" + } + }, + "node_modules/@angular/cdk/node_modules/parse5": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz", + "integrity": "sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==", + "optional": true + }, "node_modules/@angular/cli": { "version": "14.2.10", "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-14.2.10.tgz", @@ -3537,6 +3561,12 @@ "@jridgewell/sourcemap-codec": "1.4.14" } }, + "node_modules/@kurkle/color": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/@kurkle/color/-/color-0.3.2.tgz", + "integrity": "sha512-fuscdXJ9G1qb7W8VdHi+IwRqij3lBkosAm4ydQtEmbY58OzHXqQhvlxqEkoz0yssNVn38bcpRWgA9PP+OGoisw==", + "peer": true + }, "node_modules/@leichtgewicht/ip-codec": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz", @@ -5409,6 +5439,18 @@ "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==", "dev": true }, + "node_modules/chart.js": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.3.0.tgz", + "integrity": "sha512-ynG0E79xGfMaV2xAHdbhwiPLczxnNNnasrmPEXriXsPJGjmhOBYzFVEsB65w2qMDz+CaBJJuJD0inE/ab/h36g==", + "peer": true, + "dependencies": { + "@kurkle/color": "^0.3.0" + }, + "engines": { + "pnpm": ">=7" + } + }, "node_modules/chokidar": { "version": "3.5.3", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", @@ -10151,6 +10193,11 @@ "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", "dev": true }, + "node_modules/lodash-es": { + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz", + "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==" + }, "node_modules/lodash.debounce": { "version": "4.0.8", "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", @@ -10824,6 +10871,22 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, + "node_modules/ng2-charts": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/ng2-charts/-/ng2-charts-4.1.1.tgz", + "integrity": "sha512-iHwXDbmX86lfeH8VRcsaW2tJATsuAZo4kvvC/Yk2l35zOHjevja1qBvO6BAibiDazi9r9aS6ZRJOqWPsz1pP2w==", + "dependencies": { + "lodash-es": "^4.17.15", + "tslib": "^2.3.0" + }, + "peerDependencies": { + "@angular/cdk": ">=14.0.0", + "@angular/common": ">=14.0.0", + "@angular/core": ">=14.0.0", + "chart.js": "^3.4.0 || ^4.0.0", + "rxjs": "^6.5.3 || ^7.4.0" + } + }, "node_modules/nice-napi": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/nice-napi/-/nice-napi-1.0.2.tgz", @@ -15923,6 +15986,23 @@ "tslib": "^2.3.0" } }, + "@angular/cdk": { + "version": "14.2.7", + "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-14.2.7.tgz", + "integrity": "sha512-/tEsYaUbDSnfEmKVvAMramIptmhI67O+9STjOV0i+74XR2NospeK0fkbywIANu1n3w6AHGMotvRWJrjmbCElFg==", + "requires": { + "parse5": "^5.0.0", + "tslib": "^2.3.0" + }, + "dependencies": { + "parse5": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz", + "integrity": "sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==", + "optional": true + } + } + }, "@angular/cli": { "version": "14.2.10", "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-14.2.10.tgz", @@ -18036,6 +18116,12 @@ "@jridgewell/sourcemap-codec": "1.4.14" } }, + "@kurkle/color": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/@kurkle/color/-/color-0.3.2.tgz", + "integrity": "sha512-fuscdXJ9G1qb7W8VdHi+IwRqij3lBkosAm4ydQtEmbY58OzHXqQhvlxqEkoz0yssNVn38bcpRWgA9PP+OGoisw==", + "peer": true + }, "@leichtgewicht/ip-codec": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz", @@ -19450,6 +19536,15 @@ "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==", "dev": true }, + "chart.js": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.3.0.tgz", + "integrity": "sha512-ynG0E79xGfMaV2xAHdbhwiPLczxnNNnasrmPEXriXsPJGjmhOBYzFVEsB65w2qMDz+CaBJJuJD0inE/ab/h36g==", + "peer": true, + "requires": { + "@kurkle/color": "^0.3.0" + } + }, "chokidar": { "version": "3.5.3", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", @@ -22911,6 +23006,11 @@ "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", "dev": true }, + "lodash-es": { + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz", + "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==" + }, "lodash.debounce": { "version": "4.0.8", "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", @@ -23424,6 +23524,15 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, + "ng2-charts": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/ng2-charts/-/ng2-charts-4.1.1.tgz", + "integrity": "sha512-iHwXDbmX86lfeH8VRcsaW2tJATsuAZo4kvvC/Yk2l35zOHjevja1qBvO6BAibiDazi9r9aS6ZRJOqWPsz1pP2w==", + "requires": { + "lodash-es": "^4.17.15", + "tslib": "^2.3.0" + } + }, "nice-napi": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/nice-napi/-/nice-napi-1.0.2.tgz", diff --git a/frontend/projects/admin/package.json b/frontend/projects/admin/package.json index 51c26325ab..945181718c 100644 --- a/frontend/projects/admin/package.json +++ b/frontend/projects/admin/package.json @@ -25,6 +25,7 @@ "private": true, "dependencies": { "@angular/animations": "^14.2.0", + "@angular/cdk": "^14.2.7", "@angular/common": "^14.2.0", "@angular/compiler": "^14.2.0", "@angular/core": "^14.2.0", @@ -39,6 +40,7 @@ "@ngx-translate/http-loader": "^7.0.0", "@popperjs/core": "^2.10.2", "bootstrap": "^5.2.0", + "ng2-charts": "^4.1.1", "rxjs": "~7.5.0", "tslib": "^2.3.0", "zone.js": "~0.11.4" @@ -66,4 +68,4 @@ "karma-jasmine-html-reporter": "~2.0.0", "typescript": "~4.7.2" } -} +} \ No newline at end of file diff --git a/frontend/projects/admin/src/app/app.module.ts b/frontend/projects/admin/src/app/app.module.ts index 5eb080f10b..4cfd2e5491 100644 --- a/frontend/projects/admin/src/app/app.module.ts +++ b/frontend/projects/admin/src/app/app.module.ts @@ -1,37 +1,48 @@ -import {APP_INITIALIZER, NgModule} from '@angular/core'; -import {BrowserModule} from '@angular/platform-browser'; -import {provideSvgIconsConfig, SvgIconComponent} from '@ngneat/svg-icon'; -import {AppRoutingModule} from './app-routing.module'; -import {AppComponent} from './app.component'; -import {AuthenticationModule} from "./authentication/authentication.module"; -import {HTTP_INTERCEPTORS, HttpClient, HttpClientModule, HttpClientXsrfModule} from "@angular/common/http"; -import {UserService} from "./shared/user.service"; -import {Router} from "@angular/router"; -import {firstValueFrom} from "rxjs"; -import {OrganizationService} from './shared/organization.service'; -import {MissingOrgComponent} from './missing-org/missing-org.component'; -import {ICON_CONFIG} from './shared/icons'; -import {TranslateLoader, TranslateModule} from '@ngx-translate/core'; -import {CustomLoader} from './shared/i18n.service'; -import {OrgSelectorComponent} from './org-selector/org-selector.component'; -import {NgbDropdownModule} from "@ng-bootstrap/ng-bootstrap"; -import {SectionDashboardComponent} from "./shared/section-dashboard/section-dashboard.component"; -import {SharedModule} from "./shared/shared.module"; -import {HttpLoginInterceptor, redirectToLogin} from "./shared/http-login.interceptor"; -import {AlfioCommonModule} from "common"; -import { OrganizationsComponent } from './organizations/organizations.component'; +import { + HTTP_INTERCEPTORS, + HttpClient, + HttpClientModule, + HttpClientXsrfModule, +} from '@angular/common/http'; +import { APP_INITIALIZER, NgModule } from '@angular/core'; +import { FormsModule, ReactiveFormsModule } from '@angular/forms'; +import { BrowserModule } from '@angular/platform-browser'; +import { Router } from '@angular/router'; +import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap'; +import { SvgIconComponent, provideSvgIconsConfig } from '@ngneat/svg-icon'; +import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; +import { AlfioCommonModule } from 'common'; +import { firstValueFrom } from 'rxjs'; +import { AccessControlComponent } from './access-control/access-control.component'; +import { ApiKeySystemBulkComponent } from './api-key-system-bulk/api-key-system-bulk.component'; +import { ApiKeySystemEditComponent } from './api-key-system-edit/api-key-system-edit.component'; +import { ApiKeySystemComponent } from './api-key-system/api-key-system.component'; +import { AppRoutingModule } from './app-routing.module'; +import { AppComponent } from './app.component'; +import { AuthenticationModule } from './authentication/authentication.module'; +import { MissingOrgComponent } from './missing-org/missing-org.component'; +import { OrgSelectorComponent } from './org-selector/org-selector.component'; import { OrganizationEditComponent } from './organization-edit/organization-edit.component'; -import { FormsModule, ReactiveFormsModule } from '@angular/forms';import { AccessControlComponent } from './access-control/access-control.component'; -import { UserSystemComponent } from './user-system/user-system.component'; +import { OrganizationsComponent } from './organizations/organizations.component'; +import { + HttpLoginInterceptor, + redirectToLogin, +} from './shared/http-login.interceptor'; +import { CustomLoader } from './shared/i18n.service'; +import { ICON_CONFIG } from './shared/icons'; +import { OrganizationService } from './shared/organization.service'; +import { SectionDashboardComponent } from './shared/section-dashboard/section-dashboard.component'; +import { SharedModule } from './shared/shared.module'; +import { UserService } from './shared/user.service'; import { UserSystemEditComponent } from './user-system-edit/user-system-edit.component'; -import { ApiKeySystemComponent } from './api-key-system/api-key-system.component'; -import { ApiKeySystemEditComponent } from './api-key-system-edit/api-key-system-edit.component'; -import { ApiKeySystemBulkComponent } from './api-key-system-bulk/api-key-system-bulk.component'; - +import { UserSystemComponent } from './user-system/user-system.component'; -export function RedirectToLoginIfNeeded(userService: UserService, router: Router): () => Promise { +export function RedirectToLoginIfNeeded( + userService: UserService, + router: Router +): () => Promise { return async () => { - const loggedIn = await firstValueFrom(userService.checkUserLoggedIn()) + const loggedIn = await firstValueFrom(userService.checkUserLoggedIn()); if (!loggedIn) { return redirectToLogin(router); } @@ -57,7 +68,6 @@ export function HttpLoaderFactory(http: HttpClient) { ApiKeySystemComponent, ApiKeySystemEditComponent, ApiKeySystemBulkComponent, - ], imports: [ BrowserModule, @@ -75,23 +85,26 @@ export function HttpLoaderFactory(http: HttpClient) { loader: { provide: TranslateLoader, useFactory: HttpLoaderFactory, - deps: [HttpClient] - } + deps: [HttpClient], + }, }), NgbDropdownModule, SharedModule, - AlfioCommonModule + AlfioCommonModule, ], providers: [ - {provide: APP_INITIALIZER, useFactory: RedirectToLoginIfNeeded, deps: [UserService, Router], multi: true}, - {provide: HTTP_INTERCEPTORS, useClass: HttpLoginInterceptor, multi: true}, + { + provide: APP_INITIALIZER, + useFactory: RedirectToLoginIfNeeded, + deps: [UserService, Router], + multi: true, + }, + { provide: HTTP_INTERCEPTORS, useClass: HttpLoginInterceptor, multi: true }, provideSvgIconsConfig(ICON_CONFIG), UserService, OrganizationService, ], - exports: [ - SectionDashboardComponent - ], - bootstrap: [AppComponent] + exports: [SectionDashboardComponent], + bootstrap: [AppComponent], }) -export class AppModule { } +export class AppModule {} diff --git a/frontend/projects/admin/src/app/dashboard/export-date-selector/export-date-selector.component.html b/frontend/projects/admin/src/app/dashboard/export-date-selector/export-date-selector.component.html index 619243579c..1dafe888b4 100644 --- a/frontend/projects/admin/src/app/dashboard/export-date-selector/export-date-selector.component.html +++ b/frontend/projects/admin/src/app/dashboard/export-date-selector/export-date-selector.component.html @@ -50,7 +50,7 @@

    Reservation date

    diff --git a/frontend/projects/admin/src/app/event/event-dashboard/event-dashboard.component.html b/frontend/projects/admin/src/app/event/event-dashboard/event-dashboard.component.html index deb32d20f9..76e71a1994 100644 --- a/frontend/projects/admin/src/app/event/event-dashboard/event-dashboard.component.html +++ b/frontend/projects/admin/src/app/event/event-dashboard/event-dashboard.component.html @@ -3,6 +3,318 @@
    -

    {{ event.displayName }}

    +

    {{ event.displayName }}

    +
    +
    +
    +
    +
    +
    +
    Total tickets confirmed
    +
    +
    + +
    + +
    + {{ + eventOrganizationInfo.event.soldTickets + + eventOrganizationInfo.event.checkedInTickets + }} +
    +
    +
    +
    +
    +
    +
    Tickets pending
    +
    +
    + +
    +
    + {{ eventOrganizationInfo.event.pendingTickets }} +
    +
    +
    +
    +
    +
    +
    Gross income
    +
    +
    + +
    +
    + {{ eventOrganizationInfo.event.grossIncome }} + {{ eventOrganizationInfo.event.currency }} +
    +
    +
    +
    +
    +
    +
    + + +
    + +
    + + +
    +
    +
    + +
    +
    Logistic Info and description
    +
    +
    +
    + +
    +
    +
    +
    Public URL
    +
    + {{ + (instanceSetting$ | async)?.baseUrl + + "/event/" + + eventOrganizationInfo.event.shortName + }} +
    +
    Organized by
    +
    + {{ eventOrganizationInfo.organization.name }} <{{ + eventOrganizationInfo.organization.email + }}> +
    +
    Website URL
    +
    + {{ eventOrganizationInfo.event.websiteUrl }} +
    +
    T&C URL
    +
    + {{ eventOrganizationInfo.event.termsAndConditionsUrl }} +
    +
    + Privacy Policy URL +
    +
    + {{ eventOrganizationInfo.event.privacyPolicyUrl }} +
    +
    + Location +
    +
    + {{ eventOrganizationInfo.event.location }} +
    +
    Languages
    +
    +
      +
    • + {{ language.displayLanguage | titlecase }} +
      • +
    +
    +
    Start Date/Time
    +
    + {{ eventOrganizationInfo.event.formattedBegin | date }} +
    +
    End Date/Time
    +
    + {{ eventOrganizationInfo.event.formattedEnd | date }} +
    +
    Time Zone
    +
    {{ eventOrganizationInfo.event.timeZone }}
    +
    +
    +
    + + +
    +
    +
    +
    +
    + +
    +
    +
    +
    +
    Seats and payment info
    +
    +
    +
    +
    +
    Tickets Price
    +
    + Free of charge + {{ + eventOrganizationInfo.event.regularPrice + | currency : eventOrganizationInfo.event.currency || "" + }} +
    +
    + Payment methods +
    +
    + {{ + eventOrganizationInfo.event.allowedPaymentProxies + | translatePaymentProxies + }} + +
    +
    Max tickets
    +
    + {{ eventOrganizationInfo.event.availableSeats }} +
    +
    + VAT (%) +
    +
    + {{ eventOrganizationInfo.event.vatPercentage | currency : "" }} +
    +
    + Final Price +
    +
    + {{ + eventOrganizationInfo.event.finalPrice + | currency : eventOrganizationInfo.event.currency || "" + }} +
    +
    +
    +
    +
    +
    +
    +
    + +
    +
    +
    +
    diff --git a/frontend/projects/admin/src/app/event/event-dashboard/event-dashboard.component.scss b/frontend/projects/admin/src/app/event/event-dashboard/event-dashboard.component.scss index e69de29bb2..8b13789179 100644 --- a/frontend/projects/admin/src/app/event/event-dashboard/event-dashboard.component.scss +++ b/frontend/projects/admin/src/app/event/event-dashboard/event-dashboard.component.scss @@ -0,0 +1 @@ + diff --git a/frontend/projects/admin/src/app/event/event-dashboard/event-dashboard.component.ts b/frontend/projects/admin/src/app/event/event-dashboard/event-dashboard.component.ts index 1a0b921dfa..3adda5ebe0 100644 --- a/frontend/projects/admin/src/app/event/event-dashboard/event-dashboard.component.ts +++ b/frontend/projects/admin/src/app/event/event-dashboard/event-dashboard.component.ts @@ -1,23 +1,176 @@ -import {Component} from '@angular/core'; -import {ActivatedRoute} from '@angular/router'; -import {map, Observable, of, switchMap} from 'rxjs'; -import {EventService} from "../../shared/event.service"; -import {Event} from "../../model/event"; - +import { Component, OnInit } from '@angular/core'; +import { ActivatedRoute } from '@angular/router'; +import { ChartConfiguration, ChartData, ChartOptions } from 'chart.js'; +import { Observable, map, of, switchMap } from 'rxjs'; +import { + Event, + EventInfo, + EventOrganizationInfo, + EventTicketsStatistics, +} from '../../model/event'; +import { EventService } from '../../shared/event.service'; +import { formatDate } from '@angular/common'; +import { ConfigurationService } from '../../shared/configuration.service'; +import { InstanceSetting } from '../../model/instance-settings'; @Component({ selector: 'app-event-dashboard', templateUrl: './event-dashboard.component.html', - styleUrls: ['./event-dashboard.component.scss'] + styleUrls: ['./event-dashboard.component.scss'], }) -export class EventDashboardComponent { - +export class EventDashboardComponent implements OnInit { public eventId$: Observable = of(); public event$: Observable = of(); + public eventOrganizationInfo$: Observable = + of(); + public eventTicketsStatistics$: Observable = + of(); + public instanceSetting$: Observable = of(); + + public pieChartOptions: ChartOptions<'pie'> = { + responsive: false, + plugins: { + legend: { + display: true, + position: 'right', + }, + }, + }; + public pieChartData: ChartData<'pie', number[], string | string[]> = { + labels: [], + datasets: [ + { + data: [], + backgroundColor: [], + }, + ], + }; + + public lineChartData: ChartConfiguration<'line'>['data'] = { + labels: [], + datasets: [], + }; + public lineChartOptions: ChartOptions<'line'> = { + responsive: false, + }; + public lineChartLegend = true; - constructor(private readonly eventService: EventService, route: ActivatedRoute) { + constructor( + private readonly eventService: EventService, + private readonly route: ActivatedRoute, + private readonly configurationService: ConfigurationService + ) { this.eventId$ = route.paramMap.pipe(map((pm) => pm.get('eventId'))); - this.event$ = this.eventId$.pipe(switchMap(v => v != null ? eventService.getEvent(v) : of())); + this.instanceSetting$ = this.configurationService.loadInstanceSetting(); + + this.event$ = this.eventId$.pipe( + switchMap((eventId) => + eventId != null ? eventService.getEvent(eventId) : of() + ) + ); + + this.eventOrganizationInfo$ = this.event$.pipe( + switchMap((event) => + event != null ? eventService.getEventByShortName(event.shortName) : of() + ) + ); + + this.eventTicketsStatistics$ = this.event$.pipe( + switchMap((event) => + event != null + ? eventService.getTicketsStatistics(event.shortName) + : of() + ) + ); + + this.eventOrganizationInfo$.subscribe((eventOrganizationInfo) => { + const event = eventOrganizationInfo?.event; + if (!event) { + return; + } + this.loadPieData(event); + }); + + this.eventTicketsStatistics$.subscribe((eventTicketsStatistics) => { + if (!eventTicketsStatistics) { + return; + } + this.loadLineData(eventTicketsStatistics); + }); + } + + loadLineData(eventTicketsStatistics: EventTicketsStatistics) { + this.lineChartData = { + labels: eventTicketsStatistics.sold.map((item) => + formatDate(item.date, 'mediumDate', 'en') + ), + datasets: [ + { + data: eventTicketsStatistics.sold.map((item) => item.count), + label: 'Created Reservations', + borderColor: 'green', + backgroundColor: 'green', + }, + { + data: eventTicketsStatistics.reserved.map((item) => item.count), + label: 'Confirmed Reservations', + borderColor: 'orange', + backgroundColor: 'orange', + }, + ], + }; } + loadPieData(event: EventInfo) { + const pieData = [ + { + value: event.checkedInTickets, + name: 'Checked in', + backgroundColor: '#5cb85c', + meta: 'Checked in (' + event.checkedInTickets + ')', + }, + { + value: event.soldTickets, + name: 'Sold', + backgroundColor: '#f0ad4e', + meta: 'Sold (' + event.soldTickets + ')', + }, + { + value: event.pendingTickets + event.releasedTickets, + name: 'Pending', + backgroundColor: '#7670b7', + meta: + 'Pending (' + (event.pendingTickets + event.releasedTickets) + ')', + }, + { + value: event.notSoldTickets, + name: 'Reserved for categories', + backgroundColor: '#f0ad4e', + meta: 'Reserved for categories (' + event.notSoldTickets + ')', + }, + { + value: event.notAllocatedTickets, + name: 'Not yet allocated', + backgroundColor: '#d9534f', + meta: 'Not yet allocated (' + event.notAllocatedTickets + ')', + }, + { + value: event.dynamicAllocation, + name: 'Available', + backgroundColor: '#428bca', + meta: 'Available (' + event.dynamicAllocation + ')', + }, + ].filter((item) => item.value > 0); + + this.pieChartData = { + labels: pieData.map((item) => item.name), + datasets: [ + { + data: pieData.map((item) => item.value), + backgroundColor: pieData.map((item) => item.backgroundColor), + }, + ], + }; + } + ngOnInit(): void {} } diff --git a/frontend/projects/admin/src/app/event/event-menu/event-menu.component.html b/frontend/projects/admin/src/app/event/event-menu/event-menu.component.html index 3c9f1b9a1d..25e87540f2 100644 --- a/frontend/projects/admin/src/app/event/event-menu/event-menu.component.html +++ b/frontend/projects/admin/src/app/event/event-menu/event-menu.component.html @@ -1 +1,8 @@ -

    event-menu works!

    + diff --git a/frontend/projects/admin/src/app/event/event.module.ts b/frontend/projects/admin/src/app/event/event.module.ts index fe70b38ee1..da3bd7a638 100644 --- a/frontend/projects/admin/src/app/event/event.module.ts +++ b/frontend/projects/admin/src/app/event/event.module.ts @@ -1,36 +1,34 @@ -import {NgModule} from '@angular/core'; -import {CommonModule} from '@angular/common'; -import {TranslateModule} from '@ngx-translate/core'; -import {provideSvgIconsConfig, SvgIconComponent} from '@ngneat/svg-icon'; -import {RouterModule} from '@angular/router'; -import {OrganizationService} from '../shared/organization.service'; -import {EventService} from '../shared/event.service'; -import {ICON_CONFIG} from '../shared/icons'; -import {EventDashboardComponent} from './event-dashboard/event-dashboard.component'; -import {EventMenuComponent} from './event-menu/event-menu.component'; -import {SharedModule} from "../shared/shared.module"; - +import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; +import { RouterModule } from '@angular/router'; +import { NgbCarouselModule, NgbNavModule } from '@ng-bootstrap/ng-bootstrap'; +import { provideSvgIconsConfig, SvgIconComponent } from '@ngneat/svg-icon'; +import { TranslateModule } from '@ngx-translate/core'; +import { NgChartsModule } from 'ng2-charts'; +import { EventService } from '../shared/event.service'; +import { ICON_CONFIG } from '../shared/icons'; +import { OrganizationService } from '../shared/organization.service'; +import { SharedModule } from '../shared/shared.module'; +import { EventDashboardComponent } from './event-dashboard/event-dashboard.component'; +import { EventMenuComponent } from './event-menu/event-menu.component'; +import { TranslatePaymentProxiesPipe } from './translate-payment-proxies.pipe'; @NgModule({ - declarations: [ - EventMenuComponent, - EventDashboardComponent, - - ], + declarations: [EventMenuComponent, EventDashboardComponent, TranslatePaymentProxiesPipe], imports: [ TranslateModule.forChild(), CommonModule, SvgIconComponent, SharedModule, - RouterModule.forChild([ - {path: '', component: EventDashboardComponent} - ]) + NgChartsModule, + NgbCarouselModule, + NgbNavModule, + RouterModule.forChild([{ path: '', component: EventDashboardComponent }]), ], providers: [ OrganizationService, EventService, - provideSvgIconsConfig(ICON_CONFIG) + provideSvgIconsConfig(ICON_CONFIG), ], - }) -export class EventModule { } +export class EventModule {} diff --git a/frontend/projects/admin/src/app/event/translate-payment-proxies.pipe.ts b/frontend/projects/admin/src/app/event/translate-payment-proxies.pipe.ts new file mode 100644 index 0000000000..0c15a5c04c --- /dev/null +++ b/frontend/projects/admin/src/app/event/translate-payment-proxies.pipe.ts @@ -0,0 +1,22 @@ +import { Pipe, PipeTransform } from '@angular/core'; + +const PAYMENT_PROXY_DESCRIPTIONS = { + STRIPE: 'Stripe: Credit cards', + ON_SITE: 'On site (cash) payment', + OFFLINE: 'Offline payment (bank transfer, invoice, etc.)', + PAYPAL: 'PayPal', + MOLLIE: + 'Mollie: Credit cards, iDEAL, Bancontact, ING Home Pay, Belfius, KBC/CBC, Przelewy24', + SAFERPAY: 'Saferpay By SIX Payments', +} as any; + +@Pipe({ + name: 'translatePaymentProxies', +}) +export class TranslatePaymentProxiesPipe implements PipeTransform { + transform(list: string[]): string[] { + return list.map((item) => + PAYMENT_PROXY_DESCRIPTIONS[item] ? PAYMENT_PROXY_DESCRIPTIONS[item] : item + ); + } +} diff --git a/frontend/projects/admin/src/app/model/event.ts b/frontend/projects/admin/src/app/model/event.ts index 3a3b02402f..fab44f7749 100644 --- a/frontend/projects/admin/src/app/model/event.ts +++ b/frontend/projects/admin/src/app/model/event.ts @@ -1,28 +1,66 @@ +import { Organization } from './organization'; + export interface EventInfo { - id: number; - displayName: string; - status: string; // TODO: enum - shortName: string; - organizationId: number; - allowedPaymentProxies: string[]; // TODO: enum - expired: boolean; - notAllocatedTickets: number; - fileBlobId: string; - availableSeats: number; - checkedInTickets: number; - notSoldTickets: number; - soldTickets: number; - pendingTickets: number; - dynamicAllocation: number; - releasedTickets: number; - formattedEnd: string; - visibleForCurrentUser: boolean; - warningNeeded: boolean; - formattedBegin: string; - displayStatistics: boolean; + allowedPaymentProxies: string[]; // TODO: enum + availableSeats: number; + checkedInTickets: number; + currency: string; + description: { [lang: string]: string }; + displayName: string; + displayStatistics: boolean; + displayLanguage: string; + contentLanguages: { + displayLanguage: string; + language: string; + }[]; + dynamicAllocation: number; + expired: boolean; + fileBlobId: string; + formattedBegin: string; + formattedEnd: string; + freeOfCharge: boolean; + id: number; + location: string; + notAllocatedTickets: number; + notSoldTickets: number; + organizationId: number; + online: boolean; + pendingTickets: number; + privacyPolicyUrl: string; + releasedTickets: number; + shortName: string; + soldTickets: number; + status: string; // TODO: enum + termsAndConditionsUrl: string; + timeZone: string; + visibleForCurrentUser: boolean; + warningNeeded: boolean; + websiteUrl: string; + grossIncome: number; + regularPrice: number; + finalPrice: number; + vatPercentage: number; +} + +export interface EventOrganizationInfo { + event: EventInfo; + organization: Organization; } export interface Event { id: number; displayName: string; + shortName: string; +} + +export interface EventTicketsStatistics { + granularity: string; + sold: { + count: number; + date: string; + }[]; + reserved: { + count: number; + date: string; + }[]; } diff --git a/frontend/projects/admin/src/app/organization-edit/organization-edit.component.html b/frontend/projects/admin/src/app/organization-edit/organization-edit.component.html index 1a415ff1f9..21887665ca 100644 --- a/frontend/projects/admin/src/app/organization-edit/organization-edit.component.html +++ b/frontend/projects/admin/src/app/organization-edit/organization-edit.component.html @@ -102,6 +102,4 @@

    Advanced Configuration

    - -
    diff --git a/frontend/projects/admin/src/app/shared/event.service.ts b/frontend/projects/admin/src/app/shared/event.service.ts index e3a80bd6eb..6b3d1cfd78 100644 --- a/frontend/projects/admin/src/app/shared/event.service.ts +++ b/frontend/projects/admin/src/app/shared/event.service.ts @@ -1,7 +1,12 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { map, Observable } from 'rxjs'; -import { Event, EventInfo } from '../model/event'; +import { + Event, + EventInfo, + EventOrganizationInfo, + EventTicketsStatistics, +} from '../model/event'; @Injectable() export class EventService { @@ -24,4 +29,20 @@ export class EventService { getEvent(eventId: string): Observable { return this.httpClient.get(`/admin/api/events/id/${eventId}`); } + + getEventByShortName( + eventShortName: string + ): Observable { + return this.httpClient.get( + `/admin/api/events/${eventShortName}` + ); + } + + getTicketsStatistics( + eventShortName: string + ): Observable { + return this.httpClient.get( + `/admin/api/events/${eventShortName}/ticket-sold-statistics` + ); + } } diff --git a/frontend/projects/admin/src/app/shared/icons.ts b/frontend/projects/admin/src/app/shared/icons.ts index e971cab8aa..d91dff4138 100644 --- a/frontend/projects/admin/src/app/shared/icons.ts +++ b/frontend/projects/admin/src/app/shared/icons.ts @@ -1,50 +1,55 @@ +import { accessIcon } from '../svg/access'; +import { accountcircleIcon } from '../svg/accountcircle'; import { addIcon } from '../svg/add'; +import { addCircleNewIcon } from '../svg/add-circle-new'; import { arrowdropdownIcon } from '../svg/arrowdropdown'; +import { calendarEventIcon } from '../svg/calendar-event'; import { checkIcon } from '../svg/check'; -import { homeIcon } from '../svg/home'; -import { organizationIcon } from '../svg/organization'; -import { settingsIcon } from '../svg/settings'; +import { deleteIcon } from '../svg/delete'; +import { detailsIcon } from '../svg/details'; +import { downloadIcon } from '../svg/download'; +import { editIcon } from '../svg/edit'; import { eventIcon } from '../svg/event'; -import { accessIcon } from '../svg/access'; import { groupsIcon } from '../svg/groups'; -import { subscriptionIcon } from '../svg/subscription'; -import { accountcircleIcon } from '../svg/accountcircle'; -import { addCircleNewIcon } from '../svg/add-circle-new'; -import { editIcon } from '../svg/edit'; -import { resetIcon } from '../svg/reset'; -import { deleteIcon } from '../svg/delete'; -import { visibilityoffIcon } from '../svg/visibilityoff'; -import { visibilityOnIcon } from '../svg/visibility-on'; +import { homeIcon } from '../svg/home'; +import { hourglassTopIcon } from '../svg/hourglass-top'; import { keyIcon } from '../svg/key'; -import { detailsIcon } from '../svg/details'; +import { organizationIcon } from '../svg/organization'; import { paymentsIcon } from '../svg/payments'; +import { piggyBankIcon } from '../svg/piggy-bank'; +import { resetIcon } from '../svg/reset'; +import { settingsIcon } from '../svg/settings'; +import { subscriptionIcon } from '../svg/subscription'; import { ticketIcon } from '../svg/ticket'; -import { downloadIcon } from '../svg/download'; +import { visibilityOnIcon } from '../svg/visibility-on'; +import { visibilityoffIcon } from '../svg/visibilityoff'; const ICONS = [ - checkIcon, - homeIcon, - checkIcon, - addIcon, - organizationIcon, - settingsIcon, - arrowdropdownIcon, - eventIcon, accessIcon, - groupsIcon, - subscriptionIcon, accountcircleIcon, addCircleNewIcon, - editIcon, - resetIcon, + addIcon, + arrowdropdownIcon, + calendarEventIcon, + checkIcon, deleteIcon, - visibilityoffIcon, - visibilityOnIcon, - keyIcon, detailsIcon, + downloadIcon, + editIcon, + eventIcon, + groupsIcon, + homeIcon, + hourglassTopIcon, + keyIcon, + organizationIcon, paymentsIcon, + piggyBankIcon, + resetIcon, + settingsIcon, + subscriptionIcon, ticketIcon, - downloadIcon, + visibilityoffIcon, + visibilityOnIcon, ]; export const ICON_CONFIG = { sizes: { diff --git a/frontend/projects/admin/src/app/svg/calendar-event.ts b/frontend/projects/admin/src/app/svg/calendar-event.ts new file mode 100644 index 0000000000..d33091e601 --- /dev/null +++ b/frontend/projects/admin/src/app/svg/calendar-event.ts @@ -0,0 +1,4 @@ +export const calendarEventIcon = { + data: ``, + name: 'calendar-event' as const +}; \ No newline at end of file diff --git a/frontend/projects/admin/src/app/svg/hourglass-top.ts b/frontend/projects/admin/src/app/svg/hourglass-top.ts new file mode 100644 index 0000000000..5ce9c79df4 --- /dev/null +++ b/frontend/projects/admin/src/app/svg/hourglass-top.ts @@ -0,0 +1,4 @@ +export const hourglassTopIcon = { + data: ``, + name: 'hourglass-top' as const +}; \ No newline at end of file diff --git a/frontend/projects/admin/src/app/svg/piggy-bank.ts b/frontend/projects/admin/src/app/svg/piggy-bank.ts new file mode 100644 index 0000000000..cd15d15ef1 --- /dev/null +++ b/frontend/projects/admin/src/app/svg/piggy-bank.ts @@ -0,0 +1,4 @@ +export const piggyBankIcon = { + data: ``, + name: 'piggy-bank' as const +}; \ No newline at end of file diff --git a/frontend/projects/admin/src/assets/svg/calendar-event.svg b/frontend/projects/admin/src/assets/svg/calendar-event.svg new file mode 100644 index 0000000000..74cda1d15a --- /dev/null +++ b/frontend/projects/admin/src/assets/svg/calendar-event.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/projects/admin/src/assets/svg/hourglass-top.svg b/frontend/projects/admin/src/assets/svg/hourglass-top.svg new file mode 100644 index 0000000000..eb4fa09eb7 --- /dev/null +++ b/frontend/projects/admin/src/assets/svg/hourglass-top.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/projects/admin/src/assets/svg/piggy-bank.svg b/frontend/projects/admin/src/assets/svg/piggy-bank.svg new file mode 100644 index 0000000000..db27be1d2a --- /dev/null +++ b/frontend/projects/admin/src/assets/svg/piggy-bank.svg @@ -0,0 +1 @@ + \ No newline at end of file From d177dcfe09eef3620dafe76ff8f275f820a6bcb3 Mon Sep 17 00:00:00 2001 From: Lorena Mondini <60662357+Lorslux@users.noreply.github.com> Date: Tue, 13 Jun 2023 11:12:46 +0200 Subject: [PATCH 213/218] Translate (#1247) * begining categories * translate api-key list, user system, organizations * translate event dashboard --- .../api-key-system-edit.component.html | 25 +-- .../api-key-system.component.html | 60 +++---- .../app/dashboard/dashboard.component.html | 14 +- .../event-dashboard.component.html | 163 ++++++++++++++---- .../event-menu/event-menu.component.html | 6 +- .../organization-edit.component.html | 39 +++-- .../organizations.component.html | 12 +- .../projects/admin/src/app/shared/icons.ts | 6 + .../projects/admin/src/app/svg/category.ts | 4 + .../projects/admin/src/app/svg/lock-open.ts | 4 + frontend/projects/admin/src/app/svg/search.ts | 4 + .../user-system-edit.component.html | 27 +-- .../user-system/user-system.component.html | 67 +++---- .../admin/src/assets/svg/category.svg | 1 + .../admin/src/assets/svg/lock-open.svg | 1 + .../projects/admin/src/assets/svg/search.svg | 1 + .../resources/alfio/i18n/public.properties | 75 +++++++- 17 files changed, 358 insertions(+), 151 deletions(-) create mode 100644 frontend/projects/admin/src/app/svg/category.ts create mode 100644 frontend/projects/admin/src/app/svg/lock-open.ts create mode 100644 frontend/projects/admin/src/app/svg/search.ts create mode 100644 frontend/projects/admin/src/assets/svg/category.svg create mode 100644 frontend/projects/admin/src/assets/svg/lock-open.svg create mode 100644 frontend/projects/admin/src/assets/svg/search.svg diff --git a/frontend/projects/admin/src/app/api-key-system-edit/api-key-system-edit.component.html b/frontend/projects/admin/src/app/api-key-system-edit/api-key-system-edit.component.html index 9eea01ba03..6d5527c506 100644 --- a/frontend/projects/admin/src/app/api-key-system-edit/api-key-system-edit.component.html +++ b/frontend/projects/admin/src/app/api-key-system-edit/api-key-system-edit.component.html @@ -1,9 +1,12 @@
    -

    User

    +

    - + User
    - + User + translate="admin.common.cancel" + >
    @@ -65,9 +71,8 @@

    User

    type="submit" class="btn btn-lg btn-primary" [disabled]="userForm.invalid" - > - Save - + translate="admin.common.save" + >
    diff --git a/frontend/projects/admin/src/app/api-key-system/api-key-system.component.html b/frontend/projects/admin/src/app/api-key-system/api-key-system.component.html index ecaf67a474..b831b09335 100644 --- a/frontend/projects/admin/src/app/api-key-system/api-key-system.component.html +++ b/frontend/projects/admin/src/app/api-key-system/api-key-system.component.html @@ -1,31 +1,17 @@
    -

    System API Key

    -

    - System API Key can be used from external application to create/modify/delete - organizations and to create API Keys -

    +

    +

    -
    + translate="admin.api-key.list.download-api-keys" + >
    @@ -56,14 +43,18 @@

    System API Key

    - - - - - - - - + + + + + + + + @@ -103,26 +94,27 @@

    System API Key

    *ngIf="user.enabled" class="btn btn-warning" (click)="enable(user)" + translate="admin.api-key.list.disable" > - - Disable diff --git a/frontend/projects/admin/src/app/dashboard/dashboard.component.html b/frontend/projects/admin/src/app/dashboard/dashboard.component.html index 75707fd53f..29b1c428be 100644 --- a/frontend/projects/admin/src/app/dashboard/dashboard.component.html +++ b/frontend/projects/admin/src/app/dashboard/dashboard.component.html @@ -17,23 +17,27 @@

    -
    -

    Active

    +

    Api keyDescriptionRoleMember ofQR CodeEditEnable / DisableDelete + / +
    -
    - - - - + + + + diff --git a/frontend/projects/admin/src/app/shared/icons.ts b/frontend/projects/admin/src/app/shared/icons.ts index d91dff4138..27aca75322 100644 --- a/frontend/projects/admin/src/app/shared/icons.ts +++ b/frontend/projects/admin/src/app/shared/icons.ts @@ -4,6 +4,7 @@ import { addIcon } from '../svg/add'; import { addCircleNewIcon } from '../svg/add-circle-new'; import { arrowdropdownIcon } from '../svg/arrowdropdown'; import { calendarEventIcon } from '../svg/calendar-event'; +import { categoryIcon } from '../svg/category'; import { checkIcon } from '../svg/check'; import { deleteIcon } from '../svg/delete'; import { detailsIcon } from '../svg/details'; @@ -14,10 +15,12 @@ import { groupsIcon } from '../svg/groups'; import { homeIcon } from '../svg/home'; import { hourglassTopIcon } from '../svg/hourglass-top'; import { keyIcon } from '../svg/key'; +import { lockOpenIcon } from '../svg/lock-open'; import { organizationIcon } from '../svg/organization'; import { paymentsIcon } from '../svg/payments'; import { piggyBankIcon } from '../svg/piggy-bank'; import { resetIcon } from '../svg/reset'; +import { searchIcon } from '../svg/search'; import { settingsIcon } from '../svg/settings'; import { subscriptionIcon } from '../svg/subscription'; import { ticketIcon } from '../svg/ticket'; @@ -31,6 +34,7 @@ const ICONS = [ addIcon, arrowdropdownIcon, calendarEventIcon, + categoryIcon, checkIcon, deleteIcon, detailsIcon, @@ -41,10 +45,12 @@ const ICONS = [ homeIcon, hourglassTopIcon, keyIcon, + lockOpenIcon, organizationIcon, paymentsIcon, piggyBankIcon, resetIcon, + searchIcon, settingsIcon, subscriptionIcon, ticketIcon, diff --git a/frontend/projects/admin/src/app/svg/category.ts b/frontend/projects/admin/src/app/svg/category.ts new file mode 100644 index 0000000000..d0be84781e --- /dev/null +++ b/frontend/projects/admin/src/app/svg/category.ts @@ -0,0 +1,4 @@ +export const categoryIcon = { + data: ``, + name: 'category' as const +}; \ No newline at end of file diff --git a/frontend/projects/admin/src/app/svg/lock-open.ts b/frontend/projects/admin/src/app/svg/lock-open.ts new file mode 100644 index 0000000000..07ca2a1ba0 --- /dev/null +++ b/frontend/projects/admin/src/app/svg/lock-open.ts @@ -0,0 +1,4 @@ +export const lockOpenIcon = { + data: ``, + name: 'lock-open' as const +}; \ No newline at end of file diff --git a/frontend/projects/admin/src/app/svg/search.ts b/frontend/projects/admin/src/app/svg/search.ts new file mode 100644 index 0000000000..4c625f88bd --- /dev/null +++ b/frontend/projects/admin/src/app/svg/search.ts @@ -0,0 +1,4 @@ +export const searchIcon = { + data: ``, + name: 'search' as const +}; \ No newline at end of file diff --git a/frontend/projects/admin/src/app/user-system-edit/user-system-edit.component.html b/frontend/projects/admin/src/app/user-system-edit/user-system-edit.component.html index d87968a479..4457c39728 100644 --- a/frontend/projects/admin/src/app/user-system-edit/user-system-edit.component.html +++ b/frontend/projects/admin/src/app/user-system-edit/user-system-edit.component.html @@ -1,8 +1,11 @@
    -

    User

    +

    - +
    - +
    - + User />
    - + User />
    - + User
    - + User + translate="admin.common.cancel" + >
    + translate="admin.common.save" + >
    diff --git a/frontend/projects/admin/src/app/user-system/user-system.component.html b/frontend/projects/admin/src/app/user-system/user-system.component.html index e48ddc4dc9..c1c1e15b95 100644 --- a/frontend/projects/admin/src/app/user-system/user-system.component.html +++ b/frontend/projects/admin/src/app/user-system/user-system.component.html @@ -1,24 +1,24 @@
    -

    Users

    +

    + id="UserOrganizationId" + class="form-select form-control d-flex me-3" + [(ngModel)]="selectedOrganization" + > + + +
    @@ -27,19 +27,27 @@

    Users

    NameDescriptionEmailEdit
    - - - - - - - - - + + + + + + + + + - + diff --git a/frontend/projects/admin/src/assets/svg/category.svg b/frontend/projects/admin/src/assets/svg/category.svg new file mode 100644 index 0000000000..b7996a6365 --- /dev/null +++ b/frontend/projects/admin/src/assets/svg/category.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/projects/admin/src/assets/svg/lock-open.svg b/frontend/projects/admin/src/assets/svg/lock-open.svg new file mode 100644 index 0000000000..5316085624 --- /dev/null +++ b/frontend/projects/admin/src/assets/svg/lock-open.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/projects/admin/src/assets/svg/search.svg b/frontend/projects/admin/src/assets/svg/search.svg new file mode 100644 index 0000000000..f51c92487b --- /dev/null +++ b/frontend/projects/admin/src/assets/svg/search.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/main/resources/alfio/i18n/public.properties b/src/main/resources/alfio/i18n/public.properties index 57dd7192d9..721890bd6d 100644 --- a/src/main/resources/alfio/i18n/public.properties +++ b/src/main/resources/alfio/i18n/public.properties @@ -15,6 +15,7 @@ common.edit=Edit common.confirm=Confirm locale=en + event.get-your-ticket-for=Get your tickets for {0} event-days.same-day={0} from {1} to {2} @@ -606,6 +607,13 @@ link.new-tab=(Opens in a new tab) ## admin related keys +admin.common.add-new=add new +admin.common.name=Name +admin.common.username=Username +admin.common.save=Save +admin.common.cancel=Cancel +admin.common.delete=Delete +admin.common.description=Description admin.menu.events=Events admin.menu.subscriptions=Subscriptions admin.menu.organization=Organization @@ -617,4 +625,69 @@ admin.menu.system.settings=Configuration admin.menu.system.organizations=Organizations admin.menu.system.security=Security admin.dashboard.my-events=My events -admin.organization.select=Select organization \ No newline at end of file +admin.dashboard.export-reservations=Export reservations +admin.dashboard.active=Active +admin.dashboard.past=Past +admin.organization.select=Select organization +admin.organization.list.title=Organizations +admin.organization.new.title=Add a new organization +admin.organization.new.organizer-data=Organizer Data +admin.organization.new.advanced-configuration=Advanced Configuration +admin.organization.new.slug=Slug +admin.organization.new.external-id=External ID (open ID organization ID) +admin.user.list.title=Users +admin.user.list.enabled=Enabled +admin.user.list.disable=Disabled +admin.user.list.username=Username +admin.user.list.role=Role +admin.user.list.member-of=Member of +admin.user.list.reset-password=Reset password +admin.user.new.title=User +admin.user.new.organization=Organization +admin.user.new.role=Role +admin.api-key.list.title=System API Key +admin.api-key.list.text= System API Key can be used from external application to create/modify/delete organizations and to create API Keys +admin.api-key.list.download-api-keys=Download all API Keys for +admin.api-key.list.bulk-creation=Bulk creation +admin.api-key.list.api-key=Api key +admin.api-key.list.description=Description +admin.api-key.list.role=Role +admin.api-key.list.member-of=Member of +admin.api-key.list.qr-code=QR Code +admin.api-key.list.enabled=Enable +admin.api-key.list.disable=Disable +admin.api-key.new.title=User +admin.api-key.new.organization=Organization +admin.api-key.new.role=Role +admin.api-key.new.description=Description + +admin.event-dashboard.total-tickets-confirmed=Total tickets confirmed +admin.event-dashboard.tickets-pending=Tickets pending +admin.event-dashboard.gross-income=Gross income +admin.event-dashboard.logistics-info-and-description=Logistic Info and description +admin.event-dashboard.public-url=Public URL +admin.event-dashboard.organized-by=Organized by +admin.event-dashboard.website-url=Website URL +admin.event-dashboard.t-and-c-url=T&C URL +admin.event-dashboard.privacy-policy-url=Privacy Policy URL +admin.event-dashboard.location=Location +admin.event-dashboard.languages=Languages +admin.event-dashboard.start-date-time=Start Date/Time +admin.event-dashboard.end-date-time=End Date/Time +admin.event-dashboard.time-zone=Time Zone +admin.event-dashboard.seats-and-payment-info=Seats and payment info +admin.event-dashboard.tickets-price=Tickets Price +admin.event-dashboard.free-of-charge=Free of charge +admin.event-dashboard.payment-methods=Payment methods +admin.event-dashboard.max-tickets=Max tickets +admin.event-dashboard.vat=VAT (%) +admin.event-dashboard.final-price=Final Price +admin.event-dashboard.categories=Categories +admin.event-dashboard.categories-legend=Here the categories that have been defined for this event. +admin.event-dashboard.active=Active +admin.event-dashboard.expired=Expired + + +admin.event.menu.details=Details +admin.event.menu.attendees-data-to-collect=Attendees'' data to collect + From 45583aaf834d7b10cb6771b623d1a923d00d4774 Mon Sep 17 00:00:00 2001 From: Lorena Mondini <60662357+Lorslux@users.noreply.github.com> Date: Fri, 16 Jun 2023 16:52:11 +0200 Subject: [PATCH 214/218] Event datail part 2 (#1248) * list menu with icons * Added pipes, progress bar and check box logic part 1 * logic progress bar * Fixed pipe for active and expire * translate * fixed button's esthetic * fixed icons from menu * fixed some classes * added empty component ticket category detail * fixed svg from button * various fixes pr * fixed typos --- .../api-key-system.component.html | 24 +- .../projects/admin/src/app/app.component.scss | 18 +- .../event/email-log/email-log.component.html | 1 + .../event/email-log/email-log.component.scss | 0 .../event/email-log/email-log.component.ts | 15 + .../event-dashboard.component.html | 463 ++++++++++++++++-- .../event-dashboard.component.ts | 52 +- .../event-menu/event-menu.component.html | 136 ++++- .../admin/src/app/event/event.module.ts | 30 +- .../event/show-selected-categories.pipe.ts | 32 ++ .../ticket-category-detail.component.html | 1 + .../ticket-category-detail.component.scss | 0 .../ticket-category-detail.component.ts | 15 + .../src/app/event/ui-category-builder.pipe.ts | 14 + .../projects/admin/src/app/model/event.ts | 4 + .../admin/src/app/shared/event.service.ts | 11 + .../projects/admin/src/app/shared/icons.ts | 27 + .../projects/admin/src/app/svg/arrow-back.ts | 4 + frontend/projects/admin/src/app/svg/close.ts | 4 + .../projects/admin/src/app/svg/description.ts | 4 + .../projects/admin/src/app/svg/email-sent.ts | 4 + frontend/projects/admin/src/app/svg/info.ts | 4 + .../projects/admin/src/app/svg/insights.ts | 4 + frontend/projects/admin/src/app/svg/lock.ts | 4 + .../admin/src/app/svg/outgoing-mail.ts | 4 + .../projects/admin/src/app/svg/percent.ts | 4 + .../projects/admin/src/app/svg/qr-code.ts | 4 + .../admin/src/app/svg/ticket-reserved.ts | 4 + .../admin/src/app/svg/waiting-list.ts | 4 + .../projects/admin/src/app/svg/warning.ts | 4 + .../user-system/user-system.component.html | 21 +- .../admin/src/assets/svg/arrow-back.svg | 1 + .../projects/admin/src/assets/svg/close.svg | 1 + .../admin/src/assets/svg/description.svg | 1 + .../admin/src/assets/svg/email-sent.svg | 1 + .../projects/admin/src/assets/svg/info.svg | 1 + .../admin/src/assets/svg/insights.svg | 1 + .../projects/admin/src/assets/svg/lock.svg | 1 + .../admin/src/assets/svg/outgoing-mail.svg | 1 + .../projects/admin/src/assets/svg/percent.svg | 1 + .../projects/admin/src/assets/svg/qr-code.svg | 1 + .../admin/src/assets/svg/ticket-reserved.svg | 1 + .../admin/src/assets/svg/waiting-list.svg | 1 + .../projects/admin/src/assets/svg/warning.svg | 1 + frontend/projects/admin/src/styles.scss | 9 +- .../public/src/app/model/ticket-category.ts | 133 ++++- .../resources/alfio/i18n/public.properties | 39 +- 47 files changed, 1007 insertions(+), 103 deletions(-) create mode 100644 frontend/projects/admin/src/app/event/email-log/email-log.component.html create mode 100644 frontend/projects/admin/src/app/event/email-log/email-log.component.scss create mode 100644 frontend/projects/admin/src/app/event/email-log/email-log.component.ts create mode 100644 frontend/projects/admin/src/app/event/show-selected-categories.pipe.ts create mode 100644 frontend/projects/admin/src/app/event/ticket-category-detail/ticket-category-detail.component.html create mode 100644 frontend/projects/admin/src/app/event/ticket-category-detail/ticket-category-detail.component.scss create mode 100644 frontend/projects/admin/src/app/event/ticket-category-detail/ticket-category-detail.component.ts create mode 100644 frontend/projects/admin/src/app/event/ui-category-builder.pipe.ts create mode 100644 frontend/projects/admin/src/app/svg/arrow-back.ts create mode 100644 frontend/projects/admin/src/app/svg/close.ts create mode 100644 frontend/projects/admin/src/app/svg/description.ts create mode 100644 frontend/projects/admin/src/app/svg/email-sent.ts create mode 100644 frontend/projects/admin/src/app/svg/info.ts create mode 100644 frontend/projects/admin/src/app/svg/insights.ts create mode 100644 frontend/projects/admin/src/app/svg/lock.ts create mode 100644 frontend/projects/admin/src/app/svg/outgoing-mail.ts create mode 100644 frontend/projects/admin/src/app/svg/percent.ts create mode 100644 frontend/projects/admin/src/app/svg/qr-code.ts create mode 100644 frontend/projects/admin/src/app/svg/ticket-reserved.ts create mode 100644 frontend/projects/admin/src/app/svg/waiting-list.ts create mode 100644 frontend/projects/admin/src/app/svg/warning.ts create mode 100644 frontend/projects/admin/src/assets/svg/arrow-back.svg create mode 100644 frontend/projects/admin/src/assets/svg/close.svg create mode 100644 frontend/projects/admin/src/assets/svg/description.svg create mode 100644 frontend/projects/admin/src/assets/svg/email-sent.svg create mode 100644 frontend/projects/admin/src/assets/svg/info.svg create mode 100644 frontend/projects/admin/src/assets/svg/insights.svg create mode 100644 frontend/projects/admin/src/assets/svg/lock.svg create mode 100644 frontend/projects/admin/src/assets/svg/outgoing-mail.svg create mode 100644 frontend/projects/admin/src/assets/svg/percent.svg create mode 100644 frontend/projects/admin/src/assets/svg/qr-code.svg create mode 100644 frontend/projects/admin/src/assets/svg/ticket-reserved.svg create mode 100644 frontend/projects/admin/src/assets/svg/waiting-list.svg create mode 100644 frontend/projects/admin/src/assets/svg/warning.svg diff --git a/frontend/projects/admin/src/app/api-key-system/api-key-system.component.html b/frontend/projects/admin/src/app/api-key-system/api-key-system.component.html index b831b09335..6e8e4f3709 100644 --- a/frontend/projects/admin/src/app/api-key-system/api-key-system.component.html +++ b/frontend/projects/admin/src/app/api-key-system/api-key-system.component.html @@ -25,16 +25,20 @@

    class="btn btn-warning mx-3" [routerLink]="['/access-control/api-keys/bulk']" > - + @@ -94,27 +98,27 @@

    *ngIf="user.enabled" class="btn btn-warning" (click)="enable(user)" - translate="admin.api-key.list.disable" > - + + diff --git a/frontend/projects/admin/src/app/app.component.scss b/frontend/projects/admin/src/app/app.component.scss index b5d9366bd0..ed3615d9b8 100644 --- a/frontend/projects/admin/src/app/app.component.scss +++ b/frontend/projects/admin/src/app/app.component.scss @@ -1,6 +1,6 @@ -@import 'bootstrap/scss/functions'; -@import 'bootstrap/scss/mixins'; -@import 'bootstrap/scss/variables'; +@import "bootstrap/scss/functions"; +@import "bootstrap/scss/mixins"; +@import "bootstrap/scss/variables"; :host { --header-height: 58px; @@ -14,7 +14,7 @@ header { * Sidebar */ - .sidebar { +.sidebar { position: fixed; top: 0; /* rtl:raw: @@ -25,7 +25,7 @@ header { left: 0; z-index: 100; /* Behind the navbar */ padding: var(--header-height) 0 0; /* Height of navbar */ - box-shadow: inset -1px 0 0 rgba(0, 0, 0, .1); + box-shadow: inset -1px 0 0 rgba(0, 0, 0, 0.1); } .sidebar-sticky { @@ -38,7 +38,7 @@ $sidebarWidth: 76px; nav#sidebarMenu { @include media-breakpoint-up(md) { - width: $sidebarWidth; + width: $sidebarWidth; } a { @@ -58,14 +58,12 @@ nav#sidebarMenu { color: $primary; } - svg-icon, svg { + svg-icon, + svg { display: flex; align-self: center; } - } - - } main { diff --git a/frontend/projects/admin/src/app/event/email-log/email-log.component.html b/frontend/projects/admin/src/app/event/email-log/email-log.component.html new file mode 100644 index 0000000000..8f60b113f6 --- /dev/null +++ b/frontend/projects/admin/src/app/event/email-log/email-log.component.html @@ -0,0 +1 @@ +

    email-log works!

    diff --git a/frontend/projects/admin/src/app/event/email-log/email-log.component.scss b/frontend/projects/admin/src/app/event/email-log/email-log.component.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/frontend/projects/admin/src/app/event/email-log/email-log.component.ts b/frontend/projects/admin/src/app/event/email-log/email-log.component.ts new file mode 100644 index 0000000000..3a55c133d0 --- /dev/null +++ b/frontend/projects/admin/src/app/event/email-log/email-log.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-email-log', + templateUrl: './email-log.component.html', + styleUrls: ['./email-log.component.scss'] +}) +export class EmailLogComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/frontend/projects/admin/src/app/event/event-dashboard/event-dashboard.component.html b/frontend/projects/admin/src/app/event/event-dashboard/event-dashboard.component.html index a1420b13f2..a1d4c85d4e 100644 --- a/frontend/projects/admin/src/app/event/event-dashboard/event-dashboard.component.html +++ b/frontend/projects/admin/src/app/event/event-dashboard/event-dashboard.component.html @@ -2,7 +2,11 @@
    -
    +
    +

    {{ event.displayName }}

    @@ -70,10 +74,13 @@

    {{ event.displayName }}

    -
    +
    {{ event.displayName }}
    -
    +
    translate="admin.common.add-new" > +
    -
    - - -
    -
    - - +
    + +
    +
    +
    +
    +
    +
    +
    +
    +
    + + + + {{ ticketCategory.name }} + +
    +
    + + +
    +
    + + + + + + + + + + + + + + + + +
    +
    +
    +
    +
    +
    +
    + + {{ ticketCategory.attendeesList }} + +
    +
    +
    + + + + + +
    +
    +
    +
    + + + . +
    +
    + + +
    + + + + +
    +
    +
    + +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + +
    +
    +
    +
    +
    + +
    +
    +
    +
    +
    diff --git a/frontend/projects/admin/src/app/event/event-dashboard/event-dashboard.component.ts b/frontend/projects/admin/src/app/event/event-dashboard/event-dashboard.component.ts index 3adda5ebe0..73edb90662 100644 --- a/frontend/projects/admin/src/app/event/event-dashboard/event-dashboard.component.ts +++ b/frontend/projects/admin/src/app/event/event-dashboard/event-dashboard.component.ts @@ -12,6 +12,13 @@ import { EventService } from '../../shared/event.service'; import { formatDate } from '@angular/common'; import { ConfigurationService } from '../../shared/configuration.service'; import { InstanceSetting } from '../../model/instance-settings'; +import { + TicketAccessType, + TicketCategory, + TicketCategoryFilter, + TicketTokenStatus, + UiTicketCategory, +} from 'projects/public/src/app/model/ticket-category'; @Component({ selector: 'app-event-dashboard', @@ -28,7 +35,8 @@ export class EventDashboardComponent implements OnInit { public instanceSetting$: Observable = of(); public pieChartOptions: ChartOptions<'pie'> = { - responsive: false, + responsive: true, + plugins: { legend: { display: true, @@ -51,10 +59,17 @@ export class EventDashboardComponent implements OnInit { datasets: [], }; public lineChartOptions: ChartOptions<'line'> = { - responsive: false, + responsive: true, + maintainAspectRatio: false, }; public lineChartLegend = true; + public categoryFilter: TicketCategoryFilter = { + active: true, + expired: false, + search: '', + }; + constructor( private readonly eventService: EventService, private readonly route: ActivatedRoute, @@ -145,7 +160,7 @@ export class EventDashboardComponent implements OnInit { { value: event.notSoldTickets, name: 'Reserved for categories', - backgroundColor: '#f0ad4e', + backgroundColor: '#00C4FF', meta: 'Reserved for categories (' + event.notSoldTickets + ')', }, { @@ -172,5 +187,36 @@ export class EventDashboardComponent implements OnInit { ], }; } + countExpired(ticketCategory: TicketCategory[]) { + return ticketCategory.filter((ticketCategory) => ticketCategory.expired) + .length; + } + countActive(ticketCategory: TicketCategory[]) { + return ticketCategory.filter((ticketCategory) => !ticketCategory.expired) + .length; + } + + getActualCapacity(ticketCategory: TicketCategory, event: EventInfo) { + return ticketCategory.bounded + ? ticketCategory.maxTickets + : event.dynamicAllocation + ticketCategory.soldTickets; + } + + toggleTokenViewCollapse(ticketCategory: UiTicketCategory) { + ticketCategory.tokenViewExpanded = !ticketCategory.tokenViewExpanded; + } + + openConfiguration(event: EventInfo, ticketCategory: TicketCategory) { + alert('TODO'); + } + + containsValidTokens(tokens: TicketTokenStatus[]) { + return tokens.every((token) => token.status !== 'WAITING'); + } + + unbindTickets(eventShortName: string, category: UiTicketCategory) { + this.eventService.unbindTickets(eventShortName, category); + } + ngOnInit(): void {} } diff --git a/frontend/projects/admin/src/app/event/event-menu/event-menu.component.html b/frontend/projects/admin/src/app/event/event-menu/event-menu.component.html index 4eaa89239b..e068c0f869 100644 --- a/frontend/projects/admin/src/app/event/event-menu/event-menu.component.html +++ b/frontend/projects/admin/src/app/event/event-menu/event-menu.component.html @@ -1,10 +1,132 @@ -
      -
    • -
    • -
        +
        +
        +
        + +
        + + + + + + + + + +
        +
        +
        + +
        + + + + + +
        +
        +
        +
        +

        + - -
      +
    +
    diff --git a/frontend/projects/admin/src/app/event/event.module.ts b/frontend/projects/admin/src/app/event/event.module.ts index da3bd7a638..fb148989f7 100644 --- a/frontend/projects/admin/src/app/event/event.module.ts +++ b/frontend/projects/admin/src/app/event/event.module.ts @@ -1,7 +1,12 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { NgbCarouselModule, NgbNavModule } from '@ng-bootstrap/ng-bootstrap'; +import { + NgbCarouselModule, + NgbDropdownModule, + NgbNavModule, + NgbTypeaheadModule, +} from '@ng-bootstrap/ng-bootstrap'; import { provideSvgIconsConfig, SvgIconComponent } from '@ngneat/svg-icon'; import { TranslateModule } from '@ngx-translate/core'; import { NgChartsModule } from 'ng2-charts'; @@ -12,9 +17,22 @@ import { SharedModule } from '../shared/shared.module'; import { EventDashboardComponent } from './event-dashboard/event-dashboard.component'; import { EventMenuComponent } from './event-menu/event-menu.component'; import { TranslatePaymentProxiesPipe } from './translate-payment-proxies.pipe'; +import { EmailLogComponent } from './email-log/email-log.component'; +import { ShowSelectedCategoriesPipe } from './show-selected-categories.pipe'; +import { UiCategoryBuilderPipe } from './ui-category-builder.pipe'; +import { FormsModule } from '@angular/forms'; +import { TicketCategoryDetailComponent } from './ticket-category-detail/ticket-category-detail.component'; @NgModule({ - declarations: [EventMenuComponent, EventDashboardComponent, TranslatePaymentProxiesPipe], + declarations: [ + EventMenuComponent, + EventDashboardComponent, + TranslatePaymentProxiesPipe, + EmailLogComponent, + ShowSelectedCategoriesPipe, + UiCategoryBuilderPipe, + TicketCategoryDetailComponent, + ], imports: [ TranslateModule.forChild(), CommonModule, @@ -23,7 +41,13 @@ import { TranslatePaymentProxiesPipe } from './translate-payment-proxies.pipe'; NgChartsModule, NgbCarouselModule, NgbNavModule, - RouterModule.forChild([{ path: '', component: EventDashboardComponent }]), + FormsModule, + NgbDropdownModule, + + RouterModule.forChild([ + { path: '', component: EventDashboardComponent }, + { path: 'email-log', component: EmailLogComponent }, + ]), ], providers: [ OrganizationService, diff --git a/frontend/projects/admin/src/app/event/show-selected-categories.pipe.ts b/frontend/projects/admin/src/app/event/show-selected-categories.pipe.ts new file mode 100644 index 0000000000..70293057b2 --- /dev/null +++ b/frontend/projects/admin/src/app/event/show-selected-categories.pipe.ts @@ -0,0 +1,32 @@ +import { Pipe, PipeTransform } from '@angular/core'; +import { + TicketCategoryFilter, + UiTicketCategory, +} from 'projects/public/src/app/model/ticket-category'; + +@Pipe({ + name: 'showSelectedCategories', + pure: false, +}) +export class ShowSelectedCategoriesPipe implements PipeTransform { + transform( + categories: UiTicketCategory[], + criteria: TicketCategoryFilter + ): UiTicketCategory[] { + if (criteria.active && criteria.expired && criteria.search === '') { + return categories; + } + return categories.filter((category) => { + const result = + (criteria.active && !category.expired) || + (criteria.expired && category.expired); + if (result && criteria.search !== '') { + return ( + category.name.toLowerCase().indexOf(criteria.search.toLowerCase()) > + -1 + ); + } + return result; + }); + } +} diff --git a/frontend/projects/admin/src/app/event/ticket-category-detail/ticket-category-detail.component.html b/frontend/projects/admin/src/app/event/ticket-category-detail/ticket-category-detail.component.html new file mode 100644 index 0000000000..3e6fafed66 --- /dev/null +++ b/frontend/projects/admin/src/app/event/ticket-category-detail/ticket-category-detail.component.html @@ -0,0 +1 @@ +

    ticket-category-detail works!

    diff --git a/frontend/projects/admin/src/app/event/ticket-category-detail/ticket-category-detail.component.scss b/frontend/projects/admin/src/app/event/ticket-category-detail/ticket-category-detail.component.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/frontend/projects/admin/src/app/event/ticket-category-detail/ticket-category-detail.component.ts b/frontend/projects/admin/src/app/event/ticket-category-detail/ticket-category-detail.component.ts new file mode 100644 index 0000000000..5134aec103 --- /dev/null +++ b/frontend/projects/admin/src/app/event/ticket-category-detail/ticket-category-detail.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-ticket-category-detail', + templateUrl: './ticket-category-detail.component.html', + styleUrls: ['./ticket-category-detail.component.scss'] +}) +export class TicketCategoryDetailComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/frontend/projects/admin/src/app/event/ui-category-builder.pipe.ts b/frontend/projects/admin/src/app/event/ui-category-builder.pipe.ts new file mode 100644 index 0000000000..c04db835fd --- /dev/null +++ b/frontend/projects/admin/src/app/event/ui-category-builder.pipe.ts @@ -0,0 +1,14 @@ +import { Pipe, PipeTransform } from '@angular/core'; +import { + TicketCategory, + UiTicketCategory, +} from 'projects/public/src/app/model/ticket-category'; + +@Pipe({ + name: 'uiCategoryBuilder', +}) +export class UiCategoryBuilderPipe implements PipeTransform { + transform(categories: TicketCategory[]): UiTicketCategory[] { + return categories.map((category) => new UiTicketCategory(category)); + } +} diff --git a/frontend/projects/admin/src/app/model/event.ts b/frontend/projects/admin/src/app/model/event.ts index fab44f7749..f7cf4c4f14 100644 --- a/frontend/projects/admin/src/app/model/event.ts +++ b/frontend/projects/admin/src/app/model/event.ts @@ -1,3 +1,4 @@ +import { TicketCategory } from 'projects/public/src/app/model/ticket-category'; import { Organization } from './organization'; export interface EventInfo { @@ -40,6 +41,9 @@ export interface EventInfo { regularPrice: number; finalPrice: number; vatPercentage: number; + ticketCategories: TicketCategory[]; + format: string; + containingUnboundedCategories: boolean; } export interface EventOrganizationInfo { diff --git a/frontend/projects/admin/src/app/shared/event.service.ts b/frontend/projects/admin/src/app/shared/event.service.ts index 6b3d1cfd78..e56613e694 100644 --- a/frontend/projects/admin/src/app/shared/event.service.ts +++ b/frontend/projects/admin/src/app/shared/event.service.ts @@ -7,6 +7,7 @@ import { EventOrganizationInfo, EventTicketsStatistics, } from '../model/event'; +import { UiTicketCategory } from 'projects/public/src/app/model/ticket-category'; @Injectable() export class EventService { @@ -45,4 +46,14 @@ export class EventService { `/admin/api/events/${eventShortName}/ticket-sold-statistics` ); } + unbindTickets(eventShortName: string, category: UiTicketCategory) { + return this.httpClient.put( + '/admin/api/events/' + + eventShortName + + '/category/' + + category.id + + '/unbind-tickets', + null + ); + } } diff --git a/frontend/projects/admin/src/app/shared/icons.ts b/frontend/projects/admin/src/app/shared/icons.ts index 27aca75322..7377ee53f3 100644 --- a/frontend/projects/admin/src/app/shared/icons.ts +++ b/frontend/projects/admin/src/app/shared/icons.ts @@ -2,60 +2,87 @@ import { accessIcon } from '../svg/access'; import { accountcircleIcon } from '../svg/accountcircle'; import { addIcon } from '../svg/add'; import { addCircleNewIcon } from '../svg/add-circle-new'; +import { arrowBackIcon } from '../svg/arrow-back'; import { arrowdropdownIcon } from '../svg/arrowdropdown'; import { calendarEventIcon } from '../svg/calendar-event'; import { categoryIcon } from '../svg/category'; import { checkIcon } from '../svg/check'; +import { closeIcon } from '../svg/close'; import { deleteIcon } from '../svg/delete'; +import { descriptionIcon } from '../svg/description'; import { detailsIcon } from '../svg/details'; import { downloadIcon } from '../svg/download'; import { editIcon } from '../svg/edit'; +import { emailSentIcon } from '../svg/email-sent'; import { eventIcon } from '../svg/event'; import { groupsIcon } from '../svg/groups'; import { homeIcon } from '../svg/home'; import { hourglassTopIcon } from '../svg/hourglass-top'; +import { infoIcon } from '../svg/info'; +import { insightsIcon } from '../svg/insights'; import { keyIcon } from '../svg/key'; +import { lockIcon } from '../svg/lock'; import { lockOpenIcon } from '../svg/lock-open'; import { organizationIcon } from '../svg/organization'; +import { outgoingMailIcon } from '../svg/outgoing-mail'; import { paymentsIcon } from '../svg/payments'; +import { percentIcon } from '../svg/percent'; import { piggyBankIcon } from '../svg/piggy-bank'; +import { qrCodeIcon } from '../svg/qr-code'; import { resetIcon } from '../svg/reset'; import { searchIcon } from '../svg/search'; import { settingsIcon } from '../svg/settings'; import { subscriptionIcon } from '../svg/subscription'; import { ticketIcon } from '../svg/ticket'; +import { ticketReservedIcon } from '../svg/ticket-reserved'; import { visibilityOnIcon } from '../svg/visibility-on'; import { visibilityoffIcon } from '../svg/visibilityoff'; +import { waitingListIcon } from '../svg/waiting-list'; +import { warningIcon } from '../svg/warning'; const ICONS = [ accessIcon, accountcircleIcon, addCircleNewIcon, addIcon, + arrowBackIcon, arrowdropdownIcon, calendarEventIcon, categoryIcon, checkIcon, deleteIcon, + descriptionIcon, detailsIcon, downloadIcon, editIcon, + emailSentIcon, eventIcon, groupsIcon, homeIcon, hourglassTopIcon, + insightsIcon, keyIcon, + lockIcon, lockOpenIcon, organizationIcon, paymentsIcon, + percentIcon, piggyBankIcon, resetIcon, searchIcon, settingsIcon, subscriptionIcon, ticketIcon, + ticketReservedIcon, visibilityoffIcon, visibilityOnIcon, + waitingListIcon, + lockIcon, + outgoingMailIcon, + qrCodeIcon, + warningIcon, + closeIcon, + infoIcon, ]; export const ICON_CONFIG = { sizes: { diff --git a/frontend/projects/admin/src/app/svg/arrow-back.ts b/frontend/projects/admin/src/app/svg/arrow-back.ts new file mode 100644 index 0000000000..ab150e0245 --- /dev/null +++ b/frontend/projects/admin/src/app/svg/arrow-back.ts @@ -0,0 +1,4 @@ +export const arrowBackIcon = { + data: ``, + name: 'arrow-back' as const +}; \ No newline at end of file diff --git a/frontend/projects/admin/src/app/svg/close.ts b/frontend/projects/admin/src/app/svg/close.ts new file mode 100644 index 0000000000..64683a5a67 --- /dev/null +++ b/frontend/projects/admin/src/app/svg/close.ts @@ -0,0 +1,4 @@ +export const closeIcon = { + data: ``, + name: 'close' as const +}; \ No newline at end of file diff --git a/frontend/projects/admin/src/app/svg/description.ts b/frontend/projects/admin/src/app/svg/description.ts new file mode 100644 index 0000000000..f2e4423d29 --- /dev/null +++ b/frontend/projects/admin/src/app/svg/description.ts @@ -0,0 +1,4 @@ +export const descriptionIcon = { + data: ``, + name: 'description' as const +}; \ No newline at end of file diff --git a/frontend/projects/admin/src/app/svg/email-sent.ts b/frontend/projects/admin/src/app/svg/email-sent.ts new file mode 100644 index 0000000000..81353de4f3 --- /dev/null +++ b/frontend/projects/admin/src/app/svg/email-sent.ts @@ -0,0 +1,4 @@ +export const emailSentIcon = { + data: ``, + name: 'email-sent' as const +}; \ No newline at end of file diff --git a/frontend/projects/admin/src/app/svg/info.ts b/frontend/projects/admin/src/app/svg/info.ts new file mode 100644 index 0000000000..a6ed8645d5 --- /dev/null +++ b/frontend/projects/admin/src/app/svg/info.ts @@ -0,0 +1,4 @@ +export const infoIcon = { + data: ``, + name: 'info' as const +}; \ No newline at end of file diff --git a/frontend/projects/admin/src/app/svg/insights.ts b/frontend/projects/admin/src/app/svg/insights.ts new file mode 100644 index 0000000000..02bc9ba3c9 --- /dev/null +++ b/frontend/projects/admin/src/app/svg/insights.ts @@ -0,0 +1,4 @@ +export const insightsIcon = { + data: ``, + name: 'insights' as const +}; \ No newline at end of file diff --git a/frontend/projects/admin/src/app/svg/lock.ts b/frontend/projects/admin/src/app/svg/lock.ts new file mode 100644 index 0000000000..9359492e22 --- /dev/null +++ b/frontend/projects/admin/src/app/svg/lock.ts @@ -0,0 +1,4 @@ +export const lockIcon = { + data: ``, + name: 'lock' as const +}; \ No newline at end of file diff --git a/frontend/projects/admin/src/app/svg/outgoing-mail.ts b/frontend/projects/admin/src/app/svg/outgoing-mail.ts new file mode 100644 index 0000000000..58d930fca3 --- /dev/null +++ b/frontend/projects/admin/src/app/svg/outgoing-mail.ts @@ -0,0 +1,4 @@ +export const outgoingMailIcon = { + data: ``, + name: 'outgoing-mail' as const +}; \ No newline at end of file diff --git a/frontend/projects/admin/src/app/svg/percent.ts b/frontend/projects/admin/src/app/svg/percent.ts new file mode 100644 index 0000000000..05f6fb1a41 --- /dev/null +++ b/frontend/projects/admin/src/app/svg/percent.ts @@ -0,0 +1,4 @@ +export const percentIcon = { + data: ``, + name: 'percent' as const +}; \ No newline at end of file diff --git a/frontend/projects/admin/src/app/svg/qr-code.ts b/frontend/projects/admin/src/app/svg/qr-code.ts new file mode 100644 index 0000000000..31ef01a211 --- /dev/null +++ b/frontend/projects/admin/src/app/svg/qr-code.ts @@ -0,0 +1,4 @@ +export const qrCodeIcon = { + data: ``, + name: 'qr-code' as const +}; \ No newline at end of file diff --git a/frontend/projects/admin/src/app/svg/ticket-reserved.ts b/frontend/projects/admin/src/app/svg/ticket-reserved.ts new file mode 100644 index 0000000000..1bf2e5876f --- /dev/null +++ b/frontend/projects/admin/src/app/svg/ticket-reserved.ts @@ -0,0 +1,4 @@ +export const ticketReservedIcon = { + data: ``, + name: 'ticket-reserved' as const +}; \ No newline at end of file diff --git a/frontend/projects/admin/src/app/svg/waiting-list.ts b/frontend/projects/admin/src/app/svg/waiting-list.ts new file mode 100644 index 0000000000..bdc6d7b78e --- /dev/null +++ b/frontend/projects/admin/src/app/svg/waiting-list.ts @@ -0,0 +1,4 @@ +export const waitingListIcon = { + data: ``, + name: 'waiting-list' as const +}; \ No newline at end of file diff --git a/frontend/projects/admin/src/app/svg/warning.ts b/frontend/projects/admin/src/app/svg/warning.ts new file mode 100644 index 0000000000..a978066122 --- /dev/null +++ b/frontend/projects/admin/src/app/svg/warning.ts @@ -0,0 +1,4 @@ +export const warningIcon = { + data: ``, + name: 'warning' as const +}; \ No newline at end of file diff --git a/frontend/projects/admin/src/app/user-system/user-system.component.html b/frontend/projects/admin/src/app/user-system/user-system.component.html index c1c1e15b95..cab790a3c1 100644 --- a/frontend/projects/admin/src/app/user-system/user-system.component.html +++ b/frontend/projects/admin/src/app/user-system/user-system.component.html @@ -14,10 +14,10 @@

    @@ -83,25 +83,22 @@

    class="btn btn-warning" (click)="enable(user)" > - + +
    diff --git a/frontend/projects/admin/src/assets/svg/arrow-back.svg b/frontend/projects/admin/src/assets/svg/arrow-back.svg new file mode 100644 index 0000000000..5811847c7d --- /dev/null +++ b/frontend/projects/admin/src/assets/svg/arrow-back.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/projects/admin/src/assets/svg/close.svg b/frontend/projects/admin/src/assets/svg/close.svg new file mode 100644 index 0000000000..ded3e2a6e7 --- /dev/null +++ b/frontend/projects/admin/src/assets/svg/close.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/projects/admin/src/assets/svg/description.svg b/frontend/projects/admin/src/assets/svg/description.svg new file mode 100644 index 0000000000..fcdbdfcc32 --- /dev/null +++ b/frontend/projects/admin/src/assets/svg/description.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/projects/admin/src/assets/svg/email-sent.svg b/frontend/projects/admin/src/assets/svg/email-sent.svg new file mode 100644 index 0000000000..f98549747c --- /dev/null +++ b/frontend/projects/admin/src/assets/svg/email-sent.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/projects/admin/src/assets/svg/info.svg b/frontend/projects/admin/src/assets/svg/info.svg new file mode 100644 index 0000000000..cb0add7937 --- /dev/null +++ b/frontend/projects/admin/src/assets/svg/info.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/projects/admin/src/assets/svg/insights.svg b/frontend/projects/admin/src/assets/svg/insights.svg new file mode 100644 index 0000000000..2fc09b2df5 --- /dev/null +++ b/frontend/projects/admin/src/assets/svg/insights.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/projects/admin/src/assets/svg/lock.svg b/frontend/projects/admin/src/assets/svg/lock.svg new file mode 100644 index 0000000000..9ef76e5368 --- /dev/null +++ b/frontend/projects/admin/src/assets/svg/lock.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/projects/admin/src/assets/svg/outgoing-mail.svg b/frontend/projects/admin/src/assets/svg/outgoing-mail.svg new file mode 100644 index 0000000000..1fc98d35a9 --- /dev/null +++ b/frontend/projects/admin/src/assets/svg/outgoing-mail.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/projects/admin/src/assets/svg/percent.svg b/frontend/projects/admin/src/assets/svg/percent.svg new file mode 100644 index 0000000000..e15c8b523c --- /dev/null +++ b/frontend/projects/admin/src/assets/svg/percent.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/projects/admin/src/assets/svg/qr-code.svg b/frontend/projects/admin/src/assets/svg/qr-code.svg new file mode 100644 index 0000000000..6ab295d9df --- /dev/null +++ b/frontend/projects/admin/src/assets/svg/qr-code.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/projects/admin/src/assets/svg/ticket-reserved.svg b/frontend/projects/admin/src/assets/svg/ticket-reserved.svg new file mode 100644 index 0000000000..c34fbb89e3 --- /dev/null +++ b/frontend/projects/admin/src/assets/svg/ticket-reserved.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/projects/admin/src/assets/svg/waiting-list.svg b/frontend/projects/admin/src/assets/svg/waiting-list.svg new file mode 100644 index 0000000000..3376369847 --- /dev/null +++ b/frontend/projects/admin/src/assets/svg/waiting-list.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/projects/admin/src/assets/svg/warning.svg b/frontend/projects/admin/src/assets/svg/warning.svg new file mode 100644 index 0000000000..21f59d38a4 --- /dev/null +++ b/frontend/projects/admin/src/assets/svg/warning.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/projects/admin/src/styles.scss b/frontend/projects/admin/src/styles.scss index d7b9fbc201..3394866fa0 100644 --- a/frontend/projects/admin/src/styles.scss +++ b/frontend/projects/admin/src/styles.scss @@ -3,4 +3,11 @@ @import "font/font.scss"; /* Importing Bootstrap SCSS file. */ -@import 'bootstrap/scss/bootstrap'; +@import "bootstrap/scss/bootstrap"; + +.btn, +.input-group { + svg-icon { + line-height: 0; + } +} diff --git a/frontend/projects/public/src/app/model/ticket-category.ts b/frontend/projects/public/src/app/model/ticket-category.ts index 3b190b4f64..665eac6b9c 100644 --- a/frontend/projects/public/src/app/model/ticket-category.ts +++ b/frontend/projects/public/src/app/model/ticket-category.ts @@ -1,31 +1,116 @@ export type TicketAccessType = 'INHERIT' | 'IN_PERSON' | 'ONLINE'; -export class TicketCategory { - id: number; - name: string; - ticketAccessType: TicketAccessType; - bounded: boolean; - maximumSaleableTickets: number; - description: {[key: string]: string}; - free: boolean; - formattedFinalPrice: string; - hasDiscount: boolean; - formattedDiscountedPrice: string; - - - // - expired: boolean; - saleInFuture: boolean; - formattedInception: {[key: string]: string}; - formattedExpiration: {[key: string]: string}; - // +export interface TicketTokenStatus { + accessCodeId: number | null; + code: string; + id: number; + priceInCents: number; + recipientEmail: string | null; + recipientName: string | null; + sentTimestamp: string | null; + status: string; + ticketCategoryId: number; +} - saleableAndLimitNotReached: boolean; - accessRestricted: boolean; - soldOutOrLimitReached: boolean; +export interface TicketCategory { + accessRestricted: boolean; + availableTickets: number | null; + bounded: boolean; + checkedInTickets: number; + containingOrphans: boolean; + containingStuckTickets: boolean; + description: { [key: string]: string }; + displayTaxInformation: boolean; + expired: boolean; + formattedDiscountedPrice: string; + formattedExpiration: { [key: string]: string }; + formattedFinalPrice: string; + formattedInception: { [key: string]: string }; + free: boolean; + hasDiscount: boolean; + id: number; + maximumSaleableTickets: number; + maxTickets: number; + name: string; + notSoldTickets: number; + pendingTickets: number; + saleableAndLimitNotReached: boolean; + saleInFuture: boolean; + soldOutOrLimitReached: boolean; + soldTickets: number; + ticketAccessType: TicketAccessType; + tokenStatus: TicketTokenStatus[]; +} - availableTickets: number | null; +export class UiTicketCategory implements TicketCategory { + accessRestricted: boolean; + availableTickets: number | null; + bounded: boolean; + checkedInTickets: number; + containingOrphans: boolean; + containingStuckTickets: boolean; + description: { [key: string]: string }; + displayTaxInformation: boolean; + displayWarning: boolean; + expired: boolean; + formattedDiscountedPrice: string; + formattedExpiration: { [key: string]: string }; + formattedFinalPrice: string; + formattedInception: { [key: string]: string }; + free: boolean; + hasDiscount: boolean; + id: number; + maximumSaleableTickets: number; + maxTickets: number; + name: string; + notSoldTickets: number; + pendingTickets: number; + saleableAndLimitNotReached: boolean; + saleInFuture: boolean; + soldOutOrLimitReached: boolean; + soldTickets: number; + ticketAccessType: TicketAccessType; + tokenViewExpanded: boolean; + attendeesList: { groupId: number; groupName: string } | null; + tokenStatus: TicketTokenStatus[]; - displayTaxInformation: boolean; + constructor(ticketCategory: TicketCategory) { + this.accessRestricted = ticketCategory.accessRestricted; + this.availableTickets = ticketCategory.availableTickets; + this.bounded = ticketCategory.bounded; + this.checkedInTickets = ticketCategory.checkedInTickets; + this.containingOrphans = ticketCategory.containingOrphans; + this.containingStuckTickets = ticketCategory.containingStuckTickets; + this.description = ticketCategory.description; + this.displayTaxInformation = ticketCategory.displayTaxInformation; + this.displayWarning = + ticketCategory.containingStuckTickets || ticketCategory.containingOrphans; + this.expired = ticketCategory.expired; + this.formattedDiscountedPrice = ticketCategory.formattedDiscountedPrice; + this.formattedExpiration = ticketCategory.formattedExpiration; + this.formattedFinalPrice = ticketCategory.formattedFinalPrice; + this.formattedInception = ticketCategory.formattedInception; + this.free = ticketCategory.free; + this.hasDiscount = ticketCategory.hasDiscount; + this.id = ticketCategory.id; + this.maximumSaleableTickets = ticketCategory.maximumSaleableTickets; + this.maxTickets = ticketCategory.maxTickets; + this.name = ticketCategory.name; + this.saleableAndLimitNotReached = ticketCategory.saleableAndLimitNotReached; + this.saleInFuture = ticketCategory.saleInFuture; + this.soldOutOrLimitReached = ticketCategory.soldOutOrLimitReached; + this.soldTickets = ticketCategory.soldTickets; + this.ticketAccessType = ticketCategory.ticketAccessType; + this.pendingTickets = ticketCategory.pendingTickets; + this.notSoldTickets = ticketCategory.notSoldTickets; + this.tokenStatus = ticketCategory.tokenStatus; + this.tokenViewExpanded = false; + this.attendeesList = null; + } } +export interface TicketCategoryFilter { + active: boolean; + expired: boolean; + search: string; +} diff --git a/src/main/resources/alfio/i18n/public.properties b/src/main/resources/alfio/i18n/public.properties index 721890bd6d..9b3cbdfd82 100644 --- a/src/main/resources/alfio/i18n/public.properties +++ b/src/main/resources/alfio/i18n/public.properties @@ -686,8 +686,43 @@ admin.event-dashboard.categories=Categories admin.event-dashboard.categories-legend=Here the categories that have been defined for this event. admin.event-dashboard.active=Active admin.event-dashboard.expired=Expired - +admin.event-dashboard.alert-warning=No categories matching the selected criteria have been found. +admin.event-dashboard.online=Online +admin.event-dashboard.tickets=Tickets +admin.event-dashboard.tokens=Tokens +admin.event-dashboard.options=Options +admin.event-dashboard.send-invitations=Send invitations +admin.event-dashboard.configure=Configure +admin.event-dashboard.alert-message-limited-group=Access to this category has been limited to Group +admin.event-dashboard.alert-message-category-tickets-unknown-state=This category contains tickets whose reservations are in an unknown state. This could happen when we have troubles after receiving a response from the Payment Gateway. Please +admin.event-dashboard.alert-message-category-tickets-unknown-state-link=fix them +admin.event-dashboard.edit-category=Edit category +admin.event-dashboard.message-orphans=This category contains allocated tickets that cannot be sold anymore. Move them to another category: +admin.event-dashboard.apply=apply +admin.event-dashboard.assign-to-dynamic-categories=Assign to dynamic categories +admin.event-dashboard.message-token-generation=Token generation in progress. Please wait 30s and then reload the page. admin.event.menu.details=Details admin.event.menu.attendees-data-to-collect=Attendees'' data to collect - +admin.event.menu.promo-codes=Promo Codes +admin.event.menu.polls=Polls +admin.event.menu.reservations=Reservations +admin.event.menu.email-log=E-mail log +admin.event.menu.status=Status +admin.event.menu.waiting-list=Waiting list +admin.event.menu.back-to-event-detail=back to event detail +admin.event.menu.actions=Actions +admin.event.menu.create-reservation=Create reservation +admin.event.menu.import-attendees=Import attendees +admin.event.menu.edit-configuration=Edit configuration +admin.event.menu.customize-templates=Customize templates +admin.event.menu.compose-message=Compose message +admin.event.menu.hide-from-list=Hide from list +admin.event.menu.check-in=Check in +admin.event.menu.copy-this-event=Copy this event +admin.event.menu.download=Download +admin.event.menu.attendees-data=Attendees'' data + +admin.event.menu.sponsors-scan=Sponsors scan +admin.event.menu.all-billing-documents-pdf=All billing documents (PDF) +admin.event.menu.all-billing-excel=All Billing Documents (Excel) From 9a775500e67d70e28a79ade1085f3af7f4bf572a Mon Sep 17 00:00:00 2001 From: Celestino Bellone <3385346+cbellone@users.noreply.github.com> Date: Sun, 25 Jun 2023 17:49:01 +0200 Subject: [PATCH 215/218] update public frontend --- .../additional-service-quantity-selector.html | 4 +- .../public/src/app/model/ticket-category.ts | 133 ++++-------------- .../booking/booking.component.html | 2 +- .../reservation/booking/booking.component.ts | 7 +- .../download-ticket.component.html | 4 +- .../invoice-form/invoice-form.component.html | 4 +- .../success-subscription.component.ts | 6 +- .../success/success.component.html | 2 +- .../subscription-summary.component.html | 2 +- .../subscription-summary.component.ts | 7 + 10 files changed, 50 insertions(+), 121 deletions(-) diff --git a/frontend/projects/public/src/app/additional-service-quantity-selector/additional-service-quantity-selector.html b/frontend/projects/public/src/app/additional-service-quantity-selector/additional-service-quantity-selector.html index 347a6efe30..8edc795455 100644 --- a/frontend/projects/public/src/app/additional-service-quantity-selector/additional-service-quantity-selector.html +++ b/frontend/projects/public/src/app/additional-service-quantity-selector/additional-service-quantity-selector.html @@ -12,7 +12,9 @@
    - {{event.currency}} +
    + {{event.currency}} +
    diff --git a/frontend/projects/public/src/app/model/ticket-category.ts b/frontend/projects/public/src/app/model/ticket-category.ts index 665eac6b9c..3b190b4f64 100644 --- a/frontend/projects/public/src/app/model/ticket-category.ts +++ b/frontend/projects/public/src/app/model/ticket-category.ts @@ -1,116 +1,31 @@ export type TicketAccessType = 'INHERIT' | 'IN_PERSON' | 'ONLINE'; -export interface TicketTokenStatus { - accessCodeId: number | null; - code: string; - id: number; - priceInCents: number; - recipientEmail: string | null; - recipientName: string | null; - sentTimestamp: string | null; - status: string; - ticketCategoryId: number; -} +export class TicketCategory { + id: number; + name: string; + ticketAccessType: TicketAccessType; + bounded: boolean; + maximumSaleableTickets: number; + description: {[key: string]: string}; + free: boolean; + formattedFinalPrice: string; + hasDiscount: boolean; + formattedDiscountedPrice: string; -export interface TicketCategory { - accessRestricted: boolean; - availableTickets: number | null; - bounded: boolean; - checkedInTickets: number; - containingOrphans: boolean; - containingStuckTickets: boolean; - description: { [key: string]: string }; - displayTaxInformation: boolean; - expired: boolean; - formattedDiscountedPrice: string; - formattedExpiration: { [key: string]: string }; - formattedFinalPrice: string; - formattedInception: { [key: string]: string }; - free: boolean; - hasDiscount: boolean; - id: number; - maximumSaleableTickets: number; - maxTickets: number; - name: string; - notSoldTickets: number; - pendingTickets: number; - saleableAndLimitNotReached: boolean; - saleInFuture: boolean; - soldOutOrLimitReached: boolean; - soldTickets: number; - ticketAccessType: TicketAccessType; - tokenStatus: TicketTokenStatus[]; -} -export class UiTicketCategory implements TicketCategory { - accessRestricted: boolean; - availableTickets: number | null; - bounded: boolean; - checkedInTickets: number; - containingOrphans: boolean; - containingStuckTickets: boolean; - description: { [key: string]: string }; - displayTaxInformation: boolean; - displayWarning: boolean; - expired: boolean; - formattedDiscountedPrice: string; - formattedExpiration: { [key: string]: string }; - formattedFinalPrice: string; - formattedInception: { [key: string]: string }; - free: boolean; - hasDiscount: boolean; - id: number; - maximumSaleableTickets: number; - maxTickets: number; - name: string; - notSoldTickets: number; - pendingTickets: number; - saleableAndLimitNotReached: boolean; - saleInFuture: boolean; - soldOutOrLimitReached: boolean; - soldTickets: number; - ticketAccessType: TicketAccessType; - tokenViewExpanded: boolean; - attendeesList: { groupId: number; groupName: string } | null; - tokenStatus: TicketTokenStatus[]; + // + expired: boolean; + saleInFuture: boolean; + formattedInception: {[key: string]: string}; + formattedExpiration: {[key: string]: string}; + // - constructor(ticketCategory: TicketCategory) { - this.accessRestricted = ticketCategory.accessRestricted; - this.availableTickets = ticketCategory.availableTickets; - this.bounded = ticketCategory.bounded; - this.checkedInTickets = ticketCategory.checkedInTickets; - this.containingOrphans = ticketCategory.containingOrphans; - this.containingStuckTickets = ticketCategory.containingStuckTickets; - this.description = ticketCategory.description; - this.displayTaxInformation = ticketCategory.displayTaxInformation; - this.displayWarning = - ticketCategory.containingStuckTickets || ticketCategory.containingOrphans; - this.expired = ticketCategory.expired; - this.formattedDiscountedPrice = ticketCategory.formattedDiscountedPrice; - this.formattedExpiration = ticketCategory.formattedExpiration; - this.formattedFinalPrice = ticketCategory.formattedFinalPrice; - this.formattedInception = ticketCategory.formattedInception; - this.free = ticketCategory.free; - this.hasDiscount = ticketCategory.hasDiscount; - this.id = ticketCategory.id; - this.maximumSaleableTickets = ticketCategory.maximumSaleableTickets; - this.maxTickets = ticketCategory.maxTickets; - this.name = ticketCategory.name; - this.saleableAndLimitNotReached = ticketCategory.saleableAndLimitNotReached; - this.saleInFuture = ticketCategory.saleInFuture; - this.soldOutOrLimitReached = ticketCategory.soldOutOrLimitReached; - this.soldTickets = ticketCategory.soldTickets; - this.ticketAccessType = ticketCategory.ticketAccessType; - this.pendingTickets = ticketCategory.pendingTickets; - this.notSoldTickets = ticketCategory.notSoldTickets; - this.tokenStatus = ticketCategory.tokenStatus; - this.tokenViewExpanded = false; - this.attendeesList = null; - } -} + saleableAndLimitNotReached: boolean; + accessRestricted: boolean; + soldOutOrLimitReached: boolean; -export interface TicketCategoryFilter { - active: boolean; - expired: boolean; - search: string; + availableTickets: number | null; + + displayTaxInformation: boolean; } + diff --git a/frontend/projects/public/src/app/reservation/booking/booking.component.html b/frontend/projects/public/src/app/reservation/booking/booking.component.html index ff7c714a67..1311c54160 100644 --- a/frontend/projects/public/src/app/reservation/booking/booking.component.html +++ b/frontend/projects/public/src/app/reservation/booking/booking.component.html @@ -119,7 +119,7 @@

    - +
    diff --git a/frontend/projects/public/src/app/reservation/booking/booking.component.ts b/frontend/projects/public/src/app/reservation/booking/booking.component.ts index 22123e2fa5..e5001c9a90 100644 --- a/frontend/projects/public/src/app/reservation/booking/booking.component.ts +++ b/frontend/projects/public/src/app/reservation/booking/booking.component.ts @@ -166,10 +166,11 @@ export class BookingComponent implements OnInit, AfterViewInit { private buildSubscriptionOwnerFormGroup(subscriptionInfos: Array | undefined, user?: User): UntypedFormGroup { if (subscriptionInfos != null) { const subscriptionInfo = subscriptionInfos[0]; + const email = subscriptionInfo.owner?.email || (this.emailEditForbidden ? this.reservationInfo.email : null) || user?.emailAddress; return this.formBuilder.group({ firstName: subscriptionInfo.owner?.firstName || user?.firstName, lastName: subscriptionInfo.owner?.lastName || user?.lastName, - email: subscriptionInfo.owner?.email || user?.emailAddress + email }); } else { return null; @@ -319,4 +320,8 @@ export class BookingComponent implements OnInit, AfterViewInit { get showContactData(): boolean { return !embedded || !this.reservationInfo.metadata.hideContactData; } + + get emailEditForbidden(): boolean { + return this.reservationInfo.metadata.lockEmailEdit; + } } diff --git a/frontend/projects/public/src/app/reservation/download-ticket/download-ticket.component.html b/frontend/projects/public/src/app/reservation/download-ticket/download-ticket.component.html index dc420f8aed..58740ac589 100644 --- a/frontend/projects/public/src/app/reservation/download-ticket/download-ticket.component.html +++ b/frontend/projects/public/src/app/reservation/download-ticket/download-ticket.component.html @@ -16,7 +16,7 @@

    {{ticket.fullName}}

    - +
    {{'reservation-page-complete.download-ticket'|translate}} PDF
     @@ -25,5 +25,5 @@

    {{ticket.fullName}}

    - +
    diff --git a/frontend/projects/public/src/app/reservation/invoice-form/invoice-form.component.html b/frontend/projects/public/src/app/reservation/invoice-form/invoice-form.component.html index b1cb57c550..66b430ae77 100644 --- a/frontend/projects/public/src/app/reservation/invoice-form/invoice-form.component.html +++ b/frontend/projects/public/src/app/reservation/invoice-form/invoice-form.component.html @@ -86,8 +86,8 @@

    -
    - {{form.value.vatCountryCode}} +
    +
    {{form.value.vatCountryCode}}
    diff --git a/frontend/projects/public/src/app/reservation/success-subscription/success-subscription.component.ts b/frontend/projects/public/src/app/reservation/success-subscription/success-subscription.component.ts index 24f5a9b9f2..7acb422e92 100644 --- a/frontend/projects/public/src/app/reservation/success-subscription/success-subscription.component.ts +++ b/frontend/projects/public/src/app/reservation/success-subscription/success-subscription.component.ts @@ -63,7 +63,7 @@ export class SuccessSubscriptionComponent implements OnInit { this.reservationService.getReservationInfo(this.reservationId).subscribe(resInfo => { this.processReservationInfo(resInfo); if (!this.reservationFinalized) { - pollReservationStatus(this.reservationId, this.reservationService, this.processReservationInfo); + pollReservationStatus(this.reservationId, this.reservationService, res1 => this.processReservationInfo(res1)); } }); } @@ -106,9 +106,9 @@ export class SuccessSubscriptionComponent implements OnInit { get displayPin(): boolean { if (this.subscriptionInfo.configuration != null) { - return this.subscriptionInfo.configuration.displayPin; + return this.reservationFinalized && this.subscriptionInfo.configuration.displayPin; } - return true; // by default, we display PIN + return this.reservationFinalized; // by default, we display PIN } public reSendReservationEmail(): void { diff --git a/frontend/projects/public/src/app/reservation/success/success.component.html b/frontend/projects/public/src/app/reservation/success/success.component.html index 8c461fa8bc..71572b7229 100644 --- a/frontend/projects/public/src/app/reservation/success/success.component.html +++ b/frontend/projects/public/src/app/reservation/success/success.component.html @@ -58,7 +58,7 @@

    {{'reservation-page-c {{'reservation-page-complete.show-ticket'|translate}}

    - + {{'reservation-page-complete.download-ticket'|translate}}
    diff --git a/frontend/projects/public/src/app/subscription-summary/subscription-summary.component.html b/frontend/projects/public/src/app/subscription-summary/subscription-summary.component.html index 4a8a9a4e83..f57bbfea8d 100644 --- a/frontend/projects/public/src/app/subscription-summary/subscription-summary.component.html +++ b/frontend/projects/public/src/app/subscription-summary/subscription-summary.component.html @@ -42,7 +42,7 @@
    - +
    {{owner.firstName}} {{owner.lastName}} ({{owner.email}})
     diff --git a/frontend/projects/public/src/app/subscription-summary/subscription-summary.component.ts b/frontend/projects/public/src/app/subscription-summary/subscription-summary.component.ts index d8dd6c8b06..b16c7b5b26 100644 --- a/frontend/projects/public/src/app/subscription-summary/subscription-summary.component.ts +++ b/frontend/projects/public/src/app/subscription-summary/subscription-summary.component.ts @@ -57,4 +57,11 @@ export class SubscriptionSummaryComponent { } return ''; } + + hasData(owner: SubscriptionOwner): boolean { + return owner != null + && owner.firstName != null + && owner.lastName != null + && owner.email != null; + } } From 107e72aba7a9328c60fa16f7062473e49f6b9361 Mon Sep 17 00:00:00 2001 From: Celestino Bellone <3385346+cbellone@users.noreply.github.com> Date: Sun, 25 Jun 2023 18:17:47 +0200 Subject: [PATCH 216/218] fix imports; remove .vscode and ignore it --- frontend/.gitignore | 1 + frontend/.vscode/extensions.json | 4 - frontend/.vscode/launch.json | 20 --- frontend/.vscode/tasks.json | 42 ------- .../event-dashboard.component.ts | 31 ++--- .../event/show-selected-categories.pipe.ts | 8 +- .../src/app/event/ui-category-builder.pipe.ts | 8 +- .../projects/admin/src/app/model/event.ts | 4 +- .../admin/src/app/model/ticket-category.ts | 116 ++++++++++++++++++ .../admin/src/app/shared/event.service.ts | 16 +-- .../public/src/app/model/ticket-category.ts | 2 +- 11 files changed, 142 insertions(+), 110 deletions(-) delete mode 100644 frontend/.vscode/extensions.json delete mode 100644 frontend/.vscode/launch.json delete mode 100644 frontend/.vscode/tasks.json create mode 100644 frontend/projects/admin/src/app/model/ticket-category.ts diff --git a/frontend/.gitignore b/frontend/.gitignore index 65859eec36..9f4777da7a 100644 --- a/frontend/.gitignore +++ b/frontend/.gitignore @@ -13,6 +13,7 @@ yarn-error.log # IDEs and editors .idea/ +.vscode/ .project .classpath .c9/ diff --git a/frontend/.vscode/extensions.json b/frontend/.vscode/extensions.json deleted file mode 100644 index 77b374577d..0000000000 --- a/frontend/.vscode/extensions.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - // For more information, visit: https://go.microsoft.com/fwlink/?linkid=827846 - "recommendations": ["angular.ng-template"] -} diff --git a/frontend/.vscode/launch.json b/frontend/.vscode/launch.json deleted file mode 100644 index 740e35a0c0..0000000000 --- a/frontend/.vscode/launch.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 - "version": "0.2.0", - "configurations": [ - { - "name": "ng serve", - "type": "pwa-chrome", - "request": "launch", - "preLaunchTask": "npm: start", - "url": "http://localhost:4200/" - }, - { - "name": "ng test", - "type": "chrome", - "request": "launch", - "preLaunchTask": "npm: test", - "url": "http://localhost:9876/debug.html" - } - ] -} diff --git a/frontend/.vscode/tasks.json b/frontend/.vscode/tasks.json deleted file mode 100644 index a298b5bd87..0000000000 --- a/frontend/.vscode/tasks.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - // For more information, visit: https://go.microsoft.com/fwlink/?LinkId=733558 - "version": "2.0.0", - "tasks": [ - { - "type": "npm", - "script": "start", - "isBackground": true, - "problemMatcher": { - "owner": "typescript", - "pattern": "$tsc", - "background": { - "activeOnStart": true, - "beginsPattern": { - "regexp": "(.*?)" - }, - "endsPattern": { - "regexp": "bundle generation complete" - } - } - } - }, - { - "type": "npm", - "script": "test", - "isBackground": true, - "problemMatcher": { - "owner": "typescript", - "pattern": "$tsc", - "background": { - "activeOnStart": true, - "beginsPattern": { - "regexp": "(.*?)" - }, - "endsPattern": { - "regexp": "bundle generation complete" - } - } - } - } - ] -} diff --git a/frontend/projects/admin/src/app/event/event-dashboard/event-dashboard.component.ts b/frontend/projects/admin/src/app/event/event-dashboard/event-dashboard.component.ts index 73edb90662..2fd8e15211 100644 --- a/frontend/projects/admin/src/app/event/event-dashboard/event-dashboard.component.ts +++ b/frontend/projects/admin/src/app/event/event-dashboard/event-dashboard.component.ts @@ -1,24 +1,13 @@ -import { Component, OnInit } from '@angular/core'; -import { ActivatedRoute } from '@angular/router'; -import { ChartConfiguration, ChartData, ChartOptions } from 'chart.js'; -import { Observable, map, of, switchMap } from 'rxjs'; -import { - Event, - EventInfo, - EventOrganizationInfo, - EventTicketsStatistics, -} from '../../model/event'; -import { EventService } from '../../shared/event.service'; -import { formatDate } from '@angular/common'; -import { ConfigurationService } from '../../shared/configuration.service'; -import { InstanceSetting } from '../../model/instance-settings'; -import { - TicketAccessType, - TicketCategory, - TicketCategoryFilter, - TicketTokenStatus, - UiTicketCategory, -} from 'projects/public/src/app/model/ticket-category'; +import {Component, OnInit} from '@angular/core'; +import {ActivatedRoute} from '@angular/router'; +import {ChartConfiguration, ChartData, ChartOptions} from 'chart.js'; +import {map, Observable, of, switchMap} from 'rxjs'; +import {Event, EventInfo, EventOrganizationInfo, EventTicketsStatistics,} from '../../model/event'; +import {EventService} from '../../shared/event.service'; +import {formatDate} from '@angular/common'; +import {ConfigurationService} from '../../shared/configuration.service'; +import {InstanceSetting} from '../../model/instance-settings'; +import {TicketCategory, TicketCategoryFilter, TicketTokenStatus, UiTicketCategory} from '../../model/ticket-category'; @Component({ selector: 'app-event-dashboard', diff --git a/frontend/projects/admin/src/app/event/show-selected-categories.pipe.ts b/frontend/projects/admin/src/app/event/show-selected-categories.pipe.ts index 70293057b2..10e254d30c 100644 --- a/frontend/projects/admin/src/app/event/show-selected-categories.pipe.ts +++ b/frontend/projects/admin/src/app/event/show-selected-categories.pipe.ts @@ -1,8 +1,6 @@ -import { Pipe, PipeTransform } from '@angular/core'; -import { - TicketCategoryFilter, - UiTicketCategory, -} from 'projects/public/src/app/model/ticket-category'; +import {Pipe, PipeTransform} from '@angular/core'; +import {TicketCategoryFilter, UiTicketCategory} from '../model/ticket-category'; + @Pipe({ name: 'showSelectedCategories', diff --git a/frontend/projects/admin/src/app/event/ui-category-builder.pipe.ts b/frontend/projects/admin/src/app/event/ui-category-builder.pipe.ts index c04db835fd..bfc235e3f3 100644 --- a/frontend/projects/admin/src/app/event/ui-category-builder.pipe.ts +++ b/frontend/projects/admin/src/app/event/ui-category-builder.pipe.ts @@ -1,8 +1,6 @@ -import { Pipe, PipeTransform } from '@angular/core'; -import { - TicketCategory, - UiTicketCategory, -} from 'projects/public/src/app/model/ticket-category'; +import {Pipe, PipeTransform} from '@angular/core'; +import {TicketCategory, UiTicketCategory} from '../model/ticket-category'; + @Pipe({ name: 'uiCategoryBuilder', diff --git a/frontend/projects/admin/src/app/model/event.ts b/frontend/projects/admin/src/app/model/event.ts index f7cf4c4f14..4dc2b4ec03 100644 --- a/frontend/projects/admin/src/app/model/event.ts +++ b/frontend/projects/admin/src/app/model/event.ts @@ -1,5 +1,5 @@ -import { TicketCategory } from 'projects/public/src/app/model/ticket-category'; -import { Organization } from './organization'; +import {Organization} from './organization'; +import {TicketCategory} from './ticket-category'; export interface EventInfo { allowedPaymentProxies: string[]; // TODO: enum diff --git a/frontend/projects/admin/src/app/model/ticket-category.ts b/frontend/projects/admin/src/app/model/ticket-category.ts new file mode 100644 index 0000000000..665eac6b9c --- /dev/null +++ b/frontend/projects/admin/src/app/model/ticket-category.ts @@ -0,0 +1,116 @@ +export type TicketAccessType = 'INHERIT' | 'IN_PERSON' | 'ONLINE'; + +export interface TicketTokenStatus { + accessCodeId: number | null; + code: string; + id: number; + priceInCents: number; + recipientEmail: string | null; + recipientName: string | null; + sentTimestamp: string | null; + status: string; + ticketCategoryId: number; +} + +export interface TicketCategory { + accessRestricted: boolean; + availableTickets: number | null; + bounded: boolean; + checkedInTickets: number; + containingOrphans: boolean; + containingStuckTickets: boolean; + description: { [key: string]: string }; + displayTaxInformation: boolean; + expired: boolean; + formattedDiscountedPrice: string; + formattedExpiration: { [key: string]: string }; + formattedFinalPrice: string; + formattedInception: { [key: string]: string }; + free: boolean; + hasDiscount: boolean; + id: number; + maximumSaleableTickets: number; + maxTickets: number; + name: string; + notSoldTickets: number; + pendingTickets: number; + saleableAndLimitNotReached: boolean; + saleInFuture: boolean; + soldOutOrLimitReached: boolean; + soldTickets: number; + ticketAccessType: TicketAccessType; + tokenStatus: TicketTokenStatus[]; +} + +export class UiTicketCategory implements TicketCategory { + accessRestricted: boolean; + availableTickets: number | null; + bounded: boolean; + checkedInTickets: number; + containingOrphans: boolean; + containingStuckTickets: boolean; + description: { [key: string]: string }; + displayTaxInformation: boolean; + displayWarning: boolean; + expired: boolean; + formattedDiscountedPrice: string; + formattedExpiration: { [key: string]: string }; + formattedFinalPrice: string; + formattedInception: { [key: string]: string }; + free: boolean; + hasDiscount: boolean; + id: number; + maximumSaleableTickets: number; + maxTickets: number; + name: string; + notSoldTickets: number; + pendingTickets: number; + saleableAndLimitNotReached: boolean; + saleInFuture: boolean; + soldOutOrLimitReached: boolean; + soldTickets: number; + ticketAccessType: TicketAccessType; + tokenViewExpanded: boolean; + attendeesList: { groupId: number; groupName: string } | null; + tokenStatus: TicketTokenStatus[]; + + constructor(ticketCategory: TicketCategory) { + this.accessRestricted = ticketCategory.accessRestricted; + this.availableTickets = ticketCategory.availableTickets; + this.bounded = ticketCategory.bounded; + this.checkedInTickets = ticketCategory.checkedInTickets; + this.containingOrphans = ticketCategory.containingOrphans; + this.containingStuckTickets = ticketCategory.containingStuckTickets; + this.description = ticketCategory.description; + this.displayTaxInformation = ticketCategory.displayTaxInformation; + this.displayWarning = + ticketCategory.containingStuckTickets || ticketCategory.containingOrphans; + this.expired = ticketCategory.expired; + this.formattedDiscountedPrice = ticketCategory.formattedDiscountedPrice; + this.formattedExpiration = ticketCategory.formattedExpiration; + this.formattedFinalPrice = ticketCategory.formattedFinalPrice; + this.formattedInception = ticketCategory.formattedInception; + this.free = ticketCategory.free; + this.hasDiscount = ticketCategory.hasDiscount; + this.id = ticketCategory.id; + this.maximumSaleableTickets = ticketCategory.maximumSaleableTickets; + this.maxTickets = ticketCategory.maxTickets; + this.name = ticketCategory.name; + this.saleableAndLimitNotReached = ticketCategory.saleableAndLimitNotReached; + this.saleInFuture = ticketCategory.saleInFuture; + this.soldOutOrLimitReached = ticketCategory.soldOutOrLimitReached; + this.soldTickets = ticketCategory.soldTickets; + this.ticketAccessType = ticketCategory.ticketAccessType; + this.pendingTickets = ticketCategory.pendingTickets; + this.notSoldTickets = ticketCategory.notSoldTickets; + this.tokenStatus = ticketCategory.tokenStatus; + this.tokenViewExpanded = false; + this.attendeesList = null; + } +} + +export interface TicketCategoryFilter { + active: boolean; + expired: boolean; + search: string; +} diff --git a/frontend/projects/admin/src/app/shared/event.service.ts b/frontend/projects/admin/src/app/shared/event.service.ts index e56613e694..1c7b5c819e 100644 --- a/frontend/projects/admin/src/app/shared/event.service.ts +++ b/frontend/projects/admin/src/app/shared/event.service.ts @@ -1,13 +1,9 @@ -import { HttpClient } from '@angular/common/http'; -import { Injectable } from '@angular/core'; -import { map, Observable } from 'rxjs'; -import { - Event, - EventInfo, - EventOrganizationInfo, - EventTicketsStatistics, -} from '../model/event'; -import { UiTicketCategory } from 'projects/public/src/app/model/ticket-category'; +import {HttpClient} from '@angular/common/http'; +import {Injectable} from '@angular/core'; +import {map, Observable} from 'rxjs'; +import {Event, EventInfo, EventOrganizationInfo, EventTicketsStatistics,} from '../model/event'; +import {UiTicketCategory} from '../model/ticket-category'; + @Injectable() export class EventService { diff --git a/frontend/projects/public/src/app/model/ticket-category.ts b/frontend/projects/public/src/app/model/ticket-category.ts index 3b190b4f64..93fe47fcae 100644 --- a/frontend/projects/public/src/app/model/ticket-category.ts +++ b/frontend/projects/public/src/app/model/ticket-category.ts @@ -1,6 +1,6 @@ export type TicketAccessType = 'INHERIT' | 'IN_PERSON' | 'ONLINE'; -export class TicketCategory { +export interface TicketCategory { id: number; name: string; ticketAccessType: TicketAccessType; From 8c837a01890263f719b426b268548301b68a963d Mon Sep 17 00:00:00 2001 From: valery1707 Date: Fri, 6 Oct 2023 15:58:49 +0300 Subject: [PATCH 217/218] Check for null value with the appropriate assertion method (#1282) --- src/main/java/alfio/manager/EventManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/alfio/manager/EventManager.java b/src/main/java/alfio/manager/EventManager.java index 4165c2afc4..1239e11582 100644 --- a/src/main/java/alfio/manager/EventManager.java +++ b/src/main/java/alfio/manager/EventManager.java @@ -1044,7 +1044,7 @@ public void addPromoCode(String promoCode, } if(PromoCodeDiscount.CodeType.ACCESS == codeType) { - Validate.isTrue(hiddenCategoryId != null, "Hidden category is required"); + Validate.notNull(hiddenCategoryId, "Hidden category is required"); } // From 7dbb6c6ad2601e124bb4a9a834649b501f96bee4 Mon Sep 17 00:00:00 2001 From: Sergey Yeranosyan Date: Fri, 1 Dec 2023 12:51:27 +0400 Subject: [PATCH 218/218] Added voucher code in attendees data --- .../java/alfio/controller/api/admin/EventApiController.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/alfio/controller/api/admin/EventApiController.java b/src/main/java/alfio/controller/api/admin/EventApiController.java index 8b4dfa0314..0b708e17e7 100644 --- a/src/main/java/alfio/controller/api/admin/EventApiController.java +++ b/src/main/java/alfio/controller/api/admin/EventApiController.java @@ -344,7 +344,7 @@ public ResponseEntity rearrangeCategories(@PathVariable("eventName") Str } private static final String PAYMENT_METHOD = "Payment Method"; - private static final List FIXED_FIELDS = Arrays.asList("ID", "Category", "Event", "Status", "OriginalPrice", "PaidPrice", "Discount", "VAT", "ReservationID", "Full Name", "First Name", "Last Name", "E-Mail", "Locked", "Language", "Confirmation", "Billing Address", "Country Code", "Payment ID", PAYMENT_METHOD); + private static final List FIXED_FIELDS = Arrays.asList("ID", "Category", "Event", "Status", "OriginalPrice", "PaidPrice", "Discount", "VAT", "ReservationID", "Full Name", "First Name", "Last Name", "E-Mail", "Locked", "Language", "Confirmation", "Billing Address", "Country Code", "Voucher Code", "Payment ID", PAYMENT_METHOD); private static final List> FIXED_PAIRS = FIXED_FIELDS.stream().map(f -> SerializablePair.of(f, f)).toList(); private static final String FISCAL_CODE = "Fiscal Code"; private static final String REFERENCE_TYPE = "Reference Type"; @@ -415,6 +415,7 @@ private Stream exportLines(String eventName, Principal principal, List if(fields.contains("Confirmation")) {line.add(reservation.getConfirmationTimestamp().withZoneSameInstant(eventZoneId).toString());} if(fields.contains("Billing Address")) {line.add(reservation.getBillingAddress());} if(fields.contains("Country Code")) {line.add(reservation.getVatCountryCode());} + if(fields.contains("Voucher Code")) {line.add(trs.getPromoCode());} boolean paymentIdRequested = fields.contains("Payment ID"); boolean paymentGatewayRequested = fields.contains(PAYMENT_METHOD); if((paymentIdRequested || paymentGatewayRequested)) {

    EnabledUsernameNameRoleMember ofEditReset passwordEnable / DisableDelete + / +
    {{ user.enabled }} {{ user.username }} @@ -75,24 +83,25 @@

    Users

    class="btn btn-warning" (click)="enable(user)" > - - - Disable +     		-
    -