Skip to content

Commit

Permalink
#234 bugfix: All TicketsInfo must belong to the same reservation
Browse files Browse the repository at this point in the history
  • Loading branch information
@cbellone
cbellone committed Nov 6, 2016
1 parent 11f2db9 commit 1022821
Show file tree
Hide file tree
Showing 2 changed files with 128 additions and 43 deletions.
129 changes: 86 additions & 43 deletions src/main/java/alfio/manager/AdminReservationManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import alfio.model.decorator.TicketPriceContainer;
import alfio.model.modification.AdminReservationModification;
import alfio.model.modification.AdminReservationModification.Attendee;
import alfio.model.modification.AdminReservationModification.Category;
import alfio.model.modification.AdminReservationModification.TicketsInfo;
import alfio.model.modification.DateTimeModification;
import alfio.model.modification.TicketCategoryModification;
Expand All @@ -44,10 +45,13 @@

import java.time.ZonedDateTime;
import java.util.*;
import java.util.function.BiFunction;
import java.util.stream.Stream;

import static alfio.util.EventUtil.generateEmptyTickets;
import static alfio.util.OptionalWrapper.optionally;
import static java.util.Collections.singletonList;
import static java.util.stream.Collectors.groupingBy;
import static java.util.stream.Collectors.toList;
import static org.apache.commons.lang3.StringUtils.trimToNull;

Expand Down Expand Up @@ -231,59 +235,96 @@ private Result<Pair<TicketReservation, List<Ticket>>> transactionalCreateReserva

private Result<Pair<TicketReservation, List<Ticket>>> processReservation(AdminReservationModification input, String username, Event event) {
return input.getTicketsInfo().stream()
.map(ti -> checkCategoryCapacity(ti, event, input, username).map(c -> Pair.of(ti, c)))
.map(t -> createReservation(t, event, input))
.reduce((r1, r2) -> {
boolean successful = r1.isSuccess() && r2.isSuccess();
ResultStatus global = r1.isSuccess() ? r2.getStatus() : r1.getStatus();
List<ErrorCode> errors = new ArrayList<>();
if(!successful) {
errors.addAll(r1.getErrors());
errors.addAll(r2.getErrors());
}
return new Result<>(global, joinData(r1, r2), errors);
}).orElseGet(() -> Result.error(singletonList(ErrorCode.custom("", "something went wrong..."))));
.map(ti -> checkCategoryCapacity(ti, event, input, username))
.reduce((r1, r2) -> reduceResults(r1, r2, this::joinData))
.map(r -> createReservation(r, event, input))
.orElseGet(() -> Result.error(singletonList(ErrorCode.custom("", "something went wrong..."))));
}

private Pair<TicketReservation, List<Ticket>> joinData(Result<Pair<TicketReservation, List<Ticket>>> t1, Result<Pair<TicketReservation, List<Ticket>>> t2) {
if(!t1.isSuccess() || !t2.isSuccess()) {
return null;
}
List<Ticket> tickets = new ArrayList<>();
Pair<TicketReservation, List<Ticket>> data1 = t1.getData();
tickets.addAll(data1.getRight());
Pair<TicketReservation, List<Ticket>> data2 = t2.getData();
tickets.addAll(data2.getRight());
return Pair.of(data1.getLeft(), tickets);
private List<TicketsInfo> joinData(List<TicketsInfo> t1, List<TicketsInfo> t2) {
List<TicketsInfo> join = new ArrayList<>();
join.addAll(t1);
join.addAll(t2);
return join;
}

private Result<Pair<TicketReservation, List<Ticket>>> createReservation(Result<Pair<TicketsInfo, TicketCategory>> input, Event event, AdminReservationModification arm) {
private Result<Pair<TicketReservation, List<Ticket>>> createReservation(Result<List<TicketsInfo>> input, Event event, AdminReservationModification arm) {
final TicketsInfo empty = new TicketsInfo(null, null, false, false);
return input.flatMap(t -> {
TicketCategory category = t.getRight();
TicketsInfo ticketsInfo = t.getLeft();
String reservationId = UUID.randomUUID().toString();
String specialPriceSessionId = UUID.randomUUID().toString();
Date validity = Date.from(arm.getExpiration().toZonedDateTime(event.getZoneId()).toInstant());
ticketReservationRepository.createNewReservation(reservationId, validity, null, arm.getLanguage());
AdminReservationModification.CustomerData customerData = arm.getCustomerData();
ticketReservationRepository.updateTicketReservation(reservationId, TicketReservationStatus.PENDING.name(), customerData.getEmailAddress(), customerData.getFullName(), customerData.getFirstName(), customerData.getLastName(), arm.getLanguage(), null, null, null);
int categoryId = category.getId();
List<Attendee> attendees = ticketsInfo.getAttendees();
List<Integer> reservedForUpdate = ticketReservationManager.reserveTickets(event.getId(), categoryId, attendees.size(), singletonList(Ticket.TicketStatus.FREE));
if(reservedForUpdate.size() != attendees.size()) {
return Result.error(ErrorCode.CategoryError.NOT_ENOUGH_SEATS);
}
ticketRepository.reserveTickets(reservationId, reservedForUpdate, categoryId, arm.getLanguage(), category.getSrcPriceCts());
Ticket ticket = ticketRepository.findById(reservedForUpdate.get(0), categoryId);
TicketPriceContainer priceContainer = TicketPriceContainer.from(ticket, event, null);
ticketRepository.updateTicketPrice(reservedForUpdate, categoryId, event.getId(), category.getSrcPriceCts(), MonetaryUtil.unitToCents(priceContainer.getFinalPrice()), MonetaryUtil.unitToCents(priceContainer.getVAT()), MonetaryUtil.unitToCents(priceContainer.getAppliedDiscount()));
List<SpecialPrice> codes = category.isAccessRestricted() ? bindSpecialPriceTokens(specialPriceSessionId, categoryId, attendees) : Collections.emptyList();
assignTickets(attendees, reservedForUpdate, codes, reservationId, arm.getLanguage(), category.getSrcPriceCts());
List<Ticket> tickets = reservedForUpdate.stream().map(id -> ticketRepository.findById(id, categoryId)).collect(toList());
return Result.success(Pair.of(ticketReservationRepository.findReservationById(reservationId), tickets));

Result<List<Ticket>> result = flattenTicketsInfo(event, empty, t)
.map(pair -> reserveForTicketsInfo(event, arm, reservationId, specialPriceSessionId, pair))
.reduce(this::reduceReservationResults)
.orElseGet(() -> Result.error(ErrorCode.custom("", "unknown error")));
return result.map(list -> Pair.of(ticketReservationRepository.findReservationById(reservationId), list));
});
}

private Result<List<Ticket>> reserveForTicketsInfo(Event event, AdminReservationModification arm, String reservationId, String specialPriceSessionId, Pair<TicketCategory, TicketsInfo> pair) {
TicketCategory category = pair.getLeft();
TicketsInfo ticketsInfo = pair.getRight();
int categoryId = category.getId();
List<Attendee> attendees = ticketsInfo.getAttendees();
List<Integer> reservedForUpdate = ticketReservationManager.reserveTickets(event.getId(), categoryId, attendees.size(), singletonList(Ticket.TicketStatus.FREE));
if (reservedForUpdate.size() != attendees.size()) {
return Result.error(ErrorCode.CategoryError.NOT_ENOUGH_SEATS);
}
ticketRepository.reserveTickets(reservationId, reservedForUpdate, categoryId, arm.getLanguage(), category.getSrcPriceCts());
Ticket ticket = ticketRepository.findById(reservedForUpdate.get(0), categoryId);
TicketPriceContainer priceContainer = TicketPriceContainer.from(ticket, event, null);
ticketRepository.updateTicketPrice(reservedForUpdate, categoryId, event.getId(), category.getSrcPriceCts(), MonetaryUtil.unitToCents(priceContainer.getFinalPrice()), MonetaryUtil.unitToCents(priceContainer.getVAT()), MonetaryUtil.unitToCents(priceContainer.getAppliedDiscount()));
List<SpecialPrice> codes = category.isAccessRestricted() ? bindSpecialPriceTokens(specialPriceSessionId, categoryId, attendees) : Collections.emptyList();
assignTickets(attendees, reservedForUpdate, codes, reservationId, arm.getLanguage(), category.getSrcPriceCts());
List<Ticket> tickets = reservedForUpdate.stream().map(id -> ticketRepository.findById(id, categoryId)).collect(toList());
return Result.success(tickets);
}

private Result<List<Ticket>> reduceReservationResults(Result<List<Ticket>> r1, Result<List<Ticket>> r2) {
return reduceResults(r1, r2, this::joinCreateReservationResults);
}

private List<Ticket> joinCreateReservationResults(List<Ticket> r1, List<Ticket> r2) {
List<Ticket> data = new ArrayList<>(r1);
data.addAll(r2);
return data;
}

private <T> Result<T> reduceResults(Result<T> r1, Result<T> r2, BiFunction<T, T, T> processData) {
boolean successful = r1.isSuccess() && r2.isSuccess();
ResultStatus global = r1.isSuccess() ? r2.getStatus() : r1.getStatus();
List<ErrorCode> errors = new ArrayList<>();
if(!successful) {
errors.addAll(r1.getErrors());
errors.addAll(r2.getErrors());
return new Result<>(global, null, errors);
} else {
return new Result<>(global, processData.apply(r1.getData(), r2.getData()), errors);
}
}

private Stream<Pair<TicketCategory, TicketsInfo>> flattenTicketsInfo(Event event, TicketsInfo empty, List<TicketsInfo> t) {
return t.stream()
.collect(groupingBy(ti -> ti.getCategory().getExistingCategoryId()))
.entrySet()
.stream()
.map(entry -> {
TicketsInfo ticketsInfo = entry.getValue()
.stream()
.reduce((ti1, ti2) -> {
List<Attendee> attendees = new ArrayList<>(ti1.getAttendees());
attendees.addAll(ti2.getAttendees());
return new TicketsInfo(ti1.getCategory(), attendees, ti1.isAddSeatsIfNotAvailable() && ti2.isAddSeatsIfNotAvailable(), ti1.isUpdateAttendees() && ti2.isUpdateAttendees());
}).orElse(empty);
return Pair.of(ticketCategoryRepository.getById(entry.getKey(), event.getId()), ticketsInfo);
});
}

private List<SpecialPrice> bindSpecialPriceTokens(String specialPriceSessionId, int categoryId, List<Attendee> attendees) {
specialPriceTokenGenerator.generatePendingCodesForCategory(categoryId);
List<SpecialPrice> codes = specialPriceRepository.findActiveNotAssignedByCategoryId(categoryId)
Expand All @@ -306,12 +347,14 @@ private void assignTickets(List<Attendee> attendees, List<Integer> reservedForUp
}
}

private Result<TicketCategory> checkCategoryCapacity(TicketsInfo ti, Event event, AdminReservationModification reservation, String username) {
return ti.getCategory().isExisting() ? checkExistingCategory(ti, event, username) : createCategory(ti, event, reservation, username);
private Result<List<TicketsInfo>> checkCategoryCapacity(TicketsInfo ti, Event event, AdminReservationModification reservation, String username) {
Result<TicketCategory> ticketCategoryResult = ti.getCategory().isExisting() ? checkExistingCategory(ti, event, username) : createCategory(ti, event, reservation, username);
return ticketCategoryResult
.map(tc -> Collections.singletonList(new TicketsInfo(new Category(tc.getId(), tc.getName(), tc.getPrice()), ti.getAttendees(), ti.isAddSeatsIfNotAvailable(), ti.isUpdateAttendees())));
}

private Result<TicketCategory> createCategory(TicketsInfo ti, Event event, AdminReservationModification reservation, String username) {
AdminReservationModification.Category category = ti.getCategory();
Category category = ti.getCategory();
List<Attendee> attendees = ti.getAttendees();
DateTimeModification inception = DateTimeModification.fromZonedDateTime(ZonedDateTime.now(event.getZoneId()));

Expand Down Expand Up @@ -340,7 +383,7 @@ private int getNotAllocatedTickets(Event event) {
}

private Result<TicketCategory> checkExistingCategory(TicketsInfo ti, Event event, String username) {
AdminReservationModification.Category category = ti.getCategory();
Category category = ti.getCategory();
List<Attendee> attendees = ti.getAttendees();
int tickets = attendees.size();
int eventId = event.getId();
Expand Down
42 changes: 42 additions & 0 deletions src/test/java/alfio/manager/AdminReservationManagerIntegrationTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,47 @@ public void testReserveFromNewCategory() throws Exception {
ticketCategoryRepository.findByEventId(event.getId()).forEach(tc -> assertTrue(specialPriceRepository.findAllByCategoryId(tc.getId()).stream().allMatch(sp -> sp.getStatus() == SpecialPrice.Status.TAKEN)));
}

@Test
public void testReserveMixed() throws Exception {
List<TicketCategoryModification> categories = Collections.singletonList(
new TicketCategoryModification(null, "default", 1,
new DateTimeModification(LocalDate.now(), LocalTime.now()),
new DateTimeModification(LocalDate.now(), LocalTime.now()),
DESCRIPTION, BigDecimal.TEN, false, "", false));
Pair<Event, String> eventWithUsername = initEvent(categories, organizationRepository, userManager, eventManager);
Event event = eventWithUsername.getKey();
String username = eventWithUsername.getValue();
DateTimeModification expiration = DateTimeModification.fromZonedDateTime(ZonedDateTime.now().plusDays(1));
CustomerData customerData = new CustomerData("Integration", "Test", "integration-test@test.ch");

TicketCategory existingCategory = ticketCategoryRepository.findByEventId(event.getId()).get(0);


Category resExistingCategory = new Category(existingCategory.getId(), "", existingCategory.getPrice());
Category resNewCategory = new Category(null, "name", new BigDecimal("100.00"));
int attendees = 1;
List<TicketsInfo> ticketsInfoList = Arrays.asList(new TicketsInfo(resExistingCategory, generateAttendees(attendees), false, false), new TicketsInfo(resNewCategory, generateAttendees(attendees), false, false),new TicketsInfo(resExistingCategory, generateAttendees(attendees), false, false));
AdminReservationModification modification = new AdminReservationModification(expiration, customerData, ticketsInfoList, "en", false, null);
Result<Pair<TicketReservation, List<Ticket>>> result = adminReservationManager.createReservation(modification, event.getShortName(), username);
assertTrue(result.isSuccess());
Pair<TicketReservation, List<Ticket>> data = result.getData();
List<Ticket> tickets = data.getRight();
assertTrue(tickets.size() == 3);
assertNotNull(data.getLeft());
assertTrue(tickets.stream().allMatch(t -> t.getTicketsReservationId().equals(data.getKey().getId())));
int resExistingCategoryId = tickets.get(0).getCategoryId();
int resNewCategoryId = tickets.get(2).getCategoryId();

Event modified = eventManager.getSingleEvent(event.getShortName(), username);
assertEquals(AVAILABLE_SEATS, modified.getAvailableSeats());
assertEquals(3, ticketRepository.findPendingTicketsInCategories(Arrays.asList(resExistingCategoryId, resNewCategoryId)).size());
assertEquals(3, ticketRepository.findTicketsInReservation(data.getLeft().getId()).size());

ticketCategoryRepository.findByEventId(event.getId()).forEach(tc -> assertTrue(specialPriceRepository.findAllByCategoryId(tc.getId()).stream().allMatch(sp -> sp.getStatus() == SpecialPrice.Status.PENDING)));
adminReservationManager.confirmReservation(event.getShortName(), data.getLeft().getId(), username);
ticketCategoryRepository.findByEventId(event.getId()).forEach(tc -> assertTrue(specialPriceRepository.findAllByCategoryId(tc.getId()).stream().allMatch(sp -> sp.getStatus() == SpecialPrice.Status.TAKEN)));
}

@Test
public void testConfirmReservation() throws Exception {
List<TicketCategoryModification> categories = Collections.singletonList(
Expand Down Expand Up @@ -274,6 +315,7 @@ private void validateSuccess(boolean bounded, List<Integer> attendeesNr, Event e
assertTrue(ticket.getAssigned());
assertEquals(attendee.getFullName(), ticket.getFullName());
assertEquals(attendee.getEmailAddress(), ticket.getEmail());
assertEquals(data.getLeft().getId(), ticket.getTicketsReservationId());
}
}
ticketCategoryRepository.findByEventId(modified.getId()).forEach(tc -> assertTrue(specialPriceRepository.findAllByCategoryId(tc.getId()).stream().allMatch(sp -> sp.getStatus() == SpecialPrice.Status.PENDING)));
Expand Down

0 comments on commit 1022821

Please # to comment.