event description: load only locale and description

alfio-event · Aug 20, 2019 · 71480f9 · 71480f9
1 parent 98680ee
commit 71480f9
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/src/main/java/alfio/controller/api/v2/user/EventApiV2Controller.java b/src/main/java/alfio/controller/api/v2/user/EventApiV2Controller.java
@@ -127,9 +127,7 @@ public ResponseEntity<EventWithAdditionalInfo> getEvent(@PathVariable("eventName
 
                 var messageSource = messageSourceManager.getMessageSourceForEvent(event);
 
-                var descriptions = applyCommonMark(eventDescriptionRepository.findByEventIdAndType(event.getId(), EventDescription.EventDescriptionType.DESCRIPTION)
-                    .stream()
-                    .collect(Collectors.toMap(EventDescription::getLocale, EventDescription::getDescription)));
+                var descriptions = applyCommonMark(eventDescriptionRepository.findDescriptionByEventIdAsMap(event.getId()));
 
                 var organization = organizationRepository.getContactById(event.getOrganizationId());
 

diff --git a/src/main/java/alfio/model/EventDescription.java b/src/main/java/alfio/model/EventDescription.java
@@ -40,4 +40,15 @@ public EventDescription(@Column("event_id_fk") Integer eventId, @Column("locale"
         this.eventDescriptionType = eventDescriptionType;
         this.description = description;
     }
+
+    @Getter
+    public static class LocaleDescription {
+        private final String locale;
+        private final String description;
+
+        public LocaleDescription(@Column("locale") String locale, @Column("description") String description) {
+            this.locale = locale;
+            this.description = description;
+        }
+    }
 }
diff --git a/src/main/java/alfio/repository/EventDescriptionRepository.java b/src/main/java/alfio/repository/EventDescriptionRepository.java
@@ -32,13 +32,17 @@ public interface EventDescriptionRepository {
     @Query("select * from event_description_text where event_id_fk = :eventId")
     List<EventDescription> findByEventId(@Bind("eventId") int eventId);
 
-    @Query("select * from event_description_text where event_id_fk = :eventId and type = :type")
-    List<EventDescription> findByEventIdAndType(@Bind("eventId") int eventId, @Bind("type")EventDescription.EventDescriptionType type);
+    @Query("select locale, description from event_description_text where event_id_fk = :eventId and type = 'DESCRIPTION'")
+    List<EventDescription.LocaleDescription> findDescriptionByEventId(@Bind("eventId") int eventId);
 
     default Map<String, String> findByEventIdAsMap(int eventId) {
         return findByEventId(eventId).stream().collect(Collectors.toMap(EventDescription::getLocale, EventDescription::getDescription));
     }
 
+    default Map<String, String> findDescriptionByEventIdAsMap(int eventId) {
+        return findDescriptionByEventId(eventId).stream().collect(Collectors.toMap(EventDescription.LocaleDescription::getLocale, EventDescription.LocaleDescription::getDescription));
+    }
+
     @Query("select description from event_description_text where event_id_fk = :eventId and type = :type and locale = :locale")
     Optional<String> findDescriptionByEventIdTypeAndLocale(@Bind("eventId") int eventId, @Bind("type") EventDescription.EventDescriptionType type, @Bind("locale") String locale);