✨ DatePatchMapper now supports new java LocalDate LocalDateTime formats

Author: Pa-Touche

sormas-backend/src/main/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/DatePatchMapper.java

@@ -2,6 +2,9 @@
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
@@ -22,17 +25,14 @@ public class DatePatchMapper implements ValuePatchMapper {
 
 	private static final Logger logger = LoggerFactory.getLogger(DatePatchMapper.class);
 
-	private static final Set<Class<?>> SUPPORTED_TYPES = Set.of(Date.class);
+	private static final Set<Class<?>> SUPPORTED_TYPES = Set.of(Date.class, LocalDate.class, LocalDateTime.class);
 
 	private static final List<String> DATE_FORMATS = Arrays.asList(
-		"yyyy-MM-dd",                // 2025-12-17
-		"yyyy/MM/dd",                // 2025/12/17
-		"yyyy-MM-dd'T'HH:mm:ssZ",    // 2025-12-17T14:30:00+0100
 		"yyyy-MM-dd'T'HH:mm:ssXXX",  // 2025-12-17T14:30:00+01:00
+		"yyyy-MM-dd'T'HH:mm:ssZ",    // 2025-12-17T14:30:00+0100
 		"yyyy-MM-dd'T'HH:mm:ss",     // 2025-12-17T14:30:00
 		"yyyy-MM-dd'T'HH:mm",        // 2025-12-17T14:30
-		"yyyy/MM/dd'T'HH:mm:ss",     // 2025/12/17T14:30:00
-		"yyyy/MM/dd'T'HH:mm:ssXXX"   // 2025/12/17T14:30:00+01:00
+		"yyyy-MM-dd"                 // 2025-12-17
 	);
 
 	@Override
@@ -50,12 +50,14 @@ public <T> ValueMappingResult<T> map(ValuePatchRequest<T> request) {
 
 		String str = value.toString().trim();
 
+		Class<?> targetType = request.getTargetType();
+
 		for (String format : DATE_FORMATS) {
 			try {
 				SimpleDateFormat sdf = new SimpleDateFormat(format);
 				sdf.setLenient(false);
 				Date parsed = sdf.parse(str);
-				return ValueMappingResult.withData((T) parsed);
+				return ValueMappingResult.withData((T) toTargetType(parsed, targetType));
 			} catch (ParseException e) {
 				// try next format
 			}
@@ -65,4 +67,14 @@ public <T> ValueMappingResult<T> map(ValuePatchRequest<T> request) {
 
 		return ValueMappingResult.withCause(DataPatchFailureCause.INVALID_VALUE_TYPE);
 	}
+
+	private Object toTargetType(Date parsed, Class<?> targetType) {
+		if (targetType == LocalDate.class) {
+			return parsed.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
+		}
+		if (targetType == LocalDateTime.class) {
+			return parsed.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
+		}
+		return parsed;
+	}
 }

sormas-backend/src/test/java/de/symeda/sormas/backend/patch/mapping/impl/valuemapper/DateMapperTest.java

@@ -3,6 +3,8 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.Set;
 
@@ -18,9 +20,9 @@ class DateMapperTest extends AbstractUnitTest {
 	private DatePatchMapper victim;
 
 	@Test
-	void getSupportedTypes_containsDateClass() {
+	void getSupportedTypes_containsDateClasses() {
 		// PREPARE
-		Set<Class<?>> expected = Set.of(Date.class);
+		Set<Class<?>> expected = Set.of(Date.class, LocalDate.class, LocalDateTime.class);
 
 		// EXECUTE
 		Set<Class<?>> actual = victim.getSupportedTypes();
@@ -109,4 +111,62 @@ void map_randomString_throwsIllegalArgumentException() {
 		// EXECUTE & CHECK
 		assertEquals(DataPatchFailureCause.INVALID_VALUE_TYPE, victim.map("notADate", Date.class).getDataPatchFailureCause());
 	}
+
+	// --- LocalDate ---
+
+	@Test
+	void map_localDate_validDate() {
+		// EXECUTE & CHECK
+		assertEquals(LocalDate.of(2024, 6, 15), victim.map("2024-06-15", LocalDate.class).getData());
+	}
+
+	@Test
+	void map_localDate_fromDateTimeString_returnsDatePart() {
+		// EXECUTE & CHECK
+		assertEquals(LocalDate.of(2024, 6, 15), victim.map("2024-06-15T14:30:00", LocalDate.class).getData());
+	}
+
+	@Test
+	void map_localDate_invalidFormat() {
+		// EXECUTE & CHECK
+		assertEquals(DataPatchFailureCause.INVALID_VALUE_TYPE, victim.map("15/06/2024", LocalDate.class).getDataPatchFailureCause());
+	}
+
+	@Test
+	void map_localDate_invalidDay() {
+		// EXECUTE & CHECK
+		assertEquals(DataPatchFailureCause.INVALID_VALUE_TYPE, victim.map("2024-02-30", LocalDate.class).getDataPatchFailureCause());
+	}
+
+	// --- LocalDateTime ---
+
+	@Test
+	void map_localDateTime_validDateTime() {
+		// EXECUTE & CHECK
+		assertEquals(LocalDateTime.of(2024, 6, 15, 14, 30, 0), victim.map("2024-06-15T14:30:00", LocalDateTime.class).getData());
+	}
+
+	@Test
+	void map_localDateTime_validDateTimeWithoutSeconds() {
+		// EXECUTE & CHECK
+		assertEquals(LocalDateTime.of(2024, 6, 15, 14, 30, 0), victim.map("2024-06-15T14:30", LocalDateTime.class).getData());
+	}
+
+	@Test
+	void map_localDateTime_fromDateOnlyString_returnsMidnight() {
+		// EXECUTE & CHECK
+		assertEquals(LocalDateTime.of(2024, 6, 15, 0, 0, 0), victim.map("2024-06-15", LocalDateTime.class).getData());
+	}
+
+	@Test
+	void map_localDateTime_invalidFormat() {
+		// EXECUTE & CHECK
+		assertEquals(DataPatchFailureCause.INVALID_VALUE_TYPE, victim.map("15/06/2024", LocalDateTime.class).getDataPatchFailureCause());
+	}
+
+	@Test
+	void map_localDateTime_invalidDay() {
+		// EXECUTE & CHECK
+		assertEquals(DataPatchFailureCause.INVALID_VALUE_TYPE, victim.map("2024-02-30T10:00:00", LocalDateTime.class).getDataPatchFailureCause());
+	}
 }