zervo/seb-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SEBSERV-417 fixed predicate

Browse source
This commit is contained in:
anhefti 2024-06-18 10:37:41 +02:00
parent 3e426ce2cc
commit 27c5cff6f5
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/UserDAOImpl.java
View file

@ -173,10 +173,13 @@ public class UserDAOImpl implements UserDAO {
public Result<Collection<UserInfo>> allMatching(final FilterMap filterMap, final Predicate<UserInfo> predicate) {
return Result.tryCatch(() -> {
final String userRole = filterMap.getUserRole();
final Set<String> userRoles = new HashSet<>(Arrays.asList(StringUtils.split(userRole, Constants.LIST_SEPARATOR)));
final Predicate<UserInfo> _predicate = (StringUtils.isNotBlank(userRole))
? predicate.and(ui -> userRoles.stream().anyMatch(ui.roles::contains))
: predicate;
final Predicate<UserInfo> _predicate;
if (StringUtils.isNotBlank(userRole)) {
final Set<String> userRoles = new HashSet<>(Arrays.asList(StringUtils.split(userRole, Constants.LIST_SEPARATOR)));
_predicate = predicate.and(ui -> userRoles.stream().anyMatch(ui.roles::contains));
} else {
_predicate = predicate;
}
final QueryExpressionDSL<MyBatis3SelectModelAdapter<List<UserRecord>>>.QueryExpressionWhereBuilder sqlWhereClause =
(filterMap.getBoolean(FilterMap.ATTR_ADD_INSITUTION_JOIN))