#318, #325 misc optimizations

alfio-event · Aug 11, 2017 · 14b3857 · 14b3857
1 parent 0f5bd6d
commit 14b3857
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/src/main/java/alfio/controller/api/admin/EventApiController.java b/src/main/java/alfio/controller/api/admin/EventApiController.java
@@ -521,7 +521,7 @@ public List<TicketCategoryModification> getCategoriesWithTickets(@PathVariable("
         Event event = loadEvent(eventName, principal);
         return eventStatisticsManager.loadTicketCategoriesWithStats(event).stream()
                 .filter(tc -> !tc.getTickets().isEmpty())
-                .map(tc -> TicketCategoryModification.fromTicketCategory(tc.getTicketCategory(), ticketCategoryDescriptionRepository.findByTicketCategoryId(tc.getId()), event.getZoneId()))
+                .map(tc -> TicketCategoryModification.fromTicketCategory(tc.getTicketCategory(), tc.getDescription(), event.getZoneId()))
                 .collect(toList());
     }
 

diff --git a/src/main/java/alfio/manager/EventStatisticsManager.java b/src/main/java/alfio/manager/EventStatisticsManager.java
@@ -105,7 +105,6 @@ public EventWithAdditionalInfo getEventWithAdditionalInfo(String eventName, Stri
         BigDecimal grossIncome = MonetaryUtil.centsToUnit(eventRepository.getGrossIncome(event.getId()));
 
         List<TicketCategory> ticketCategories = loadTicketCategories(event);
-
         List<Integer> ticketCategoriesIds = ticketCategories.stream().map(TicketCategory::getId).collect(Collectors.toList());
 
         Map<Integer, Map<String, String>> descriptions = ticketCategoryDescriptionRepository.descriptionsByTicketCategory(ticketCategoriesIds);
@@ -120,10 +119,15 @@ public EventWithAdditionalInfo getEventWithAdditionalInfo(String eventName, Stri
     }
 
     public List<TicketCategoryWithStatistic> loadTicketCategoriesWithStats(Event event) {
+
+        List<TicketCategory> categories = loadTicketCategories(event);
+        List<Integer> ticketCategoriesIds = categories.stream().map(TicketCategory::getId).collect(Collectors.toList());
+        Map<Integer, Map<String, String>> descriptions = ticketCategoryDescriptionRepository.descriptionsByTicketCategory(ticketCategoriesIds);
+        Map<Integer, List<SpecialPrice>> specialPrices = specialPriceRepository.findAllByCategoriesIdsMapped(ticketCategoriesIds);
+
         return loadTicketCategories(event).stream()
                 .map(tc -> new TicketCategoryWithStatistic(tc, loadModifiedTickets(tc.getEventId(), tc.getId()),
-                    specialPriceRepository.findAllByCategoryId(tc.getId()), event,
-                    ticketCategoryDescriptionRepository.descriptionForTicketCategory(tc.getId())))
+                    specialPrices.get(tc.getId()), event, descriptions.get(tc.getId())))
                 .sorted()
                 .collect(toList());
     }

diff --git a/src/main/java/alfio/model/modification/TicketCategoryModification.java b/src/main/java/alfio/model/modification/TicketCategoryModification.java
@@ -71,13 +71,13 @@ public int getPriceInCents() {
         return Optional.ofNullable(price).map(MonetaryUtil::unitToCents).orElse(0);
     }
 
-    public static TicketCategoryModification fromTicketCategory(TicketCategory tc, List<TicketCategoryDescription> ticketCategoryDescriptions, ZoneId zoneId) {
+    public static TicketCategoryModification fromTicketCategory(TicketCategory tc, Map<String, String> ticketCategoryDescriptions, ZoneId zoneId) {
         return new TicketCategoryModification(tc.getId(),
                 tc.getName(),
                 tc.getMaxTickets(),
                 DateTimeModification.fromZonedDateTime(tc.getInception(zoneId)),
                 DateTimeModification.fromZonedDateTime(tc.getExpiration(zoneId)),
-                ticketCategoryDescriptions.stream().collect(Collectors.toMap(TicketCategoryDescription::getLocale, TicketCategoryDescription::getDescription)),
+                ticketCategoryDescriptions,
                 tc.getPrice(),
                 tc.isAccessRestricted(), "", tc.isBounded());
     }