fix IQSS#10835

QualitativeDataRepository · Feb 15, 2025 · b2e6b45 · b2e6b45
1 parent 1046a01
commit b2e6b45
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetVersion.java b/src/main/java/edu/harvard/iq/dataverse/DatasetVersion.java
@@ -2175,4 +2175,20 @@ public void removeCurationStatus(CurationStatus curationStatus) {
         curationStatus.setDatasetVersion(null);
     }
 
+    public CurationStatus getCurationStatusAsOfDate(Date date) {
+        if (curationStatuses == null || curationStatuses.isEmpty()) {
+            return null;
+        }
+
+        // Find the first status whose createTime is before or equal to the given date
+        for (CurationStatus status : curationStatuses) {
+            if (status.getCreateTime().compareTo(date) <= 0) {
+                return status;
+            }
+        }
+
+        // If no status is found before the given date, return null
+        return null;
+    }
+
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/MailServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/MailServiceBean.java
@@ -569,7 +569,7 @@ public String getMessageTextBasedOnNotification(UserNotification userNotificatio
             case STATUSUPDATED:
                 version =  (DatasetVersion) targetObject;
                 pattern = BundleUtil.getStringFromBundle("notification.email.status.change");
-                CurationStatus status = version.getCurrentCurationStatus();
+                CurationStatus status = version.getCurationStatusAsOfDate(userNotification.getSendDateTimestamp());
                 String curationLabel = DatasetUtil.getLocaleCurationStatusLabel(status);
                 if(curationLabel == null) {
                     curationLabel = BundleUtil.getStringFromBundle("dataset.status.none");