Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
@cbellone
cbellone committed Apr 7, 2015
2 parents d3fa68d + 0ed0bb3 commit dd244d2
Show file tree
Hide file tree
Showing 2 changed files with 51 additions and 42 deletions.
82 changes: 41 additions & 41 deletions src/main/java/alfio/model/FullTicketInfo.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,52 +35,52 @@ public class FullTicketInfo {
private final TicketCategory ticketCategory;


public FullTicketInfo(@Column("ticket.id") int id,
@Column("ticket.uuid") String uuid,
@Column("ticket.creation") ZonedDateTime creation,
@Column("ticket.category_id") int categoryId,
@Column("ticket.status") String status,
@Column("ticket.event_id") int eventId,
@Column("ticket.original_price_cts") int originalPriceInCents,
@Column("ticket.paid_price_cts") int paidPriceInCents,
@Column("ticket.tickets_reservation_id") String ticketsReservationId,
@Column("ticket.full_name") String fullName,
@Column("ticket.email_address") String email,
@Column("ticket.locked_assignment") boolean lockedAssignment,
public FullTicketInfo(@Column("t_id") int id,
@Column("t_uuid") String uuid,
@Column("t_creation") ZonedDateTime creation,
@Column("t_category_id") int categoryId,
@Column("t_status") String status,
@Column("t_event_id") int eventId,
@Column("t_original_price_cts") int originalPriceInCents,
@Column("t_paid_price_cts") int paidPriceInCents,
@Column("t_tickets_reservation_id") String ticketsReservationId,
@Column("t_full_name") String fullName,
@Column("t_email_address") String email,
@Column("t_locked_assignment") boolean lockedAssignment,
//
@Column("ticket.job_title") String jobTitle,
@Column("ticket.company") String company,
@Column("ticket.phone_number") String phoneNumber,
@Column("ticket.address") String address,
@Column("ticket.country") String country,
@Column("ticket.tshirt_size") String tshirtSize,
@Column("ticket.notes") String notes,
@Column("ticket.user_language") String userLanguage,
@Column("t_job_title") String jobTitle,
@Column("t_company") String company,
@Column("t_phone_number") String phoneNumber,
@Column("t_address") String address,
@Column("t_country") String country,
@Column("t_tshirt_size") String tshirtSize,
@Column("t_notes") String notes,
@Column("t_user_language") String userLanguage,
//
//
@Column("tickets_reservation.id") String trId,
@Column("tickets_reservation.validity") Date trValidity,
@Column("tickets_reservation.status") TicketReservation.TicketReservationStatus trStatus,
@Column("tickets_reservation.full_name") String trFullName,
@Column("tickets_reservation.email_address") String trEmail,
@Column("tickets_reservation.billing_address") String trBillingAddress,
@Column("tickets_reservation.confirmation_ts") ZonedDateTime trConfirmationTimestamp,
@Column("tickets_reservation.latest_reminder_ts") ZonedDateTime trLatestReminder,
@Column("tickets_reservation.payment_method") PaymentProxy trPaymentMethod,
@Column("tickets_reservation.offline_payment_reminder_sent") Boolean trReminderSent,
@Column("tickets_reservation.promo_code_id_fk") Integer trPromoCodeDiscountId,
@Column("tr_id") String trId,
@Column("tr_validity") Date trValidity,
@Column("tr_status") TicketReservation.TicketReservationStatus trStatus,
@Column("tr_full_name") String trFullName,
@Column("tr_email_address") String trEmail,
@Column("tr_billing_address") String trBillingAddress,
@Column("tr_confirmation_ts") ZonedDateTime trConfirmationTimestamp,
@Column("tr_latest_reminder_ts") ZonedDateTime trLatestReminder,
@Column("tr_payment_method") PaymentProxy trPaymentMethod,
@Column("tr_offline_payment_reminder_sent") Boolean trReminderSent,
@Column("tr_promo_code_id_fk") Integer trPromoCodeDiscountId,
//
//
@Column("ticket_category.id") int tcId,
@Column("ticket_category.inception") ZonedDateTime tcUtcInception,
@Column("ticket_category.expiration") ZonedDateTime tcUtcExpiration,
@Column("ticket_category.max_tickets") int tcMaxTickets,
@Column("ticket_category.name") String tcName,
@Column("ticket_category.description") String tcDescription,
@Column("ticket_category.price_cts") int tcPriceInCents,
@Column("ticket_category.access_restricted") boolean tcAccessRestricted,
@Column("ticket_category.tc_status") TicketCategory.Status tcStatus,
@Column("ticket_category.event_id") int tcEventId) {
@Column("tc_id") int tcId,
@Column("tc_inception") ZonedDateTime tcUtcInception,
@Column("tc_expiration") ZonedDateTime tcUtcExpiration,
@Column("tc_max_tickets") int tcMaxTickets,
@Column("tc_name") String tcName,
@Column("tc_description") String tcDescription,
@Column("tc_price_cts") int tcPriceInCents,
@Column("tc_access_restricted") boolean tcAccessRestricted,
@Column("tc_tc_status") TicketCategory.Status tcStatus,
@Column("tc_event_id") int tcEventId) {

this.ticket = new Ticket(id, uuid, creation, categoryId, status, eventId, originalPriceInCents, paidPriceInCents,
ticketsReservationId, fullName, email, lockedAssignment, jobTitle, company, phoneNumber, address, country,
Expand Down
11 changes: 10 additions & 1 deletion src/main/java/alfio/repository/TicketRepository.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,16 @@ int updateOptionalTicketInfo(@Bind("ticketIdentifier") String ticketIdentifier,
@Query("select * from ticket where category_id in (:categories) and status = 'PENDING'")
List<Ticket> findPendingTicketsInCategories(@Bind("categories") List<Integer> categories);

@Query("select * from ticket t " +
@Query("select " +
" t.id t_id, t.uuid t_uuid, t.creation t_creation, t.category_id t_category_id, t.status t_status, t.event_id t_event_id," +
" t.original_price_cts t_original_price_cts, t.paid_price_cts t_paid_price_cts, t.tickets_reservation_id t_tickets_reservation_id," +
" t.full_name t_full_name, t.email_address t_email_address, t.locked_assignment t_locked_assignment, t.job_title t_job_title, t.company t_company," +
" t.phone_number t_phone_number, t.address t_address, t.country t_country, t.tshirt_size t_tshirt_size," +
" t.notes t_notes, t.user_language t_user_language," +
" tr.id tr_id, tr.validity tr_validity, tr.status tr_status, tr.full_name tr_full_name, tr.email_address tr_email_address, tr.billing_address tr_billing_address," +
" tr.confirmation_ts tr_confirmation_ts, tr.latest_reminder_ts tr_latest_reminder_ts, tr.payment_method tr_payment_method, tr.offline_payment_reminder_sent tr_offline_payment_reminder_sent, tr.promo_code_id_fk tr_promo_code_id_fk," +
" tc.id tc_id, tc.inception tc_inception, tc.expiration tc_expiration, tc.max_tickets tc_max_tickets, tc.name tc_name, tc.description tc_description, tc.price_cts tc_price_cts, tc.access_restricted tc_access_restricted, tc.tc_status tc_tc_status, tc.event_id tc_event_id" +
" from ticket t " +
" inner join tickets_reservation tr on t.tickets_reservation_id = tr.id " +
" inner join ticket_category tc on t.category_id = tc.id " +
" where t.event_id = :eventId and t.full_name is not null and t.email_address is not null")
Expand Down

0 comments on commit dd244d2

Please sign in to comment.