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

Merge branch 'zoom_rejoin_collecting' into development

Browse source
This commit is contained in:
anhefti 2022-11-07 15:57:20 +01:00
commit 02196951e1
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/proctoring/ExamProctoringRoomServiceImpl.java
View file

@ -475,7 +475,8 @@ public class ExamProctoringRoomServiceImpl implements ExamProctoringRoomService
final ExamProctoringService examProctoringService) { final ExamProctoringService examProctoringService) {
// get all connections of the room // get all connections of the room
final List<String> connectionTokens = this.getActiveCollectingRoomConnections(examId, roomName) final List<String> connectionTokens = this
.getActiveCollectingRoomConnections(examId, roomName)
.getOrThrow() .getOrThrow()
.stream() .stream()
.map(cc -> cc.connectionToken) .map(cc -> cc.connectionToken)
@ -501,6 +502,12 @@ public class ExamProctoringRoomServiceImpl implements ExamProctoringRoomService
connectionTokens, connectionTokens,
examProctoringService.getDefaultReconfigInstructionAttributes()); examProctoringService.getDefaultReconfigInstructionAttributes());
} }
// Send the rejoin to collecting room instruction to all involved clients
sendJoinCollectingRoomInstructions(
proctoringSettings,
connectionTokens,
examProctoringService);
} }
private void cleanupBreakOutRooms(final ClientConnectionRecord cc) { private void cleanupBreakOutRooms(final ClientConnectionRecord cc) {