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

SEBSERV-204 fix join instruction

Browse source
This commit is contained in:
anhefti 2021-06-30 16:12:19 +02:00
parent cbbff94a75
commit 1e8ecd94ec
2 changed files with 20 additions and 14 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

@ -630,16 +630,17 @@ public class ExamProctoringRoomServiceImpl implements ExamProctoringRoomService
final ClientConnectionData clientConnection = this.examSessionService final ClientConnectionData clientConnection = this.examSessionService
.getConnectionData(connectionToken) .getConnectionData(connectionToken)
.getOrThrow(); .getOrThrow();
final String roomName = this.remoteProctoringRoomDAO
.getRoomName(clientConnection.clientConnection.getRemoteProctoringRoomId()) final RemoteProctoringRoom remoteProctoringRoom = this.remoteProctoringRoomDAO
.getRoom(clientConnection.clientConnection.getRemoteProctoringRoomId())
.getOrThrow(); .getOrThrow();
final ProctoringRoomConnection proctoringConnection = examProctoringService final ProctoringRoomConnection proctoringConnection = examProctoringService
.getClientRoomConnection( .getClientRoomConnection(
proctoringSettings, proctoringSettings,
clientConnection.clientConnection.connectionToken, clientConnection.clientConnection.connectionToken,
roomName, remoteProctoringRoom.name,
clientConnection.clientConnection.userSessionId) remoteProctoringRoom.subject)
.getOrThrow(); .getOrThrow();
sendJoinInstruction( sendJoinInstruction(

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

@ -449,17 +449,22 @@ public class ZoomProctoringService implements ExamProctoringService {
return; return;
} }
final ProctoringRoomConnection proctoringRoomConnection = this.getProctorRoomConnection(
proctoringSettings,
room.name,
room.subject)
.getOrThrow();
clientConnections.stream() clientConnections.stream()
.forEach(cc -> sendJoinInstruction( .forEach(cc -> {
proctoringSettings.examId, try {
cc.connectionToken, sendJoinInstruction(
proctoringRoomConnection)); proctoringSettings.examId,
cc.connectionToken,
getClientRoomConnection(
proctoringSettings,
cc.connectionToken,
room.name,
room.subject)
.getOrThrow());
} catch (final Exception e) {
log.error("Failed to send rejoin instruction to SEB client: {}", cc.connectionToken, e);
}
});
}); });
} }