Allow non UTC lastUpdateTimestamp

Author: stevenwinship

src/main/java/edu/harvard/iq/dataverse/api/AbstractApiBean.java

@@ -61,7 +61,11 @@
 
 import java.io.InputStream;
 import java.net.URI;
-import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
+import java.time.temporal.ChronoUnit;
 import java.util.*;
 import java.util.concurrent.Callable;
 import java.util.logging.Level;
@@ -488,21 +492,32 @@ public Command<DatasetVersion> handleLatestPublished() {
     }
 
     protected void validateInternalTimestampIsNotOutdated(DvObject dvObject, String sourceLastUpdateTime) throws WrappedResponse {
-        Date date = sourceLastUpdateTime != null ? DateUtil.parseDate(sourceLastUpdateTime, "yyyy-MM-dd'T'HH:mm:ss'Z'") : null;
-        if (date == null) {
+        LocalDateTime dtIN = null;
+        try {
+            dtIN = sourceLastUpdateTime != null ? LocalDateTime.parse(sourceLastUpdateTime, DateTimeFormatter.ISO_OFFSET_DATE_TIME) : null;
+        } catch (DateTimeParseException e) {
+        }
+        if (dtIN == null) {
             throw new WrappedResponse(
-                    badRequest(BundleUtil.getStringFromBundle("jsonparser.error.parsing.date", Collections.singletonList(sourceLastUpdateTime)))
+                    badRequest(BundleUtil.getStringFromBundle("jsonparser.error.parsing.date", List.of(sourceLastUpdateTime)))
             );
         }
-        Instant instant = date.toInstant();
-        Instant updateTimestamp =
-                (dvObject instanceof DataFile) ? ((DataFile) dvObject).getFileMetadata().getDatasetVersion().getLastUpdateTime().toInstant() :
-                (dvObject instanceof Dataset) ? ((Dataset) dvObject).getLatestVersion().getLastUpdateTime().toInstant() :
-                instant;
-        // granularity is to the second since the json output only returns dates in this format to the second
-        if (updateTimestamp.getEpochSecond() != instant.getEpochSecond()) {
+
+        Date lastUpdateTimestamp =
+                (dvObject instanceof DataFile) ? ((DataFile) dvObject).getFileMetadata().getDatasetVersion().getLastUpdateTime() :
+                (dvObject instanceof Dataset) ? ((Dataset) dvObject).getLatestVersion().getLastUpdateTime() :
+                null;
+
+        if (lastUpdateTimestamp != null) {
+            LocalDateTime localDateTime = lastUpdateTimestamp.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime().truncatedTo(ChronoUnit.SECONDS);
+            if (!localDateTime.equals(dtIN)) {
+                throw new WrappedResponse(
+                        badRequest(BundleUtil.getStringFromBundle("abstractApiBean.error.internalVersionTimestampIsOutdated", List.of(sourceLastUpdateTime)))
+                );
+            }
+        } else {
             throw new WrappedResponse(
-                    badRequest(BundleUtil.getStringFromBundle("abstractApiBean.error.internalVersionTimestampIsOutdated", Collections.singletonList(sourceLastUpdateTime)))
+                    badRequest(BundleUtil.getStringFromBundle("jsonparser.error.parsing.date", List.of(sourceLastUpdateTime)))
             );
         }
     }

src/test/java/edu/harvard/iq/dataverse/api/DatasetsTest.java

@@ -1,11 +1,20 @@
 package edu.harvard.iq.dataverse.api;
 
+import edu.harvard.iq.dataverse.Dataset;
+import edu.harvard.iq.dataverse.DatasetVersion;
+import edu.harvard.iq.dataverse.util.DateUtil;
 import org.junit.jupiter.api.Test;
+
+import java.time.*;
+import java.time.format.DateTimeFormatter;
+import java.util.Date;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
+import static org.assertj.core.api.Fail.fail;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
@@ -55,4 +64,60 @@ public void testCleanup() {
         assertTrue(deleted.contains("1837fda17ce-d7b9987fc6e9_suffix"));
         assertTrue(deleted.contains("1837fda17ce-d7b9987fc6e9.aux"));
     }
+
+    @Test
+    public void testValidateInternalTimestampIsNotOutdated() {
+        Datasets dsBean = new Datasets();
+        Dataset ds = new Dataset();
+        DatasetVersion dsv = new DatasetVersion();
+        dsv.setDataset(ds);
+        ds.setVersions(List.of(dsv));
+
+        // setLastUpdateTime LOCAL TIME ZONE
+        String str1 = "2023-10-01T10:00:00+05:00";
+        LocalDateTime dt1 = LocalDateTime.parse(str1, DateTimeFormatter.ISO_OFFSET_DATE_TIME);
+        dsv.setLastUpdateTime(Date.from(dt1.atZone(ZoneId.systemDefault()).toInstant()));
+
+        // Test not Equal
+        String str2 = "2023-10-01T11:00:00-08:00";
+        try {
+            dsBean.validateInternalTimestampIsNotOutdated(ds,str2);
+            fail();
+        } catch (AbstractApiBean.WrappedResponse e) {
+        }
+
+        // Test Equal
+        try {
+            dsBean.validateInternalTimestampIsNotOutdated(ds,str1);
+        } catch (AbstractApiBean.WrappedResponse e) {
+            fail();
+        }
+
+        // setLastUpdateTime UTC
+        String str11 = "2023-10-01T10:00:00Z";
+        Date dt11 = DateUtil.parseDate(str11, "yyyy-MM-dd'T'HH:mm:ss'Z'");
+        dsv.setLastUpdateTime(dt11);
+
+        // Test Not Equal
+        String str12 = "2023-10-01T11:00:00Z";
+        try {
+            dsBean.validateInternalTimestampIsNotOutdated(ds,str12);
+            fail();
+        } catch (AbstractApiBean.WrappedResponse e) {
+        }
+
+        // Test Equal
+        try {
+            dsBean.validateInternalTimestampIsNotOutdated(ds,str11);
+        } catch (AbstractApiBean.WrappedResponse e) {
+            fail();
+        }
+
+        // Test BAD Date/Time
+        try {
+            dsBean.validateInternalTimestampIsNotOutdated(ds,"invalid");
+            fail();
+        } catch (AbstractApiBean.WrappedResponse e) {
+        }
+    }
 }