feat: Send published article public link in publish news mail notific…

…ation message - EXO-73050 - Meeds-io/MIPs#129 (#250)
Meeds-io · Oct 7, 2024 · 2b10178 · 2b10178
1 parent 25e3984
commit 2b10178
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/content-service/src/main/java/io/meeds/news/notification/provider/MailTemplateProvider.java b/content-service/src/main/java/io/meeds/news/notification/provider/MailTemplateProvider.java
@@ -111,8 +111,7 @@ protected MessageInfo makeMessage(NotificationContext ctx) {
       templateContext.put("AUTHOR_AVATAR_URL", encoder.encode(authorAvatarUrl));
       templateContext.put("CONTEXT", encoder.encode(context));
       StringBuilder activityUrl = new StringBuilder();
-      Space space = spaceService.getSpaceByDisplayName(contentSpaceName);
-      if (pluginId.equals(PublishNewsNotificationPlugin.ID) && !spaceService.isMember(space, notification.getTo())) {
+      if (pluginId.equals(PublishNewsNotificationPlugin.ID)) {
         String portalName = PortalContainer.getCurrentPortalContainerName();
         String portalOwner = CommonsUtils.getCurrentPortalOwner();
         String currentDomain = CommonsUtils.getCurrentDomain();
@@ -125,8 +124,6 @@ protected MessageInfo makeMessage(NotificationContext ctx) {
                    .append(portalOwner)
                    .append("/news-detail?newsId=")
                    .append(newsId);
-      } else {
-        activityUrl.append(activityLink);
       }
 
       templateContext.put("ACTIVITY_LINK", encoder.encode(activityUrl.toString()));

diff --git a/...t-service/src/test/java/io/meeds/news/notification/provider/MailTemplateProviderTest.java b/...t-service/src/test/java/io/meeds/news/notification/provider/MailTemplateProviderTest.java
@@ -153,7 +153,6 @@ public void shouldInstantiateMailTemplate() {
     when(encoder.encode("jean")).thenReturn("jean");
     when(encoder.encode("http://localhost:8080/content/images/newsImageDefault.png")).thenReturn("http://localhost:8080/content/images/newsImageDefault.png");
     when(encoder.encode("COMMENT MY NEWS")).thenReturn("COMMENT MY NEWS");
-    when(encoder.encode("http://localhost:8080/portal/intranet/activity?id=39")).thenReturn("http://localhost:8080/portal/intranet/activity?id=39");
     when(notification.getValueOwnerParameter("read")).thenReturn("true");
     when(notification.getId()).thenReturn("NotifId123");
     Date date = new Date();