SORMAS-Foundation#3360 add UUID generation in epi date and visit facades

Author: lgal

sormas-backend/src/main/java/de/symeda/sormas/backend/epidata/EpiDataFacadeEjb.java

@@ -17,7 +17,6 @@
  *******************************************************************************/
 package de.symeda.sormas.backend.epidata;
 
-import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -89,17 +88,7 @@ public Exposure fromExposureDto(ExposureDto source, boolean checkChangeDate) {
 			return null;
 		}
 
-		Exposure exposure = exposureService.getByUuid(source.getUuid());
-		if (exposure == null) {
-			exposure = new Exposure();
-			exposure.setUuid(source.getUuid());
-			if (source.getCreationDate() != null) {
-				exposure.setCreationDate(new Timestamp(source.getCreationDate().getTime()));
-			}
-		}
-
-		Exposure target = exposure;
-		DtoHelper.validateDto(source, target, checkChangeDate);
+		Exposure target = DtoHelper.fillOrBuildEntity(source, exposureService.getByUuid(source.getUuid()), Exposure::new, checkChangeDate);
 
 		target.setAnimalCondition(source.getAnimalCondition());
 		target.setTypeOfAnimal(source.getTypeOfAnimal());
@@ -152,7 +141,7 @@ public Exposure fromExposureDto(ExposureDto source, boolean checkChangeDate) {
 		target.setRiskArea(source.getRiskArea());
 		target.setPatientExpositionRole(source.getPatientExpositionRole());
 
-		return exposure;
+		return target;
 	}
 
 	public static EpiDataDto toDto(EpiData epiData) {

sormas-backend/src/main/java/de/symeda/sormas/backend/visit/VisitFacadeEjb.java

@@ -17,7 +17,6 @@
  *******************************************************************************/
 package de.symeda.sormas.backend.visit;
 
-import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -492,15 +491,7 @@ public List<VisitExportDto> getVisitsExportList(
 	public Visit fromDto(@NotNull VisitDto source, boolean checkChangeDate) {
 
 		final String visitUuid = source.getUuid();
-		Visit target = visitUuid != null ? visitService.getByUuid(visitUuid) : null;
-		if (target == null) {
-			target = new Visit();
-			target.setUuid(visitUuid);
-			if (source.getCreationDate() != null) {
-				target.setCreationDate(new Timestamp(source.getCreationDate().getTime()));
-			}
-		}
-		DtoHelper.validateDto(source, target, checkChangeDate);
+		Visit target = DtoHelper.fillOrBuildEntity(source, visitService.getByUuid(visitUuid), Visit::new, checkChangeDate);
 
 		target.setDisease(source.getDisease());
 		target.setPerson(personService.getByReferenceDto(source.getPerson()));