RSDEV-487: Rewrite Group invitation email for a better user experience

Author: rs-nicof

src/main/java/com/axiope/service/cfg/TestAppConfig.java

@@ -24,7 +24,6 @@
 import com.researchspace.service.IMediaFactory;
 import com.researchspace.service.RemoteLicenseService;
 import com.researchspace.service.impl.CommunicationManagerImpl;
-import com.researchspace.service.impl.DevBroadCaster;
 import com.researchspace.service.impl.DeveloperGroupSetup;
 import com.researchspace.service.impl.DummyConversionService;
 import com.researchspace.service.impl.EcatMediaFactory;
@@ -60,11 +59,6 @@
 @EnableAsync
 public class TestAppConfig extends BaseConfig {
 
-  @Bean
-  public Broadcaster broadcaster() {
-    return new DevBroadCaster("run");
-  }
-
   @Bean(name = "postUserCreate")
   public IPostUserCreationSetUp postUserCreationSetup() {
     return new NullOpPostUserCreate();

src/main/java/com/researchspace/service/impl/EmailBroadcastImp.java

@@ -48,7 +48,6 @@
 import lombok.Builder;
 import lombok.Getter;
 import org.apache.commons.lang.RandomStringUtils;
-import org.apache.commons.lang.StringUtils;
 import org.apache.velocity.tools.generic.DateTool;
 import org.jsoup.helper.Validate;
 import org.slf4j.Logger;
@@ -323,8 +322,7 @@ public void run() throws Throwable {
   }
 
   private void logEmailSendStart(String txt, String id) {
-    final int maxWidth = 25;
-    log.info("Sending email [{}] with text :{}", id, StringUtils.abbreviate(txt, maxWidth));
+    log.info("Sending email [{}] with text :{}", id, txt);
   }
 
   // package-scoped for testing

src/main/java/com/researchspace/webapp/controller/DashboardController.java

@@ -17,6 +17,7 @@
 import com.researchspace.model.dtos.NotificationStatus;
 import com.researchspace.model.field.ErrorList;
 import com.researchspace.model.views.ServiceOperationResult;
+import com.researchspace.properties.IPropertyHolder;
 import com.researchspace.service.CommunicationManager;
 import com.researchspace.service.IMessageAndNotificationTracker;
 import com.researchspace.service.RSpaceRequestManager;
@@ -35,15 +36,18 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.view.RedirectView;
 
 /** Handles URL requests for the Dashboard page, including messaging and notifications. */
 @Controller
 @RequestMapping("/dashboard")
 public class DashboardController extends BaseController {
+
   @Autowired private SystemPropertyPermissionManager systemPropertyPermissionManager;
   private @Autowired RSpaceRequestManager reqStatusUpdateMgr;
   private @Autowired CommunicationManager commService;
   private @Autowired IMessageAndNotificationTracker tracker;
+  private @Autowired IPropertyHolder propertyHolder;
 
   @GetMapping
   public String dashboard(Model model, Principal principal) {
@@ -157,6 +161,28 @@ public AjaxReturnObject<String> updateMessageStatus(
     return new AjaxReturnObject<>("Success", null);
   }
 
+  @GetMapping("/ajax/messageStatus")
+  @ResponseBody
+  public RedirectView updateMessageStatusGet(
+      Principal principal,
+      @RequestParam("messageOrRequestId") Long messageOrRequestId,
+      @RequestParam("status") String status,
+      @RequestParam(value = "optionalMessage", required = false) String optionalMessage) {
+    CommunicationStatus statusEnum = CommunicationStatus.valueOf(status);
+    String baseUrl = propertyHolder.getServerUrl();
+    switch (statusEnum) {
+      case ACCEPTED:
+      case COMPLETED:
+        updateMessageStatus(principal, messageOrRequestId, status, optionalMessage);
+        return new RedirectView(baseUrl + "/requestAccepted");
+      case REJECTED:
+        updateMessageStatus(principal, messageOrRequestId, status, optionalMessage);
+        return new RedirectView(baseUrl + "/requestDeclined");
+      default:
+        return new RedirectView(baseUrl + "/error");
+    }
+  }
+
   /**
    * Handles a user responding to an original message.
    *

src/main/java/com/researchspace/webapp/controller/GroupController.java

@@ -46,7 +46,13 @@
 import com.researchspace.model.views.GroupListResult;
 import com.researchspace.model.views.ServiceOperationResultCollection;
 import com.researchspace.model.views.UserView;
-import com.researchspace.service.*;
+import com.researchspace.service.AutoshareManager;
+import com.researchspace.service.CommunicationManager;
+import com.researchspace.service.CommunityServiceManager;
+import com.researchspace.service.IContentInitializer;
+import com.researchspace.service.IGroupCreationStrategy;
+import com.researchspace.service.MessageOrRequestCreatorManager;
+import com.researchspace.service.SystemPropertyPermissionManager;
 import com.researchspace.session.SessionAttributeUtils;
 import java.security.Principal;
 import java.util.ArrayList;

src/main/resources/deployments/dev/deployment.properties

@@ -4,7 +4,7 @@ rs.customer.name.short=RSpace Local
 rs.usergroup.initfile=deployments/dev/initUsers.csv
 offline.button.visible=true
 cache.com.researchspace.model.UserGroup=123
-email.enabled=false
+email.enabled=true
 
 api.beta.enabled=true
 #api.beta.allowUnauthorizedLinks=true

src/main/resources/velocityTemplates/messageAndNotificationEmails/request.vm

@@ -1,22 +1,34 @@
 <html>
 #utf8header
 <body>
-<h2> RSpace Request from $cmm.originator.fullName </h2>
-<a href="$baseURL/userform?userId=$cmm.originator.id">$cmm.originator.fullName</a>
-sent you a request on #formatDate($dateOb)
-#if ($cmm.record && $cmm.record.notebook)
-concerning notebook <a href="$baseURL/notebookEditor/$cmm.record.id">$cmm.record.name</a>  
-<br>
-#elseif($cmm.record)
-concerning document <a href="$baseURL/workspace/editor/structuredDocument/$cmm.record.id">$cmm.record.name </a>  
-<br>
-#end
+<p align="left"><img height="75" src="$baseURL/public/banner"></p>
+<h2> RSpace Request from the user "$cmm.originator.username" </h2>
+The RSpace Principal Investigator "<b>$cmm.originator.username</b>" has invited you to join the Lab Group
+"<b>$cmm.group.displayName</b>" on $date.format('full_date', $dateOb) at $date.format('short_time', $dateOb)
+<p>
+Click to
+<a rel="nofollow" target="_blank" class="word-wrap"
+   href="$baseURL/dashboard/ajax/messageStatus?messageOrRequestId=$cmm.id&status=COMPLETED">ACCEPT</a>
+ or
+<a rel="nofollow" target="_blank" class="word-wrap"
+   href="$baseURL/dashboard/ajax/messageStatus?messageOrRequestId=$cmm.id&status=REJECTED">REJECT</a>
+ this invitation, then log in to RSpace with your credentials.
+<br/><br/>
 
-#if ($cmm.message) 
+
+ #if ($cmm.record && $cmm.record.notebook)
+ concerning notebook <a href="$baseURL/notebookEditor/$cmm.record.id">$cmm.record.name</a>
+ <br>
+ #elseif($cmm.record)
+ concerning document <a href="$baseURL/workspace/editor/structuredDocument/$cmm.record.id">$cmm.record.name </a>
+ <br>
+ #end
+
+ #if ($cmm.message)
  More details: <br>
-$cmm.message
-#end
+  $cmm.message
+ #end
 <p/>
 #dontReply
 </body>
-</html>
+</html>

src/main/webapp/WEB-INF/dispatcher-servlet.xml

@@ -90,6 +90,8 @@
 	<mvc:view-controller path="/public/terms" view-name="public/terms" />
 	<mvc:view-controller path="/public/ssoinfo" view-name="public/ssoinfo" />
 	<mvc:view-controller path="/public/ssologout" view-name="public/ssologout" />
+	<mvc:view-controller path="/requestAccepted" view-name="requestAccepted" />
+	<mvc:view-controller path="/requestDeclined" view-name="requestDeclined" />
 	<mvc:view-controller path="/public/ipAddressInvalid" view-name="public/ipAddressInvalid" />
 	<mvc:view-controller path="/public/apiDocs" view-name="public/apiDocs" />
 	<mvc:view-controller path="/test/template" view-name="/test/template" />

src/main/webapp/WEB-INF/pages/requestAccepted.jsp

@@ -0,0 +1,14 @@
+<%@ include file="/common/taglibs.jsp"%>
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta charset="UTF-8">
+<title>Request Accepted</title>
+</head>
+<body>
+<p style="font-size:18px">Your request has been successfully <b>accepted!</b>
+    <img height="20" src="images/tick-icon.png">
+</p>
+<br/>
+<a href="../workspace"> Return to workspace </a>
+</body>

src/main/webapp/WEB-INF/pages/requestDeclined.jsp

@@ -0,0 +1,14 @@
+<%@ include file="/common/taglibs.jsp"%>
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta charset="UTF-8">
+<title>Request Declined</title>
+</head>
+<body>
+<p style="font-size:18px">Your request has been successfully <b>declined!</b>
+    <img height="20" src="images/tick-icon.png">
+</p>
+<br/><br/>
+<a href="../workspace"> Return to workspace </a>
+</body>