Skip to content

Commit d25c4d4

Browse files
committed
#721 | Fetch existing group privileges by impl_version during bundle upload
1 parent e1c3f7f commit d25c4d4

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

avni-server-api/src/main/java/org/avni/server/dao/GroupPrivilegeRepository.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,4 +60,6 @@ default List<GroupPrivilege> saveAllGroupPrivileges(List<GroupPrivilege> groupPr
6060
groupPrivileges.forEach(gp -> gp.setImplVersion(GroupPrivilege.IMPL_VERSION));
6161
return this.saveAll(groupPrivileges);
6262
}
63+
64+
List<GroupPrivilege> findByImplVersion(int implVersion);
6365
}

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import java.util.Arrays;
2323
import java.util.List;
2424
import java.util.Objects;
25-
import java.util.stream.Collectors;
2625

2726
@Service
2827
public class GroupPrivilegeService implements NonScopeAwareService {
@@ -176,9 +175,7 @@ public List<GroupPrivilege> getAllGroupPrivileges(long groupId) {
176175
}
177176

178177
public void savePrivileges(GroupPrivilegeContractWeb[] requests, Organisation organisation) {
179-
List<GroupPrivilege> groupPrivileges = groupPrivilegeRepository.findAll()
180-
.stream().filter(groupPrivilege -> groupPrivilege.getImplVersion() == GroupPrivilege.IMPL_VERSION)
181-
.collect(Collectors.toList());
178+
List<GroupPrivilege> groupPrivileges = groupPrivilegeRepository.findByImplVersion(GroupPrivilege.IMPL_VERSION);
182179
List<Privilege> privileges = privilegeRepository.findAll();
183180
List<SubjectType> subjectTypes = subjectTypeRepository.findAll();
184181
List<Program> programs = programRepository.findAll();

0 commit comments

Comments
 (0)