#721 | Use targetGroup's uuid after accounting for Everyone Group during groupPriv import

Author: himeshr

avni-server-api/src/main/java/org/avni/server/service/accessControl/GroupPrivilegeService.java

@@ -184,8 +184,9 @@ public void savePrivileges(GroupPrivilegeContractWeb[] requests, Organisation or
         List<Group> groups = groupRepository.findAll();
 
         Arrays.stream(requests).filter(grpPrivyConWebRequest -> !grpPrivyConWebRequest.isVoided()).forEach(request -> {
+            Group targetedGroup = getGroup(request, organisation, groups);
             GroupPrivilege groupPrivilege = groupPrivileges.stream().filter(gp ->
-                Objects.equals(request.getGroupUUID(), gp.getGroupUuid())
+                Objects.equals(targetedGroup.getUuid(), gp.getGroupUuid())
                 && Objects.equals(request.getPrivilegeUUID(), gp.getPrivilegeUuid())
                 && Objects.equals(request.getSubjectTypeUUID(), gp.getSubjectTypeUuid())
                 && Objects.equals(request.getProgramUUID(), gp.getProgramUuid())
@@ -203,7 +204,7 @@ public void savePrivileges(GroupPrivilegeContractWeb[] requests, Organisation or
                 groupPrivilege.setEncounterType(CollectionUtil.findByUuid(encounterTypes, request.getEncounterTypeUUID()));
                 groupPrivilege.setProgramEncounterType(CollectionUtil.findByUuid(encounterTypes, request.getProgramEncounterTypeUUID()));
                 groupPrivilege.setChecklistDetail(CollectionUtil.findByUuid(checklistDetails, request.getChecklistDetailUUID()));
-                groupPrivilege.setGroup(getGroup(request, organisation, groups));
+                groupPrivilege.setGroup(targetedGroup);
             }
 
             groupPrivilege.setAllow(request.isAllow());