remove a sendSimpleEmail variant

alfio-event · Aug 19, 2015 · 9f4965a · 9f4965a
1 parent ff18617
commit 9f4965a
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 16 deletions.
diff --git a/src/main/java/alfio/controller/ReservationController.java b/src/main/java/alfio/controller/ReservationController.java
@@ -394,18 +394,21 @@ public String assignTicketToPerson(@PathVariable("eventName") String eventName,
     private void sendReservationCompleteEmail(HttpServletRequest request, Event event, TicketReservation reservation) {
 
         Locale locale = RequestContextUtils.getLocale(request);
-        String reservationTxt = templateManager.renderClassPathResource("/alfio/templates/confirmation-email-txt.ms",
-                ticketReservationManager.prepareModelForReservationEmail(event, reservation), locale, TemplateOutput.TEXT);
+
         String shortReservationID = ticketReservationManager.getShortReservationID(reservation.getId());
+
         notificationManager.sendSimpleEmail(event, reservation.getEmail(), messageSource.getMessage("reservation-email-subject",
-                new Object[] { shortReservationID, event.getDisplayName() }, locale), reservationTxt);
+                new Object[] { shortReservationID, event.getDisplayName() }, locale), () -> {
+            return templateManager.renderClassPathResource("/alfio/templates/confirmation-email-txt.ms", ticketReservationManager.prepareModelForReservationEmail(event, reservation), locale, TemplateOutput.TEXT);
+        });
     }
 
     private void sendReservationCompleteEmailToOrganizer(HttpServletRequest request, Event event, TicketReservation reservation) {
         Organization organization = organizationRepository.getById(event.getOrganizationId());
-        String reservationInfo = templateManager.renderClassPathResource("/alfio/templates/confirmation-email-for-organizer-txt.ms",
-                ticketReservationManager.prepareModelForReservationEmail(event, reservation), RequestContextUtils.getLocale(request), TemplateOutput.TEXT);
-        notificationManager.sendSimpleEmail(event, organization.getEmail(), "Reservation complete " + reservation.getId(), reservationInfo);
+        notificationManager.sendSimpleEmail(event, organization.getEmail(), "Reservation complete " + reservation.getId(), () -> {
+            return  templateManager.renderClassPathResource("/alfio/templates/confirmation-email-for-organizer-txt.ms", ticketReservationManager.prepareModelForReservationEmail(event, reservation),
+                RequestContextUtils.getLocale(request), TemplateOutput.TEXT);
+        });
     }
 
 }
diff --git a/src/main/java/alfio/manager/NotificationManager.java b/src/main/java/alfio/manager/NotificationManager.java
@@ -117,12 +117,6 @@ public void sendSimpleEmail(Event event, String recipient, String subject, TextT
         messages.offer(new EmailMessage(-1, event.getId(), WAITING.name(), recipient, subject, text, null, checksum));
     }
 
-    public void sendSimpleEmail(Event event, String recipient, String subject, String text) {
-        String checksum = calculateChecksum(recipient, null, subject, text);
-        emailMessageRepository.insert(event.getId(), recipient, subject, text, null, checksum, ZonedDateTime.now(UTC));
-        messages.offer(new EmailMessage(-1, event.getId(), WAITING.name(), recipient, subject, text, null, checksum));
-    }
-
     void sendWaitingMessages() {
         Set<EmailMessage> toBeSent = messages.poll(configurationManager.getIntConfigValue(Configuration.maxEmailPerCycle(), 10));
         toBeSent.forEach(m -> {

diff --git a/src/main/java/alfio/manager/TicketReservationManager.java b/src/main/java/alfio/manager/TicketReservationManager.java
@@ -747,7 +747,7 @@ public void updateTicketOwner(Ticket ticket,
         if (!admin && StringUtils.isNotBlank(ticket.getEmail()) && !StringUtils.equalsIgnoreCase(newEmail, ticket.getEmail())) {
             Locale oldUserLocale = Locale.forLanguageTag(ticket.getUserLanguage());
             String subject = messageSource.getMessage("ticket-has-changed-owner-subject", new Object[] {event.getDisplayName()}, oldUserLocale);
-            notificationManager.sendSimpleEmail(event, ticket.getEmail(), subject, ownerChangeTextBuilder.generate(newTicket));
+            notificationManager.sendSimpleEmail(event, ticket.getEmail(), subject, () -> ownerChangeTextBuilder.generate(newTicket));
         }
 
         if(admin) {

diff --git a/src/main/java/alfio/manager/support/CustomMessageManager.java b/src/main/java/alfio/manager/support/CustomMessageManager.java
@@ -94,7 +94,7 @@ public int sendMessages(String eventName, Optional<Integer> categoryId, List<Mes
                     String subject = renderResource(m.getSubject(), model, m.getLocale(), templateManager);
                     String text = renderResource(m.getText(), model, m.getLocale(), templateManager);
                     counter.incrementAndGet();
-                    notificationManager.sendSimpleEmail(event, triple.getMiddle(), subject, text);
+                    notificationManager.sendSimpleEmail(event, triple.getMiddle(), subject, () -> text);
                 });
         return counter.get();
 

diff --git a/src/test/java/alfio/manager/TicketReservationManagerTest.java b/src/test/java/alfio/manager/TicketReservationManagerTest.java
@@ -97,7 +97,7 @@ public class TicketReservationManagerTest {{
             when(original.getUserLanguage()).thenReturn("it");
             trm.updateTicketOwner(original, Locale.ENGLISH, event, form, (a) -> null, ownerChangeTextBuilder, (c) -> null, Optional.empty());
             verify(messageSource, times(1)).getMessage(eq("ticket-has-changed-owner-subject"), any(), eq(Locale.ITALIAN));
-            verify(notificationManager, times(1)).sendSimpleEmail(eq(event), eq(originalEmail), anyString(), eq("Hello, world"));
+            verify(notificationManager, times(1)).sendSimpleEmail(eq(event), eq(originalEmail), anyString(), any(TextTemplateGenerator.class));
         });
 
         it.should("fall back to the current locale", expect -> {
@@ -107,7 +107,7 @@ public class TicketReservationManagerTest {{
             trm.updateTicketOwner(original, Locale.ENGLISH, event, form, (a) -> null, ownerChangeTextBuilder, (c) -> null, Optional.empty());
             verify(messageSource, times(1)).getMessage(eq("ticket-has-changed-owner-subject"), any(), eq(Locale.ITALIAN));
             verify(notificationManager, times(1)).sendTicketByEmail(eq(modified), eq(event), eq(Locale.ENGLISH), any(), any());
-            verify(notificationManager, times(1)).sendSimpleEmail(eq(event), eq(originalEmail), anyString(), eq("Hello, world"));
+            verify(notificationManager, times(1)).sendSimpleEmail(eq(event), eq(originalEmail), anyString(), any(TextTemplateGenerator.class));
         });
     });