diff --git a/sormas-api/pom.xml b/sormas-api/pom.xml index e130e44ed0a..e8fddaa77d3 100644 --- a/sormas-api/pom.xml +++ b/sormas-api/pom.xml @@ -2,7 +2,7 @@ de.symeda.sormas sormas-base - 1.77.1 + 1.77.2 ../sormas-base 4.0.0 diff --git a/sormas-app/pom.xml b/sormas-app/pom.xml index 25c593ebbb4..2ccce94b3db 100644 --- a/sormas-app/pom.xml +++ b/sormas-app/pom.xml @@ -3,7 +3,7 @@ sormas-base de.symeda.sormas - 1.77.1 + 1.77.2 ../sormas-base 4.0.0 diff --git a/sormas-backend/pom.xml b/sormas-backend/pom.xml index e05b8b80828..eea7f02f544 100644 --- a/sormas-backend/pom.xml +++ b/sormas-backend/pom.xml @@ -3,7 +3,7 @@ sormas-base de.symeda.sormas - 1.77.1 + 1.77.2 ../sormas-base 4.0.0 diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/FacadeHelper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/FacadeHelper.java index a1e712ff209..a51d07ee074 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/FacadeHelper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/FacadeHelper.java @@ -2,6 +2,7 @@ import java.util.Set; +import de.symeda.sormas.api.EntityDto; import de.symeda.sormas.api.i18n.I18nProperties; import de.symeda.sormas.api.i18n.Strings; import de.symeda.sormas.api.user.UserRight; @@ -32,4 +33,10 @@ public static void checkCreateAndEditRights( } } + public static void setUuidIfDtoExists(AbstractDomainObject target, EntityDto dto) { + if (dto != null) { + target.setUuid(dto.getUuid()); + } + } + } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/caze/CaseFacadeEjb.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/caze/CaseFacadeEjb.java index f6d2218d760..21945a42be5 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/caze/CaseFacadeEjb.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/caze/CaseFacadeEjb.java @@ -158,7 +158,6 @@ import de.symeda.sormas.api.infrastructure.facility.FacilityDto; import de.symeda.sormas.api.infrastructure.facility.FacilityHelper; import de.symeda.sormas.api.infrastructure.facility.FacilityType; -import de.symeda.sormas.api.infrastructure.region.RegionDto; import de.symeda.sormas.api.infrastructure.region.RegionReferenceDto; import de.symeda.sormas.api.location.LocationDto; import de.symeda.sormas.api.location.LocationReferenceDto; @@ -2990,9 +2989,9 @@ public Case fillOrBuildEntity(@NotNull CaseDataDto source, Case target, boolean }, checkChangeDate); if (targetWasNull) { - target.getHospitalization().setUuid(source.getHospitalization().getUuid()); - target.getEpiData().setUuid(source.getEpiData().getUuid()); - target.getSymptoms().setUuid(source.getSymptoms().getUuid()); + FacadeHelper.setUuidIfDtoExists(target.getHospitalization(), source.getHospitalization()); + FacadeHelper.setUuidIfDtoExists(target.getEpiData(), source.getEpiData()); + FacadeHelper.setUuidIfDtoExists(target.getSymptoms(), source.getSymptoms()); } target.setDisease(source.getDisease()); diff --git a/sormas-base/dependencies/serverlibs.pom b/sormas-base/dependencies/serverlibs.pom index cc02ecf47d5..ee1480935bc 100644 --- a/sormas-base/dependencies/serverlibs.pom +++ b/sormas-base/dependencies/serverlibs.pom @@ -8,7 +8,7 @@ sormas-base de.symeda.sormas - 1.77.1 + 1.77.2 ../ diff --git a/sormas-base/pom.xml b/sormas-base/pom.xml index 4df01fde8d2..4f5ce7a763e 100644 --- a/sormas-base/pom.xml +++ b/sormas-base/pom.xml @@ -5,7 +5,7 @@ de.symeda.sormas sormas-base pom - 1.77.1 + 1.77.2 1.8 diff --git a/sormas-cargoserver/pom.xml b/sormas-cargoserver/pom.xml index 7d8bfab8257..cca171a9a20 100644 --- a/sormas-cargoserver/pom.xml +++ b/sormas-cargoserver/pom.xml @@ -3,7 +3,7 @@ de.symeda.sormas sormas-base - 1.77.1 + 1.77.2 ../sormas-base diff --git a/sormas-ear/pom.xml b/sormas-ear/pom.xml index f5f55c298cb..e1f44f32644 100644 --- a/sormas-ear/pom.xml +++ b/sormas-ear/pom.xml @@ -3,7 +3,7 @@ de.symeda.sormas sormas-base - 1.77.1 + 1.77.2 ../sormas-base diff --git a/sormas-keycloak-service-provider/pom.xml b/sormas-keycloak-service-provider/pom.xml index 89648c13387..b2631031898 100644 --- a/sormas-keycloak-service-provider/pom.xml +++ b/sormas-keycloak-service-provider/pom.xml @@ -3,7 +3,7 @@ sormas-base de.symeda.sormas - 1.77.1 + 1.77.2 ../sormas-base 4.0.0 diff --git a/sormas-rest/pom.xml b/sormas-rest/pom.xml index b9267050ec2..b89e3259dfb 100644 --- a/sormas-rest/pom.xml +++ b/sormas-rest/pom.xml @@ -3,7 +3,7 @@ de.symeda.sormas sormas-base - 1.77.1 + 1.77.2 ../sormas-base diff --git a/sormas-ui/pom.xml b/sormas-ui/pom.xml index 0165ee3d92f..7fdb8a376dc 100644 --- a/sormas-ui/pom.xml +++ b/sormas-ui/pom.xml @@ -3,7 +3,7 @@ sormas-base de.symeda.sormas - 1.77.1 + 1.77.2 ../sormas-base 4.0.0 diff --git a/sormas-widgetset/pom.xml b/sormas-widgetset/pom.xml index 9cc00885d3c..e9b0e2a4235 100644 --- a/sormas-widgetset/pom.xml +++ b/sormas-widgetset/pom.xml @@ -3,7 +3,7 @@ sormas-base de.symeda.sormas - 1.77.1 + 1.77.2 ../sormas-base 4.0.0