fix: remove redundent event title from email notifications - EXO-73531

exoplatform · Sep 26, 2024 · 62896fa · 62896fa
1 parent a751a7b
commit 62896fa
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/...ices/src/main/java/org/exoplatform/agenda/notification/builder/AgendaTemplateBuilder.java b/...ices/src/main/java/org/exoplatform/agenda/notification/builder/AgendaTemplateBuilder.java
@@ -119,15 +119,8 @@ protected MessageInfo makeMessage(NotificationContext ctx) {
                                                                 notification,
                                                                 timeZone);
       MessageInfo messageInfo = new MessageInfo();
-      long creatorIdentityId = event.getCreatorId();
-      long modifierIdentityId = event.getModifierId();
-      if((StringUtils.equals(eventModificationType, AgendaEventModificationType.ADDED.name()) && identityId == creatorIdentityId)
-              || (StringUtils.equals(eventModificationType, AgendaEventModificationType.UPDATED.name()) && identityId == modifierIdentityId)){
-        messageInfo.subject(notification.getValueOwnerParameter(STORED_PARAMETER_EVENT_TITLE));
-        messageInfo.body(TemplateUtils.processGroovy(templateContext));
-      } else {
-        messageInfo = buildMessageSubjectAndBody(templateContext, notification, pushNotificationURL);
-      }
+      messageInfo.subject(notification.getValueOwnerParameter(STORED_PARAMETER_EVENT_TITLE));
+      messageInfo.body(TemplateUtils.processGroovy(templateContext));
       addIcsFile(notification, messageInfo, timeZone);
       Throwable exception = templateContext.getException();
       logException(notification, exception);

diff --git a/agenda-services/src/main/java/org/exoplatform/agenda/util/NotificationUtils.java b/agenda-services/src/main/java/org/exoplatform/agenda/util/NotificationUtils.java
@@ -848,7 +848,7 @@ private static final void setLasModifiedTime(NotificationInfo notification, Temp
   }
 
   private static final String getEventNotificationCreatorOrModifierUserName(Identity identity) {
-    String fullName = Arrays.stream(identity.getProfile().getFullName().split(" "))
+    String fullName = Arrays.stream(identity.getProfile().getFullName().split(" +"))
             .map(t -> t.substring(0, 1).toUpperCase() + t.substring(1))
             .collect(Collectors.joining(" "));
     if(Utils.isExternal(identity.getRemoteId())) {