From 211d074d78359544aa9676eebfb7d9b586ca3704 Mon Sep 17 00:00:00 2001 From: Bartha Barna Date: Thu, 6 Jan 2022 07:20:26 +0200 Subject: [PATCH] #7434 - CR suggestion - fix internal flag default --- .../java/de/symeda/sormas/backend/caze/CaseFacadeEjb.java | 6 +++--- .../src/main/java/de/symeda/sormas/rest/CaseResource.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) 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 f52bc180dd8..7a839278e56 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 @@ -1335,12 +1335,12 @@ public CaseReferenceDto getReferenceByUuid(String uuid) { @Override public CaseDataDto saveCase(@Valid CaseDataDto dto) throws ValidationRuntimeException { - return saveCase(dto, true, true, false, false); + return saveCase(dto, true, true, true, false); } @Override public CaseDataDto saveCase(@Valid CaseDataDto dto, Boolean systemSave) throws ValidationRuntimeException { - return saveCase(dto, true, true, false, systemSave); + return saveCase(dto, true, true, true, systemSave); } public void saveBulkCase( @@ -3172,7 +3172,7 @@ private void mergeCase(CaseDataDto leadCaseData, CaseDataDto otherCaseData, bool // 1.1 Case copyDtoValues(leadCaseData, otherCaseData, cloning); - saveCase(leadCaseData, !cloning, true, false, false); + saveCase(leadCaseData, !cloning, true, true, false); // 1.2 Person - Only merge when the persons have different UUIDs if (!cloning && !DataHelper.equal(leadCaseData.getPerson().getUuid(), otherCaseData.getPerson().getUuid())) { diff --git a/sormas-rest/src/main/java/de/symeda/sormas/rest/CaseResource.java b/sormas-rest/src/main/java/de/symeda/sormas/rest/CaseResource.java index f6bbb81b993..9c86487f952 100644 --- a/sormas-rest/src/main/java/de/symeda/sormas/rest/CaseResource.java +++ b/sormas-rest/src/main/java/de/symeda/sormas/rest/CaseResource.java @@ -77,7 +77,7 @@ public List getByPersonUuids(List uuids) { @POST @Path("/push") public List postCases(@Valid List dtos) { - return savePushedDto(dtos, dto -> FacadeProvider.getCaseFacade().saveCase(dto)); + return savePushedDto(dtos, FacadeProvider.getCaseFacade()::saveCase); } @GET