NotificationMail: Fix incorrect order of messages

The order of messages of merged notification was incorrectly reversed. This bug was caused by 96f7a52.
naver · May 12, 2015 · ff9319d · ff9319d
1 parent dfcf344
commit ff9319d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/app/models/NotificationMail.java b/app/models/NotificationMail.java
@@ -274,7 +274,7 @@ public EventHashKey(Resource resource, User sender) {
                     Set<User> commentReceivers = event.findReceivers();
 
                     if (ObjectUtils.equals(stateReceivers, commentReceivers)) {
-                        stateChangedEvent.merge(event);
+                        stateChangedEvent.getMessageSources().add(0, event);
                         // No need to add the current event because it was merged.
                         continue;
                     } else {
@@ -285,6 +285,7 @@ public EventHashKey(Resource resource, User sender) {
                         // a. the notification of both of state-change and comment
                         Set<User> intersect = new HashSet<>(
                                 CollectionUtils.intersection(stateReceivers, commentReceivers));
+
                         MergedNotificationEvent mergedEvent = new MergedNotificationEvent(
                                 stateChangedEvent, Arrays.asList(event, stateChangedEvent));
                         mergedEvent.setReceivers(intersect);

diff --git a/app/notification/MergedNotificationEvent.java b/app/notification/MergedNotificationEvent.java
@@ -38,7 +38,7 @@ public class MergedNotificationEvent implements INotificationEvent {
     public MergedNotificationEvent(@Nonnull INotificationEvent main,
                                    @Nonnull List<INotificationEvent> messageSources) {
         this.main = main;
-        this.messageSources = new ArrayList<>(messageSources);
+        this.messageSources = new LinkedList<>(messageSources);
     }
 
     public MergedNotificationEvent(@Nonnull INotificationEvent main) {
@@ -113,7 +113,7 @@ public void setReceivers(@Nonnull Set<User> receivers) {
         this.receivers = receivers;
     }
 
-    public void merge(INotificationEvent event) {
-        this.messageSources.add(event);
+    public List<INotificationEvent> getMessageSources() {
+        return messageSources;
     }
 }