#203 do an async call when sending bulk emails

Author: syjer

src/main/java/alfio/controller/api/admin/CustomMessagesApiController.java

@@ -53,11 +53,11 @@ public Map<String, Object> preview(@PathVariable("eventName") String eventName,
     }
 
     @RequestMapping(value= "/send", method = RequestMethod.POST)
-    public int send(@PathVariable("eventName") String eventName,
+    public void send(@PathVariable("eventName") String eventName,
                     @RequestParam(required = false, value = "categoryId") Integer categoryId,
                     @RequestBody List<MessageModification> messageModifications,
                     Principal principal) {
-        return customMessageManager.sendMessages(eventName, Optional.ofNullable(categoryId), messageModifications, principal.getName());
+        customMessageManager.sendMessages(eventName, Optional.ofNullable(categoryId), messageModifications, principal.getName());
     }
 
 }

src/main/java/alfio/manager/support/CustomMessageManager.java

@@ -42,6 +42,8 @@
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.*;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 
@@ -57,23 +59,21 @@ public class CustomMessageManager {
     private final TicketReservationManager ticketReservationManager;
     private final NotificationManager notificationManager;
     private final TicketCategoryRepository ticketCategoryRepository;
-    private final FileUploadManager fileUploadManager;
+    private final Executor sendMessagesExecutor = Executors.newSingleThreadExecutor();
 
     @Autowired
     public CustomMessageManager(TemplateManager templateManager,
                                 EventManager eventManager,
                                 TicketRepository ticketRepository,
                                 TicketReservationManager ticketReservationManager,
                                 NotificationManager notificationManager,
-                                TicketCategoryRepository ticketCategoryRepository,
-                                FileUploadManager fileUploadManager) {
+                                TicketCategoryRepository ticketCategoryRepository) {
         this.templateManager = templateManager;
         this.eventManager = eventManager;
         this.ticketRepository = ticketRepository;
         this.ticketReservationManager = ticketReservationManager;
         this.notificationManager = notificationManager;
         this.ticketCategoryRepository = ticketCategoryRepository;
-        this.fileUploadManager = fileUploadManager;
     }
 
     public Map<String, Object> generatePreview(String eventName, Optional<Integer> categoryId, List<MessageModification> input, String username) {
@@ -84,13 +84,16 @@ public Map<String, Object> generatePreview(String eventName, Optional<Integer> c
         return result;
     }
 
-    public int sendMessages(String eventName, Optional<Integer> categoryId, List<MessageModification> input, String username) {
+    public void sendMessages(String eventName, Optional<Integer> categoryId, List<MessageModification> input, String username) {
+
         Event event = eventManager.getSingleEvent(eventName, username);
         preview(event, input, username);//dry run for checking the syntax
         Organization organization = eventManager.loadOrganizer(event, username);
         AtomicInteger counter = new AtomicInteger();
         Map<String, List<MessageModification>> byLanguage = input.stream().collect(Collectors.groupingBy(m -> m.getLocale().getLanguage()));
-        categoryId.map(id -> ticketRepository.findConfirmedByCategoryId(event.getId(), id))
+
+        sendMessagesExecutor.execute(() -> {
+            categoryId.map(id -> ticketRepository.findConfirmedByCategoryId(event.getId(), id))
                 .orElseGet(() -> ticketRepository.findAllConfirmed(event.getId()))
                 .stream()
                 .filter(t -> isNotBlank(t.getFullName()) && isNotBlank(t.getEmail()))
@@ -123,7 +126,7 @@ public int sendMessages(String eventName, Optional<Integer> categoryId, List<Mes
                     counter.incrementAndGet();
                     notificationManager.sendSimpleEmail(event, triple.getMiddle(), subject, () -> text, attachments);
                 });
-        return counter.get();
+        });
 
     }