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

SEBSERV-417 fix teacher account selection for supporter

Browse source
This commit is contained in:
anhefti 2024-06-20 10:41:18 +02:00
parent ce168094cf
commit 45969934c3
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/ExamAdministrationController.java
View file

@ -15,6 +15,7 @@ import java.util.stream.Collectors;
import javax.validation.Valid; import javax.validation.Valid;
import ch.ethz.seb.sebserver.gbl.model.Activatable; import ch.ethz.seb.sebserver.gbl.model.Activatable;
import ch.ethz.seb.sebserver.gbl.model.user.UserInfo;
import ch.ethz.seb.sebserver.gbl.util.Cryptor; import ch.ethz.seb.sebserver.gbl.util.Cryptor;
import ch.ethz.seb.sebserver.webservice.servicelayer.exam.ExamImportService; import ch.ethz.seb.sebserver.webservice.servicelayer.exam.ExamImportService;
import ch.ethz.seb.sebserver.webservice.servicelayer.exam.ExamUtils; import ch.ethz.seb.sebserver.webservice.servicelayer.exam.ExamUtils;
@ -682,7 +683,7 @@ public class ExamAdministrationController extends EntityController<Exam, Exam> {
this.authorization.getUserService().getCurrentUser().getUserInfo().institutionId, this.authorization.getUserService().getCurrentUser().getUserInfo().institutionId,
true) true)
.map(users -> users.stream() .map(users -> users.stream()
.filter(user -> user.getRoles().contains(UserRole.EXAM_SUPPORTER.name())) .filter(user -> user.hasAnyRole(UserRole.EXAM_SUPPORTER, UserRole.TEACHER))
.map(user -> user.uuid) .map(user -> user.uuid)
.collect(Collectors.toSet())) .collect(Collectors.toSet()))
.getOrThrow(); .getOrThrow();