Merge pull request #6728 from ORCID/feature/8437-for-works-stop-sending-notifications-when-no-updates-to-the-works-has-actually-been-made

feature: Compare work to be updated with the one stored in the database

Author: amontenegro

orcid-core/src/main/java/org/orcid/core/manager/impl/WorkManagerImpl.java

@@ -45,6 +45,7 @@
 import org.orcid.persistence.jpa.entities.SourceEntity;
 import org.orcid.persistence.jpa.entities.WorkEntity;
 import org.orcid.pojo.ContributorsRolesAndSequencesV2;
+import org.orcid.pojo.ajaxForm.WorkForm;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
@@ -350,6 +351,16 @@ private void addExternalIdsToExistingSet(Map<ExternalID, Long> extIDPutCodeMap,
     @Transactional
     public Work updateWork(String orcid, Work work, boolean isApiRequest) {
         WorkEntity workEntity = workDao.getWork(orcid, work.getPutCode());
+
+        Work workSaved = jpaJaxbWorkAdapter.toWork(workEntity);
+        WorkForm workFormSaved = WorkForm.valueOf(workSaved, maxContributorsForUI);
+
+        if (Features.STOP_SENDING_NOTIFICATION_WORK_NOT_UPDATED.isActive()) {
+            if (workFormSaved.compare(WorkForm.valueOf(work, maxContributorsForUI))) {
+                return workSaved;
+            }
+        }
+
         String originalVisibility = workEntity.getVisibility();
         SourceEntity sourceEntity = sourceManager.retrieveSourceEntity();
 
@@ -387,8 +398,7 @@ public Work updateWork(String orcid, Work work, boolean isApiRequest) {
         workDao.merge(workEntity);
         workDao.flush();
         notificationManager.sendAmendEmail(orcid, AmendedSection.WORK, createItemList(workEntity, work.getExternalIdentifiers(), ActionType.UPDATE));
-        Work updatedWork = jpaJaxbWorkAdapter.toWork(workEntity);
-        return updatedWork;
+        return jpaJaxbWorkAdapter.toWork(workEntity);
     }
 
     @Override

orcid-core/src/main/java/org/orcid/core/manager/v3/impl/WorkManagerImpl.java

@@ -41,6 +41,7 @@
 import org.orcid.persistence.jpa.entities.ProfileEntity;
 import org.orcid.persistence.jpa.entities.WorkEntity;
 import org.orcid.pojo.ContributorsRolesAndSequences;
+import org.orcid.pojo.WorkExtended;
 import org.orcid.pojo.ajaxForm.WorkForm;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -358,6 +359,16 @@ private void addExternalIdsToExistingSet(Map<ExternalID, Long> extIDPutCodeMap,
     @Transactional
     public Work updateWork(String orcid, Work work, boolean isApiRequest) {
         WorkEntity workEntity = workDao.getWork(orcid, work.getPutCode());
+
+        Work workSaved = jpaJaxbWorkAdapter.toWork(workEntity);
+        WorkForm workFormSaved = WorkForm.valueOf(workSaved, maxContributorsForUI);
+
+        if (Features.STOP_SENDING_NOTIFICATION_WORK_NOT_UPDATED.isActive()) {
+            if (workFormSaved.compare(WorkForm.valueOf(work, maxContributorsForUI))) {
+                return workSaved;
+            }
+        }
+
         Visibility originalVisibility = Visibility.valueOf(workEntity.getVisibility());
         Source activeSource = sourceManager.retrieveActiveSource();
 
@@ -539,6 +550,16 @@ public Work updateWork(String orcid, WorkForm workForm) {
         Work work = workForm.toWork();
 
         WorkEntity workEntity = workDao.getWork(orcid, work.getPutCode());
+
+        WorkExtended workSaved = jpaJaxbWorkAdapter.toWorkExtended(workEntity);
+        WorkForm workFormSaved = WorkForm.valueOf(workSaved, maxContributorsForUI);
+
+        if (Features.STOP_SENDING_NOTIFICATION_WORK_NOT_UPDATED.isActive()) {
+            if (workFormSaved.compare(workForm)) {
+                return workSaved;
+            }
+        }
+
         Visibility originalVisibility = Visibility.valueOf(workEntity.getVisibility());
 
         //Save the original source

orcid-core/src/main/java/org/orcid/core/togglz/Features.java

@@ -6,6 +6,9 @@
 
 public enum Features implements Feature {
 
+    @Label("Stop sending notification if work has not been updated")
+    STOP_SENDING_NOTIFICATION_WORK_NOT_UPDATED,
+
     @Label("Move client from a member to another member")
     MOVE_CLIENT,
 

orcid-core/src/main/java/org/orcid/pojo/ajaxForm/ActivityExternalIdentifier.java

@@ -65,7 +65,23 @@ public static ActivityExternalIdentifier valueOf(ExternalID externalIdentifier)
         return wi;
 
     }
-    
+
+    public static ActivityExternalIdentifier valueOf(org.orcid.jaxb.model.record_v2.ExternalID externalIdentifier) {
+        ActivityExternalIdentifier wi = new ActivityExternalIdentifier();
+        if (externalIdentifier != null) {
+            if (externalIdentifier.getValue() != null)
+                wi.setExternalIdentifierId(Text.valueOf(externalIdentifier.getValue()));
+            if (externalIdentifier.getType() != null)
+                wi.setExternalIdentifierType(Text.valueOf(externalIdentifier.getType()));
+            if(externalIdentifier.getRelationship() != null)
+                wi.setRelationship(Text.valueOf(externalIdentifier.getRelationship().value()));
+            if(externalIdentifier.getUrl() != null)
+                wi.setUrl(Text.valueOf(externalIdentifier.getUrl().getValue()));
+        }
+        return wi;
+
+    }
+
     public ExternalID toExternalIdentifier() {
         ExternalID we = new ExternalID();
         if (!PojoUtil.isEmpty(this.getExternalIdentifierId())) 

orcid-core/src/main/java/org/orcid/pojo/ajaxForm/Date.java

@@ -83,6 +83,20 @@ public static Date valueOf(LastModifiedDate date) {
         return newDate;
     }
 
+    public static Date valueOf(org.orcid.jaxb.model.common_v2.CreatedDate date) {
+        Date newDate = new Date();
+        if (date != null && date.getValue() != null)
+            return Date.valueOf(date.getValue().toGregorianCalendar().getTime());
+        return newDate;
+    }
+
+    public static Date valueOf(org.orcid.jaxb.model.common_v2.LastModifiedDate date) {
+        Date newDate = new Date();
+        if (date != null && date.getValue() != null)
+            return Date.valueOf(date.getValue().toGregorianCalendar().getTime());
+        return newDate;
+    }
+
     public java.util.Date toJavaDate() {
         Calendar gc = toCalendar();
         return gc.getTime();