${PD-1935} Member name fix for MVP Notifications (#7342)

Author: Camelia-Orcid

orcid-scheduler-web/src/main/java/org/orcid/scheduler/mvp/OrcidIntegrationMVPNotifications.java

@@ -10,6 +10,8 @@
 import org.json.JSONArray;
 import org.orcid.core.manager.ProfileEntityCacheManager;
 import org.orcid.core.manager.v3.NotificationManager;
+import org.orcid.core.manager.v3.RecordNameManager;
+import org.orcid.jaxb.model.v3.release.record.Name;
 import org.orcid.persistence.dao.ClientDetailsDao;
 import org.orcid.persistence.dao.OrcidOauth2TokenDetailDao;
 import org.orcid.persistence.dao.ProfileEmailDomainDao;
@@ -42,9 +44,19 @@ public class OrcidIntegrationMVPNotifications {
 
     @Resource(name = "orcidOauth2TokenDetailDaoReadOnly")
     private OrcidOauth2TokenDetailDao orcidOauth2TokenDetailDaoReadOnly;
-    
-    @Resource
-    private ProfileEntityCacheManager profileEntityCacheManager;
+
+    @Resource(name = "recordNameManagerV3")
+    private RecordNameManager recordNameManager;
+
+    /**
+     * Creates notifications for clients that have enabled the MVP feature
+     * 
+     * This method checks for clients that have the MVP feature enabled and
+     * sends notifications to users whose email domains match the configured
+     * domains for each client. Notifications are sent only if no previous
+     * notifications have been sent or no notification sent within a specified
+     * number of days by default 10.
+     */
 
     public void createOrcidIntegrationNotifications() {
         // Get clients eligible for mvp
@@ -55,12 +67,16 @@ public void createOrcidIntegrationNotifications() {
             for (ClientDetailsEntity clientDetails : clientsWithMVP) {
                 if (StringUtils.isNotBlank(clientDetails.getNotificationWebpageUrl()) && StringUtils.isNotBlank(clientDetails.getNotificationDomains())) {
                     long startTimeClient = System.currentTimeMillis();
-                    ProfileEntity profileEntity = profileEntityCacheManager.retrieve(clientDetails.getGroupProfileId());
-                    String memberName = profileEntity != null ? profileEntity.getUsername() : null;
-                    if (memberName == null || memberName.isEmpty()) {
+                    Name memberNameObj = recordNameManager.getRecordName(clientDetails.getGroupProfileId());
+                    String memberName = null;
+                    if (memberNameObj != null) {
+                        memberName = memberNameObj.getCreditName() != null ? memberNameObj.getCreditName().getContent() : null;
+                    }
+
+                    if (memberName == null) {
                         memberName = clientDetails.getClientName();
                     }
-                    
+
                     LOG.info("Start process client {}. Notification send for the second time if no notifications sent since {} ago", clientDetails.getClientId(),
                             daysAgo);
                     try {
@@ -74,7 +90,7 @@ public void createOrcidIntegrationNotifications() {
                             }
                         }
                         if (profileDomainSet.size() > 0) {
-                            
+
                             for (ProfileEmailDomainEntity pe : profileDomainSet) {
                                 if (!orcidOauth2TokenDetailDaoReadOnly.hasTokenForClient(pe.getOrcid(), clientDetails.getClientId())) {
                                     List<NotificationEntity> orcidIntegrationNotifications = notificationManager.findByOrcidAndClientAndNotificationFamilyNoClientToken(
@@ -118,19 +134,17 @@ private String durationToString(long durationMillis) {
         long seconds = (durationMillis / 1000) % 60;
         return String.format("%d hours, %d minutes, %d seconds", hours, minutes, seconds);
     }
-    
-    
+
     private boolean shouldSendNotification(List<NotificationEntity> orcidIntegrationNotifications) {
         if (orcidIntegrationNotifications == null || orcidIntegrationNotifications.isEmpty()) {
             return true;
         }
-        
-        if (orcidIntegrationNotifications.size() > 1)   {
-            return false ;
-        }
-        else {
-        java.util.Date daysAgoDate = new java.util.Date(System.currentTimeMillis() - daysAgo * 24 * 60 * 60 * 1000);
-        return orcidIntegrationNotifications.get(0).getDateCreated() != null && orcidIntegrationNotifications.get(0).getDateCreated().before(daysAgoDate);
+
+        if (orcidIntegrationNotifications.size() > 1) {
+            return false;
+        } else {
+            java.util.Date daysAgoDate = new java.util.Date(System.currentTimeMillis() - daysAgo * 24 * 60 * 60 * 1000);
+            return orcidIntegrationNotifications.get(0).getDateCreated() != null && orcidIntegrationNotifications.get(0).getDateCreated().before(daysAgoDate);
         }
     }
 }