corrected Archived subject in mail

TIK-NFL · Oct 23, 2024 · 443d0a3 · 443d0a3
1 parent e839b84
commit 443d0a3
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 8 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/MailServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/MailServiceBean.java
@@ -520,16 +520,18 @@ public String getMessageTextBasedOnNotification(UserNotification userNotificatio
                 version =  (DatasetVersion) targetObject;
                 pattern = BundleUtil.getStringFromBundle("notification.email.wasPublished");
 
-                if (version.getVersionNote() != null) {
-                    if (version.getVersionNote().equals("Archived Dataset")) {
-                        pattern = BundleUtil.getStringFromBundle("notification.email.wasArchived");
-                    }
-                }
-
                 String[] paramArrayPublishedDataset = {version.getDataset().getDisplayName(), getDatasetLink(version.getDataset()), 
                     version.getDataset().getOwner().getDisplayName(),  getDataverseLink(version.getDataset().getOwner())};
                 messageText += MessageFormat.format(pattern, paramArrayPublishedDataset);
                 return messageText;
+            case ARCHIVEDDS:
+                version =  (DatasetVersion) targetObject;
+                pattern = BundleUtil.getStringFromBundle("notification.email.wasArchived");
+
+                String[] paramArrayArchivedDataset = {version.getDataset().getDisplayName(), getDatasetLink(version.getDataset()), 
+                    version.getDataset().getOwner().getDisplayName(),  getDataverseLink(version.getDataset().getOwner())};
+                messageText += MessageFormat.format(pattern, paramArrayArchivedDataset);
+                return messageText;
             case PUBLISHFAILED_PIDREG:
                 version =  (DatasetVersion) targetObject;
                 pattern = BundleUtil.getStringFromBundle("notification.email.publishFailedPidReg");

diff --git a/src/main/java/edu/harvard/iq/dataverse/UserNotification.java b/src/main/java/edu/harvard/iq/dataverse/UserNotification.java
@@ -34,7 +34,7 @@
 public class UserNotification implements Serializable {
     // Keep in sync with list at admin/user-administration.rst
     public enum Type {
-        ASSIGNROLE, REVOKEROLE, CREATEDV, CREATEDS, CREATEACC, SUBMITTEDDS, RETURNEDDS, 
+        ARCHIVEDDS, ASSIGNROLE, REVOKEROLE, CREATEDV, CREATEDS, CREATEACC, SUBMITTEDDS, RETURNEDDS, 
         PUBLISHEDDS, REQUESTFILEACCESS, GRANTFILEACCESS, REJECTFILEACCESS, FILESYSTEMIMPORT, 
         CHECKSUMIMPORT, CHECKSUMFAIL, CONFIRMEMAIL, APIGENERATED, INGESTCOMPLETED, INGESTCOMPLETEDWITHERRORS, 
         PUBLISHFAILED_PIDREG, WORKFLOW_SUCCESS, WORKFLOW_FAILURE, STATUSUPDATED, DATASETCREATED, DATASETMENTIONED,

diff --git a/...main/java/edu/harvard/iq/dataverse/engine/command/impl/FinalizeDatasetArchiveCommand.java b/...main/java/edu/harvard/iq/dataverse/engine/command/impl/FinalizeDatasetArchiveCommand.java
@@ -217,7 +217,7 @@ public boolean onSuccess(CommandContext ctxt, Object r) {
 
         try {
             // Success! - send notification:
-            notifyUsersDatasetPublishStatus(ctxt, dataset, UserNotification.Type.PUBLISHEDDS);
+            notifyUsersDatasetPublishStatus(ctxt, dataset, UserNotification.Type.ARCHIVEDDS);
         } catch (Exception e) {
             logger.warning("Failure to send dataset published messages for : " + dataset.getId() + " : " + e.getMessage());
         }

diff --git a/src/main/java/edu/harvard/iq/dataverse/util/MailUtil.java b/src/main/java/edu/harvard/iq/dataverse/util/MailUtil.java
@@ -51,6 +51,8 @@ public static String getSubjectTextBasedOnNotification(UserNotification userNoti
                 return BundleUtil.getStringFromBundle("notification.email.create.dataset.subject", Arrays.asList(rootDvNameAsList.get(0), datasetDisplayName));
             case SUBMITTEDDS:
                 return BundleUtil.getStringFromBundle("notification.email.submit.dataset.subject", Arrays.asList(rootDvNameAsList.get(0), datasetDisplayName));
+            case ARCHIVEDDS:
+                return BundleUtil.getStringFromBundle("notification.email.archive.dataset.subject", Arrays.asList(rootDvNameAsList.get(0), datasetDisplayName));
             case PUBLISHEDDS:
                 return BundleUtil.getStringFromBundle("notification.email.publish.dataset.subject", Arrays.asList(rootDvNameAsList.get(0), datasetDisplayName));
             case PUBLISHFAILED_PIDREG:

diff --git a/src/main/java/propertyFiles/Bundle.properties b/src/main/java/propertyFiles/Bundle.properties
@@ -764,6 +764,7 @@ notification.email.grant.file.access.subject={0}: You have been granted access t
 notification.email.rejected.file.access.subject={0}: Your request for access to a restricted file has been rejected
 notification.email.submit.dataset.subject={0}: Dataset "{1}" has been submitted for review
 notification.email.publish.dataset.subject={0}: Dataset "{1}" has been published
+notification.email.archive.dataset.subject={0}: Dataset "{1}" has been archived
 notification.email.publishFailure.dataset.subject={0}: Failed to publish your dataset "{1}"
 notification.email.returned.dataset.subject={0}: Dataset "{1}" has been returned
 notification.email.workflow.success.subject={0}: Dataset "{1}" has been processed