✅ same day Date patching

Author: Pa-Touche

sormas-backend/src/main/java/de/symeda/sormas/backend/patch/BusinessDtoFacade.java

@@ -43,7 +43,7 @@ public class BusinessDtoFacade {
 	@EJB
 	private UserFacadeEjb.UserFacadeEjbLocal userFacade;
 
-	private final Map<Class<? extends EntityDto>, Function<? extends EntityDto, ? extends EntityDto>> dtoSaveDictionary = new HashMap<>();
+	private final Map<Class<? extends EntityDto>, Function<? extends EntityDto, ? extends EntityDto>> directDtoSaveDictionary = new HashMap<>();
 
 	private final Map<Class<? extends EntityDto>, Function<CaseDataDto, ? extends EntityDto>> dtoRetrieverDictionary = new HashMap<>();
 
@@ -76,7 +76,7 @@ private void registerSaveOperations() {
 	}
 
 	private <T extends EntityDto> void registerSave(Class<T> dtoClass, Function<T, T> consumer) {
-		dtoSaveDictionary.put(dtoClass, consumer);
+		directDtoSaveDictionary.put(dtoClass, consumer);
 	}
 
 	private void registerFetchOperations() {
@@ -110,17 +110,21 @@ private void registerFetchByI18nOperationsCreateUpdate() {
 				caseDataDto -> personFacade.getByUuid(caseDataDto.getPerson().getUuid()));
 		registerFetchByI18nCreateUpdate(
 				ImmunizationDto.I18N_PREFIX,
-				caseDataDto -> {
-					ImmunizationDto build = ImmunizationDto.build(caseDataDto.getPerson());
-					build.setRelatedCase(caseDataDto.toReference());
-					return build;
-                });
+				createImmunizationDtoFromCaseFct());
 
 		registerFetchByI18nCreateUpdate(
 				VaccinationDto.I18N_PREFIX,
 				caseDataDto -> VaccinationDto.build(userFacade.getCurrentUserAsReference()));
 	}
 
+	private static Function<CaseDataDto, EntityDto> createImmunizationDtoFromCaseFct() {
+		return caseDataDto -> {
+			ImmunizationDto build = ImmunizationDto.build(caseDataDto.getPerson());
+			build.setRelatedCase(caseDataDto.toReference());
+			return build;
+		};
+	}
+
 	private void registerFetchByI18nRead(String i18nName, Function<CaseDataDto, List<? extends EntityDto>> fct) {
 		dtoRetrieverByI18nDictionaryRead.put(i18nName, fct);
 	}
@@ -208,7 +212,7 @@ public Set<String> fetchablePrefixes() {
 	public <T extends EntityDto> T save(@NotNull EntityDto entityDto) {
 		Class<? extends EntityDto> entityDtoClass = entityDto.getClass();
 
-		return Optional.ofNullable((Function<T, T>) dtoSaveDictionary.get(entityDtoClass))
+		return Optional.ofNullable((Function<T, T>) directDtoSaveDictionary.get(entityDtoClass))
 			.orElseThrow(() -> new IllegalStateException(String.format("No save function defined for: [%s]", entityDtoClass)))
 			.apply((T) entityDto);
 	}

sormas-backend/src/test/java/de/symeda/sormas/patch/DataPatcherImplTest.java

@@ -2,6 +2,7 @@
 
 import java.sql.Date;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.util.Collections;
 import java.util.HashMap;
@@ -941,6 +942,34 @@ void patch_fieldDoesNoExist() {
 			() -> Assertions.assertEquals(Map.of(), response.getValidPatchDictionary()));
 	}
 
+	@Test
+	void patch_ifNotAlreadyPresent_sameDayDifferentTime_noForbiddenValueOverride() {
+		// PREPARE
+		CaseDataDto originalCase = creator.createUnclassifiedCase(Disease.PERTUSSIS);
+
+		// Set classificationDate to 08:30 on 2024-06-15 — a non-midnight timestamp on the same calendar day that will be patched
+		java.util.Date existingDate =
+			java.util.Date.from(LocalDateTime.of(2024, 6, 15, 8, 30, 0).atZone(ZoneId.systemDefault()).toInstant());
+		originalCase.setClassificationDate(existingDate);
+		getCaseFacade().save(originalCase);
+
+		// Patch with the same calendar day as a plain date string — DatePatchMapper resolves this to midnight (00:00:00),
+		// which differs in time from existingDate. Without DateEqualityChecker this would trigger FORBIDDEN_VALUE_OVERRIDE.
+		String patchDate = "2024-06-15";
+		CaseDataPatchRequest request = new CaseDataPatchRequest().setCaseUuid(originalCase.getUuid())
+			.setPatchDictionary(Map.of("CaseData.classificationDate", patchDate));
+
+		// EXECUTE
+		DataPatchResponse response = victim().patch(request);
+
+		// CHECK
+		logger.info("response: [{}]", response);
+
+		Assertions.assertAll(
+			() -> Assertions.assertTrue(response.getFailures().isEmpty(), "FORBIDDEN_VALUE_OVERRIDE must not fire for same-day dates"),
+			() -> Assertions.assertTrue(response.isApplied()));
+	}
+
 	private DataPatcher victim() {
 		return getCaseDataPatcher();
 	}