Merge branch 'jenkins_with_weblogic' of https://git.eactive.synology.me:8090/kjb-eapim/eapim-portal into jenkins_with_weblogic

src/main/java/com/eactive/apim/portal/apps/user/facade/UserManFacade.java

@@ -30,6 +30,7 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.sound.midi.Receiver;
 import java.security.SecureRandom;
 import java.time.Duration;
 import java.time.LocalDateTime;
@@ -121,8 +122,8 @@ public class UserManFacade {
         String token = createInvitation(sender, emailAddr);
 
         // {"CRPT_NM":"%corpName%", "MNGR_NM":"%managerName%", "CUST_ID":"%loginId%", "AUTH_NO": "%authNumber%", "NAME": "%loginId%"}
-        MessageRecipient recipient = new MessageRecipient();
-        recipient.setUserId(emailAddr);
+        MessageRecipient recipient;
+
         HashMap<String, Object> params = new HashMap<>();
         params.put("managerName", sender.getUserName());
         params.put("corpName", sender.getPortalOrg().getOrgName());
@@ -134,10 +135,18 @@ public class UserManFacade {
             params.put("loginId", user.getUserName());
             params.put("NAME", user.getUserName());
             params.put("url", "signup/decision?invitation=" + token);
+
+            recipient = MessageRecipient.of(user);
         } else {
             params.put("loginId", emailAddr);
             params.put("NAME", emailAddr);
             params.put("url", "signup/portalUser?invitation=" + token);
+
+            String emailUsername = emailAddr.contains("@") ? emailAddr.substring(0, emailAddr.indexOf("@")) : emailAddr;
+            recipient = MessageRecipient.builder()
+                    .userId(emailAddr)
+                    .username(emailUsername)
+                    .build();
         }
 
         messageHandlerService.publishEvent(UserInvitationEvent.KEY, recipient, params);