add updating index, permindex, export times

Author: qqmyers

src/main/java/edu/harvard/iq/dataverse/DatasetServiceBean.java

@@ -30,6 +30,7 @@
 import edu.harvard.iq.dataverse.workflows.WorkflowComment;
 
 import java.io.*;
+import java.sql.Timestamp;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.logging.FileHandler;
@@ -1171,4 +1172,30 @@ public void setLastExportTimeInNewTransaction(Long datasetId, Date lastExportTim
             logger.log(Level.SEVERE, "Failed to retry export after OptimisticLockException for dataset id=" + datasetId, e);
         }
     }
+
+    @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
+    public void updateIndexingAndExportTimes(Dataset dataset) {
+        Query timestampQuery = em.createNativeQuery(
+                "SELECT dvo.indextime, dvo.permissionindextime, d.lastexporttime " +
+                "FROM dvobject dvo, dataset d WHERE dvo.id = d.id AND dvo.id = ?");
+            timestampQuery.setParameter(1, dataset.getId());
+
+            Object[] timestamps = (Object[]) timestampQuery.getSingleResult();
+
+            // Cast and apply the fresh timestamps to the current dataset
+            Timestamp freshIndexTime = (Timestamp) timestamps[0];
+            Timestamp freshPermissionIndexTime = (Timestamp) timestamps[1];
+            Timestamp freshLastExportTime = (Timestamp) timestamps[2];
+
+
+            logger.fine("Updating index time from " + dataset.getIndexTime() + " to " + freshIndexTime);
+            dataset.setIndexTime(freshIndexTime);
+
+            logger.fine("Updating permission index time from " + dataset.getPermissionIndexTime() + " to " + freshPermissionIndexTime);
+            dataset.setPermissionIndexTime(freshPermissionIndexTime);
+
+            logger.fine("Updating last export time from " + dataset.getLastExportTime() + " to " + freshLastExportTime);
+            dataset.setLastExportTime(freshLastExportTime);
+        
+    }
 }

src/main/java/edu/harvard/iq/dataverse/workflow/WorkflowServiceBean.java

@@ -42,6 +42,7 @@
 import jakarta.inject.Inject;
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.Query;
 import jakarta.persistence.TypedQuery;
 
 /**
@@ -149,13 +150,12 @@ public void start(Workflow wf, WorkflowContext ctxt, boolean findDataset) throws
                 logger.warning("Failed to sleep for a second.");
             }
         }
-        //Refresh will only em.find the dataset if findDataset is true. (otherwise the dataset is em.merged)
+        
         ctxt = refresh(ctxt, retrieveRequestedSettings( wf.getRequiredSettings()), getCurrentApiToken(ctxt.getRequest().getAuthenticatedUser()), findDataset);
         lockDataset(ctxt, new DatasetLock(DatasetLock.Reason.Workflow, ctxt.getRequest().getAuthenticatedUser()));
         forward(wf, ctxt);
     }
 
-
     private ApiToken getCurrentApiToken(AuthenticatedUser au) {
         if (au != null) {
             CommandContext ctxt = engine.getContext();
@@ -210,7 +210,6 @@ public void resume(PendingWorkflowInvocation pending, String body) {
     }
 
 
-    @Asynchronous
     private void forward(Workflow wf, WorkflowContext ctxt) {
         executeSteps(wf, ctxt, 0);
     }
@@ -244,7 +243,6 @@ private void doResume(PendingWorkflowInvocation pending, String body) {
         }
     }
 
-    @Asynchronous
     private void rollback(Workflow wf, WorkflowContext ctxt, Failure failure, int lastCompletedStepIdx) {
         ctxt = refresh(ctxt);
         final List<WorkflowStepData> steps = wf.getSteps();
@@ -308,7 +306,6 @@ private void executeSteps(Workflow wf, WorkflowContext ctxt, int initialStepIdx
                 return;
             }
         }
-        
         workflowCompleted(wf, ctxt);
 
     }
@@ -317,22 +314,18 @@ private void executeSteps(Workflow wf, WorkflowContext ctxt, int initialStepIdx
     // Internal methods to run each step in its own transaction.
     //
 
-    @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
     WorkflowStepResult runStep( WorkflowStep step, WorkflowContext ctxt ) {
         return step.run(ctxt);
     }
 
-    @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
     WorkflowStepResult resumeStep( WorkflowStep step, WorkflowContext ctxt, Map<String,String> localData, String externalData ) {
         return step.resume(ctxt, localData, externalData);
     }
 
-    @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
     void rollbackStep( WorkflowStep step, WorkflowContext ctxt, Failure reason ) {
         step.rollback(ctxt, reason);
     }
 
-    @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
     void lockDataset(WorkflowContext ctxt, DatasetLock datasetLock) throws CommandException {
         /*
          * Note that this method directly adds a lock to the database rather than adding
@@ -350,7 +343,6 @@ void lockDataset(WorkflowContext ctxt, DatasetLock datasetLock) throws CommandEx
         ctxt.setLockId(datasetLock.getId());
     }
 
-    @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
     void unlockDataset(WorkflowContext ctxt) throws CommandException {
         /*
          * Since the lockDataset command above directly persists a lock to the database,
@@ -387,14 +379,14 @@ private void workflowCompleted(Workflow wf, WorkflowContext ctxt) {
         // Read fresh timestamps from DB - parallel index/exports may have occurred while the workflow ran
         // (Nominally the workflow lock should have stopped other changes).
         Dataset dataset = ctxt.getDataset();
-        Dataset dbDataset = em.find(Dataset.class, ctxt.getDataset().getId());
-        dataset.setIndexTime(dbDataset.getIndexTime());
-        dataset.setPermissionIndexTime(dbDataset.getPermissionIndexTime());
-        dataset.setLastExportTime(dbDataset.getLastExportTime());
 
+        datasets.updateIndexingAndExportTimes(dataset);
+
+        
         try {
             if (ctxt.getType() == TriggerType.PrePublishDataset) {
                 ctxt = refresh(ctxt);
+                dataset = ctxt.getDataset();
                 // Now lock for FinalizePublication - this block mirrors that in PublishDatasetCommand
                 AuthenticatedUser user = ctxt.getRequest().getAuthenticatedUser();
                 DatasetLock lock = new DatasetLock(DatasetLock.Reason.finalizePublication, user);

src/main/java/edu/harvard/iq/dataverse/workflow/internalspi/ArchivalSubmissionWorkflowStep.java

@@ -89,6 +89,7 @@ public WorkflowStepResult run(WorkflowContext context) {
              * pending as is done when running archiving from the UI/API. Instead, there is a generic workflow
              * lock on the dataset. 
              */
+
             return archiveCommand.performArchiveSubmission(
                 version, 
                 dataCiteXml,