update for add new sample to be displayed since it was hidden after m…

…erge
ePareto-Information-System · Nov 29, 2023 · 8fe60f5 · 8fe60f5
1 parent 9425cdc
commit 8fe60f5
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 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
@@ -4584,18 +4584,26 @@ public Pseudonymizer getPseudonymizerForDtoWithClinician(@Nullable String pseudo
     }
 
     @Override
+    @RightsAllowed(UserRight._CASE_MERGE)
     public void merge(String leadUuid, String otherUuid) {
-
+        mergeCase(getCaseDataWithoutPseudonyimization(leadUuid), getCaseDataWithoutPseudonyimization(otherUuid), false);
     }
 
     @Override
-    public void deleteAsDuplicate(String uuid, String duplicateOfUuid) {
+    @RightsAllowed(UserRight._CASE_MERGE)
+    public void deleteAsDuplicate(String caseUuid, String duplicateOfCaseUuid) {
 
+        Case caze = service.getByUuid(caseUuid);
+        Case duplicateOfCase = service.getByUuid(duplicateOfCaseUuid);
+        caze.setDuplicateOf(duplicateOfCase);
+        service.ensurePersisted(caze);
+
+        delete(caseUuid, new DeletionDetails(DeletionReason.DUPLICATE_ENTRIES, null));
     }
 
-    @Override
+
     public boolean isEditAllowed(String uuid) {
-        return false;
+        return service.isEditAllowed(service.getByUuid(uuid));
     }
 
     @Override

diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/common/AbstractCoreFacadeEjb.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/common/AbstractCoreFacadeEjb.java
@@ -255,8 +255,7 @@ public EditPermissionType getEditPermissionType(String uuid) {
 		return service.getEditPermissionType(service.getByUuid(uuid));
 	}
 
-//	@Override
-//	public EditPermissionType isEditAllowed(String uuid) {
-//		return service.isEditAllowed(service.getByUuid(uuid));
-//	}
+
+
+
 }