get event api: avoid calling message override twice

alfio-event · Aug 20, 2019 · 295999a · 295999a
1 parent 3b26a66
commit 295999a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 14 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
@@ -124,8 +124,10 @@ public ResponseEntity<List<BasicEventInfo>> listEvents() {
     public ResponseEntity<EventWithAdditionalInfo> getEvent(@PathVariable("eventName") String eventName, HttpSession session) {
         return eventRepository.findOptionalByShortName(eventName).filter(e -> e.getStatus() != Event.Status.DISABLED)//
             .map(event -> {
-
-                var messageSource = messageSourceManager.getMessageSourceForEvent(event);
+                //
+                var messageSourceAndOverride = messageSourceManager.getMessageSourceForEventAndOverride(event);
+                var messageSource = messageSourceAndOverride.getLeft();
+                var i18nOverride = messageSourceAndOverride.getRight();
 
                 var descriptions = applyCommonMark(eventDescriptionRepository.findDescriptionByEventIdAsMap(event.getId()));
 
@@ -234,10 +236,6 @@ public ResponseEntity<EventWithAdditionalInfo> getEvent(@PathVariable("eventName
                 var analyticsConf = AnalyticsConfiguration.build(configurationsValues, session);
                 //
 
-                //
-                var i18nOverride = messageSourceManager.getEventMessageSourceOverride(event);
-                //
-
                 return new ResponseEntity<>(new EventWithAdditionalInfo(event, ld.getMapUrl(), organization, descriptions, availablePaymentMethods,
                     bankAccount, bankAccountOwner,
                     formattedBeginDate, formattedBeginTime,

diff --git a/src/main/java/alfio/manager/i18n/MessageSourceManager.java b/src/main/java/alfio/manager/i18n/MessageSourceManager.java
@@ -19,6 +19,7 @@
 import alfio.model.EventAndOrganizationId;
 import alfio.repository.system.ConfigurationRepository;
 import alfio.util.CustomResourceBundleMessageSource;
+import org.apache.commons.lang3.tuple.Pair;
 import org.springframework.context.MessageSource;
 import org.springframework.context.support.AbstractMessageSource;
 
@@ -27,7 +28,6 @@
 import java.util.Map;
 import java.util.Set;
 
-
 public class MessageSourceManager {
 
     private final CustomResourceBundleMessageSource messageSource;
@@ -43,9 +43,13 @@ public Set<String> getKeys(String basename, Locale locale) {
         return messageSource.getKeys(basename, locale);
     }
 
+    public Pair<MessageSource, Map<String, Map<String, String>>> getMessageSourceForEventAndOverride(EventAndOrganizationId eventAndOrganizationId) {
+        var override = configurationRepository.getEventOverrideMessages(eventAndOrganizationId.getOrganizationId(), eventAndOrganizationId.getId());
+        return Pair.of(new MessageSourceWithOverride(messageSource, override), override);
+    }
+
     public MessageSource getMessageSourceForEvent(EventAndOrganizationId eventAndOrganizationId) {
-        var res = getEventMessageSourceOverride(eventAndOrganizationId);
-        return new MessageSourceWithOverride(messageSource, res);
+        return getMessageSourceForEventAndOverride(eventAndOrganizationId).getLeft();
     }
 
     public MessageSource getRootMessageSource() {
@@ -60,11 +64,7 @@ public MessageSource getRootMessageSource(boolean withSystemOverride) {
         }
     }
 
-    public Map<String, Map<String, String>> getEventMessageSourceOverride(EventAndOrganizationId eventAndOrganizationId) {
-        return configurationRepository.getEventOverrideMessages(eventAndOrganizationId.getOrganizationId(), eventAndOrganizationId.getId());
-    }
-
-    private static final class MessageSourceWithOverride extends AbstractMessageSource {
+    private static class MessageSourceWithOverride extends AbstractMessageSource {
 
         private final CustomResourceBundleMessageSource messageSource;
         private final Map<String, Map<String, String>> override;