From 7cb68078827dacbb3b83c185c211f80ad0e17765 Mon Sep 17 00:00:00 2001 From: Sylvain Jermini Date: Mon, 23 Jul 2018 10:53:26 +0200 Subject: [PATCH 1/5] initial work for merging whitelist in master --- .../controller/ReservationController.java | 3 +- .../api/admin/GroupApiController.java | 159 ++++++++++++ .../controller/api/support/TicketHelper.java | 11 + src/main/java/alfio/manager/GroupManager.java | 229 +++++++++++++++++ .../manager/TicketReservationManager.java | 40 ++- src/main/java/alfio/model/Audit.java | 3 +- src/main/java/alfio/model/group/Group.java | 39 +++ .../java/alfio/model/group/GroupMember.java | 40 +++ .../java/alfio/model/group/LinkedGroup.java | 57 +++++ .../alfio/model/group/WhitelistedTicket.java | 40 +++ .../modification/GroupMemberModification.java | 37 +++ .../model/modification/GroupModification.java | 46 ++++ .../modification/LinkedGroupModification.java | 50 ++++ .../alfio/repository/GroupRepository.java | 121 +++++++++ .../alfio/repository/TicketRepository.java | 3 + src/main/java/alfio/util/ErrorsCode.java | 1 + src/main/java/alfio/util/Validator.java | 53 ++++ .../db/PGSQL/V22_1.15.5.1__CREATE_GROUP.sql | 67 +++++ .../resources/alfio/i18n/public.properties | 2 + .../resources/alfio/i18n/public_it.properties | 4 +- .../webapp/WEB-INF/templates/admin/index.ms | 4 +- .../partials/configuration/category.html | 63 ++++- .../admin/partials/configuration/event.html | 47 ++++ .../admin/partials/event/detail.html | 7 + .../additional-service/additional-service.js | 4 +- .../feature/configuration/configuration.js | 111 +++++++-- .../resources/js/admin/feature/group/all.html | 21 ++ .../js/admin/feature/group/edit.html | 80 ++++++ .../js/admin/feature/group/groups.js | 231 ++++++++++++++++++ .../js/admin/feature/group/list.html | 7 + .../js/admin/ng-app/admin-application.js | 26 +- .../manager/GroupManagerIntegrationTest.java | 140 +++++++++++ ...cketReservationManagerIntegrationTest.java | 8 +- .../manager/TicketReservationManagerTest.java | 17 +- .../TicketReservationManagerUnitTest.java | 5 +- .../WaitingQueueManagerIntegrationTest.java | 12 +- .../system/DataMigratorIntegrationTest.java | 2 +- 37 files changed, 1738 insertions(+), 52 deletions(-) create mode 100644 src/main/java/alfio/controller/api/admin/GroupApiController.java create mode 100644 src/main/java/alfio/manager/GroupManager.java create mode 100644 src/main/java/alfio/model/group/Group.java create mode 100644 src/main/java/alfio/model/group/GroupMember.java create mode 100644 src/main/java/alfio/model/group/LinkedGroup.java create mode 100644 src/main/java/alfio/model/group/WhitelistedTicket.java create mode 100644 src/main/java/alfio/model/modification/GroupMemberModification.java create mode 100644 src/main/java/alfio/model/modification/GroupModification.java create mode 100644 src/main/java/alfio/model/modification/LinkedGroupModification.java create mode 100644 src/main/java/alfio/repository/GroupRepository.java create mode 100644 src/main/resources/alfio/db/PGSQL/V22_1.15.5.1__CREATE_GROUP.sql create mode 100644 src/main/webapp/resources/js/admin/feature/group/all.html create mode 100644 src/main/webapp/resources/js/admin/feature/group/edit.html create mode 100644 src/main/webapp/resources/js/admin/feature/group/groups.js create mode 100644 src/main/webapp/resources/js/admin/feature/group/list.html create mode 100644 src/test/java/alfio/manager/GroupManagerIntegrationTest.java diff --git a/src/main/java/alfio/controller/ReservationController.java b/src/main/java/alfio/controller/ReservationController.java index 550ebef774..185d13df93 100644 --- a/src/main/java/alfio/controller/ReservationController.java +++ b/src/main/java/alfio/controller/ReservationController.java @@ -593,7 +593,8 @@ public String handleReservation(@PathVariable("eventName") String eventName, final PaymentResult status = ticketReservationManager.confirm(paymentForm.getToken(), paymentForm.getPaypalPayerID(), event, reservationId, ticketReservation.getEmail(), customerName, locale, ticketReservation.getBillingAddress(), ticketReservation.getCustomerReference(), reservationCost, SessionUtil.retrieveSpecialPriceSessionId(request), Optional.ofNullable(paymentForm.getPaymentMethod()), invoiceRequested, ticketReservation.getVatCountryCode(), - ticketReservation.getVatNr(), ticketReservation.getVatStatus(), paymentForm.getTermAndConditionsAccepted(), Optional.ofNullable(paymentForm.getPrivacyPolicyAccepted()).orElse(false)); + ticketReservation.getVatNr(), ticketReservation.getVatStatus(), paymentForm.getTermAndConditionsAccepted(), Optional.ofNullable(paymentForm.getPrivacyPolicyAccepted()).orElse(false), + Collections.emptyMap()); //FIXME if(!status.isSuccessful()) { String errorMessageCode = status.getErrorCode().get(); diff --git a/src/main/java/alfio/controller/api/admin/GroupApiController.java b/src/main/java/alfio/controller/api/admin/GroupApiController.java new file mode 100644 index 0000000000..672fba7d7f --- /dev/null +++ b/src/main/java/alfio/controller/api/admin/GroupApiController.java @@ -0,0 +1,159 @@ +/** + * 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.EventManager; +import alfio.manager.GroupManager; +import alfio.manager.user.UserManager; +import alfio.model.group.Group; +import alfio.model.group.LinkedGroup; +import alfio.model.modification.GroupModification; +import alfio.model.modification.LinkedGroupModification; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.security.Principal; +import java.util.List; +import java.util.Objects; +import java.util.Optional; + +import static alfio.util.OptionalWrapper.optionally; + +@RestController +@RequestMapping("/admin/api/group") +@RequiredArgsConstructor +public class GroupApiController { + + private final GroupManager groupManager; + private final UserManager userManager; + private final EventManager eventManager; + + @GetMapping("/{organizationId}") + public ResponseEntity> loadAllGroupsForOrganization(@PathVariable("organizationId") int organizationId, Principal principal) { + if(notOwner(principal.getName(), organizationId)) { + return ResponseEntity.status(HttpStatus.FORBIDDEN).build(); + } + return ResponseEntity.ok(groupManager.getAllForOrganization(organizationId)); + } + + @GetMapping("/{organizationId}/detail/{listId}") + public ResponseEntity loadDetail(@PathVariable("organizationId") int organizationId, @PathVariable("listId") int listId, Principal principal) { + if(notOwner(principal.getName(), organizationId)) { + return ResponseEntity.status(HttpStatus.FORBIDDEN).build(); + } + return groupManager.loadComplete(listId).map(ResponseEntity::ok).orElseGet(() -> ResponseEntity.notFound().build()); + } + + @PostMapping("/{organizationId}/update/{listId}") + public ResponseEntity updateGroup(@PathVariable("organizationId") int organizationId, + @PathVariable("listId") int listId, + @RequestBody GroupModification modification, + Principal principal) { + if(notOwner(principal.getName(), organizationId)) { + return ResponseEntity.status(HttpStatus.FORBIDDEN).build(); + } + return groupManager.update(listId, modification).map(ResponseEntity::ok).orElseGet(() -> ResponseEntity.notFound().build()); + } + + @PostMapping("/{organizationId}/new") + public ResponseEntity createNew(@PathVariable("organizationId") int organizationId, @RequestBody GroupModification request, Principal principal) { + if(notOwner(principal.getName(), organizationId)) { + return ResponseEntity.status(HttpStatus.FORBIDDEN).build(); + } + if(request.getOrganizationId() != organizationId) { + return ResponseEntity.badRequest().build(); + } + return ResponseEntity.ok(groupManager.createNew(request)); + } + + @GetMapping("/event/{eventName}/all") + public ResponseEntity> findLinked(@PathVariable("eventName") String eventName, + Principal principal) { + return eventManager.getOptionalByName(eventName, principal.getName()) + .map(event -> ResponseEntity.ok(groupManager.getLinksForEvent(event.getId()))) + .orElseGet(() -> ResponseEntity.notFound().build()); + } + + @GetMapping("/event/{eventName}") + public ResponseEntity findActiveGroup(@PathVariable("eventName") String eventName, + Principal principal) { + return eventManager.getOptionalByName(eventName, principal.getName()) + .map(event -> { + Optional configuration = groupManager.getLinksForEvent(event.getId()).stream() + .filter(c -> c.getTicketCategoryId() == null) + .findFirst(); + return configuration.map(ResponseEntity::ok).orElseGet(() -> ResponseEntity.noContent().build()); + }) + .orElseGet(() -> ResponseEntity.notFound().build()); + } + + @GetMapping("/event/{eventName}/category/{categoryId}") + public ResponseEntity findActiveGroup(@PathVariable("eventName") String eventName, + @PathVariable("categoryId") int categoryId, + Principal principal) { + return eventManager.getOptionalByName(eventName, principal.getName()) + .map(event -> { + Optional configuration = groupManager.findLinks(event.getId(), categoryId) + .stream() + .filter(c -> c.getTicketCategoryId() != null && c.getTicketCategoryId() == categoryId) + .findFirst(); + return configuration.map(ResponseEntity::ok).orElseGet(() -> ResponseEntity.noContent().build()); + }) + .orElseGet(() -> ResponseEntity.notFound().build()); + } + + @PostMapping("/{listId}/link") + public ResponseEntity linkGroup(@PathVariable("listId") int listId, @RequestBody LinkedGroupModification body, Principal principal) { + if(body == null || listId != body.getGroupId()) { + return ResponseEntity.badRequest().build(); + } + + return optionally(() -> eventManager.getSingleEventById(body.getEventId(), principal.getName())) + .map(event -> { + Optional existing = groupManager.getLinksForEvent(event.getId()) + .stream() + .filter(c -> c.getGroupId() == listId && Objects.equals(body.getTicketCategoryId(), c.getTicketCategoryId())) + .findFirst(); + LinkedGroup link; + if(existing.isPresent()) { + link = groupManager.updateLink(existing.get().getId(), body); + } else { + link = groupManager.createLink(listId, event.getId(), body); + } + return ResponseEntity.ok(link.getId()); + }) + .orElseGet(() -> ResponseEntity.notFound().build()); + } + + @DeleteMapping("/{organizationId}/link/{configurationId}") + public ResponseEntity unlinkGroup(@PathVariable("organizationId") int organizationId, @PathVariable("configurationId") int configurationId, Principal principal) { + if(optionally(() -> userManager.findUserByUsername(principal.getName())).filter(u -> userManager.isOwnerOfOrganization(u, organizationId)).isPresent()) { + groupManager.disableLink(configurationId); + return ResponseEntity.ok("OK"); + } + return ResponseEntity.status(HttpStatus.UNAUTHORIZED).build(); + } + + private boolean notOwner(String username, int organizationId) { + return !optionally(() -> userManager.findUserByUsername(username)) + .filter(user -> userManager.isOwnerOfOrganization(user, organizationId)) + .isPresent(); + } + +} diff --git a/src/main/java/alfio/controller/api/support/TicketHelper.java b/src/main/java/alfio/controller/api/support/TicketHelper.java index 0b9101d514..1d06839bce 100644 --- a/src/main/java/alfio/controller/api/support/TicketHelper.java +++ b/src/main/java/alfio/controller/api/support/TicketHelper.java @@ -21,6 +21,7 @@ import alfio.manager.EuVatChecker; import alfio.manager.EuVatChecker.SameCountryValidator; import alfio.manager.FileUploadManager; +import alfio.manager.GroupManager; import alfio.manager.TicketReservationManager; import alfio.manager.support.PartialTicketTextGenerator; import alfio.model.*; @@ -35,6 +36,7 @@ import alfio.util.LocaleUtil; import alfio.util.TemplateManager; import alfio.util.Validator; +import alfio.util.Validator.AdvancedTicketAssignmentValidator; import lombok.AllArgsConstructor; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.Pair; @@ -67,6 +69,7 @@ public class TicketHelper { private final TicketFieldRepository ticketFieldRepository; private final AdditionalServiceItemRepository additionalServiceItemRepository; private final EuVatChecker vatChecker; + private final GroupManager groupManager; public List findTicketFieldConfigurationAndValue(Ticket ticket) { @@ -110,7 +113,12 @@ private Triple assignTicket(UpdateTicketOwnerFo final TicketReservation ticketReservation = result.getMiddle(); List fieldConf = ticketFieldRepository.findAdditionalFieldsForEvent(event.getId()); + AdvancedTicketAssignmentValidator advancedValidator = new AdvancedTicketAssignmentValidator(new SameCountryValidator(vatChecker, event.getOrganizationId(), event.getId(), ticketReservation.getId()), + new GroupManager.WhitelistValidator(event.getId(), groupManager)); + + Validator.AdvancedValidationContext context = new Validator.AdvancedValidationContext(updateTicketOwner, fieldConf, t.getCategoryId(), t.getUuid(), formPrefix); ValidationResult validationResult = Validator.validateTicketAssignment(updateTicketOwner, fieldConf, bindingResult, event, formPrefix, new SameCountryValidator(vatChecker, event.getOrganizationId(), event.getId(), ticketReservation.getId())) + .or(Validator.performAdvancedValidation(advancedValidator, context, bindingResult.orElse(null))) .ifSuccess(() -> updateTicketOwner(updateTicketOwner, request, t, event, ticketReservation, userDetails)); return Triple.of(validationResult, event, ticketRepository.findByUUID(t.getUuid())); } @@ -213,6 +221,9 @@ private void updateTicketOwner(UpdateTicketOwnerForm updateTicketOwner, HttpServ getConfirmationTextBuilder(request, event, ticketReservation, t, category), getOwnerChangeTextBuilder(request, t, event), userDetails); + if(t.hasBeenSold() && !groupManager.findLinks(event.getId(), t.getCategoryId()).isEmpty()) { + ticketRepository.forbidReassignment(Collections.singletonList(t.getId())); + } } private PartialTicketTextGenerator getOwnerChangeTextBuilder(HttpServletRequest request, Ticket t, Event event) { diff --git a/src/main/java/alfio/manager/GroupManager.java b/src/main/java/alfio/manager/GroupManager.java new file mode 100644 index 0000000000..c10749be19 --- /dev/null +++ b/src/main/java/alfio/manager/GroupManager.java @@ -0,0 +1,229 @@ +/** + * 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.Audit; +import alfio.model.Ticket; +import alfio.model.group.Group; +import alfio.model.group.GroupMember; +import alfio.model.group.LinkedGroup; +import alfio.model.modification.GroupMemberModification; +import alfio.model.modification.GroupModification; +import alfio.model.modification.LinkedGroupModification; +import alfio.repository.AuditingRepository; +import alfio.repository.GroupRepository; +import alfio.repository.TicketRepository; +import ch.digitalfondue.npjt.AffectedRowCountAndKey; +import lombok.AllArgsConstructor; +import lombok.RequiredArgsConstructor; +import lombok.extern.log4j.Log4j2; +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Validate; +import org.springframework.jdbc.core.namedparam.MapSqlParameterSource; +import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + +import java.util.*; +import java.util.function.Predicate; +import java.util.stream.Collectors; + +import static alfio.model.group.LinkedGroup.MatchType.FULL; +import static alfio.model.group.LinkedGroup.Type.*; +import static java.util.Collections.singletonList; + +@AllArgsConstructor +@Transactional +@Component +@Log4j2 +public class GroupManager { + + private final GroupRepository groupRepository; + private final NamedParameterJdbcTemplate jdbcTemplate; + private final TicketRepository ticketRepository; + private final AuditingRepository auditingRepository; + + public int createNew(GroupModification input) { + Group wl = createNew(input.getName(), input.getDescription(), input.getOrganizationId()); + insertMembers(wl.getId(), input.getItems()); + return wl.getId(); + } + + public Group createNew(String name, String description, int organizationId) { + AffectedRowCountAndKey insert = groupRepository.insert(name, description, organizationId); + return groupRepository.getById(insert.getKey()); + } + + public LinkedGroup createLink(int groupId, + int eventId, + LinkedGroupModification modification) { + Objects.requireNonNull(groupRepository.getById(groupId), "Group not found"); + Validate.isTrue(modification.getType() != LIMITED_QUANTITY || modification.getMaxAllocation() != null, "Missing max allocation"); + AffectedRowCountAndKey configuration = groupRepository.createConfiguration(groupId, eventId, + modification.getTicketCategoryId(), modification.getType(), modification.getMatchType(), modification.getMaxAllocation()); + return groupRepository.getConfiguration(configuration.getKey()); + } + + public LinkedGroup updateLink(int id, LinkedGroupModification modification) { + LinkedGroup original = groupRepository.getConfigurationForUpdate(id); + if(requiresCleanState(modification, original)) { + Validate.isTrue(groupRepository.countWhitelistedTicketsForConfiguration(original.getId()) == 0, "Cannot update as there are already confirmed tickets."); + } + groupRepository.updateConfiguration(id, modification.getGroupId(), original.getEventId(), modification.getTicketCategoryId(), modification.getType(), modification.getMatchType(), modification.getMaxAllocation()); + return groupRepository.getConfiguration(id); + } + + private boolean requiresCleanState(LinkedGroupModification modification, LinkedGroup original) { + return (original.getType() == UNLIMITED && modification.getType() != UNLIMITED) + || original.getGroupId() != modification.getGroupId() + || (modification.getType() == LIMITED_QUANTITY && modification.getMaxAllocation() != null && original.getMaxAllocation() != null && modification.getMaxAllocation().compareTo(original.getMaxAllocation()) < 0); + } + + public boolean isGroupLinked(int eventId, int categoryId) { + return CollectionUtils.isNotEmpty(findLinks(eventId, categoryId)); + } + + public List getAllForOrganization(int organizationId) { + return groupRepository.getAllForOrganization(organizationId); + } + + public Optional loadComplete(int id) { + return groupRepository.getOptionalById(id) + .map(wl -> { + List items = groupRepository.getItems(wl.getId()).stream().map(i -> new GroupMemberModification(i.getId(), i.getValue(), i.getDescription())).collect(Collectors.toList()); + return new GroupModification(wl.getId(), wl.getName(), wl.getDescription(), wl.getOrganizationId(), items); + }); + } + + public Optional findById(int groupId, int organizationId) { + return groupRepository.getOptionalById(groupId).filter(w -> w.getOrganizationId() == organizationId); + } + + public boolean isAllowed(String value, int eventId, int categoryId) { + + List configurations = findLinks(eventId, categoryId); + if(CollectionUtils.isEmpty(configurations)) { + return true; + } + LinkedGroup configuration = configurations.get(0); + return getMatchingMember(configuration, value).isPresent(); + } + + public List getLinksForEvent(int eventId) { + return groupRepository.findActiveConfigurationsForEvent(eventId); + } + + public List findLinks(int eventId, int categoryId) { + return groupRepository.findActiveConfigurationsFor(eventId, categoryId); + } + + public int insertMembers(int groupId, List members) { + MapSqlParameterSource[] params = members.stream() + .map(i -> new MapSqlParameterSource("groupId", groupId).addValue("value", i.getValue()).addValue("description", i.getDescription())) + .toArray(MapSqlParameterSource[]::new); + return Arrays.stream(jdbcTemplate.batchUpdate(groupRepository.insertItemTemplate(), params)).sum(); + } + + boolean acquireMemberForTicket(Ticket ticket, String email) { + List configurations = findLinks(ticket.getEventId(), ticket.getCategoryId()); + if(CollectionUtils.isEmpty(configurations)) { + return true; + } + LinkedGroup configuration = configurations.get(0); + Optional optionalItem = getMatchingMember(configuration, StringUtils.defaultString(StringUtils.trimToNull(ticket.getEmail()), email)); + if(!optionalItem.isPresent()) { + return false; + } + GroupMember item = optionalItem.get(); + boolean preventDuplication = configuration.getType() == ONCE_PER_VALUE; + boolean limitAssignments = preventDuplication || configuration.getType() == LIMITED_QUANTITY; + if(limitAssignments) { + //reload and lock configuration + configuration = groupRepository.getConfigurationForUpdate(configuration.getId()); + int existing = groupRepository.countExistingWhitelistedTickets(item.getId(), configuration.getId()); + int expected = preventDuplication ? 1 : Optional.ofNullable(configuration.getMaxAllocation()).orElse(0); + if(existing >= expected) { + return false; + } + } + groupRepository.insertWhitelistedTicket(item.getId(), configuration.getId(), ticket.getId(), preventDuplication ? true : null); + Map modifications = new HashMap<>(); + modifications.put("itemId", item.getId()); + modifications.put("configurationId", configuration.getId()); + modifications.put("ticketId", ticket.getId()); + auditingRepository.insert(ticket.getTicketsReservationId(), null, ticket.getEventId(), Audit.EventType.GROUP_MEMBER_ACQUIRED, new Date(), Audit.EntityType.TICKET, ticket.getUuid(), singletonList(modifications)); + return true; + } + + private Optional getMatchingMember(LinkedGroup configuration, String email) { + String trimmed = StringUtils.trimToEmpty(email); + Optional exactMatch = groupRepository.findItemByValueExactMatch(configuration.getGroupId(), trimmed); + if(exactMatch.isPresent() || configuration.getMatchType() == FULL) { + return exactMatch; + } + String partial = StringUtils.substringAfterLast(trimmed, "@"); + return partial.length() > 0 ? groupRepository.findItemEndsWith(configuration.getId(), configuration.getGroupId(), "%@"+partial) : Optional.empty(); + } + + public void deleteWhitelistedTicketsForReservation(String reservationId) { + List tickets = ticketRepository.findTicketsInReservation(reservationId).stream().map(Ticket::getId).collect(Collectors.toList()); + if(!tickets.isEmpty()) { + int result = groupRepository.deleteExistingWhitelistedTickets(tickets); + log.trace("deleted {} whitelisted tickets for reservation {}", result, reservationId); + } + } + + public void disableLink(int linkId) { + Validate.isTrue(groupRepository.disableConfiguration(linkId) == 1, "Error while disabling link"); + } + + public Optional update(int listId, GroupModification modification) { + + if(!groupRepository.getOptionalById(listId).isPresent() || CollectionUtils.isEmpty(modification.getItems())) { + return Optional.empty(); + } + + List existingItems = groupRepository.getItems(listId); + List notPresent = modification.getItems().stream() + .filter(i -> i.getId() == null && existingItems.stream().noneMatch(ali -> ali.getValue().equals(i.getValue()))) + .collect(Collectors.toList()); + if(!notPresent.isEmpty()) { + insertMembers(listId, notPresent); + } + groupRepository.update(listId, modification.getName(), modification.getDescription()); + return loadComplete(listId); + } + + @RequiredArgsConstructor + public static class WhitelistValidator implements Predicate { + + private final int eventId; + private final GroupManager groupManager; + + @Override + public boolean test(WhitelistValidationItem item) { + return groupManager.isAllowed(item.value, eventId, item.categoryId); + } + } + + @RequiredArgsConstructor + public static class WhitelistValidationItem { + private final int categoryId; + private final String value; + } +} diff --git a/src/main/java/alfio/manager/TicketReservationManager.java b/src/main/java/alfio/manager/TicketReservationManager.java index de9d96bd54..d57558aaab 100644 --- a/src/main/java/alfio/manager/TicketReservationManager.java +++ b/src/main/java/alfio/manager/TicketReservationManager.java @@ -32,6 +32,7 @@ import alfio.model.decorator.AdditionalServiceItemPriceContainer; import alfio.model.decorator.AdditionalServicePriceContainer; import alfio.model.decorator.TicketPriceContainer; +import alfio.model.group.LinkedGroup; import alfio.model.modification.ASReservationWithOptionalCodeModification; import alfio.model.modification.AdditionalServiceReservationModification; import alfio.model.modification.TicketReservationWithOptionalCodeModification; @@ -121,6 +122,7 @@ public class TicketReservationManager { private final UserRepository userRepository; private final ExtensionManager extensionManager; private final TicketSearchRepository ticketSearchRepository; + private final GroupManager groupManager; public static class NotEnoughTicketsException extends RuntimeException { @@ -160,7 +162,8 @@ public TicketReservationManager(EventRepository eventRepository, InvoiceSequencesRepository invoiceSequencesRepository, AuditingRepository auditingRepository, UserRepository userRepository, - ExtensionManager extensionManager, TicketSearchRepository ticketSearchRepository) { + ExtensionManager extensionManager, TicketSearchRepository ticketSearchRepository, + GroupManager groupManager) { this.eventRepository = eventRepository; this.organizationRepository = organizationRepository; this.ticketRepository = ticketRepository; @@ -186,6 +189,7 @@ public TicketReservationManager(EventRepository eventRepository, this.userRepository = userRepository; this.extensionManager = extensionManager; this.ticketSearchRepository = ticketSearchRepository; + this.groupManager = groupManager; } /** @@ -342,8 +346,14 @@ public PaymentResult confirm(String gatewayToken, String payerId, Event event, S String email, CustomerName customerName, Locale userLanguage, String billingAddress, String customerReference, TotalPrice reservationCost, Optional specialPriceSessionId, Optional method, boolean invoiceRequested, String vatCountryCode, String vatNr, PriceContainer.VatStatus vatStatus, - boolean tcAccepted, boolean privacyPolicyAccepted) { + boolean tcAccepted, boolean privacyPolicyAccepted, Map ticketEmails) { PaymentProxy paymentProxy = evaluatePaymentProxy(method, reservationCost); + + if(!acquiregroupMembers(reservationId, event, ticketEmails)) { + groupManager.deleteWhitelistedTicketsForReservation(reservationId); + return PaymentResult.unsuccessful("error.STEP2_WHITELIST"); + } + if(!initPaymentProcess(reservationCost, paymentProxy, reservationId, email, customerName, userLanguage, billingAddress, customerReference)) { return PaymentResult.unsuccessful("error.STEP2_UNABLE_TO_TRANSITION"); } @@ -433,6 +443,21 @@ private boolean initPaymentProcess(TotalPrice reservationCost, PaymentProxy paym return true; } + private boolean acquiregroupMembers(String reservationId, Event event, Map ticketEmails) { + int eventId = event.getId(); + List linkedGroups = groupManager.getLinksForEvent(eventId); + if(!linkedGroups.isEmpty()) { + List ticketsInReservation = ticketRepository.findTicketsInReservation(reservationId); + return requiresNewTransactionTemplate.execute(status -> + ticketsInReservation + .stream() + .filter(ticket -> linkedGroups.stream().anyMatch(c -> c.getTicketCategoryId() == null || c.getTicketCategoryId().equals(ticket.getCategoryId()))) + .map(t -> groupManager.acquireMemberForTicket(t, ticketEmails.get(t.getUuid()))) + .reduce(true, Boolean::logicalAnd)); + } + return true; + } + public void confirmOfflinePayment(Event event, String reservationId, String username) { TicketReservation ticketReservation = findById(reservationId).orElseThrow(IllegalArgumentException::new); ticketReservationRepository.lockReservationForUpdate(reservationId); @@ -672,12 +697,15 @@ private void acquireItems(TicketStatus ticketStatus, AdditionalServiceItemStatus String userLanguage, String billingAddress, String customerReference, int eventId) { Map preUpdateTicket = ticketRepository.findTicketsInReservation(reservationId).stream().collect(toMap(Ticket::getId, Function.identity())); int updatedTickets = ticketRepository.updateTicketsStatusWithReservationId(reservationId, ticketStatus.toString()); - Map postUpdateTicket = ticketRepository.findTicketsInReservation(reservationId).stream().collect(toMap(Ticket::getId, Function.identity())); + List ticketsInReservation = ticketRepository.findTicketsInReservation(reservationId); + Map postUpdateTicket = ticketsInReservation.stream().collect(toMap(Ticket::getId, Function.identity())); postUpdateTicket.forEach((id, ticket) -> { auditUpdateTicket(preUpdateTicket.get(id), Collections.emptyMap(), ticket, Collections.emptyMap(), eventId); }); + Set categoriesId = ticketsInReservation.stream().map(Ticket::getCategoryId).collect(Collectors.toSet()); + int updatedAS = additionalServiceItemRepository.updateItemsStatusWithReservationUUID(reservationId, asStatus); Validate.isTrue(updatedTickets + updatedAS > 0, "no items have been updated"); specialPriceRepository.updateStatusForReservation(singletonList(reservationId), Status.TAKEN.toString()); @@ -983,6 +1011,7 @@ private void cancelReservation(String reservationId, boolean expired) { int updatedTickets = ticketRepository.findTicketsInReservation(reservationId).stream().mapToInt(t -> ticketRepository.releaseExpiredTicket(reservationId, event.getId(), t.getId())).sum(); Validate.isTrue(updatedTickets + updatedAS > 0, "no items have been updated"); waitingQueueManager.fireReservationExpired(reservationId); + groupManager.deleteWhitelistedTicketsForReservation(reservationId); deleteReservation(event, reservationId, expired); auditingRepository.insert(reservationId, null, event.getId(), expired ? Audit.EventType.CANCEL_RESERVATION_EXPIRED : Audit.EventType.CANCEL_RESERVATION, new Date(), Audit.EntityType.RESERVATION, reservationId); } @@ -1058,6 +1087,11 @@ public void updateTicketOwner(Ticket ticket, Optional userDetails) { Ticket preUpdateTicket = ticketRepository.findByUUID(ticket.getUuid()); + if(preUpdateTicket.getLockedAssignment()) { + log.warn("trying to update assignee for a locked ticket ({})", preUpdateTicket.getId()); + return; + } + Map preUpdateTicketFields = ticketFieldRepository.findAllByTicketId(ticket.getId()).stream().collect(Collectors.toMap(TicketFieldValue::getName, TicketFieldValue::getValue)); String newEmail = updateTicketOwner.getEmail().trim(); diff --git a/src/main/java/alfio/model/Audit.java b/src/main/java/alfio/model/Audit.java index 8fd7d4efd1..abd3bf9737 100644 --- a/src/main/java/alfio/model/Audit.java +++ b/src/main/java/alfio/model/Audit.java @@ -51,7 +51,8 @@ public enum EventType { TERMS_CONDITION_ACCEPTED, PRIVACY_POLICY_ACCEPTED, VAT_VALIDATION_SUCCESSFUL, - VAT_FORMAL_VALIDATION_SUCCESSFUL + VAT_FORMAL_VALIDATION_SUCCESSFUL, + GROUP_MEMBER_ACQUIRED } private final String reservationId; diff --git a/src/main/java/alfio/model/group/Group.java b/src/main/java/alfio/model/group/Group.java new file mode 100644 index 0000000000..f9295dec0c --- /dev/null +++ b/src/main/java/alfio/model/group/Group.java @@ -0,0 +1,39 @@ +/** + * 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.group; + +import ch.digitalfondue.npjt.ConstructorAnnotationRowMapper.Column; +import lombok.Getter; + +@Getter +public class Group { + private final int id; + private final String name; + private final String description; + private final Integer organizationId; + + + public Group(@Column("id") int id, + @Column("name") String name, + @Column("description") String description, + @Column("organization_id_fk") Integer organizationId) { + this.id = id; + this.name = name; + this.description = description; + this.organizationId = organizationId; + } +} diff --git a/src/main/java/alfio/model/group/GroupMember.java b/src/main/java/alfio/model/group/GroupMember.java new file mode 100644 index 0000000000..8fb71b4957 --- /dev/null +++ b/src/main/java/alfio/model/group/GroupMember.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.group; + +import ch.digitalfondue.npjt.ConstructorAnnotationRowMapper.Column; +import lombok.Getter; + +@Getter +public class GroupMember { + + private final int id; + private final int groupId; + private final String value; + private final String description; + + + public GroupMember(@Column("id") int id, + @Column("a_group_id_fk") int groupId, + @Column("value") String value, + @Column("description") String description) { + this.id = id; + this.groupId = groupId; + this.value = value; + this.description = description; + } +} diff --git a/src/main/java/alfio/model/group/LinkedGroup.java b/src/main/java/alfio/model/group/LinkedGroup.java new file mode 100644 index 0000000000..3f06b0c452 --- /dev/null +++ b/src/main/java/alfio/model/group/LinkedGroup.java @@ -0,0 +1,57 @@ +/** + * 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.group; + +import ch.digitalfondue.npjt.ConstructorAnnotationRowMapper.Column; +import lombok.Getter; + +@Getter +public class LinkedGroup { + + + public enum Type { + ONCE_PER_VALUE, LIMITED_QUANTITY, UNLIMITED + } + + public enum MatchType { + FULL, EMAIL_DOMAIN + } + + private final int id; + private final int groupId; + private final Integer eventId; + private final Integer ticketCategoryId; + private final Type type; + private final MatchType matchType; + private final Integer maxAllocation; + + public LinkedGroup(@Column("id") int id, + @Column("a_group_id_fk") int groupId, + @Column("event_id_fk") Integer eventId, + @Column("ticket_category_id_fk") Integer ticketCategoryId, + @Column("type") Type type, + @Column("match_type") MatchType matchType, + @Column("max_allocation") Integer maxAllocation) { + this.id = id; + this.groupId = groupId; + this.eventId = eventId; + this.ticketCategoryId = ticketCategoryId; + this.type = type; + this.matchType = matchType; + this.maxAllocation = maxAllocation; + } +} diff --git a/src/main/java/alfio/model/group/WhitelistedTicket.java b/src/main/java/alfio/model/group/WhitelistedTicket.java new file mode 100644 index 0000000000..d5561a380a --- /dev/null +++ b/src/main/java/alfio/model/group/WhitelistedTicket.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.group; + +import ch.digitalfondue.npjt.ConstructorAnnotationRowMapper.Column; +import lombok.Getter; + +@Getter +public class WhitelistedTicket { + + private final int groupMemberId; + private final int groupLinkId; + private final int ticketId; + private final boolean requiresUniqueValue; + + public WhitelistedTicket(@Column("group_member_id_fk") int groupMemberId, + @Column("group_link_id_fk") int groupLinkId, + @Column("ticket_id_fk") int ticketId, + @Column("requires_unique_value") Boolean requiresUniqueValue) { + this.groupMemberId = groupMemberId; + this.groupLinkId = groupLinkId; + this.ticketId = ticketId; + this.requiresUniqueValue = requiresUniqueValue != null ? requiresUniqueValue : false; + } + +} diff --git a/src/main/java/alfio/model/modification/GroupMemberModification.java b/src/main/java/alfio/model/modification/GroupMemberModification.java new file mode 100644 index 0000000000..10e67b06d0 --- /dev/null +++ b/src/main/java/alfio/model/modification/GroupMemberModification.java @@ -0,0 +1,37 @@ +/** + * 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; +import lombok.Getter; + +@Getter +public class GroupMemberModification { + private final Integer id; + private final String value; + private final String description; + + @JsonCreator + public GroupMemberModification(@JsonProperty("id") Integer id, + @JsonProperty("value") String value, + @JsonProperty("description") String description) { + this.id = id; + this.value = value; + this.description = description; + } +} diff --git a/src/main/java/alfio/model/modification/GroupModification.java b/src/main/java/alfio/model/modification/GroupModification.java new file mode 100644 index 0000000000..8135d19ee3 --- /dev/null +++ b/src/main/java/alfio/model/modification/GroupModification.java @@ -0,0 +1,46 @@ +/** + * 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; +import lombok.Getter; + +import java.util.List; + +@Getter +public class GroupModification { + private final Integer id; + private final String name; + private final String description; + private final int organizationId; + private final List items; + + + @JsonCreator + public GroupModification(@JsonProperty("id") Integer id, + @JsonProperty("name") String name, + @JsonProperty("description") String description, + @JsonProperty("organizationId") int organizationId, + @JsonProperty("items") List items) { + this.id = id; + this.name = name; + this.description = description; + this.organizationId = organizationId; + this.items = items; + } +} diff --git a/src/main/java/alfio/model/modification/LinkedGroupModification.java b/src/main/java/alfio/model/modification/LinkedGroupModification.java new file mode 100644 index 0000000000..95d0d4eff7 --- /dev/null +++ b/src/main/java/alfio/model/modification/LinkedGroupModification.java @@ -0,0 +1,50 @@ +/** + * 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 alfio.model.group.LinkedGroup; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Getter; + +@Getter +public class LinkedGroupModification { + private final Integer id; + private final int groupId; + private final int eventId; + private final Integer ticketCategoryId; + private final LinkedGroup.Type type; + private final LinkedGroup.MatchType matchType; + private final Integer maxAllocation; + + @JsonCreator + public LinkedGroupModification(@JsonProperty("id") Integer id, + @JsonProperty("groupId") int groupId, + @JsonProperty("eventId") int eventId, + @JsonProperty("ticketCategoryId") Integer ticketCategoryId, + @JsonProperty("type") LinkedGroup.Type type, + @JsonProperty("matchType") LinkedGroup.MatchType matchType, + @JsonProperty("maxAllocation") Integer maxAllocation) { + this.id = id; + this.groupId = groupId; + this.eventId = eventId; + this.ticketCategoryId = ticketCategoryId; + this.type = type; + this.matchType = matchType; + this.maxAllocation = maxAllocation; + } +} diff --git a/src/main/java/alfio/repository/GroupRepository.java b/src/main/java/alfio/repository/GroupRepository.java new file mode 100644 index 0000000000..3016309eab --- /dev/null +++ b/src/main/java/alfio/repository/GroupRepository.java @@ -0,0 +1,121 @@ +/** + * 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.group.Group; +import alfio.model.group.GroupMember; +import alfio.model.group.LinkedGroup; +import alfio.model.group.WhitelistedTicket; +import ch.digitalfondue.npjt.*; + +import java.util.List; +import java.util.Optional; + +@QueryRepository +public interface GroupRepository { + + String BY_EVENT_ID = "select * from group_link_active where event_id_fk = :eventId"; + + @Query("insert into a_group(name, description, organization_id_fk) values(:name, :description, :orgId)") + @AutoGeneratedKey("id") + AffectedRowCountAndKey insert(@Bind("name") String name, + @Bind("description") String description, + @Bind("orgId") int organizationId); + + @Query("select * from a_group where id = :id") + Group getById(@Bind("id") int id); + + @Query("update a_group set name = :name, description = :description where id = :id") + int update(@Bind("id") int id, @Bind("name") String name, @Bind("description") String description); + + @Query("select * from a_group where id = :id") + Optional getOptionalById(@Bind("id") int id); + + @Query("select * from a_group where organization_id_fk = :organizationId") + List getAllForOrganization(@Bind("organizationId") int organizationId); + + @Query("insert into group_link(a_group_id_fk, event_id_fk, ticket_category_id_fk, type, match_type, max_allocation)" + + " values(:groupId, :eventId, :ticketCategoryId, :type, :matchType, :maxAllocation)") + @AutoGeneratedKey("id") + AffectedRowCountAndKey createConfiguration(@Bind("groupId") int groupId, + @Bind("eventId") int eventId, + @Bind("ticketCategoryId") Integer ticketCategoryId, + @Bind("type") LinkedGroup.Type type, + @Bind("matchType") LinkedGroup.MatchType matchType, + @Bind("maxAllocation") Integer maxAllocation); + + @Query(type = QueryType.TEMPLATE, + value = "insert into group_member(a_group_id_fk, value, description) values(:groupId, :value, :description)") + String insertItemTemplate(); + + @Query("select * from group_member where a_group_id_fk = :groupId order by value") + List getItems(@Bind("groupId") int groupId); + + @Query("insert into whitelisted_ticket(group_member_id_fk, group_link_id_fk, ticket_id_fk, requires_unique_value)" + + " values(:itemId, :configurationId, :ticketId, :requiresUniqueValue)") + int insertWhitelistedTicket(@Bind("itemId") int itemId, @Bind("configurationId") int configurationId, @Bind("ticketId") int ticketId, @Bind("requiresUniqueValue") Boolean requiresUniqueValue); + + @Query(BY_EVENT_ID + + " and ticket_category_id_fk = :categoryId" + + " union all select * from group_link_active where event_id_fk = :eventId and ticket_category_id_fk is null") + List findActiveConfigurationsFor(@Bind("eventId") int eventId, @Bind("categoryId") int categoryId); + + @Query(BY_EVENT_ID) + List findActiveConfigurationsForEvent(@Bind("eventId") int eventId); + + @Query("select * from group_link_active where id = :configurationId") + LinkedGroup getConfiguration(@Bind("configurationId") int configurationId); + + @Query("select * from group_link where id = :configurationId for update") + LinkedGroup getConfigurationForUpdate(@Bind("configurationId") int configurationId); + + @Query("select count(*) from whitelisted_ticket where group_link_id_fk = :configurationId") + int countWhitelistedTicketsForConfiguration(@Bind("configurationId") int configurationId); + + @Query("update group_link set a_group_id_fk = :groupId, event_id_fk = :eventId, ticket_category_id_fk = :categoryId, type = :type, match_type = :matchType, max_allocation = :maxAllocation where id = :id") + int updateConfiguration(@Bind("id") int configurationId, + @Bind("groupId") int groupId, + @Bind("eventId") int eventId, + @Bind("categoryId") Integer categoryId, + @Bind("type") LinkedGroup.Type type, + @Bind("matchType") LinkedGroup.MatchType matchType, + @Bind("maxAllocation") Integer maxAllocation); + + @Query("update group_link set active = false where id = :id") + int disableConfiguration(@Bind("id") int id); + + @Query("select * from group_member wi where wi.a_group_id_fk = :groupId and wi.value = lower(:value)") + Optional findItemByValueExactMatch(@Bind("groupId") int groupId, @Bind("value") String value); + + @Query("select * from group_member wi where wi.a_group_id_fk = :groupId and wi.value like lower(:value) limit 1") + Optional findItemEndsWith(@Bind("configurationId") int configurationId, + @Bind("groupId") int groupId, + @Bind("value") String value); + + @Query("select * from whitelisted_ticket where a_group_id_fk = :itemId and group_link_id_fk = :configurationId") + Optional findExistingWhitelistedTicket(@Bind("itemId") int itemId, + @Bind("configurationId") int configurationId); + + @Query("select count(*) from whitelisted_ticket where group_member_id_fk = :itemId and group_link_id_fk = :configurationId") + int countExistingWhitelistedTickets(@Bind("itemId") int itemId, + @Bind("configurationId") int configurationId); + + @Query("delete from whitelisted_ticket where ticket_id_fk in (:ticketIds)") + int deleteExistingWhitelistedTickets(@Bind("ticketIds") List ticketIds); + + +} diff --git a/src/main/java/alfio/repository/TicketRepository.java b/src/main/java/alfio/repository/TicketRepository.java index defa7b9d75..013465c068 100644 --- a/src/main/java/alfio/repository/TicketRepository.java +++ b/src/main/java/alfio/repository/TicketRepository.java @@ -140,6 +140,9 @@ public interface TicketRepository { @Query("update ticket set locked_assignment = :lockedAssignment where id = :id and category_id = :categoryId") int toggleTicketLocking(@Bind("id") int ticketId, @Bind("categoryId") int categoryId, @Bind("lockedAssignment") boolean locked); + @Query("update ticket set locked_assignment = true where id in (:ids)") + int forbidReassignment(@Bind("ids") List ticketIds); + @Query("update ticket set ext_reference = :extReference, locked_assignment = :lockedAssignment where id = :id and category_id = :categoryId") int updateExternalReferenceAndLocking(@Bind("id") int ticketId, @Bind("categoryId") int categoryId, @Bind("extReference") String extReference, @Bind("lockedAssignment") boolean locked); diff --git a/src/main/java/alfio/util/ErrorsCode.java b/src/main/java/alfio/util/ErrorsCode.java index fe34c6eb34..eb7f5d8144 100644 --- a/src/main/java/alfio/util/ErrorsCode.java +++ b/src/main/java/alfio/util/ErrorsCode.java @@ -45,6 +45,7 @@ public interface ErrorsCode { String STEP_2_MAX_LENGTH_BILLING_ADDRESS = "error.STEP_2_MAX_LENGTH_BILLING_ADDRESS"; String STEP_2_EMPTY_BILLING_ADDRESS = "error.STEP_2_EMPTY_BILLING_ADDRESS"; String STEP_2_INVALID_VAT = "error.STEP_2_INVALID_VAT"; + String STEP_2_WHITELIST_CHECK_FAILED = "error.STEP_2_WHITELIST_CHECK_FAILED"; String STEP_2_INVALID_HMAC = "error.STEP_2_INVALID_HMAC"; String STEP_2_PAYMENT_REQUEST_CREATION = "error.STEP_2_PAYMENT_REQUEST_CREATION"; diff --git a/src/main/java/alfio/util/Validator.java b/src/main/java/alfio/util/Validator.java index e92943e76b..766dfff982 100644 --- a/src/main/java/alfio/util/Validator.java +++ b/src/main/java/alfio/util/Validator.java @@ -19,6 +19,7 @@ import alfio.controller.form.UpdateTicketOwnerForm; import alfio.controller.form.WaitingQueueSubscriptionForm; import alfio.manager.EuVatChecker; +import alfio.manager.GroupManager; import alfio.model.ContentLanguage; import alfio.model.Event; import alfio.model.TicketFieldConfiguration; @@ -27,10 +28,13 @@ import alfio.model.modification.TicketCategoryModification; import alfio.model.modification.support.LocationDescriptor; import alfio.model.result.ErrorCode; +import alfio.model.result.Result; import alfio.model.result.ValidationResult; import lombok.Data; +import lombok.RequiredArgsConstructor; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Validate; import org.springframework.validation.Errors; import org.springframework.validation.ValidationUtils; @@ -39,6 +43,7 @@ import java.util.Collections; import java.util.List; import java.util.Optional; +import java.util.function.Function; import java.util.function.Predicate; import java.util.regex.Pattern; import java.util.stream.Collectors; @@ -175,6 +180,19 @@ public static ValidationResult evaluateValidationResult(Errors errors) { return ValidationResult.success(); } + public static ValidationResult performAdvancedValidation(AdvancedTicketAssignmentValidator advancedValidator, AdvancedValidationContext context, Errors errors) { + if(errors == null) { + return ValidationResult.success(); + } + Result advancedValidation = advancedValidator.apply(context); + if(!advancedValidation.isSuccess()) { + ErrorCode error = advancedValidation.getFirstErrorOrNull(); + Validate.notNull(error, "unexpected error"); + errors.rejectValue(StringUtils.defaultString(context.prefix) + error.getDescription(), error.getCode()); + } + return evaluateValidationResult(errors); + } + public static ValidationResult validateTicketAssignment(UpdateTicketOwnerForm form, List additionalFieldsForEvent, Optional errorsOptional, @@ -358,4 +376,39 @@ public static ValidationResult validateAdditionalFields(List> { + + private final EuVatChecker.SameCountryValidator vatValidator; + private final GroupManager.WhitelistValidator whitelistValidator; + + + @Override + public Result apply(AdvancedValidationContext context) { + + Optional vatField = context.ticketFieldConfigurations.stream() + .filter(TicketFieldConfiguration::isEuVat) + .filter(f -> context.updateTicketOwnerForm.getAdditional() !=null && context.updateTicketOwnerForm.getAdditional().containsKey(f.getName())) + .findFirst(); + + Optional vatNr = vatField.map(c -> context.updateTicketOwnerForm.getAdditional().get(c.getName()).get(0)); + String vatFieldName = vatField.map(TicketFieldConfiguration::getName).orElse(""); + + return new Result.Builder() + .checkPrecondition(() -> !vatNr.isPresent() || vatValidator.test(vatNr.get()), ErrorCode.custom(ErrorsCode.STEP_2_INVALID_VAT, "additional['"+vatFieldName+"']")) + .checkPrecondition(() -> whitelistValidator.test(new GroupManager.WhitelistValidationItem(context.categoryId, context.updateTicketOwnerForm.getEmail())), ErrorCode.custom(ErrorsCode.STEP_2_WHITELIST_CHECK_FAILED, "email")) + .build(() -> null); + } + } + + @RequiredArgsConstructor + public static class AdvancedValidationContext { + private final UpdateTicketOwnerForm updateTicketOwnerForm; + private final List ticketFieldConfigurations; + private final int categoryId; + private final String ticketUuid; + private final String prefix; + } + } diff --git a/src/main/resources/alfio/db/PGSQL/V22_1.15.5.1__CREATE_GROUP.sql b/src/main/resources/alfio/db/PGSQL/V22_1.15.5.1__CREATE_GROUP.sql new file mode 100644 index 0000000000..579e1dfcfb --- /dev/null +++ b/src/main/resources/alfio/db/PGSQL/V22_1.15.5.1__CREATE_GROUP.sql @@ -0,0 +1,67 @@ +-- +-- 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 . +-- + +create table a_group ( + id serial primary key not null, + name varchar(255) not null, + description varchar(2048), + organization_id_fk integer not null +); + +alter table a_group add constraint "a_group_org_id_fk" foreign key(organization_id_fk) references organization(id); +alter table a_group add constraint "a_group_unique_name_org_id" unique(name, organization_id_fk); + +create table group_member ( + id serial primary key not null, + a_group_id_fk integer not null, + value varchar(255), + description varchar(2048) +); + +alter table group_member add constraint "group_member_a_group_id_fk" foreign key(a_group_id_fk) references a_group(id); +alter table group_member add constraint "group_member_unique_value" unique(a_group_id_fk, value); + +create table group_link ( + id serial primary key not null, + a_group_id_fk integer not null, + event_id_fk integer not null, + ticket_category_id_fk integer, + type varchar(255), + match_type varchar(255), + max_allocation integer, + active boolean not null default true +); + +alter table group_link add constraint "group_link_a_group_id_fk" foreign key(a_group_id_fk) references a_group(id); +alter table group_link add constraint "group_link_event_id_fk" foreign key(event_id_fk) references event(id); +alter table group_link add constraint "group_link_ticket_category_id_fk" foreign key(ticket_category_id_fk) references ticket_category(id); + +create table whitelisted_ticket ( + group_member_id_fk integer not null, + group_link_id_fk integer not null, + ticket_id_fk integer not null, + requires_unique_value boolean +); + +alter table whitelisted_ticket add constraint "whitelisted_ticket_group_member_id_fk" foreign key(group_member_id_fk) references group_member(id); +alter table whitelisted_ticket add constraint "whitelisted_ticket_group_link_id_fk" foreign key(group_link_id_fk) references group_link(id); +alter table whitelisted_ticket add constraint "whitelisted_ticket_ticket_id_fk" foreign key(ticket_id_fk) references ticket(id); +alter table whitelisted_ticket add constraint "whitelisted_ticket_unique_item_id" unique(group_member_id_fk, group_link_id_fk, requires_unique_value); + +create view group_link_active as select * from group_link where active = true; + + diff --git a/src/main/resources/alfio/i18n/public.properties b/src/main/resources/alfio/i18n/public.properties index c0f248da33..7911a1ecce 100644 --- a/src/main/resources/alfio/i18n/public.properties +++ b/src/main/resources/alfio/i18n/public.properties @@ -174,6 +174,8 @@ error.STEP2_STRIPE_abort=A network error has occurred, and you have not been cha error.STEP2_STRIPE_rate_limit=A network error has occurred, and you have not been charged. Please try again. error.STEP2_STRIPE_unexpected=An unexpected error has occurred. Please contact the event''s organizers in order to get assistance. error.STEP2_UNABLE_TO_TRANSITION=An unexpected error has occurred, and you have not been charged. Please try again. +error.STEP2_WHITELIST=One or more email addresses have already been used or are not allowed for this event. +error.STEP_2_WHITELIST_CHECK_FAILED=Cannot assign a ticket using the provided email addresses: access is limited. error.generic=An unexpected error has occurred. Please contact the event''s organizers in order to get assistance. error.STEP_2_PAYMENT_PROCESSING_ERROR=Payment processing error: {0} diff --git a/src/main/resources/alfio/i18n/public_it.properties b/src/main/resources/alfio/i18n/public_it.properties index f13aebebd0..368b19134e 100644 --- a/src/main/resources/alfio/i18n/public_it.properties +++ b/src/main/resources/alfio/i18n/public_it.properties @@ -349,6 +349,8 @@ reservation.add-company-billing-details=Acquisto come azienda (\u00E8 richiesto error.STEP_2_EMPTY_BILLING_ADDRESS=L''indirizzo di fatturazione \u00E8 obbligatorio common.customer-reference=Numero di riferimento error.STEP_2_INVALID_VAT=Il numero IVA immesso non risulta valido. +error.STEP2_WHITELIST=Uno o pi\u00F9 indirizzi email sono gi\u00E0 stati usati in precedenza o non sono autorizzati per questo evento. +error.STEP_2_WHITELIST_CHECK_FAILED=L''accesso ad una delle categorie selezionate \u00E8 limitato e uno o pi\u00F9 indirizzi email forniti non sono autorizzati a prenotare. error.vatVIESDown=[IT] An error occurred contacting the EU VIES vat checker. Please try again. breadcrumb.step4=[IT]-Thank You common.back=[IT]-Back @@ -361,4 +363,4 @@ reservation-page.if-applicable=[IT]-if applicable error.emptyField=[IT]-This field is required error.tooLong=[IT]-The value is too long reservation-page.skipVatNr=[IT]-I don''t have a {0} number -breadcrumb.step3.free=[IT]-Overview \ No newline at end of file +breadcrumb.step3.free=[IT]-Overview diff --git a/src/main/webapp/WEB-INF/templates/admin/index.ms b/src/main/webapp/WEB-INF/templates/admin/index.ms index c51a5a99a5..419e02cdf7 100644 --- a/src/main/webapp/WEB-INF/templates/admin/index.ms +++ b/src/main/webapp/WEB-INF/templates/admin/index.ms @@ -87,6 +87,7 @@ + @@ -122,6 +123,7 @@
  • Api Key
  • Configuration
  • Extension
    • +
  • Groups
    • {{/isOwner}}

    • Status

      • diff --git a/src/main/webapp/resources/angular-templates/admin/partials/configuration/category.html b/src/main/webapp/resources/angular-templates/admin/partials/configuration/category.html index ebc91238da..dbd91c4a2a 100644 --- a/src/main/webapp/resources/angular-templates/admin/partials/configuration/category.html +++ b/src/main/webapp/resources/angular-templates/admin/partials/configuration/category.html @@ -6,12 +6,12 @@

      You are not authorized to see Category configuration.

      -
      -

      Configuration for {{categoryConf.category.name}}

      +
      +

      Configuration for {{categoryConf.category.name}}

      -

      General

      +

      General

      General settings
      @@ -23,7 +23,7 @@

      General

      -

      E-Mail

      +

      E-Mail

      E-Mail settings
      @@ -69,7 +69,7 @@

      E-Mail

      -

      Payment

      +

      Payment

      Payment provider settings
      @@ -78,7 +78,58 @@

      Payment

      +
      +
      +

      Link to Group

      + Allow only selected people to assign/buy a ticket for this category +
      +
      +
      +
      +
      +
      + +

      + {{group.name}}

      +

      +       +
      +
      +
      + +
      +
      +
      +
      +
      +
      +
      + + +
      +
      +
      +
      + + +
      +
      +
      +
      + + +
      +
      + + +
      + +
      +
      + +
      +
      - + \ No newline at end of file diff --git a/src/main/webapp/resources/angular-templates/admin/partials/configuration/event.html b/src/main/webapp/resources/angular-templates/admin/partials/configuration/event.html index 0fd1d2e617..c89f613701 100644 --- a/src/main/webapp/resources/angular-templates/admin/partials/configuration/event.html +++ b/src/main/webapp/resources/angular-templates/admin/partials/configuration/event.html @@ -123,6 +123,53 @@

      Payment

      +
      +
      +

      Link to Group

      + Allow only selected people to assign/buy a ticket for this event +
      +
      +
      +
      +
      +
      + +

      {{group.name}}

      +

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

      Internationalization

      diff --git a/src/main/webapp/resources/angular-templates/admin/partials/event/detail.html b/src/main/webapp/resources/angular-templates/admin/partials/event/detail.html index 782f4d6fc9..3311a839f0 100644 --- a/src/main/webapp/resources/angular-templates/admin/partials/event/detail.html +++ b/src/main/webapp/resources/angular-templates/admin/partials/event/detail.html @@ -19,6 +19,10 @@
      There are reservations for which a payment has not yet confirmed.
      +
      + Access to this event has been limited to Group {{event.attendeesList.groupName}} configure +
      +
      @@ -86,6 +90,9 @@
      Here the categories that have been defined for this event
      +
      + Access to this category has been limited to Group {{ticketCategory.attendeesList.groupName}} +
      This category contains orphan (not sold) tickets. Move them to another category: diff --git a/src/main/webapp/resources/js/admin/feature/additional-service/additional-service.js b/src/main/webapp/resources/js/admin/feature/additional-service/additional-service.js index 1d431ce753..db5fa6932e 100644 --- a/src/main/webapp/resources/js/admin/feature/additional-service/additional-service.js +++ b/src/main/webapp/resources/js/admin/feature/additional-service/additional-service.js @@ -88,7 +88,7 @@ var result = results[1].data; self.titles = titles; self.descriptions = descriptions; - self.list = _.map(result, function(item) { + self.group = _.map(result, function(item) { item.title = _.map(angular.copy(titles), fillExistingTexts(item.title)); item.description = _.map(angular.copy(descriptions), fillExistingTexts(item.description)); return item; @@ -184,7 +184,7 @@ self.delete = function(item) { var afterDelete = function(r) { - self.list = _.filter(self.list, function (i) { + self.group = _.filter(self.list, function (i) { return i !== r; }); editComplete(); 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 a4ae888041..90866c3adc 100644 --- a/src/main/webapp/resources/js/admin/feature/configuration/configuration.js +++ b/src/main/webapp/resources/js/admin/feature/configuration/configuration.js @@ -1,6 +1,6 @@ (function() { "use strict"; - angular.module('alfio-configuration', ['adminServices']) + angular.module('alfio-configuration', ['adminServices', 'group']) .config(['$stateProvider', function($stateProvider) { $stateProvider .state('configuration', { @@ -109,7 +109,7 @@ mailReplyTo: _.find(original['MAIL'], function(e) {return e.configurationKey === 'MAIL_REPLY_TO';}), mailAttemptsCount: _.find(original['MAIL'], function(e) {return e.configurationKey === 'MAIL_ATTEMPTS_COUNT';}) }; - }; + } if(angular.isDefined(original['MAP']) && original['MAP'].length > 0) { transformed.map = { @@ -155,12 +155,12 @@ function handleEuCountries(conf, euCountries) { if(conf.invoiceEu) { - var euCountries = _.map(euCountries, function(o) { + var eu = _.map(euCountries, function(o) { var key = Object.keys(o)[0]; return {key: key, value: o[key]}; }); _.forEach(_.filter(conf.invoiceEu.settings, function(e) {return e.key === 'COUNTRY_OF_BUSINESS'}), function(cb) { - cb.listValues = euCountries; + cb.listValues = eu; }); } } @@ -293,7 +293,30 @@ OrganizationConfigurationController.$inject = ['ConfigurationService', 'OrganizationService', 'ExtensionService', 'NotificationHandler', '$stateParams', '$q', '$rootScope']; - function EventConfigurationController(ConfigurationService, EventService, ExtensionService, NotificationHandler, $q, $rootScope, $stateParams) { + var groupTypes = { + 'ONCE_PER_VALUE': 'Limit to one ticket per email address', + 'LIMITED_QUANTITY': 'Limit to a specific number of tickets per email address', + 'UNLIMITED': 'Unlimited' + }; + + var groupMatchTypes = { + 'FULL': 'Full match', + 'EMAIL_DOMAIN': 'Match full email address, fallback on domain' + }; + + function selectGroup(conf) { + return function(list) { + conf.group = { + groupId: list.id, + eventId: conf.event.id, + ticketCategoryId: conf.category ? conf.category.id : null, + matchType: 'FULL', + type: 'ONCE_PER_VALUE' + }; + } + } + + function EventConfigurationController(ConfigurationService, EventService, ExtensionService, NotificationHandler, $q, $rootScope, $stateParams, GroupService) { var eventConf = this; var getData = function() { if(angular.isDefined($stateParams.eventName)) { @@ -303,7 +326,10 @@ var event = result.data.event; eventConf.eventName = event.shortName; eventConf.eventId = event.id; - $q.all([ConfigurationService.loadEventConfig(eventConf.eventId), ExtensionService.loadEventConfigWithOrgIdAndEventId(eventConf.organizationId, eventConf.eventId)]).then(function(result) { + $q.all([ + ConfigurationService.loadEventConfig(eventConf.eventId), + ExtensionService.loadEventConfigWithOrgIdAndEventId(eventConf.organizationId, eventConf.eventId) + ]).then(function(result) { deferred.resolve([{data:event}].concat(result)); }, function(e) { deferred.reject(e); @@ -323,8 +349,10 @@ eventConf.loading = true; getData().then(function(result) { eventConf.event = result[0].data; + loadGroups(); loadSettings(eventConf, result[1].data, ConfigurationService); + if(eventConf.alfioPi) { eventConf.alfioPiOptions = _.filter(eventConf.alfioPi.settings, function(pi) { return pi.key !== 'LABEL_LAYOUT'}); eventConf.labelLayout = _.find(eventConf.alfioPi.settings, function(pi) { return pi.key === 'LABEL_LAYOUT'}); @@ -347,7 +375,9 @@ } eventConf.loading = true; $q.all([ConfigurationService.updateEventConfig(eventConf.organizationId, eventConf.eventId, eventConf.settings), - ExtensionService.saveBulkEventSetting(eventConf.organizationId, eventConf.eventId, eventConf.extensionSettings)]).then(function() { + ExtensionService.saveBulkEventSetting(eventConf.organizationId, eventConf.eventId, eventConf.extensionSettings), + GroupService.linkTo(eventConf.group) + ]).then(function() { load(); NotificationHandler.showSuccess("Configurations have been saved successfully"); }, function(e) { @@ -368,9 +398,36 @@ $rootScope.$on('ReloadSettings', function() { load(); }); + + function loadGroups() { + $q.all([ + GroupService.loadGroups(eventConf.event.organizationId), + GroupService.loadActiveGroup(eventConf.event.shortName) + ]).then(function(results) { + eventConf.groups = results[0].data; + eventConf.group = results[1].status === 200 ? results[1].data : null; + eventConf.selectGroup = selectGroup(eventConf); + eventConf.groupTypes = groupTypes; + eventConf.groupMatchTypes = groupMatchTypes; + eventConf.removeGroupLink = unlinkGroup(eventConf, GroupService, load); + }); + + } } - EventConfigurationController.$inject = ['ConfigurationService', 'EventService', 'ExtensionService', 'NotificationHandler', '$q', '$rootScope', '$stateParams']; + EventConfigurationController.$inject = ['ConfigurationService', 'EventService', 'ExtensionService', 'NotificationHandler', '$q', '$rootScope', '$stateParams', 'GroupService']; + + function unlinkGroup(conf, GroupService, loadFn) { + return function(organizationId, groupLink) { + if(groupLink && angular.isDefined(groupLink.id)) { + GroupService.unlinkFrom(organizationId, groupLink.id).then(function() { + loadFn(); + }); + } else { + conf.group = undefined; + } + }; + } function loadSettings(container, settings, ConfigurationService) { var general = settings['GENERAL'] || []; @@ -392,33 +449,51 @@ closeModal: '&' }, bindToController: true, - controller: 'CategoryConfigurationController', + controller: ['ConfigurationService', '$rootScope', 'GroupService', '$q', CategoryConfigurationController], controllerAs: 'categoryConf', templateUrl: '/resources/angular-templates/admin/partials/configuration/category.html' }; } - function CategoryConfigurationController(ConfigurationService, $rootScope) { + function CategoryConfigurationController(ConfigurationService, $rootScope, GroupService, $q) { var categoryConf = this; var load = function() { categoryConf.loading = true; - ConfigurationService.loadCategory(categoryConf.event.id, categoryConf.category.id).then(function(result) { - loadSettings(categoryConf, result.data, ConfigurationService); - categoryConf.loading = false; - }, function() { - categoryConf.loading = false; - }); + $q.all([ConfigurationService.loadCategory(categoryConf.event.id, categoryConf.category.id), + GroupService.loadGroups(categoryConf.event.organizationId), + GroupService.loadActiveGroup(categoryConf.event.shortName, categoryConf.category.id)]) + .then(function(results) { + loadSettings(categoryConf, results[0].data, ConfigurationService); + categoryConf.groups = results[1].data; + categoryConf.group = results[2].status === 200 ? results[2].data : null; + categoryConf.removeGroupLink = unlinkGroup(categoryConf, GroupService, load); + categoryConf.loading = false; + }, function() { + categoryConf.loading = false; + }); }; load(); + categoryConf.selectGroup = selectGroup(categoryConf); + categoryConf.groupTypes = groupTypes; + categoryConf.groupMatchTypes = groupMatchTypes; + + categoryConf.saveSettings = function(frm) { if(!frm.$valid) { return; } categoryConf.loading = true; + ConfigurationService.updateCategoryConfig(categoryConf.category.id, categoryConf.event.id, categoryConf.settings).then(function() { - load(); + if(categoryConf.group) { + GroupService.linkTo(categoryConf.group).then(function() { + load(); + }); + } else { + load(); + } }, function(e) { alert(e.data); categoryConf.loading = false; @@ -433,7 +508,7 @@ load(); }); } - CategoryConfigurationController.$inject = ['ConfigurationService', '$rootScope']; + CategoryConfigurationController.$inject = ['ConfigurationService', '$rootScope', 'GroupService', '$q']; function basicConfigurationNeeded($uibModal, ConfigurationService, EventService, $q, $window) { return { diff --git a/src/main/webapp/resources/js/admin/feature/group/all.html b/src/main/webapp/resources/js/admin/feature/group/all.html new file mode 100644 index 0000000000..7594539251 --- /dev/null +++ b/src/main/webapp/resources/js/admin/feature/group/all.html @@ -0,0 +1,21 @@ +
      +
      +

      Groups

      + groups can be used to limit access to certain categories or events +
      + +
      +
      + + +
      +
      + +
      +
      \ No newline at end of file diff --git a/src/main/webapp/resources/js/admin/feature/group/edit.html b/src/main/webapp/resources/js/admin/feature/group/edit.html new file mode 100644 index 0000000000..ded494ac05 --- /dev/null +++ b/src/main/webapp/resources/js/admin/feature/group/edit.html @@ -0,0 +1,80 @@ +
      + +
      + back +
      + +
      +
      +
      +
      + + +
      +
      +
      +
      + + +
      +
      +
      + +
      +

      Items

      +
      + + +
        +
      • +
        +
        +
        + + +

        +
        +
        +
        +
        + + +

        +
        +
        +
        +
        + + +
        +
        +
        +
        • +
      +
      + +
      + +
      +
      +

      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
      + 
      +                        email@host.tld,description
+
+                        where:
+
+                        email@host.tld is the allowed email
+                        description description, for internal usage
+
      +
      + + +
      +
      + + +
      +
      diff --git a/src/main/webapp/resources/js/admin/feature/group/groups.js b/src/main/webapp/resources/js/admin/feature/group/groups.js new file mode 100644 index 0000000000..063f0ab007 --- /dev/null +++ b/src/main/webapp/resources/js/admin/feature/group/groups.js @@ -0,0 +1,231 @@ +(function() { + 'use strict'; + + angular.module('group', ['adminServices']) + .config(['$stateProvider', function($stateProvider) { + $stateProvider.state('groups', { + url: '/group', + template: '', + controller: ['loadOrganizations', function (loadOrganizations) { + this.organizations = loadOrganizations.data; + }], + controllerAs: 'ctrl', + resolve: { + 'loadOrganizations': function(OrganizationService) { + return OrganizationService.getAllOrganizations(); + } + } + }).state('groups.all', { + url: '/:orgId/all', + template: '', + controller: ['$stateParams', function ($stateParams) { + this.orgId = $stateParams.orgId; + }], + controllerAs: 'ctrl' + }).state('groups.edit', { + url: '/:orgId/edit/:groupId', + template: '', + controller: ['$stateParams', function ($stateParams) { + this.orgId = $stateParams.orgId; + this.groupId = $stateParams.groupId; + }], + controllerAs: 'ctrl' + }).state('groups.new', { + url: '/:orgId/new', + template: '', + controller: ['$stateParams', function ($stateParams) { + this.orgId = $stateParams.orgId; + }], + controllerAs: 'ctrl' + }); + }]) + .component('groupsContainer', { + controller: ['$stateParams', '$state', ContainerCtrl], + templateUrl: '../resources/js/admin/feature/group/all.html', + bindings: { + organizations: '<' + } + }) + .component('groups', { + controller: ['GroupService', GroupCtrl], + templateUrl: '../resources/js/admin/feature/group/list.html', + bindings: { + organizationId: '<' + } + }).component('group', { + controller: ['GroupService', '$timeout', 'NotificationHandler', '$state', DetailCtrl], + templateUrl: '../resources/js/admin/feature/group/edit.html', + bindings: { + organizationId: '<', + groupId: '<', + createNew: '<' + } + }).service('GroupService', ['$http', 'HttpErrorHandler', '$q', GroupService]); + + + function ContainerCtrl($stateParams, $state) { + var ctrl = this; + + ctrl.$onInit = function() { + if(ctrl.organizations && ctrl.organizations.length > 0) { + var orgId = ctrl.organizations[0].id; + if($stateParams.orgId) { + orgId = parseInt($stateParams.orgId, 10); + } + ctrl.organization = _.find(ctrl.organizations, function(org) {return org.id === orgId}); + if($state.current.name === 'groups') { + $state.go('.all', {orgId: ctrl.organization.id}); + } + } + }; + } + + function GroupCtrl(GroupService) { + var ctrl = this; + + ctrl.loadGroups = loadGroups; + + ctrl.$onInit = function() { + ctrl.groups = []; + loadGroups(); + }; + + function loadGroups() { + ctrl.loading = true; + GroupService.loadGroups(ctrl.organizationId).then(function(result) { + ctrl.groups = result.data; + ctrl.loading = false; + }); + } + + } + + function DetailCtrl(GroupService, $timeout, NotificationHandler, $state) { + var ctrl = this; + ctrl.uploadCsv = false; + ctrl.removeItem = removeItem; + ctrl.addItem = addItem; + ctrl.parseFileContent = parseFile; + ctrl.reinit = init; + ctrl.toggleUploadCsv = function() { + ctrl.uploadCsv = !ctrl.uploadCsv; + }; + ctrl.submit = submit; + + ctrl.$onInit = function() { + init(); + }; + + function removeItem(index) { + ctrl.group.items.splice(index, 1); + } + + function addItem() { + ctrl.group.items.push({ value: null, description: null, editable: true}); + } + + function init() { + if(ctrl.createNew) { + ctrl.group = { + name: '', + description: '', + organizationId: ctrl.organizationId, + items: [] + }; + addItem(); + } else { + ctrl.loading = true; + GroupService.loadGroupDetail(ctrl.organizationId, ctrl.groupId).then(function(result) { + ctrl.group = result.data; + ctrl.loading = false; + }); + } + } + + function submit(frm) { + if(!frm.$valid) { + return false; + } + if(angular.isDefined(ctrl.group.id)) { + GroupService.updateGroup(ctrl.organizationId, ctrl.group).then(function(result) { + NotificationHandler.showSuccess('Group '+ctrl.group.name+' successfully updated'); + $state.go('^.all', {orgId: ctrl.organizationId}); + }); + } else { + GroupService.createGroup(ctrl.organizationId, ctrl.group).then(function(result) { + NotificationHandler.showSuccess('Group '+ctrl.group.name+' successfully created'); + $state.go('^.all', {orgId: ctrl.organizationId}); + }); + } + } + + function parseFile(content) { + $timeout(function() { + ctrl.loading = true; + }); + var items = _.filter(ctrl.group.items, function(i) {return !i.editable;}); + $timeout(function() { + Papa.parse(content, { + header: false, + skipEmptyLines: true, + chunk: function(results, parser) { + var data = results.data; + _.forEach(data, function(row) { + if(row.length >= 1) { + var item = { + value: row[0], + description: row.length > 1 ? row[1] : null, + editable: true + }; + items.push(item); + } else { + console.log("unable to parse row", row); + } + }); + }, + complete: function() { + ctrl.loading = false; + ctrl.group.items = items; + if(items.length > 0) { + ctrl.uploadCsv = false; + } + } + }); + }, 100); + } + } + + function GroupService($http, HttpErrorHandler, $q) { + return { + loadGroups: function(orgId) { + return $http.get('/admin/api/group/'+orgId).error(HttpErrorHandler.handle); + }, + loadGroupDetail: function(orgId, groupId) { + return $http.get('/admin/api/group/'+orgId+'/detail/'+groupId).error(HttpErrorHandler.handle); + }, + createGroup: function(orgId, group) { + return $http.post('/admin/api/group/'+orgId+'/new', group).error(HttpErrorHandler.handle); + }, + updateGroup: function(orgId, group) { + return $http.post('/admin/api/group/'+orgId+'/update/'+group.id, group) + }, + loadActiveGroup: function(eventName, categoryId) { + var url = '/admin/api/group/event/'+eventName + (angular.isDefined(categoryId) ? '/category/'+categoryId : ''); + return $http.get(url).error(HttpErrorHandler.handle); + }, + loadActiveLinks: function(eventName) { + return $http.get('/admin/api/group/event/'+eventName+'/all').error(HttpErrorHandler.handle); + }, + linkTo: function(configuration) { + if(configuration) { + return $http.post('/admin/api/group/'+configuration.groupId+'/link', configuration).error(HttpErrorHandler.handle); + } else { + return $q.resolve(true); + } + }, + unlinkFrom: function(organizationId, groupLinkId) { + return $http['delete']('/admin/api/group/'+organizationId+'/link/'+groupLinkId); + } + } + } +})(); \ No newline at end of file diff --git a/src/main/webapp/resources/js/admin/feature/group/list.html b/src/main/webapp/resources/js/admin/feature/group/list.html new file mode 100644 index 0000000000..f5e6c6a136 --- /dev/null +++ b/src/main/webapp/resources/js/admin/feature/group/list.html @@ -0,0 +1,7 @@ +
      + +

      {{group.name}}

      +

      +       +
      +Add New \ 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 f98ddda460..fd88cdc044 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 @@ -8,7 +8,7 @@ var FIELD_TYPES = ['input:text', 'input:tel', 'textarea', 'select', 'country']; var ERROR_CODES = { DUPLICATE:'duplicate', MAX_LENGTH:'maxlength', MIN_LENGTH:'minlength'}; - var admin = angular.module('adminApplication', ['ngSanitize','ui.bootstrap', 'ui.router', 'adminDirectives', 'adminServices', 'utilFilters', 'ngMessages', 'ngFileUpload', 'nzToggle', 'alfio-email', 'alfio-util', 'alfio-configuration', 'alfio-additional-services', 'alfio-event-statistic', 'ui.ace', 'monospaced.qrcode', 'checklist-model']); + var admin = angular.module('adminApplication', ['ngSanitize','ui.bootstrap', 'ui.router', 'adminDirectives', 'adminServices', 'utilFilters', 'ngMessages', 'ngFileUpload', 'nzToggle', 'alfio-email', 'alfio-util', 'alfio-configuration', 'alfio-additional-services', 'alfio-event-statistic', 'ui.ace', 'monospaced.qrcode', 'checklist-model', 'group']); var loadEvent = { 'loadEvent': function($stateParams, EventService) { @@ -719,7 +719,8 @@ UtilsService, NotificationHandler, $timeout, - TicketCategoryEditorService) { + TicketCategoryEditorService, + GroupService) { var loadData = function() { $scope.loading = true; @@ -771,6 +772,27 @@ expired: $scope.event.ticketCategories.filter(function(tc) { return tc.containingOrphans; }).length > 0, freeText: '' }; + $q.all([GroupService.loadActiveLinks($state.params.eventName), GroupService.loadGroups($scope.event.organizationId)]) + .then(function(results) { + var confResult = results[0]; + var lists = results[1].data; + if(confResult.status === 200) { + _.forEach(confResult.data, function(list) { + var group = _.find(lists, function(l) { return l.id === list.groupId}); + list.groupName = group ? group.name : ""; + if(angular.isDefined(list.ticketCategoryId)) { + var category = _.find($scope.event.ticketCategories, function(c) { return c.id === list.ticketCategoryId;}); + if(category) { + category.attendeesList = list; + } + } + $scope.event.attendeesList = list; + }); + } + + }); + GroupService.loadActiveLinks($state.params.eventName).then(function(confResult) { + }); }); $scope.allocationStrategyRadioClass = 'radio'; $scope.evaluateCategoryStatusClass = function(index, category) { diff --git a/src/test/java/alfio/manager/GroupManagerIntegrationTest.java b/src/test/java/alfio/manager/GroupManagerIntegrationTest.java new file mode 100644 index 0000000000..c931e64f05 --- /dev/null +++ b/src/test/java/alfio/manager/GroupManagerIntegrationTest.java @@ -0,0 +1,140 @@ +/** + * 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.TestConfiguration; +import alfio.config.DataSourceConfiguration; +import alfio.config.Initializer; +import alfio.config.RepositoryConfiguration; +import alfio.manager.user.UserManager; +import alfio.model.Event; +import alfio.model.Ticket; +import alfio.model.TicketCategory; +import alfio.model.group.Group; +import alfio.model.group.LinkedGroup; +import alfio.model.modification.*; +import alfio.repository.EventRepository; +import alfio.repository.GroupRepository; +import alfio.repository.TicketRepository; +import alfio.repository.system.ConfigurationRepository; +import alfio.repository.user.AuthorityRepository; +import alfio.repository.user.OrganizationRepository; +import alfio.repository.user.UserRepository; +import alfio.test.util.IntegrationTestUtil; +import alfio.util.BaseIntegrationTest; +import org.apache.commons.lang3.time.DateUtils; +import org.apache.commons.lang3.tuple.Pair; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.test.context.ActiveProfiles; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.transaction.annotation.Transactional; + +import java.math.BigDecimal; +import java.time.LocalDate; +import java.time.LocalTime; +import java.util.*; + +import static alfio.test.util.IntegrationTestUtil.*; +import static org.junit.Assert.*; + +@RunWith(SpringJUnit4ClassRunner.class) +@ContextConfiguration(classes = {RepositoryConfiguration.class, DataSourceConfiguration.class, TestConfiguration.class}) +@ActiveProfiles({Initializer.PROFILE_DEV, Initializer.PROFILE_DISABLE_JOBS}) +@Transactional +public class GroupManagerIntegrationTest extends BaseIntegrationTest { + + @Autowired + private EventManager eventManager; + @Autowired + private OrganizationRepository organizationRepository; + @Autowired + private UserManager userManager; + @Autowired + private UserRepository userRepository; + @Autowired + private AuthorityRepository authorityRepository; + @Autowired + private TicketRepository ticketRepository; + @Autowired + private ConfigurationRepository configurationRepository; + @Autowired + private EventRepository eventRepository; + @Autowired + private GroupRepository groupRepository; + @Autowired + private GroupManager groupManager; + @Autowired + private TicketReservationManager ticketReservationManager; + + @Before + public void setup() { + IntegrationTestUtil.ensureMinimalConfiguration(configurationRepository); + initAdminUser(userRepository, authorityRepository); + } + + @Test + public void testLinkToEvent() { + + List categories = Collections.singletonList( + new TicketCategoryModification(null, "default", 10, + new DateTimeModification(LocalDate.now().plusDays(1), LocalTime.now()), + new DateTimeModification(LocalDate.now().plusDays(2), LocalTime.now()), + DESCRIPTION, BigDecimal.TEN, false, "", false, null, null, null, null, null)); + Pair pair = initEvent(categories, organizationRepository, userManager, eventManager, eventRepository); + Event event = pair.getKey(); + Group group = groupManager.createNew("test", "This is a test", event.getOrganizationId()); + assertNotNull(group); + LinkedGroupModification modification = new LinkedGroupModification(null, group.getId(), event.getId(), null, LinkedGroup.Type.ONCE_PER_VALUE, LinkedGroup.MatchType.FULL, null); + LinkedGroup configuration = groupManager.createLink(group.getId(), event.getId(), modification); + assertNotNull(configuration); + List ticketCategories = eventManager.loadTicketCategories(event); + int categoryId = ticketCategories.get(0).getId(); + assertTrue(groupManager.isGroupLinked(event.getId(), categoryId)); + List activeConfigurations = groupRepository.findActiveConfigurationsFor(event.getId(), categoryId); + assertFalse(activeConfigurations.isEmpty()); + assertEquals(1, activeConfigurations.size()); + assertEquals(configuration.getId(), activeConfigurations.get(0).getId()); + assertFalse("Group is empty, therefore no value is allowed", groupManager.isAllowed("test@test.ch", event.getId(), categoryId)); + int items = groupManager.insertMembers(group.getId(), Collections.singletonList(new GroupMemberModification(null,"test@test.ch", "description"))); + assertEquals(1, items); + assertTrue("Value should be allowed", groupManager.isAllowed("test@test.ch", event.getId(), categoryId)); + + TicketReservationModification ticketReservation = new TicketReservationModification(); + ticketReservation.setAmount(1); + ticketReservation.setTicketCategoryId(categoryId); + + String reservationId = ticketReservationManager.createTicketReservation(event, Collections.singletonList(new TicketReservationWithOptionalCodeModification(ticketReservation, Optional.empty())), + Collections.emptyList(), DateUtils.addDays(new Date(), 1), Optional.empty(), Optional.empty(), Locale.ENGLISH, false); + + Ticket ticket = ticketRepository.findFirstTicketInReservation(reservationId).orElseThrow(NullPointerException::new); + ticketRepository.updateTicketOwnerById(ticket.getId(), "test@test.ch", "This is a Test", "This is", "a Test"); + + ticket = ticketRepository.findFirstTicketInReservation(reservationId).orElseThrow(NullPointerException::new); + assertTrue("cannot confirm ticket", groupManager.acquireMemberForTicket(ticket, "not-valid")); + + reservationId = ticketReservationManager.createTicketReservation(event, Collections.singletonList(new TicketReservationWithOptionalCodeModification(ticketReservation, Optional.empty())), + Collections.emptyList(), DateUtils.addDays(new Date(), 1), Optional.empty(), Optional.empty(), Locale.ENGLISH, false); + + ticket = ticketRepository.findFirstTicketInReservation(reservationId).orElseThrow(NullPointerException::new); + assertFalse("shouldn't be allowed", groupManager.acquireMemberForTicket(ticket, "not-valid")); + + } +} \ No newline at end of file diff --git a/src/test/java/alfio/manager/TicketReservationManagerIntegrationTest.java b/src/test/java/alfio/manager/TicketReservationManagerIntegrationTest.java index 39c86616ad..8e7705b345 100644 --- a/src/test/java/alfio/manager/TicketReservationManagerIntegrationTest.java +++ b/src/test/java/alfio/manager/TicketReservationManagerIntegrationTest.java @@ -168,7 +168,7 @@ public void testTicketSelection() { assertEquals(0, ticketReservationManager.getPendingPayments(event).size()); PaymentResult confirm = ticketReservationManager.confirm(null, null, event, reservationId, "email@example.com", new CustomerName("full name", "full", "name", event), Locale.ENGLISH, "billing address", "reference", - totalPrice, Optional.empty(), Optional.of(PaymentProxy.OFFLINE), false, null, null, null, false, false); + totalPrice, Optional.empty(), Optional.of(PaymentProxy.OFFLINE), false, null, null, null, false, false, Collections.emptyMap()); assertTrue(confirm.isSuccessful()); @@ -203,7 +203,7 @@ public void testTicketSelection() { String reservationId2 = ticketReservationManager.createTicketReservation(event, Collections.singletonList(modForDelete), Collections.emptyList(), DateUtils.addDays(new Date(), 1), Optional.empty(), Optional.empty(), Locale.ENGLISH, false); ticketReservationManager.confirm(null, null, event, reservationId2, "email@example.com", new CustomerName("full name", "full", "name", event), Locale.ENGLISH, "billing address", "reference", - totalPrice, Optional.empty(), Optional.of(PaymentProxy.OFFLINE), false, null, null, null, false, false); + totalPrice, Optional.empty(), Optional.of(PaymentProxy.OFFLINE), false, null, null, null, false, false, Collections.emptyMap()); assertTrue(ticketReservationManager.findById(reservationId2).isPresent()); @@ -355,7 +355,7 @@ public void testDeletePendingPaymentUnboundedCategory() { TicketReservationWithOptionalCodeModification mod = new TicketReservationWithOptionalCodeModification(tr, Optional.empty()); String reservationId = ticketReservationManager.createTicketReservation(event, Collections.singletonList(mod), Collections.emptyList(), DateUtils.addDays(new Date(), 1), Optional.empty(), Optional.empty(), Locale.ENGLISH, false); TotalPrice reservationCost = ticketReservationManager.totalReservationCostWithVAT(reservationId); - PaymentResult result = ticketReservationManager.confirm("", null, event, reservationId, "test@test.ch", new CustomerName("full name", "full", "name", event), Locale.ENGLISH, "", "", reservationCost, Optional.empty(), Optional.of(PaymentProxy.OFFLINE), false, null, null, null, false, false); + PaymentResult result = ticketReservationManager.confirm("", null, event, reservationId, "test@test.ch", new CustomerName("full name", "full", "name", event), Locale.ENGLISH, "", "", reservationCost, Optional.empty(), Optional.of(PaymentProxy.OFFLINE), false, null, null, null, false, false, Collections.emptyMap()); assertTrue(result.isSuccessful()); ticketReservationManager.deleteOfflinePayment(event, reservationId, false); waitingQueueManager.distributeSeats(event); @@ -363,7 +363,7 @@ public void testDeletePendingPaymentUnboundedCategory() { mod = new TicketReservationWithOptionalCodeModification(tr, Optional.empty()); reservationId = ticketReservationManager.createTicketReservation(event, Collections.singletonList(mod), Collections.emptyList(), DateUtils.addDays(new Date(), 1), Optional.empty(), Optional.empty(), Locale.ENGLISH, false); reservationCost = ticketReservationManager.totalReservationCostWithVAT(reservationId); - result = ticketReservationManager.confirm("", null, event, reservationId, "test@test.ch", new CustomerName("full name", "full", "name", event), Locale.ENGLISH, "", "", reservationCost, Optional.empty(), Optional.of(PaymentProxy.OFFLINE), false, null, null, null, false, false); + result = ticketReservationManager.confirm("", null, event, reservationId, "test@test.ch", new CustomerName("full name", "full", "name", event), Locale.ENGLISH, "", "", reservationCost, Optional.empty(), Optional.of(PaymentProxy.OFFLINE), false, null, null, null, false, false, Collections.emptyMap()); assertTrue(result.isSuccessful()); } } \ No newline at end of file diff --git a/src/test/java/alfio/manager/TicketReservationManagerTest.java b/src/test/java/alfio/manager/TicketReservationManagerTest.java index 7d322b9743..b68cc5a597 100644 --- a/src/test/java/alfio/manager/TicketReservationManagerTest.java +++ b/src/test/java/alfio/manager/TicketReservationManagerTest.java @@ -116,6 +116,7 @@ public class TicketReservationManagerTest { private UserRepository userRepository; private ExtensionManager extensionManager; private TicketSearchRepository ticketSearchRepository; + private GroupManager groupManager; @BeforeEach public void init() { @@ -151,6 +152,7 @@ public void init() { userRepository = mock(UserRepository.class); extensionManager = mock(ExtensionManager.class); ticketSearchRepository = mock(TicketSearchRepository.class); + groupManager = mock(GroupManager.class); trm = new TicketReservationManager(eventRepository, organizationRepository, @@ -176,7 +178,8 @@ public void init() { auditingRepository, userRepository, extensionManager, - ticketSearchRepository); + ticketSearchRepository, + groupManager); when(event.getId()).thenReturn(EVENT_ID); when(event.getOrganizationId()).thenReturn(ORGANIZATION_ID); @@ -703,7 +706,8 @@ public void confirmPaidReservation() throws Exception { when(paymentManager.processStripePayment(eq(RESERVATION_ID), eq(GATEWAY_TOKEN), anyInt(), eq(event), anyString(), any(CustomerName.class), anyString())).thenReturn(PaymentResult.successful(TRANSACTION_ID)); PaymentResult result = trm.confirm(GATEWAY_TOKEN, null, event, RESERVATION_ID, "", new CustomerName("Full Name", null, null, event), Locale.ENGLISH, "", "", new TotalPrice(100, 0, 0, 0), Optional.empty(), - Optional.of(PaymentProxy.STRIPE), true, "IT", "123456", PriceContainer.VatStatus.INCLUDED, true, false); + Optional.of(PaymentProxy.STRIPE), true, "IT", "123456", PriceContainer.VatStatus.INCLUDED, true, false, + Collections.emptyMap()); assertTrue(result.isSuccessful()); assertEquals(Optional.of(TRANSACTION_ID), result.getGatewayTransactionId()); verify(ticketReservationRepository).updateTicketReservation(eq(RESERVATION_ID), eq(TicketReservationStatus.IN_PAYMENT.toString()), anyString(), anyString(), isNull(), isNull(), anyString(), anyString(), any(), eq(PaymentProxy.STRIPE.toString()), anyString()); @@ -728,7 +732,8 @@ public void returnFailureCodeIfPaymentNotSuccesful() throws Exception { when(paymentManager.processStripePayment(eq(RESERVATION_ID), eq(GATEWAY_TOKEN), anyInt(), eq(event), anyString(), any(CustomerName.class), anyString())).thenReturn(PaymentResult.unsuccessful("error-code")); PaymentResult result = trm.confirm(GATEWAY_TOKEN, null, event, RESERVATION_ID, "", new CustomerName("Full Name", null, null, event), Locale.ENGLISH, "","", new TotalPrice(100, 0, 0, 0), Optional.empty(), Optional.of(PaymentProxy.STRIPE), - true, "IT", "12345", PriceContainer.VatStatus.INCLUDED, true, false); + true, "IT", "12345", PriceContainer.VatStatus.INCLUDED, true, false, + Collections.emptyMap()); assertFalse(result.isSuccessful()); assertFalse(result.getGatewayTransactionId().isPresent()); assertEquals(Optional.of("error-code"), result.getErrorCode()); @@ -749,7 +754,8 @@ public void handleOnSitePaymentMethod() throws Exception { when(paymentManager.processStripePayment(eq(RESERVATION_ID), eq(GATEWAY_TOKEN), anyInt(), eq(event), anyString(), any(CustomerName.class), anyString())).thenReturn(PaymentResult.unsuccessful("error-code")); PaymentResult result = trm.confirm(GATEWAY_TOKEN, null, event, RESERVATION_ID, "", new CustomerName("Full Name", null, null, event), Locale.ENGLISH, "", "", new TotalPrice(100, 0, 0, 0), Optional.empty(), - Optional.of(PaymentProxy.ON_SITE), true, "IT", "123456", PriceContainer.VatStatus.INCLUDED, true, false); + Optional.of(PaymentProxy.ON_SITE), true, "IT", "123456", PriceContainer.VatStatus.INCLUDED, true, false, + Collections.emptyMap()); assertTrue(result.isSuccessful()); assertEquals(Optional.of(TicketReservationManager.NOT_YET_PAID_TRANSACTION_ID), result.getGatewayTransactionId()); verify(ticketReservationRepository).updateTicketReservation(eq(RESERVATION_ID), eq(TicketReservationStatus.COMPLETE.toString()), anyString(), anyString(), isNull(), isNull(), anyString(), anyString(), any(), eq(PaymentProxy.ON_SITE.toString()), anyString()); @@ -770,7 +776,8 @@ public void handleOfflinePaymentMethod() throws Exception { when(ticketReservationRepository.postponePayment(eq(RESERVATION_ID), any(Date.class), anyString(), anyString(), isNull(), isNull(), anyString(), anyString())).thenReturn(1); PaymentResult result = trm.confirm(GATEWAY_TOKEN, null, event, RESERVATION_ID, "", new CustomerName("Full Name", null, null, event), Locale.ENGLISH, "", "", new TotalPrice(100, 0, 0, 0), Optional.empty(), - Optional.of(PaymentProxy.OFFLINE), true, "IT", "123456", PriceContainer.VatStatus.INCLUDED, true, false); + Optional.of(PaymentProxy.OFFLINE), true, "IT", "123456", PriceContainer.VatStatus.INCLUDED, true, false, + Collections.emptyMap()); assertTrue(result.isSuccessful()); assertEquals(Optional.of(TicketReservationManager.NOT_YET_PAID_TRANSACTION_ID), result.getGatewayTransactionId()); verify(waitingQueueManager, never()).fireReservationConfirmed(eq(RESERVATION_ID)); diff --git a/src/test/java/alfio/manager/TicketReservationManagerUnitTest.java b/src/test/java/alfio/manager/TicketReservationManagerUnitTest.java index 2d940ce21f..e47b70e82f 100644 --- a/src/test/java/alfio/manager/TicketReservationManagerUnitTest.java +++ b/src/test/java/alfio/manager/TicketReservationManagerUnitTest.java @@ -72,6 +72,7 @@ public class TicketReservationManagerUnitTest { private AuditingRepository auditingRepository; private UserRepository userRepository; private ExtensionManager extensionManager; + private GroupManager groupManager; @BeforeEach public void setUp() { @@ -104,6 +105,7 @@ public void setUp() { auditingRepository = mock(AuditingRepository.class); userRepository = mock(UserRepository.class); extensionManager = mock(ExtensionManager.class); + groupManager = mock(GroupManager.class); manager = new TicketReservationManager(eventRepository, organizationRepository, @@ -129,7 +131,8 @@ public void setUp() { auditingRepository, userRepository, extensionManager, - mock(TicketSearchRepository.class)); + mock(TicketSearchRepository.class), + groupManager); } @Test diff --git a/src/test/java/alfio/manager/WaitingQueueManagerIntegrationTest.java b/src/test/java/alfio/manager/WaitingQueueManagerIntegrationTest.java index f883aed9f1..9e8b8476bd 100644 --- a/src/test/java/alfio/manager/WaitingQueueManagerIntegrationTest.java +++ b/src/test/java/alfio/manager/WaitingQueueManagerIntegrationTest.java @@ -172,7 +172,7 @@ public void testWaitingQueueForUnboundedCategory() { TicketReservationWithOptionalCodeModification mod = new TicketReservationWithOptionalCodeModification(tr, Optional.empty()); String reservationId = ticketReservationManager.createTicketReservation(event, Collections.singletonList(mod), Collections.emptyList(), DateUtils.addDays(new Date(), 1), Optional.empty(), Optional.empty(), Locale.ENGLISH, false); TotalPrice reservationCost = ticketReservationManager.totalReservationCostWithVAT(reservationId); - PaymentResult result = ticketReservationManager.confirm("", null, event, reservationId, "test@test.ch", new CustomerName("Full Name", "Full", "Name", event), Locale.ENGLISH, "", "", reservationCost, Optional.empty(), Optional.of(PaymentProxy.OFFLINE), false, null, null, null, false, false); + PaymentResult result = ticketReservationManager.confirm("", null, event, reservationId, "test@test.ch", new CustomerName("Full Name", "Full", "Name", event), Locale.ENGLISH, "", "", reservationCost, Optional.empty(), Optional.of(PaymentProxy.OFFLINE), false, null, null, null, false, false, Collections.emptyMap()); assertTrue(result.isSuccessful()); assertEquals(0, eventRepository.findStatisticsFor(event.getId()).getDynamicAllocation()); @@ -207,12 +207,12 @@ public void testAssignTicketToWaitingQueueUnboundedCategory() { String reservationId = ticketReservationManager.createTicketReservation(event, Collections.singletonList(multi), Collections.emptyList(), DateUtils.addDays(new Date(), 1), Optional.empty(), Optional.empty(), Locale.ENGLISH, false); TotalPrice reservationCost = ticketReservationManager.totalReservationCostWithVAT(reservationId); - PaymentResult result = ticketReservationManager.confirm("", null, event, reservationId, "test@test.ch", new CustomerName("Full Name", "Full", "Name", event), Locale.ENGLISH, "", "", reservationCost, Optional.empty(), Optional.of(PaymentProxy.OFFLINE), false, null, null, null, false, false); + PaymentResult result = ticketReservationManager.confirm("", null, event, reservationId, "test@test.ch", new CustomerName("Full Name", "Full", "Name", event), Locale.ENGLISH, "", "", reservationCost, Optional.empty(), Optional.of(PaymentProxy.OFFLINE), false, null, null, null, false, false, Collections.emptyMap()); assertTrue(result.isSuccessful()); String reservationIdSingle = ticketReservationManager.createTicketReservation(event, Collections.singletonList(single), Collections.emptyList(), DateUtils.addDays(new Date(), 1), Optional.empty(), Optional.empty(), Locale.ENGLISH, false); TotalPrice reservationCostSingle = ticketReservationManager.totalReservationCostWithVAT(reservationIdSingle); - PaymentResult resultSingle = ticketReservationManager.confirm("", null, event, reservationIdSingle, "test@test.ch", new CustomerName("Full Name", "Full", "Name", event), Locale.ENGLISH, "", "", reservationCostSingle, Optional.empty(), Optional.of(PaymentProxy.OFFLINE), false, null, null, null, false, false); + PaymentResult resultSingle = ticketReservationManager.confirm("", null, event, reservationIdSingle, "test@test.ch", new CustomerName("Full Name", "Full", "Name", event), Locale.ENGLISH, "", "", reservationCostSingle, Optional.empty(), Optional.of(PaymentProxy.OFFLINE), false, null, null, null, false, false, Collections.emptyMap()); assertTrue(resultSingle.isSuccessful()); @@ -261,12 +261,12 @@ public void testAssignTicketToWaitingQueueBoundedCategory() { String reservationId = ticketReservationManager.createTicketReservation(event, Collections.singletonList(multi), Collections.emptyList(), DateUtils.addDays(new Date(), 1), Optional.empty(), Optional.empty(), Locale.ENGLISH, false); TotalPrice reservationCost = ticketReservationManager.totalReservationCostWithVAT(reservationId); - PaymentResult result = ticketReservationManager.confirm("", null, event, reservationId, "test@test.ch", new CustomerName("Full Name", "Full", "Name", event), Locale.ENGLISH, "", "", reservationCost, Optional.empty(), Optional.of(PaymentProxy.OFFLINE), false, null, null, null, false, false); + PaymentResult result = ticketReservationManager.confirm("", null, event, reservationId, "test@test.ch", new CustomerName("Full Name", "Full", "Name", event), Locale.ENGLISH, "", "", reservationCost, Optional.empty(), Optional.of(PaymentProxy.OFFLINE), false, null, null, null, false, false, Collections.emptyMap()); assertTrue(result.isSuccessful()); String reservationIdSingle = ticketReservationManager.createTicketReservation(event, Collections.singletonList(single), Collections.emptyList(), DateUtils.addDays(new Date(), 1), Optional.empty(), Optional.empty(), Locale.ENGLISH, false); TotalPrice reservationCostSingle = ticketReservationManager.totalReservationCostWithVAT(reservationIdSingle); - PaymentResult resultSingle = ticketReservationManager.confirm("", null, event, reservationIdSingle, "test@test.ch", new CustomerName("Full Name", "Full", "Name", event), Locale.ENGLISH, "", "", reservationCostSingle, Optional.empty(), Optional.of(PaymentProxy.OFFLINE), false, null, null, null, false, false); + PaymentResult resultSingle = ticketReservationManager.confirm("", null, event, reservationIdSingle, "test@test.ch", new CustomerName("Full Name", "Full", "Name", event), Locale.ENGLISH, "", "", reservationCostSingle, Optional.empty(), Optional.of(PaymentProxy.OFFLINE), false, null, null, null, false, false, Collections.emptyMap()); assertTrue(resultSingle.isSuccessful()); @@ -354,7 +354,7 @@ private String reserveTickets(Event event, TicketCategory category, int num) { TicketReservationWithOptionalCodeModification tcm = new TicketReservationWithOptionalCodeModification(tr, Optional.empty()); String reservationId = ticketReservationManager.createTicketReservation(event, Collections.singletonList(tcm), Collections.emptyList(), DateUtils.addDays(new Date(), 1), Optional.empty(), Optional.empty(), Locale.ENGLISH, false); TotalPrice reservationCost = ticketReservationManager.totalReservationCostWithVAT(reservationId); - PaymentResult result = ticketReservationManager.confirm("", null, event, reservationId, "test@test.ch", new CustomerName("Full Name", "Full", "Name", event), Locale.ENGLISH, "", "", reservationCost, Optional.empty(), Optional.of(PaymentProxy.OFFLINE), false, null, null, null, false, false); + PaymentResult result = ticketReservationManager.confirm("", null, event, reservationId, "test@test.ch", new CustomerName("Full Name", "Full", "Name", event), Locale.ENGLISH, "", "", reservationCost, Optional.empty(), Optional.of(PaymentProxy.OFFLINE), false, null, null, null, false, false, Collections.emptyMap()); assertTrue(result.isSuccessful()); return reservationId; } diff --git a/src/test/java/alfio/manager/system/DataMigratorIntegrationTest.java b/src/test/java/alfio/manager/system/DataMigratorIntegrationTest.java index f20200e5c4..27e94843a0 100644 --- a/src/test/java/alfio/manager/system/DataMigratorIntegrationTest.java +++ b/src/test/java/alfio/manager/system/DataMigratorIntegrationTest.java @@ -283,7 +283,7 @@ public void testUpdateGender() throws IOException { TicketReservationWithOptionalCodeModification r = new TicketReservationWithOptionalCodeModification(trm, Optional.empty()); Date expiration = DateUtils.addDays(new Date(), 1); String reservationId = ticketReservationManager.createTicketReservation(event, Collections.singletonList(r), Collections.emptyList(), expiration, Optional.empty(), Optional.empty(), Locale.ENGLISH, false); - ticketReservationManager.confirm("TOKEN", null, event, reservationId, "email@email.ch", new CustomerName("Full Name", "Full", "Name", event), Locale.ENGLISH, null, null, new TotalPrice(1000, 10, 0, 0), Optional.empty(), Optional.of(PaymentProxy.ON_SITE), false, null, null, null, false, false); + ticketReservationManager.confirm("TOKEN", null, event, reservationId, "email@email.ch", new CustomerName("Full Name", "Full", "Name", event), Locale.ENGLISH, null, null, new TotalPrice(1000, 10, 0, 0), Optional.empty(), Optional.of(PaymentProxy.ON_SITE), false, null, null, null, false, false, Collections.emptyMap()); List tickets = ticketRepository.findTicketsInReservation(reservationId); UpdateTicketOwnerForm first = new UpdateTicketOwnerForm(); first.setEmail("email@email.ch"); From 20a5053daa489d40b9a170e1b218faaa84fba93d Mon Sep 17 00:00:00 2001 From: Celestino Bellone Date: Tue, 24 Jul 2018 17:15:26 +0200 Subject: [PATCH 2/5] disable postpone assignment option if one or more categories are linked to groups --- .../alfio/controller/ReservationController.java | 14 ++++---------- .../controller/form/ContactAndTicketsForm.java | 12 ++++++++---- .../alfio/manager/TicketReservationManager.java | 17 +++++++++++++---- 3 files changed, 25 insertions(+), 18 deletions(-) diff --git a/src/main/java/alfio/controller/ReservationController.java b/src/main/java/alfio/controller/ReservationController.java index 185d13df93..69eb5d29d2 100644 --- a/src/main/java/alfio/controller/ReservationController.java +++ b/src/main/java/alfio/controller/ReservationController.java @@ -119,17 +119,10 @@ public String showBookingPage(@PathVariable("eventName") String eventName, List ticketsInReservation = ticketReservationManager.findTicketsInReservation(reservationId); model.addAttribute("postponeAssignment", false) - .addAttribute("showPostpone", !forceAssignment && ticketsInReservation.size() > 1); + .addAttribute("showPostpone", !forceAssignment && ticketsInReservation.size() > 1 && ticketReservationManager.containsCategoriesLinkedToGroups(reservationId, event.getId())); - try { - model.addAttribute("delayForOfflinePayment", Math.max(1, TicketReservationManager.getOfflinePaymentWaitingPeriod(event, configurationManager))); - } catch (TicketReservationManager.OfflinePaymentException e) { - if(event.getAllowedPaymentProxies().contains(PaymentProxy.OFFLINE)) { - log.error("Already started event {} has been found with OFFLINE payment enabled" , event.getDisplayName() , e); - } - model.addAttribute("delayForOfflinePayment", 0); - } + addDelayForOffline(model, event); OrderSummary orderSummary = ticketReservationManager.orderSummaryForReservationId(reservationId, event, locale); @@ -250,7 +243,8 @@ public String validateToOverview(@PathVariable("eventName") String eventName, @P final TotalPrice reservationCost = ticketReservationManager.totalReservationCostWithVAT(reservationId); Configuration.ConfigurationPathKey forceAssignmentKey = Configuration.from(event.getOrganizationId(), event.getId(), ConfigurationKeys.FORCE_TICKET_OWNER_ASSIGNMENT_AT_RESERVATION); boolean forceAssignment = configurationManager.getBooleanConfigValue(forceAssignmentKey, false); - if(forceAssignment) { + + if(forceAssignment || ticketReservationManager.containsCategoriesLinkedToGroups(reservationId, event.getId())) { contactAndTicketsForm.setPostponeAssignment(false); } diff --git a/src/main/java/alfio/controller/form/ContactAndTicketsForm.java b/src/main/java/alfio/controller/form/ContactAndTicketsForm.java index 77827b7f7a..207c62f2fb 100644 --- a/src/main/java/alfio/controller/form/ContactAndTicketsForm.java +++ b/src/main/java/alfio/controller/form/ContactAndTicketsForm.java @@ -17,7 +17,10 @@ package alfio.controller.form; import alfio.manager.EuVatChecker; -import alfio.model.*; +import alfio.model.Event; +import alfio.model.TicketFieldConfiguration; +import alfio.model.TicketReservation; +import alfio.model.TicketReservationAdditionalInfo; import alfio.model.result.ValidationResult; import alfio.util.ErrorsCode; import alfio.util.Validator; @@ -27,7 +30,10 @@ import org.springframework.validation.ValidationUtils; import java.io.Serializable; -import java.util.*; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; import java.util.stream.Collectors; import static alfio.util.ErrorsCode.STEP_2_INVALID_VAT; @@ -121,8 +127,6 @@ public void validate(BindingResult bindingResult, Event event, List ticketEmails) { PaymentProxy paymentProxy = evaluatePaymentProxy(method, reservationCost); - if(!acquiregroupMembers(reservationId, event, ticketEmails)) { + if(!acquireGroupMembers(reservationId, event, ticketEmails)) { groupManager.deleteWhitelistedTicketsForReservation(reservationId); return PaymentResult.unsuccessful("error.STEP2_WHITELIST"); } @@ -418,6 +418,15 @@ public PaymentResult confirm(String gatewayToken, String payerId, Event event, S } + public boolean containsCategoriesLinkedToGroups(String reservationId, int eventId) { + List allLinks = groupManager.getLinksForEvent(eventId); + if(allLinks.isEmpty()) { + return false; + } + return ticketRepository.findTicketsInReservation(reservationId).stream() + .anyMatch(t -> allLinks.stream().anyMatch(lg -> lg.getTicketCategoryId() == null || lg.getTicketCategoryId().equals(t.getCategoryId()))); + } + private PaymentProxy evaluatePaymentProxy(Optional method, TotalPrice reservationCost) { if(method.isPresent()) { return method.get(); @@ -443,17 +452,17 @@ private boolean initPaymentProcess(TotalPrice reservationCost, PaymentProxy paym return true; } - private boolean acquiregroupMembers(String reservationId, Event event, Map ticketEmails) { + private boolean acquireGroupMembers(String reservationId, Event event, Map ticketEmails) { int eventId = event.getId(); List linkedGroups = groupManager.getLinksForEvent(eventId); if(!linkedGroups.isEmpty()) { List ticketsInReservation = ticketRepository.findTicketsInReservation(reservationId); - return requiresNewTransactionTemplate.execute(status -> + return Boolean.TRUE.equals(requiresNewTransactionTemplate.execute(status -> ticketsInReservation .stream() .filter(ticket -> linkedGroups.stream().anyMatch(c -> c.getTicketCategoryId() == null || c.getTicketCategoryId().equals(ticket.getCategoryId()))) .map(t -> groupManager.acquireMemberForTicket(t, ticketEmails.get(t.getUuid()))) - .reduce(true, Boolean::logicalAnd)); + .reduce(true, Boolean::logicalAnd))); } return true; } From aed600b567185fd4d17c2b86d1c7efd83969b2ed Mon Sep 17 00:00:00 2001 From: Celestino Bellone Date: Thu, 26 Jul 2018 22:28:53 +0200 Subject: [PATCH 3/5] #487 - remove members + remove groups --- .../api/admin/GroupApiController.java | 55 ++++++++++++++----- src/main/java/alfio/manager/GroupManager.java | 28 +++++++++- .../alfio/repository/GroupRepository.java | 22 +++++--- .../db/PGSQL/V22_1.15.5.1__CREATE_GROUP.sql | 10 +++- .../js/admin/feature/group/edit.html | 4 +- .../js/admin/feature/group/groups.js | 44 ++++++++++++--- 6 files changed, 128 insertions(+), 35 deletions(-) diff --git a/src/main/java/alfio/controller/api/admin/GroupApiController.java b/src/main/java/alfio/controller/api/admin/GroupApiController.java index 672fba7d7f..6b3e362fd9 100644 --- a/src/main/java/alfio/controller/api/admin/GroupApiController.java +++ b/src/main/java/alfio/controller/api/admin/GroupApiController.java @@ -29,6 +29,7 @@ import org.springframework.web.bind.annotation.*; import java.security.Principal; +import java.util.Collections; import java.util.List; import java.util.Objects; import java.util.Optional; @@ -44,7 +45,7 @@ public class GroupApiController { private final UserManager userManager; private final EventManager eventManager; - @GetMapping("/{organizationId}") + @GetMapping("/for/{organizationId}") public ResponseEntity> loadAllGroupsForOrganization(@PathVariable("organizationId") int organizationId, Principal principal) { if(notOwner(principal.getName(), organizationId)) { return ResponseEntity.status(HttpStatus.FORBIDDEN).build(); @@ -52,7 +53,7 @@ public ResponseEntity> loadAllGroupsForOrganization(@PathVariable("o return ResponseEntity.ok(groupManager.getAllForOrganization(organizationId)); } - @GetMapping("/{organizationId}/detail/{listId}") + @GetMapping("/for/{organizationId}/detail/{listId}") public ResponseEntity loadDetail(@PathVariable("organizationId") int organizationId, @PathVariable("listId") int listId, Principal principal) { if(notOwner(principal.getName(), organizationId)) { return ResponseEntity.status(HttpStatus.FORBIDDEN).build(); @@ -60,9 +61,9 @@ public ResponseEntity loadDetail(@PathVariable("organizationI return groupManager.loadComplete(listId).map(ResponseEntity::ok).orElseGet(() -> ResponseEntity.notFound().build()); } - @PostMapping("/{organizationId}/update/{listId}") + @PostMapping("/for/{organizationId}/update/{groupId}") public ResponseEntity updateGroup(@PathVariable("organizationId") int organizationId, - @PathVariable("listId") int listId, + @PathVariable("groupId") int listId, @RequestBody GroupModification modification, Principal principal) { if(notOwner(principal.getName(), organizationId)) { @@ -71,7 +72,7 @@ public ResponseEntity updateGroup(@PathVariable("organization return groupManager.update(listId, modification).map(ResponseEntity::ok).orElseGet(() -> ResponseEntity.notFound().build()); } - @PostMapping("/{organizationId}/new") + @PostMapping("/for/{organizationId}/new") public ResponseEntity createNew(@PathVariable("organizationId") int organizationId, @RequestBody GroupModification request, Principal principal) { if(notOwner(principal.getName(), organizationId)) { return ResponseEntity.status(HttpStatus.FORBIDDEN).build(); @@ -82,7 +83,7 @@ public ResponseEntity createNew(@PathVariable("organizationId") int org return ResponseEntity.ok(groupManager.createNew(request)); } - @GetMapping("/event/{eventName}/all") + @GetMapping("/for/event/{eventName}/all") public ResponseEntity> findLinked(@PathVariable("eventName") String eventName, Principal principal) { return eventManager.getOptionalByName(eventName, principal.getName()) @@ -90,7 +91,7 @@ public ResponseEntity> findLinked(@PathVariable("eventName") S .orElseGet(() -> ResponseEntity.notFound().build()); } - @GetMapping("/event/{eventName}") + @GetMapping("/for/event/{eventName}") public ResponseEntity findActiveGroup(@PathVariable("eventName") String eventName, Principal principal) { return eventManager.getOptionalByName(eventName, principal.getName()) @@ -103,7 +104,7 @@ public ResponseEntity findActiveGroup(@PathVariable("eventName") St .orElseGet(() -> ResponseEntity.notFound().build()); } - @GetMapping("/event/{eventName}/category/{categoryId}") + @GetMapping("/for/event/{eventName}/category/{categoryId}") public ResponseEntity findActiveGroup(@PathVariable("eventName") String eventName, @PathVariable("categoryId") int categoryId, Principal principal) { @@ -118,9 +119,9 @@ public ResponseEntity findActiveGroup(@PathVariable("eventName") St .orElseGet(() -> ResponseEntity.notFound().build()); } - @PostMapping("/{listId}/link") - public ResponseEntity linkGroup(@PathVariable("listId") int listId, @RequestBody LinkedGroupModification body, Principal principal) { - if(body == null || listId != body.getGroupId()) { + @PostMapping("/{groupId}/link") + public ResponseEntity linkGroup(@PathVariable("groupId") int groupId, @RequestBody LinkedGroupModification body, Principal principal) { + if(body == null || groupId != body.getGroupId()) { return ResponseEntity.badRequest().build(); } @@ -128,26 +129,50 @@ public ResponseEntity linkGroup(@PathVariable("listId") int listId, @Re .map(event -> { Optional existing = groupManager.getLinksForEvent(event.getId()) .stream() - .filter(c -> c.getGroupId() == listId && Objects.equals(body.getTicketCategoryId(), c.getTicketCategoryId())) + .filter(c -> Objects.equals(body.getTicketCategoryId(), c.getTicketCategoryId())) .findFirst(); LinkedGroup link; if(existing.isPresent()) { link = groupManager.updateLink(existing.get().getId(), body); } else { - link = groupManager.createLink(listId, event.getId(), body); + link = groupManager.createLink(groupId, event.getId(), body); } return ResponseEntity.ok(link.getId()); }) .orElseGet(() -> ResponseEntity.notFound().build()); } - @DeleteMapping("/{organizationId}/link/{configurationId}") + @DeleteMapping("/for/{organizationId}/link/{configurationId}") public ResponseEntity unlinkGroup(@PathVariable("organizationId") int organizationId, @PathVariable("configurationId") int configurationId, Principal principal) { if(optionally(() -> userManager.findUserByUsername(principal.getName())).filter(u -> userManager.isOwnerOfOrganization(u, organizationId)).isPresent()) { groupManager.disableLink(configurationId); return ResponseEntity.ok("OK"); } - return ResponseEntity.status(HttpStatus.UNAUTHORIZED).build(); + return ResponseEntity.status(HttpStatus.FORBIDDEN).build(); + } + + @DeleteMapping("/for/{organizationId}/id/{groupId}/member/{memberId}") + public ResponseEntity deactivateMember(@PathVariable("groupId") int groupId, + @PathVariable("memberId") int memberId, + @PathVariable("organizationId") int organizationId, + Principal principal) { + if(notOwner(principal.getName(), organizationId) || !groupManager.findById(groupId, organizationId).isPresent()) { + return ResponseEntity.status(HttpStatus.FORBIDDEN).build(); + } + + return ResponseEntity.ok(groupManager.deactivateMembers(Collections.singletonList(memberId), groupId)); + + } + + @DeleteMapping("/for/{organizationId}/id/{groupId}") + public ResponseEntity deactivateGroup(@PathVariable("groupId") int groupId, + @PathVariable("organizationId") int organizationId, + Principal principal) { + if(notOwner(principal.getName(), organizationId) || !groupManager.findById(groupId, organizationId).isPresent()) { + return ResponseEntity.status(HttpStatus.FORBIDDEN).build(); + } + + return ResponseEntity.ok(groupManager.deactivateGroup(groupId)); } private boolean notOwner(String username, int organizationId) { diff --git a/src/main/java/alfio/manager/GroupManager.java b/src/main/java/alfio/manager/GroupManager.java index c10749be19..0db530b1ae 100644 --- a/src/main/java/alfio/manager/GroupManager.java +++ b/src/main/java/alfio/manager/GroupManager.java @@ -189,7 +189,7 @@ public void deleteWhitelistedTicketsForReservation(String reservationId) { } public void disableLink(int linkId) { - Validate.isTrue(groupRepository.disableConfiguration(linkId) == 1, "Error while disabling link"); + Validate.isTrue(groupRepository.disableLink(linkId) == 1, "Error while disabling link"); } public Optional update(int listId, GroupModification modification) { @@ -209,6 +209,32 @@ public Optional update(int listId, GroupModification modifica return loadComplete(listId); } + public boolean deactivateMembers(List memberIds, int groupId) { + if(memberIds.isEmpty()) { + return false; + } + MapSqlParameterSource[] params = memberIds.stream().map(i -> toParameterSource(groupId, i)).toArray(MapSqlParameterSource[]::new); + jdbcTemplate.batchUpdate(groupRepository.deactivateGroupMember(), params); + return true; + } + + public boolean deactivateGroup(int groupId) { + List members = groupRepository.getItems(groupId).stream().map(GroupMember::getId).collect(Collectors.toList()); + if(!members.isEmpty()) { + Validate.isTrue(deactivateMembers(members, groupId), "error while disabling group members"); + } + groupRepository.disableAllLinks(groupId); + Validate.isTrue(groupRepository.deactivateGroup(groupId) == 1, "unexpected error while disabling group"); + return true; + } + + + private static MapSqlParameterSource toParameterSource(int groupId, Integer itemId) { + return new MapSqlParameterSource("groupId", groupId) + .addValue("memberId", itemId) + .addValue("disabledPlaceholder", UUID.randomUUID().toString()); + } + @RequiredArgsConstructor public static class WhitelistValidator implements Predicate { diff --git a/src/main/java/alfio/repository/GroupRepository.java b/src/main/java/alfio/repository/GroupRepository.java index 3016309eab..9f55bdb35a 100644 --- a/src/main/java/alfio/repository/GroupRepository.java +++ b/src/main/java/alfio/repository/GroupRepository.java @@ -36,16 +36,16 @@ AffectedRowCountAndKey insert(@Bind("name") String name, @Bind("description") String description, @Bind("orgId") int organizationId); - @Query("select * from a_group where id = :id") + @Query("select * from group_active where id = :id") Group getById(@Bind("id") int id); @Query("update a_group set name = :name, description = :description where id = :id") int update(@Bind("id") int id, @Bind("name") String name, @Bind("description") String description); - @Query("select * from a_group where id = :id") + @Query("select * from group_active where id = :id") Optional getOptionalById(@Bind("id") int id); - @Query("select * from a_group where organization_id_fk = :organizationId") + @Query("select * from group_active where organization_id_fk = :organizationId") List getAllForOrganization(@Bind("organizationId") int organizationId); @Query("insert into group_link(a_group_id_fk, event_id_fk, ticket_category_id_fk, type, match_type, max_allocation)" + @@ -62,7 +62,7 @@ AffectedRowCountAndKey createConfiguration(@Bind("groupId") int groupId value = "insert into group_member(a_group_id_fk, value, description) values(:groupId, :value, :description)") String insertItemTemplate(); - @Query("select * from group_member where a_group_id_fk = :groupId order by value") + @Query("select * from group_member_active where a_group_id_fk = :groupId order by value") List getItems(@Bind("groupId") int groupId); @Query("insert into whitelisted_ticket(group_member_id_fk, group_link_id_fk, ticket_id_fk, requires_unique_value)" + @@ -96,12 +96,15 @@ int updateConfiguration(@Bind("id") int configurationId, @Bind("maxAllocation") Integer maxAllocation); @Query("update group_link set active = false where id = :id") - int disableConfiguration(@Bind("id") int id); + int disableLink(@Bind("id") int id); - @Query("select * from group_member wi where wi.a_group_id_fk = :groupId and wi.value = lower(:value)") + @Query("update group_link set active = false where a_group_id_fk = :groupId") + int disableAllLinks(@Bind("groupId") int groupId); + + @Query("select * from group_member_active wi where wi.a_group_id_fk = :groupId and wi.value = lower(:value)") Optional findItemByValueExactMatch(@Bind("groupId") int groupId, @Bind("value") String value); - @Query("select * from group_member wi where wi.a_group_id_fk = :groupId and wi.value like lower(:value) limit 1") + @Query("select * from group_member_active wi where wi.a_group_id_fk = :groupId and wi.value like lower(:value) limit 1") Optional findItemEndsWith(@Bind("configurationId") int configurationId, @Bind("groupId") int groupId, @Bind("value") String value); @@ -117,5 +120,10 @@ int countExistingWhitelistedTickets(@Bind("itemId") int itemId, @Query("delete from whitelisted_ticket where ticket_id_fk in (:ticketIds)") int deleteExistingWhitelistedTickets(@Bind("ticketIds") List ticketIds); + @Query(type = QueryType.TEMPLATE, value = "update group_member set active = false, value = 'DISABLED-' || :disabledPlaceholder where id = :memberId and a_group_id_fk = :groupId") + String deactivateGroupMember(); + + @Query("update a_group set active = false where id = :groupId") + int deactivateGroup(@Bind("groupId") int groupId); } diff --git a/src/main/resources/alfio/db/PGSQL/V22_1.15.5.1__CREATE_GROUP.sql b/src/main/resources/alfio/db/PGSQL/V22_1.15.5.1__CREATE_GROUP.sql index 579e1dfcfb..7264adc25a 100644 --- a/src/main/resources/alfio/db/PGSQL/V22_1.15.5.1__CREATE_GROUP.sql +++ b/src/main/resources/alfio/db/PGSQL/V22_1.15.5.1__CREATE_GROUP.sql @@ -19,7 +19,8 @@ create table a_group ( id serial primary key not null, name varchar(255) not null, description varchar(2048), - organization_id_fk integer not null + organization_id_fk integer not null, + active boolean default true ); alter table a_group add constraint "a_group_org_id_fk" foreign key(organization_id_fk) references organization(id); @@ -29,7 +30,8 @@ create table group_member ( id serial primary key not null, a_group_id_fk integer not null, value varchar(255), - description varchar(2048) + description varchar(2048), + active boolean default true ); alter table group_member add constraint "group_member_a_group_id_fk" foreign key(a_group_id_fk) references a_group(id); @@ -64,4 +66,8 @@ alter table whitelisted_ticket add constraint "whitelisted_ticket_unique_item_id create view group_link_active as select * from group_link where active = true; +create view group_member_active as select * from group_member where active = true; + +create view group_active as select * from a_group where active = true; + diff --git a/src/main/webapp/resources/js/admin/feature/group/edit.html b/src/main/webapp/resources/js/admin/feature/group/edit.html index ded494ac05..5949845e75 100644 --- a/src/main/webapp/resources/js/admin/feature/group/edit.html +++ b/src/main/webapp/resources/js/admin/feature/group/edit.html @@ -2,6 +2,7 @@
      back +
      @@ -44,8 +45,9 @@

      Items

      + - +
      diff --git a/src/main/webapp/resources/js/admin/feature/group/groups.js b/src/main/webapp/resources/js/admin/feature/group/groups.js index 063f0ab007..864843357b 100644 --- a/src/main/webapp/resources/js/admin/feature/group/groups.js +++ b/src/main/webapp/resources/js/admin/feature/group/groups.js @@ -53,7 +53,7 @@ organizationId: '<' } }).component('group', { - controller: ['GroupService', '$timeout', 'NotificationHandler', '$state', DetailCtrl], + controller: ['GroupService', '$timeout', 'NotificationHandler', '$state', '$window', DetailCtrl], templateUrl: '../resources/js/admin/feature/group/edit.html', bindings: { organizationId: '<', @@ -100,13 +100,15 @@ } - function DetailCtrl(GroupService, $timeout, NotificationHandler, $state) { + function DetailCtrl(GroupService, $timeout, NotificationHandler, $state, $window) { var ctrl = this; ctrl.uploadCsv = false; ctrl.removeItem = removeItem; ctrl.addItem = addItem; ctrl.parseFileContent = parseFile; ctrl.reinit = init; + ctrl.deactivateGroup = deactivateGroup; + ctrl.deactivateMember = deactivateMember; ctrl.toggleUploadCsv = function() { ctrl.uploadCsv = !ctrl.uploadCsv; }; @@ -159,6 +161,24 @@ } } + function deactivateGroup() { + if($window.confirm('About to delete ['+ctrl.group.name+'] group. Are you sure?')) { + GroupService.deactivateGroup(ctrl.organizationId, ctrl.group.id).then(function() { + NotificationHandler.showSuccess('Group '+ctrl.group.name+' successfully deleted'); + $state.go('^.all', {orgId: ctrl.organizationId}); + }); + } + } + + function deactivateMember(member) { + if($window.confirm('About to remove ['+member.value+']. Are you sure?')) { + GroupService.deactivateMember(ctrl.organizationId, ctrl.group.id, member.id).then(function() { + NotificationHandler.showSuccess(member.value+' successfully removed'); + init(); + }); + } + } + function parseFile(content) { $timeout(function() { ctrl.loading = true; @@ -198,23 +218,23 @@ function GroupService($http, HttpErrorHandler, $q) { return { loadGroups: function(orgId) { - return $http.get('/admin/api/group/'+orgId).error(HttpErrorHandler.handle); + return $http.get('/admin/api/group/for/'+orgId).error(HttpErrorHandler.handle); }, loadGroupDetail: function(orgId, groupId) { - return $http.get('/admin/api/group/'+orgId+'/detail/'+groupId).error(HttpErrorHandler.handle); + return $http.get('/admin/api/group/for/'+orgId+'/detail/'+groupId).error(HttpErrorHandler.handle); }, createGroup: function(orgId, group) { - return $http.post('/admin/api/group/'+orgId+'/new', group).error(HttpErrorHandler.handle); + return $http.post('/admin/api/group/for/'+orgId+'/new', group).error(HttpErrorHandler.handle); }, updateGroup: function(orgId, group) { - return $http.post('/admin/api/group/'+orgId+'/update/'+group.id, group) + return $http.post('/admin/api/group/for/'+orgId+'/update/'+group.id, group) }, loadActiveGroup: function(eventName, categoryId) { - var url = '/admin/api/group/event/'+eventName + (angular.isDefined(categoryId) ? '/category/'+categoryId : ''); + var url = '/admin/api/group/for/event/'+eventName + (angular.isDefined(categoryId) ? '/category/'+categoryId : ''); return $http.get(url).error(HttpErrorHandler.handle); }, loadActiveLinks: function(eventName) { - return $http.get('/admin/api/group/event/'+eventName+'/all').error(HttpErrorHandler.handle); + return $http.get('/admin/api/group/for/event/'+eventName+'/all').error(HttpErrorHandler.handle); }, linkTo: function(configuration) { if(configuration) { @@ -224,7 +244,13 @@ } }, unlinkFrom: function(organizationId, groupLinkId) { - return $http['delete']('/admin/api/group/'+organizationId+'/link/'+groupLinkId); + return $http['delete']('/admin/api/group/for/'+organizationId+'/link/'+groupLinkId); + }, + deactivateGroup: function(organizationId, groupId) { + return $http['delete']('/admin/api/group/for/'+organizationId+'/id/'+groupId); + }, + deactivateMember: function(organizationId, groupId, memberId) { + return $http['delete']('/admin/api/group/for/'+organizationId+'/id/'+groupId+'/member/'+memberId); } } } From d600dad50d44e90b83eb5c2c9b2f045aca915b66 Mon Sep 17 00:00:00 2001 From: Celestino Bellone Date: Tue, 31 Jul 2018 18:34:54 +0200 Subject: [PATCH 4/5] #487 - display "linked to group" message on event level only if the group is not linked directly to a category --- src/main/webapp/resources/js/admin/ng-app/admin-application.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 fd88cdc044..440d1aa607 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 @@ -785,8 +785,9 @@ if(category) { category.attendeesList = list; } + } else { + $scope.event.attendeesList = list; } - $scope.event.attendeesList = list; }); } From 1cce46f3cc8bdffb4ebd3cd1c70b98df3f842ee3 Mon Sep 17 00:00:00 2001 From: Celestino Bellone Date: Tue, 31 Jul 2018 19:54:43 +0200 Subject: [PATCH 5/5] #487 - remove unnecessary ticket->email map --- .../alfio/controller/ReservationController.java | 3 +-- src/main/java/alfio/manager/GroupManager.java | 4 ++-- .../alfio/manager/TicketReservationManager.java | 8 ++++---- .../alfio/manager/GroupManagerIntegrationTest.java | 4 ++-- .../TicketReservationManagerIntegrationTest.java | 8 ++++---- .../manager/TicketReservationManagerTest.java | 14 ++++---------- .../WaitingQueueManagerIntegrationTest.java | 12 ++++++------ .../system/DataMigratorIntegrationTest.java | 2 +- 8 files changed, 24 insertions(+), 31 deletions(-) diff --git a/src/main/java/alfio/controller/ReservationController.java b/src/main/java/alfio/controller/ReservationController.java index 69eb5d29d2..0732c67d61 100644 --- a/src/main/java/alfio/controller/ReservationController.java +++ b/src/main/java/alfio/controller/ReservationController.java @@ -587,8 +587,7 @@ public String handleReservation(@PathVariable("eventName") String eventName, final PaymentResult status = ticketReservationManager.confirm(paymentForm.getToken(), paymentForm.getPaypalPayerID(), event, reservationId, ticketReservation.getEmail(), customerName, locale, ticketReservation.getBillingAddress(), ticketReservation.getCustomerReference(), reservationCost, SessionUtil.retrieveSpecialPriceSessionId(request), Optional.ofNullable(paymentForm.getPaymentMethod()), invoiceRequested, ticketReservation.getVatCountryCode(), - ticketReservation.getVatNr(), ticketReservation.getVatStatus(), paymentForm.getTermAndConditionsAccepted(), Optional.ofNullable(paymentForm.getPrivacyPolicyAccepted()).orElse(false), - Collections.emptyMap()); //FIXME + ticketReservation.getVatNr(), ticketReservation.getVatStatus(), paymentForm.getTermAndConditionsAccepted(), Optional.ofNullable(paymentForm.getPrivacyPolicyAccepted()).orElse(false)); if(!status.isSuccessful()) { String errorMessageCode = status.getErrorCode().get(); diff --git a/src/main/java/alfio/manager/GroupManager.java b/src/main/java/alfio/manager/GroupManager.java index 0db530b1ae..29cc7a0923 100644 --- a/src/main/java/alfio/manager/GroupManager.java +++ b/src/main/java/alfio/manager/GroupManager.java @@ -139,13 +139,13 @@ public int insertMembers(int groupId, List members) { return Arrays.stream(jdbcTemplate.batchUpdate(groupRepository.insertItemTemplate(), params)).sum(); } - boolean acquireMemberForTicket(Ticket ticket, String email) { + boolean acquireMemberForTicket(Ticket ticket) { List configurations = findLinks(ticket.getEventId(), ticket.getCategoryId()); if(CollectionUtils.isEmpty(configurations)) { return true; } LinkedGroup configuration = configurations.get(0); - Optional optionalItem = getMatchingMember(configuration, StringUtils.defaultString(StringUtils.trimToNull(ticket.getEmail()), email)); + Optional optionalItem = getMatchingMember(configuration, ticket.getEmail()); if(!optionalItem.isPresent()) { return false; } diff --git a/src/main/java/alfio/manager/TicketReservationManager.java b/src/main/java/alfio/manager/TicketReservationManager.java index c33e7e2ec6..04cf3f8f73 100644 --- a/src/main/java/alfio/manager/TicketReservationManager.java +++ b/src/main/java/alfio/manager/TicketReservationManager.java @@ -346,10 +346,10 @@ public PaymentResult confirm(String gatewayToken, String payerId, Event event, S String email, CustomerName customerName, Locale userLanguage, String billingAddress, String customerReference, TotalPrice reservationCost, Optional specialPriceSessionId, Optional method, boolean invoiceRequested, String vatCountryCode, String vatNr, PriceContainer.VatStatus vatStatus, - boolean tcAccepted, boolean privacyPolicyAccepted, Map ticketEmails) { + boolean tcAccepted, boolean privacyPolicyAccepted) { PaymentProxy paymentProxy = evaluatePaymentProxy(method, reservationCost); - if(!acquireGroupMembers(reservationId, event, ticketEmails)) { + if(!acquireGroupMembers(reservationId, event)) { groupManager.deleteWhitelistedTicketsForReservation(reservationId); return PaymentResult.unsuccessful("error.STEP2_WHITELIST"); } @@ -452,7 +452,7 @@ private boolean initPaymentProcess(TotalPrice reservationCost, PaymentProxy paym return true; } - private boolean acquireGroupMembers(String reservationId, Event event, Map ticketEmails) { + private boolean acquireGroupMembers(String reservationId, Event event) { int eventId = event.getId(); List linkedGroups = groupManager.getLinksForEvent(eventId); if(!linkedGroups.isEmpty()) { @@ -461,7 +461,7 @@ private boolean acquireGroupMembers(String reservationId, Event event, Map linkedGroups.stream().anyMatch(c -> c.getTicketCategoryId() == null || c.getTicketCategoryId().equals(ticket.getCategoryId()))) - .map(t -> groupManager.acquireMemberForTicket(t, ticketEmails.get(t.getUuid()))) + .map(t -> groupManager.acquireMemberForTicket(t)) .reduce(true, Boolean::logicalAnd))); } return true; diff --git a/src/test/java/alfio/manager/GroupManagerIntegrationTest.java b/src/test/java/alfio/manager/GroupManagerIntegrationTest.java index c931e64f05..5552e79027 100644 --- a/src/test/java/alfio/manager/GroupManagerIntegrationTest.java +++ b/src/test/java/alfio/manager/GroupManagerIntegrationTest.java @@ -128,13 +128,13 @@ public void testLinkToEvent() { ticketRepository.updateTicketOwnerById(ticket.getId(), "test@test.ch", "This is a Test", "This is", "a Test"); ticket = ticketRepository.findFirstTicketInReservation(reservationId).orElseThrow(NullPointerException::new); - assertTrue("cannot confirm ticket", groupManager.acquireMemberForTicket(ticket, "not-valid")); + assertTrue("cannot confirm ticket", groupManager.acquireMemberForTicket(ticket)); reservationId = ticketReservationManager.createTicketReservation(event, Collections.singletonList(new TicketReservationWithOptionalCodeModification(ticketReservation, Optional.empty())), Collections.emptyList(), DateUtils.addDays(new Date(), 1), Optional.empty(), Optional.empty(), Locale.ENGLISH, false); ticket = ticketRepository.findFirstTicketInReservation(reservationId).orElseThrow(NullPointerException::new); - assertFalse("shouldn't be allowed", groupManager.acquireMemberForTicket(ticket, "not-valid")); + assertFalse("shouldn't be allowed", groupManager.acquireMemberForTicket(ticket)); } } \ No newline at end of file diff --git a/src/test/java/alfio/manager/TicketReservationManagerIntegrationTest.java b/src/test/java/alfio/manager/TicketReservationManagerIntegrationTest.java index 8e7705b345..39c86616ad 100644 --- a/src/test/java/alfio/manager/TicketReservationManagerIntegrationTest.java +++ b/src/test/java/alfio/manager/TicketReservationManagerIntegrationTest.java @@ -168,7 +168,7 @@ public void testTicketSelection() { assertEquals(0, ticketReservationManager.getPendingPayments(event).size()); PaymentResult confirm = ticketReservationManager.confirm(null, null, event, reservationId, "email@example.com", new CustomerName("full name", "full", "name", event), Locale.ENGLISH, "billing address", "reference", - totalPrice, Optional.empty(), Optional.of(PaymentProxy.OFFLINE), false, null, null, null, false, false, Collections.emptyMap()); + totalPrice, Optional.empty(), Optional.of(PaymentProxy.OFFLINE), false, null, null, null, false, false); assertTrue(confirm.isSuccessful()); @@ -203,7 +203,7 @@ public void testTicketSelection() { String reservationId2 = ticketReservationManager.createTicketReservation(event, Collections.singletonList(modForDelete), Collections.emptyList(), DateUtils.addDays(new Date(), 1), Optional.empty(), Optional.empty(), Locale.ENGLISH, false); ticketReservationManager.confirm(null, null, event, reservationId2, "email@example.com", new CustomerName("full name", "full", "name", event), Locale.ENGLISH, "billing address", "reference", - totalPrice, Optional.empty(), Optional.of(PaymentProxy.OFFLINE), false, null, null, null, false, false, Collections.emptyMap()); + totalPrice, Optional.empty(), Optional.of(PaymentProxy.OFFLINE), false, null, null, null, false, false); assertTrue(ticketReservationManager.findById(reservationId2).isPresent()); @@ -355,7 +355,7 @@ public void testDeletePendingPaymentUnboundedCategory() { TicketReservationWithOptionalCodeModification mod = new TicketReservationWithOptionalCodeModification(tr, Optional.empty()); String reservationId = ticketReservationManager.createTicketReservation(event, Collections.singletonList(mod), Collections.emptyList(), DateUtils.addDays(new Date(), 1), Optional.empty(), Optional.empty(), Locale.ENGLISH, false); TotalPrice reservationCost = ticketReservationManager.totalReservationCostWithVAT(reservationId); - PaymentResult result = ticketReservationManager.confirm("", null, event, reservationId, "test@test.ch", new CustomerName("full name", "full", "name", event), Locale.ENGLISH, "", "", reservationCost, Optional.empty(), Optional.of(PaymentProxy.OFFLINE), false, null, null, null, false, false, Collections.emptyMap()); + PaymentResult result = ticketReservationManager.confirm("", null, event, reservationId, "test@test.ch", new CustomerName("full name", "full", "name", event), Locale.ENGLISH, "", "", reservationCost, Optional.empty(), Optional.of(PaymentProxy.OFFLINE), false, null, null, null, false, false); assertTrue(result.isSuccessful()); ticketReservationManager.deleteOfflinePayment(event, reservationId, false); waitingQueueManager.distributeSeats(event); @@ -363,7 +363,7 @@ public void testDeletePendingPaymentUnboundedCategory() { mod = new TicketReservationWithOptionalCodeModification(tr, Optional.empty()); reservationId = ticketReservationManager.createTicketReservation(event, Collections.singletonList(mod), Collections.emptyList(), DateUtils.addDays(new Date(), 1), Optional.empty(), Optional.empty(), Locale.ENGLISH, false); reservationCost = ticketReservationManager.totalReservationCostWithVAT(reservationId); - result = ticketReservationManager.confirm("", null, event, reservationId, "test@test.ch", new CustomerName("full name", "full", "name", event), Locale.ENGLISH, "", "", reservationCost, Optional.empty(), Optional.of(PaymentProxy.OFFLINE), false, null, null, null, false, false, Collections.emptyMap()); + result = ticketReservationManager.confirm("", null, event, reservationId, "test@test.ch", new CustomerName("full name", "full", "name", event), Locale.ENGLISH, "", "", reservationCost, Optional.empty(), Optional.of(PaymentProxy.OFFLINE), false, null, null, null, false, false); assertTrue(result.isSuccessful()); } } \ No newline at end of file diff --git a/src/test/java/alfio/manager/TicketReservationManagerTest.java b/src/test/java/alfio/manager/TicketReservationManagerTest.java index b68cc5a597..77c158fdba 100644 --- a/src/test/java/alfio/manager/TicketReservationManagerTest.java +++ b/src/test/java/alfio/manager/TicketReservationManagerTest.java @@ -44,12 +44,10 @@ import java.io.IOException; import java.time.DayOfWeek; -import java.time.LocalDate; import java.time.ZoneId; import java.time.ZonedDateTime; import java.time.temporal.ChronoField; import java.time.temporal.ChronoUnit; -import java.time.temporal.TemporalAdjuster; import java.time.temporal.TemporalAdjusters; import java.util.*; import java.util.stream.Collectors; @@ -706,8 +704,7 @@ public void confirmPaidReservation() throws Exception { when(paymentManager.processStripePayment(eq(RESERVATION_ID), eq(GATEWAY_TOKEN), anyInt(), eq(event), anyString(), any(CustomerName.class), anyString())).thenReturn(PaymentResult.successful(TRANSACTION_ID)); PaymentResult result = trm.confirm(GATEWAY_TOKEN, null, event, RESERVATION_ID, "", new CustomerName("Full Name", null, null, event), Locale.ENGLISH, "", "", new TotalPrice(100, 0, 0, 0), Optional.empty(), - Optional.of(PaymentProxy.STRIPE), true, "IT", "123456", PriceContainer.VatStatus.INCLUDED, true, false, - Collections.emptyMap()); + Optional.of(PaymentProxy.STRIPE), true, "IT", "123456", PriceContainer.VatStatus.INCLUDED, true, false); assertTrue(result.isSuccessful()); assertEquals(Optional.of(TRANSACTION_ID), result.getGatewayTransactionId()); verify(ticketReservationRepository).updateTicketReservation(eq(RESERVATION_ID), eq(TicketReservationStatus.IN_PAYMENT.toString()), anyString(), anyString(), isNull(), isNull(), anyString(), anyString(), any(), eq(PaymentProxy.STRIPE.toString()), anyString()); @@ -732,8 +729,7 @@ public void returnFailureCodeIfPaymentNotSuccesful() throws Exception { when(paymentManager.processStripePayment(eq(RESERVATION_ID), eq(GATEWAY_TOKEN), anyInt(), eq(event), anyString(), any(CustomerName.class), anyString())).thenReturn(PaymentResult.unsuccessful("error-code")); PaymentResult result = trm.confirm(GATEWAY_TOKEN, null, event, RESERVATION_ID, "", new CustomerName("Full Name", null, null, event), Locale.ENGLISH, "","", new TotalPrice(100, 0, 0, 0), Optional.empty(), Optional.of(PaymentProxy.STRIPE), - true, "IT", "12345", PriceContainer.VatStatus.INCLUDED, true, false, - Collections.emptyMap()); + true, "IT", "12345", PriceContainer.VatStatus.INCLUDED, true, false); assertFalse(result.isSuccessful()); assertFalse(result.getGatewayTransactionId().isPresent()); assertEquals(Optional.of("error-code"), result.getErrorCode()); @@ -754,8 +750,7 @@ public void handleOnSitePaymentMethod() throws Exception { when(paymentManager.processStripePayment(eq(RESERVATION_ID), eq(GATEWAY_TOKEN), anyInt(), eq(event), anyString(), any(CustomerName.class), anyString())).thenReturn(PaymentResult.unsuccessful("error-code")); PaymentResult result = trm.confirm(GATEWAY_TOKEN, null, event, RESERVATION_ID, "", new CustomerName("Full Name", null, null, event), Locale.ENGLISH, "", "", new TotalPrice(100, 0, 0, 0), Optional.empty(), - Optional.of(PaymentProxy.ON_SITE), true, "IT", "123456", PriceContainer.VatStatus.INCLUDED, true, false, - Collections.emptyMap()); + Optional.of(PaymentProxy.ON_SITE), true, "IT", "123456", PriceContainer.VatStatus.INCLUDED, true, false); assertTrue(result.isSuccessful()); assertEquals(Optional.of(TicketReservationManager.NOT_YET_PAID_TRANSACTION_ID), result.getGatewayTransactionId()); verify(ticketReservationRepository).updateTicketReservation(eq(RESERVATION_ID), eq(TicketReservationStatus.COMPLETE.toString()), anyString(), anyString(), isNull(), isNull(), anyString(), anyString(), any(), eq(PaymentProxy.ON_SITE.toString()), anyString()); @@ -776,8 +771,7 @@ public void handleOfflinePaymentMethod() throws Exception { when(ticketReservationRepository.postponePayment(eq(RESERVATION_ID), any(Date.class), anyString(), anyString(), isNull(), isNull(), anyString(), anyString())).thenReturn(1); PaymentResult result = trm.confirm(GATEWAY_TOKEN, null, event, RESERVATION_ID, "", new CustomerName("Full Name", null, null, event), Locale.ENGLISH, "", "", new TotalPrice(100, 0, 0, 0), Optional.empty(), - Optional.of(PaymentProxy.OFFLINE), true, "IT", "123456", PriceContainer.VatStatus.INCLUDED, true, false, - Collections.emptyMap()); + Optional.of(PaymentProxy.OFFLINE), true, "IT", "123456", PriceContainer.VatStatus.INCLUDED, true, false); assertTrue(result.isSuccessful()); assertEquals(Optional.of(TicketReservationManager.NOT_YET_PAID_TRANSACTION_ID), result.getGatewayTransactionId()); verify(waitingQueueManager, never()).fireReservationConfirmed(eq(RESERVATION_ID)); diff --git a/src/test/java/alfio/manager/WaitingQueueManagerIntegrationTest.java b/src/test/java/alfio/manager/WaitingQueueManagerIntegrationTest.java index 9e8b8476bd..f883aed9f1 100644 --- a/src/test/java/alfio/manager/WaitingQueueManagerIntegrationTest.java +++ b/src/test/java/alfio/manager/WaitingQueueManagerIntegrationTest.java @@ -172,7 +172,7 @@ public void testWaitingQueueForUnboundedCategory() { TicketReservationWithOptionalCodeModification mod = new TicketReservationWithOptionalCodeModification(tr, Optional.empty()); String reservationId = ticketReservationManager.createTicketReservation(event, Collections.singletonList(mod), Collections.emptyList(), DateUtils.addDays(new Date(), 1), Optional.empty(), Optional.empty(), Locale.ENGLISH, false); TotalPrice reservationCost = ticketReservationManager.totalReservationCostWithVAT(reservationId); - PaymentResult result = ticketReservationManager.confirm("", null, event, reservationId, "test@test.ch", new CustomerName("Full Name", "Full", "Name", event), Locale.ENGLISH, "", "", reservationCost, Optional.empty(), Optional.of(PaymentProxy.OFFLINE), false, null, null, null, false, false, Collections.emptyMap()); + PaymentResult result = ticketReservationManager.confirm("", null, event, reservationId, "test@test.ch", new CustomerName("Full Name", "Full", "Name", event), Locale.ENGLISH, "", "", reservationCost, Optional.empty(), Optional.of(PaymentProxy.OFFLINE), false, null, null, null, false, false); assertTrue(result.isSuccessful()); assertEquals(0, eventRepository.findStatisticsFor(event.getId()).getDynamicAllocation()); @@ -207,12 +207,12 @@ public void testAssignTicketToWaitingQueueUnboundedCategory() { String reservationId = ticketReservationManager.createTicketReservation(event, Collections.singletonList(multi), Collections.emptyList(), DateUtils.addDays(new Date(), 1), Optional.empty(), Optional.empty(), Locale.ENGLISH, false); TotalPrice reservationCost = ticketReservationManager.totalReservationCostWithVAT(reservationId); - PaymentResult result = ticketReservationManager.confirm("", null, event, reservationId, "test@test.ch", new CustomerName("Full Name", "Full", "Name", event), Locale.ENGLISH, "", "", reservationCost, Optional.empty(), Optional.of(PaymentProxy.OFFLINE), false, null, null, null, false, false, Collections.emptyMap()); + PaymentResult result = ticketReservationManager.confirm("", null, event, reservationId, "test@test.ch", new CustomerName("Full Name", "Full", "Name", event), Locale.ENGLISH, "", "", reservationCost, Optional.empty(), Optional.of(PaymentProxy.OFFLINE), false, null, null, null, false, false); assertTrue(result.isSuccessful()); String reservationIdSingle = ticketReservationManager.createTicketReservation(event, Collections.singletonList(single), Collections.emptyList(), DateUtils.addDays(new Date(), 1), Optional.empty(), Optional.empty(), Locale.ENGLISH, false); TotalPrice reservationCostSingle = ticketReservationManager.totalReservationCostWithVAT(reservationIdSingle); - PaymentResult resultSingle = ticketReservationManager.confirm("", null, event, reservationIdSingle, "test@test.ch", new CustomerName("Full Name", "Full", "Name", event), Locale.ENGLISH, "", "", reservationCostSingle, Optional.empty(), Optional.of(PaymentProxy.OFFLINE), false, null, null, null, false, false, Collections.emptyMap()); + PaymentResult resultSingle = ticketReservationManager.confirm("", null, event, reservationIdSingle, "test@test.ch", new CustomerName("Full Name", "Full", "Name", event), Locale.ENGLISH, "", "", reservationCostSingle, Optional.empty(), Optional.of(PaymentProxy.OFFLINE), false, null, null, null, false, false); assertTrue(resultSingle.isSuccessful()); @@ -261,12 +261,12 @@ public void testAssignTicketToWaitingQueueBoundedCategory() { String reservationId = ticketReservationManager.createTicketReservation(event, Collections.singletonList(multi), Collections.emptyList(), DateUtils.addDays(new Date(), 1), Optional.empty(), Optional.empty(), Locale.ENGLISH, false); TotalPrice reservationCost = ticketReservationManager.totalReservationCostWithVAT(reservationId); - PaymentResult result = ticketReservationManager.confirm("", null, event, reservationId, "test@test.ch", new CustomerName("Full Name", "Full", "Name", event), Locale.ENGLISH, "", "", reservationCost, Optional.empty(), Optional.of(PaymentProxy.OFFLINE), false, null, null, null, false, false, Collections.emptyMap()); + PaymentResult result = ticketReservationManager.confirm("", null, event, reservationId, "test@test.ch", new CustomerName("Full Name", "Full", "Name", event), Locale.ENGLISH, "", "", reservationCost, Optional.empty(), Optional.of(PaymentProxy.OFFLINE), false, null, null, null, false, false); assertTrue(result.isSuccessful()); String reservationIdSingle = ticketReservationManager.createTicketReservation(event, Collections.singletonList(single), Collections.emptyList(), DateUtils.addDays(new Date(), 1), Optional.empty(), Optional.empty(), Locale.ENGLISH, false); TotalPrice reservationCostSingle = ticketReservationManager.totalReservationCostWithVAT(reservationIdSingle); - PaymentResult resultSingle = ticketReservationManager.confirm("", null, event, reservationIdSingle, "test@test.ch", new CustomerName("Full Name", "Full", "Name", event), Locale.ENGLISH, "", "", reservationCostSingle, Optional.empty(), Optional.of(PaymentProxy.OFFLINE), false, null, null, null, false, false, Collections.emptyMap()); + PaymentResult resultSingle = ticketReservationManager.confirm("", null, event, reservationIdSingle, "test@test.ch", new CustomerName("Full Name", "Full", "Name", event), Locale.ENGLISH, "", "", reservationCostSingle, Optional.empty(), Optional.of(PaymentProxy.OFFLINE), false, null, null, null, false, false); assertTrue(resultSingle.isSuccessful()); @@ -354,7 +354,7 @@ private String reserveTickets(Event event, TicketCategory category, int num) { TicketReservationWithOptionalCodeModification tcm = new TicketReservationWithOptionalCodeModification(tr, Optional.empty()); String reservationId = ticketReservationManager.createTicketReservation(event, Collections.singletonList(tcm), Collections.emptyList(), DateUtils.addDays(new Date(), 1), Optional.empty(), Optional.empty(), Locale.ENGLISH, false); TotalPrice reservationCost = ticketReservationManager.totalReservationCostWithVAT(reservationId); - PaymentResult result = ticketReservationManager.confirm("", null, event, reservationId, "test@test.ch", new CustomerName("Full Name", "Full", "Name", event), Locale.ENGLISH, "", "", reservationCost, Optional.empty(), Optional.of(PaymentProxy.OFFLINE), false, null, null, null, false, false, Collections.emptyMap()); + PaymentResult result = ticketReservationManager.confirm("", null, event, reservationId, "test@test.ch", new CustomerName("Full Name", "Full", "Name", event), Locale.ENGLISH, "", "", reservationCost, Optional.empty(), Optional.of(PaymentProxy.OFFLINE), false, null, null, null, false, false); assertTrue(result.isSuccessful()); return reservationId; } diff --git a/src/test/java/alfio/manager/system/DataMigratorIntegrationTest.java b/src/test/java/alfio/manager/system/DataMigratorIntegrationTest.java index 27e94843a0..f20200e5c4 100644 --- a/src/test/java/alfio/manager/system/DataMigratorIntegrationTest.java +++ b/src/test/java/alfio/manager/system/DataMigratorIntegrationTest.java @@ -283,7 +283,7 @@ public void testUpdateGender() throws IOException { TicketReservationWithOptionalCodeModification r = new TicketReservationWithOptionalCodeModification(trm, Optional.empty()); Date expiration = DateUtils.addDays(new Date(), 1); String reservationId = ticketReservationManager.createTicketReservation(event, Collections.singletonList(r), Collections.emptyList(), expiration, Optional.empty(), Optional.empty(), Locale.ENGLISH, false); - ticketReservationManager.confirm("TOKEN", null, event, reservationId, "email@email.ch", new CustomerName("Full Name", "Full", "Name", event), Locale.ENGLISH, null, null, new TotalPrice(1000, 10, 0, 0), Optional.empty(), Optional.of(PaymentProxy.ON_SITE), false, null, null, null, false, false, Collections.emptyMap()); + ticketReservationManager.confirm("TOKEN", null, event, reservationId, "email@email.ch", new CustomerName("Full Name", "Full", "Name", event), Locale.ENGLISH, null, null, new TotalPrice(1000, 10, 0, 0), Optional.empty(), Optional.of(PaymentProxy.ON_SITE), false, null, null, null, false, false); List tickets = ticketRepository.findTicketsInReservation(reservationId); UpdateTicketOwnerForm first = new UpdateTicketOwnerForm(); first.setEmail("email@email.ch");