- Updated notification messages

- Moved date calculations to PrivateDateReminderSettings.  Added unit tests
- Improvements to PrivateDataReminderJob
- Fixed PrivateDataReminderTest

Author: vagisha

panoramapublic/src/org/labkey/panoramapublic/PanoramaPublicController.java

@@ -10098,23 +10098,23 @@ public void validateCommand(PrivateDataReminderSettingsForm form, Errors errors)
             }
             else if (form.getDelayUntilFirstReminder() < 0)
             {
-                errors.reject(ERROR_MSG, "Value for 'Delay until first reminder' must be greater than 0.");
+                errors.reject(ERROR_MSG, "Value for 'Delay until first reminder' cannot be less than 0.");
             }
             if (form.getReminderFrequency() == null)
             {
                 errors.reject(ERROR_MSG, "Please enter a value for 'Reminder frequency'.");
             }
             else if (form.getReminderFrequency() < 0)
             {
-                errors.reject(ERROR_MSG, "Value for 'Reminder frequency' must be greater than 0.");
+                errors.reject(ERROR_MSG, "Value for 'Reminder frequency' cannot be less than 0.");
             }
             if (form.getExtensionLength() == null)
             {
                 errors.reject(ERROR_MSG, "Please enter a value for 'Extension duration'.");
             }
             else if (form.getExtensionLength() < 0)
             {
-                errors.reject(ERROR_MSG, "Value for 'Extension duration' must be greater than 0.");
+                errors.reject(ERROR_MSG, "Value for 'Extension duration' cannot be less than 0.");
             }
         }
 
@@ -10244,7 +10244,7 @@ public ModelAndView getView(PrivateDataSendReminderForm form, boolean reshow, Bi
             qSettings.setBaseFilter(new SimpleFilter(FieldKey.fromParts("Public"), "No"));
 
             QueryView tableView = new QueryView(new PanoramaPublicSchema(getUser(), getContainer()), qSettings, null);
-            tableView.setTitle("Private Panorama Public Datasets");
+            tableView.setTitle("Private Panorama Private Datasets");
             tableView.setFrame(WebPartView.FrameType.NONE);
 
             form.setDataRegionName(tableView.getDataRegionName());
@@ -10266,7 +10266,7 @@ public boolean handlePost(PrivateDataSendReminderForm form, BindException errors
                 return false;
             }
             PipelineJob job = new PrivateDataReminderJob(getViewBackgroundInfo(),
-                    PipelineService.get().getPipelineRootSetting(ContainerManager.getRoot()),
+                    PipelineService.get().getPipelineRootSetting(getContainer()),
                     JournalManager.getJournal(getContainer()),
                     form.getSelectedExperimentIds(),
                     form.getTestMode());
@@ -10294,7 +10294,6 @@ public static class PrivateDataSendReminderForm
         private boolean _testMode;
         private String _selectedIds;
         private String _dataRegionName = null;
-        private List<ExperimentAnnotations> _experiments = null;
 
         public boolean getTestMode()
         {
@@ -10334,16 +10333,6 @@ public void setDataRegionName(String dataRegionName)
         {
             _dataRegionName = dataRegionName;
         }
-
-        public List<ExperimentAnnotations> getExperiments()
-        {
-            return _experiments;
-        }
-
-        public void setExperiments(List<ExperimentAnnotations> experiments)
-        {
-            _experiments = experiments;
-        }
     }
 
     @RequiresAnyOf({AdminPermission.class, PanoramaPublicSubmitterPermission.class})
@@ -10355,7 +10344,6 @@ public abstract class UpdateDatasetStatusAction extends ConfirmAction<ShortUrlFo
         protected abstract void doValidationForAction(Errors errors);
         protected abstract void updateDatasetStatus(DatasetStatus datasetStatus);
         protected abstract void postNotification();
-
         protected abstract String getConfirmViewTitle();
         protected abstract String getConfirmViewMessage();
 
@@ -10407,7 +10395,6 @@ public boolean handlePost(ShortUrlForm shortUrlForm, BindException errors) throw
                     DatasetStatusManager.update(_datasetStatus, getUser());
                 }
 
-                // Post notification
                 postNotification();
 
                 transaction.commit();
@@ -10444,10 +10431,10 @@ protected void doValidationForAction(Errors errors)
             if (_datasetStatus != null)
             {
                 PrivateDataReminderSettings settings = PrivateDataReminderSettings.get();
-                if (_datasetStatus.isExtensionCurrent(settings))
+                if (settings.isExtensionValid(_datasetStatus))
                 {
                     errors.reject(ERROR_MSG, "An extension has already been requested for the data with short URL " + _datasetStatus.getShortUrl().renderShortURL()
-                            + ". The extension is valid until " + _datasetStatus.extensionValidUntilFormatted(settings));
+                            + ". The extension is valid until " + settings.extensionValidUntilFormatted(_datasetStatus));
                 }
                 else if (_datasetStatus.deletionRequested())
                 {
@@ -10478,7 +10465,7 @@ public ModelAndView getSuccessView(ShortUrlForm shortUrlForm)
             setTitle("Extension Request Success");
             PrivateDataReminderSettings settings = PrivateDataReminderSettings.get();
             return new HtmlView(DIV("An extension request was successfully submitted for the data at " + _exptAnnotations.getShortUrl().renderShortURL(),
-                    DIV("The extension is valid until " + _datasetStatus.extensionValidUntilFormatted(settings)),
+                    DIV("The extension is valid until " + settings.extensionValidUntilFormatted(_datasetStatus)),
                     BR(),
                     DIV(
                             LinkBuilder.labkeyLink("Data Folder", PageFlowUtil.urlProvider(ProjectUrls.class).getBeginURL(_exptAnnotations.getContainer()))

panoramapublic/src/org/labkey/panoramapublic/PanoramaPublicModule.java

@@ -46,6 +46,7 @@
 import org.labkey.panoramapublic.bluesky.BlueskyApiClient;
 import org.labkey.panoramapublic.bluesky.PanoramaPublicLogoResourceType;
 import org.labkey.panoramapublic.catalog.CatalogImageAttachmentType;
+import org.labkey.panoramapublic.message.PrivateDataReminderSettings;
 import org.labkey.panoramapublic.model.Journal;
 import org.labkey.panoramapublic.model.speclib.SpecLibKey;
 import org.labkey.panoramapublic.pipeline.CopyExperimentPipelineProvider;
@@ -382,6 +383,7 @@ public Set<Class> getUnitTests()
         set.add(Formula.TestCase.class);
         set.add(CatalogEntryManager.TestCase.class);
         set.add(BlueskyApiClient.TestCase.class);
+        set.add(PrivateDataReminderSettings.TestCase.class);
         return set;
 
     }

panoramapublic/src/org/labkey/panoramapublic/PanoramaPublicNotification.java

@@ -23,7 +23,6 @@
 import org.labkey.panoramapublic.datacite.DataCiteException;
 import org.labkey.panoramapublic.datacite.DataCiteService;
 import org.labkey.panoramapublic.message.PrivateDataReminderSettings;
-import org.labkey.panoramapublic.model.DatasetStatus;
 import org.labkey.panoramapublic.model.ExperimentAnnotations;
 import org.labkey.panoramapublic.model.Journal;
 import org.labkey.panoramapublic.model.JournalExperiment;
@@ -306,17 +305,13 @@ public static void postPrivateStatusExtensionMessage(@NotNull Journal journal, @
             throw new NotFoundException(String.format("Could not find an admin user for %s.", journal.getName()));
         }
         PrivateDataReminderSettings reminderSettings = PrivateDataReminderSettings.get();
-        /*
-            Thank you for your request to extend the private status of your data on Panorama Public at <short_url>.
-            Your data has been granted an extension for an additional 6 months. You’ll receive another reminder at that time, or you may make the dataset public earlier.
-            Please feel free to contact us if you have any questions
-         */
+
         String messageTitle = "Private Status Extended" +" - " + je.getShortAccessUrl().renderShortURL();
         StringBuilder messageBody = new StringBuilder();
         messageBody.append("Dear ").append(getUserName(submitter)).append(",").append(NL2);
         messageBody.append("Thank you for your request to extend the private status of your data on Panorama Public. ")
                 .append("Your data has been granted a " + reminderSettings.getExtensionLength() + " month extension. ")
-                .append("You’ll receive another reminder when this period ends. ")
+                .append("You will receive another reminder when this period ends. ")
                 .append("If you'd like to make your data public sooner, you can do so at any time ")
                 .append("by clicking the \"Make Public\" button in your data folder, or by clicking this link: ")
                 .append(bold(link("Make Data Public", PanoramaPublicController.getMakePublicUrl(expAnnotations.getId(), expAnnotations.getContainer()).getURIString())))
@@ -354,7 +349,7 @@ public static void postDataDeletionRequestMessage(@NotNull Journal journal, @Not
             messageBody.append("We were unable to locate the source folder for this data in your project. ")
                     .append("The folder at the path ")
                     .append(expAnnotations.getSourceExperimentPath())
-                    .append("may have been deleted.");
+                    .append(" may have been deleted.");
         }
 
         messageBody.append(NL2).append("Best regards,");
@@ -369,25 +364,14 @@ public static void postPrivateDataReminderMessage(@NotNull Journal journal, @Not
                                                       @NotNull Announcement announcement, @NotNull Container announcementsContainer, @NotNull User journalAdmin)
     {
         String message = getDataStatusReminderMessage(expAnnotations, submitter, js, announcement, announcementsContainer, journalAdmin);
-        String title = "Action Required: Status Update for Your Private Dataset on Panorama Public";
+        String title = "Action Required: Status Update for Your Private Data on Panorama Public";
         postNotificationFullTitle(journal, js.getJournalExperiment(), message, messagePoster, title, StatusOption.Closed, notifyUsers);
     }
 
     public static String getDataStatusReminderMessage(@NotNull ExperimentAnnotations exptAnnotations, @NotNull User submitter,
                                                       @NotNull JournalSubmission js,@NotNull Announcement announcement,
                                                       @NotNull Container announcementContainer, @NotNull User journalAdmin)
     {
-        /*
-        We are reaching out regarding your dataset on Panorama Public (https://panoramaweb.org/polyjuice.url), which has been private since January 1, 2024.
-        Is the paper associated with this work already published?
-        If yes: Please make your data public by clicking the "Make Public" button in your folder or by clicking [Make Data Public] here. This helps ensure that your valuable research is easily accessible to the community.
-        If not: You have a couple of options:
-        Request an Extension - If your paper is still under review, or you need additional time, please let us know by clicking [Request Extension]
-        Delete from Panorama Public - If you no longer wish to host your data on Panorama Public, please click [Request Deletion]. We will remove your dataset from Panorama Public. However, your source folder (/Hogwarts/Gryffindor/magic-potion) will remain intact, allowing you to resubmit your data in the future if you wish.
-        If you have any questions or need further assistance, please do not hesitate to respond to this message by clicking here.
-        Thank you for sharing your research on Panorama Public. We appreciate your commitment to open science and your contributions to the research community.
-         */
-
         String shortUrl = exptAnnotations.getShortUrl().renderShortURL();
         String makePublicLink = PanoramaPublicController.getMakePublicUrl(exptAnnotations.getId(), exptAnnotations.getContainer()).getURIString();
         String dateString = DateUtil.formatDateTime(js.getLatestSubmission().getCreated(), "MMMM d, yyyy");
@@ -410,18 +394,18 @@ We are reaching out regarding your dataset on Panorama Public (https://panoramaw
 
         StringBuilder message = new StringBuilder();
         message.append("Dear ").append(getUserName(submitter)).append(",").append(NL2)
-                .append("We are reaching out regarding your dataset on Panorama Public (").append(shortUrl).append("), which has been private since ")
+                .append("We are reaching out regarding your data on Panorama Public (").append(shortUrl).append("), which has been private since ")
                 .append(dateString).append(".")
                 .append("\n\n**Is the paper associated with this work already published?**")
-                .append("\n- If yes: Please make your data public by clicking the \"Make Public\" button in your folder or by clicking ")
+                .append("\n- If yes: Please make your data public by clicking the \"Make Public\" button in your folder or by clicking this link: ")
                 .append(bold(link("Make Data Public", makePublicLink)))
                 .append(". This helps ensure that your valuable research is easily accessible to the community.")
                 .append("\n- If not: You have a couple of options:")
                 .append("\n  - **Request an Extension** - If your paper is still under review, or you need additional time, please let us know by clicking ")
                 .append(bold(link("Request Extension", requestExtensionUrl.getURIString()))).append(".")
                 .append("\n  - **Delete from Panorama Public** - If you no longer wish to host your data on Panorama Public, please click ")
                 .append(bold(link("Request Deletion", requesDeletionUrl.getURIString()))).append(". ")
-                .append("We will remove your dataset from Panorama Public.");
+                .append("We will remove your data from Panorama Public.");
         if (sourceExperiment != null)
         {
             message.append(" However, your source folder (")
@@ -594,7 +578,7 @@ private static String escape(String text)
     {
         // https://www.markdownguide.org/basic-syntax/#characters-you-can-escape
         // Escape Markdown special characters. Some character combinations can result in
-        // unintended Markdown styling, e.g. "+_Italics_+" will result in "Italics" to be italicized.
+        // unintended Markdown styling, e.g. "+_Italics_+" results in "Italics" to be italicized.
         // This can be seen with the tricky characters used for project names in labkey tests.
         // 8/13/25 - Escape tilde (~) as well. In the LabKey Markdown flavor, text between
         // single tildes (e.g., ~strikethrough~) is rendered as strikethrough.

panoramapublic/src/org/labkey/panoramapublic/message/PrivateDataMessageScheduler.java

@@ -9,9 +9,12 @@
 import org.labkey.api.pipeline.PipelineService;
 import org.labkey.api.security.User;
 import org.labkey.api.util.ConfigurationException;
+import org.labkey.api.util.ExceptionUtil;
 import org.labkey.api.util.logging.LogHelper;
 import org.labkey.api.view.ViewBackgroundInfo;
+import org.labkey.panoramapublic.model.Journal;
 import org.labkey.panoramapublic.pipeline.PrivateDataReminderJob;
+import org.labkey.panoramapublic.query.JournalManager;
 import org.quartz.DateBuilder;
 import org.quartz.Job;
 import org.quartz.JobBuilder;
@@ -88,40 +91,42 @@ protected Trigger getTrigger()
 
     public static class PrivateDataMessageSchedulerJob implements Job
     {
-        private final @Nullable User _user;
-
         @SuppressWarnings("unused")
-        public PrivateDataMessageSchedulerJob()
-        {
-            this(null);
-        }
-
-        public PrivateDataMessageSchedulerJob(@Nullable User user)
-        {
-            _user = user;
-        }
+        public PrivateDataMessageSchedulerJob() {}
 
         @Override
         public void execute(JobExecutionContext context)
         {
             try
             {
-                Container c = ContainerManager.getRoot();
-                ViewBackgroundInfo vbi = new ViewBackgroundInfo(c, _user, null);
+                Journal panoramaPublic = JournalManager.getJournal(JournalManager.PANORAMA_PUBLIC);
+                if (panoramaPublic == null)
+                {
+                    throw new ConfigurationException("Server does not have a Panorama Public project.");
+                }
+
+                Container c = panoramaPublic.getProject();
+
+                User panoramaPublicAdmin = JournalManager.getJournalAdminUser(panoramaPublic);
+                if (panoramaPublicAdmin == null)
+                {
+                    throw new ConfigurationException("Unable to find an admin user in the Panorama Public project.");
+                }
+                ViewBackgroundInfo vbi = new ViewBackgroundInfo(c, panoramaPublicAdmin, null);
                 PipeRoot root = PipelineService.get().findPipelineRoot(c);
 
                 if (root == null || !root.isValid())
                 {
-                    throw new ConfigurationException("No valid pipeline root found in the root container");
+                    throw new ConfigurationException("No valid pipeline root found in the container " + c.getName());
                 }
 
-                PipelineJob job = new PrivateDataReminderJob(vbi, PipelineService.get().getPipelineRootSetting(ContainerManager.getRoot()), false);
+                PipelineJob job = new PrivateDataReminderJob(vbi, PipelineService.get().getPipelineRootSetting(c), false);
                 PipelineService.get().queueJob(job);
             }
             catch(Exception e)
             {
                 _log.error("Error queuing PrivateDataReminderJob", e);
-                // ExceptionUtil.logExceptionToMothership(null, e);
+                ExceptionUtil.logExceptionToMothership(null, e);
 
             }
         }