Updated DatashareItemDataset to check if embargo date is passed, as it

seems to be retailed in the metadata in DSpace 8.

Author: johnpinto1

dspace-api/src/main/java/org/dspace/content/datashare/DatashareItemDataset.java

@@ -53,6 +53,7 @@ public class DatashareItemDataset {
 	private static final String DATASHARE_SCHEMA = "ds";
 	private static final String TOMBSTONE_ELEMENT = "withdrawn";
 	private static final String TOMBSTONE_SHOW_QUALIFIER = "showtombstone";
+	private static final String DC_DATE_EMBARGO = "dc.date.embargo";
 
 	// Static variables
 	private static String dir = null;
@@ -341,12 +342,27 @@ public static String getShowTombstone(Item item) {
 	public static boolean hasEmbargo(Context context, Item item) {
 		boolean hasEmbargo = true;
 		ItemService itemService = ContentServiceFactory.getInstance().getItemService();
-		ConfigurationService configurationService = DSpaceServicesFactory.getInstance().getConfigurationService();
 
-		List<MetadataValue> embargoList = itemService.getMetadataByMetadataString(item,
-				configurationService.getProperty("embargo.field.lift"));
+		// List<MetadataValue> embargoList = itemService.getMetadataByMetadataString(item,
+		// 		configurationService.getProperty("embargo.field.lift"));
+        List<MetadataValue> embargoList = itemService.getMetadataByMetadataString(item, DC_DATE_EMBARGO);
 		if (embargoList == null || embargoList.size() == 0) {
 			hasEmbargo = false;
+		} else {
+			// Check if embargo date is in the past
+			try {
+				String embargoDateStr = embargoList.get(0).getValue();
+				log.info("embargoDateStr: " + embargoDateStr);
+
+				Date embargoDate = parseDate(embargoDateStr);
+				Date now = new Date();
+				log.info("embargoDate: " + embargoDate + ", now: " + now);
+				if (embargoDate != null && embargoDate.after(now)) {
+					hasEmbargo = false;
+				}
+			} catch (Exception ex) {
+				log.error("Problem parsing embargo date: " + ex.getMessage());
+			}
 		}
 
 		log.info(item.getID() + " hasEmbargo: " + hasEmbargo);
@@ -384,6 +400,30 @@ private static boolean isTombstoned(Context context, Item item) {
 		log.info("isTombstoned(): " + show);
 		return show;
 	}
+	
+	/**
+	 * Parse a date string in ISO format yyyy-MM-dd and return a Date
+	 * representing the start of that day in the system default timezone.
+	 * Returns null when the input is null, empty or not in the expected format.
+	 *
+	 * @param dateStr date string expected in yyyy-MM-dd
+	 * @return parsed Date or null
+	 */
+	public static Date parseDate(String dateStr) {
+		if (dateStr == null || dateStr.trim().isEmpty()) {
+			return null;
+		}
+		try {
+			// Use Java 8 date time API to parse date
+			java.time.LocalDate ld = java.time.LocalDate.parse(dateStr,
+					java.time.format.DateTimeFormatter.ISO_LOCAL_DATE);
+			java.time.ZonedDateTime zdt = ld.atStartOfDay(java.time.ZoneId.systemDefault());
+			return Date.from(zdt.toInstant());
+		} catch (java.time.format.DateTimeParseException ex) {
+			log.error("Problem parsing date: " + ex.getMessage());
+			return null;
+		}
+	}
 
 	/**
 	 * Create dataset zip file in a seperate thread.

dspace-api/src/test/java/org/dspace/content/datashare/DatashareItemDatasetTest.java

@@ -0,0 +1,35 @@
+package org.dspace.content.datashare;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.util.Date;
+
+import org.junit.Test;
+
+public class DatashareItemDatasetTest {
+
+    @Test
+    public void testParseDateValidYMD() {
+        String s = "2015-05-07";
+        Date d = DatashareItemDataset.parseDate(s);
+        assertNotNull(d);
+        LocalDate ld = d.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
+        assertEquals(LocalDate.of(2015, 5, 7), ld);
+    }
+
+    @Test
+    public void testParseDateInvalidFormatReturnsNull() {
+        String s = "05/07/2015";
+        Date d = DatashareItemDataset.parseDate(s);
+        assertNull(d);
+    }
+
+    @Test
+    public void testParseDateNullReturnsNull() {
+        assertNull(DatashareItemDataset.parseDate(null));
+    }
+}