SORMAS-Foundation#4178 - Handle the null SymptomsDto uuid when creating a visit (SORMAS-Foundation#4217)

alexcaruntu-vita · web-flow · commit 0dcb04e0a425 · 2021-02-03T14:51:14.000+01:00
* SORMAS-Foundation#4178 - Handle the null SymptomsDto uuid when creating a visit * SORMAS-Foundation#4178 - Code rewrite
diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/symptoms/SymptomsFacadeEjb.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/symptoms/SymptomsFacadeEjb.java
@@ -37,7 +37,8 @@ public Symptoms fromDto(SymptomsDto source, boolean checkChangeDate) {
 			return null;
 		}
 
-		Symptoms target = DtoHelper.fillOrBuildEntity(source, service.getByUuid(source.getUuid()), Symptoms::new, checkChangeDate);
+		String uuid = source.getUuid();
+		Symptoms target = DtoHelper.fillOrBuildEntity(source, uuid != null ? service.getByUuid(uuid) : null, Symptoms::new, checkChangeDate);
 
 		target.setAbdominalPain(source.getAbdominalPain());
 		target.setAlteredConsciousness(source.getAlteredConsciousness());

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,8 @@ public Symptoms fromDto(SymptomsDto source, boolean checkChangeDate) {`
`37`	`37`	`return null;`
`38`	`38`	`}`
`39`	`39`
`40`		`- Symptoms target = DtoHelper.fillOrBuildEntity(source, service.getByUuid(source.getUuid()), Symptoms::new, checkChangeDate);`
	`40`	`+ String uuid = source.getUuid();`
	`41`	`+ Symptoms target = DtoHelper.fillOrBuildEntity(source, uuid != null ? service.getByUuid(uuid) : null, Symptoms::new, checkChangeDate);`
`41`	`42`
`42`	`43`	`target.setAbdominalPain(source.getAbdominalPain());`
`43`	`44`	`target.setAlteredConsciousness(source.getAlteredConsciousness());`