#721 | IsVoided for GroupPrivileges with IMPL_VERSION == 1 is meaning…

…less, return false for them always
avniproject · Jul 18, 2024 · 574fc4a · mahalakshme · Jul 19, 2024 · himeshr
1 parent b3abd8e
commit 574fc4a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/avni-server-api/src/main/java/org/avni/server/domain/accessControl/GroupPrivilege.java b/avni-server-api/src/main/java/org/avni/server/domain/accessControl/GroupPrivilege.java
@@ -218,4 +218,13 @@ public int getImplVersion() {
     public void setImplVersion(int implVersion) {
         this.implVersion = implVersion;
     }
+
+    /**
+     *
+     * @return For GroupPrivileges with IMPL_VERSION == 1 return FALSE, otherwise return actual db isVoided value .
+     */
+    @Override
+    public boolean isVoided() {
+        return getImplVersion() == GroupPrivilege.IMPL_VERSION ? false : super.isVoided();
+    }
 }
diff --git a/...server-api/src/main/java/org/avni/server/service/accessControl/GroupPrivilegeService.java b/...server-api/src/main/java/org/avni/server/service/accessControl/GroupPrivilegeService.java
@@ -183,7 +183,7 @@ public void savePrivileges(GroupPrivilegeContractWeb[] requests, Organisation or
         List<ChecklistDetail> checklistDetails = checklistDetailRepository.findAll();
         List<Group> groups = groupRepository.findAll();
 
-        Arrays.stream(requests).forEach(request -> {
+        Arrays.stream(requests).filter(grpPrivyConWebRequest -> !grpPrivyConWebRequest.isVoided()).forEach(request -> {
             GroupPrivilege groupPrivilege = groupPrivileges.stream().filter(gp ->
                 Objects.equals(request.getGroupUUID(), gp.getGroupUuid())
                 && Objects.equals(request.getPrivilegeUUID(), gp.getPrivilegeUuid())

diff --git a/avni-server-api/src/main/java/org/avni/server/web/request/GroupPrivilegeContractWeb.java b/avni-server-api/src/main/java/org/avni/server/web/request/GroupPrivilegeContractWeb.java
@@ -25,6 +25,7 @@ public static GroupPrivilegeContractWeb fromEntity(GroupPrivilege groupPrivilege
         groupPrivilegeContractWeb.setEncounterTypeUUID(groupPrivilege.getEncounterTypeUuid());
         groupPrivilegeContractWeb.setChecklistDetailUUID(groupPrivilege.getChecklistDetailUuid());
         groupPrivilegeContractWeb.setAllow(groupPrivilege.isAllow());
+        groupPrivilegeContractWeb.setVoided(groupPrivilege.isVoided());
         groupPrivilegeContractWeb.setNotEveryoneGroup(!groupPrivilege.getGroup().isEveryone());
         return groupPrivilegeContractWeb;
     }