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

SEBSERV-332

Browse source
This commit is contained in:
anhefti 2022-06-28 14:12:10 +02:00
parent 38037539db
commit 335cab3783
5 changed files with 24 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pom.xml
View file

@ -18,7 +18,7 @@
<packaging>jar</packaging> <packaging>jar</packaging>
<properties> <properties>
<sebserver-version>1.4-rc1</sebserver-version> <sebserver-version>1.4.0-SNAPSHOT</sebserver-version>
<build-version>${sebserver-version}</build-version> <build-version>${sebserver-version}</build-version>
<revision>${sebserver-version}</revision> <revision>${sebserver-version}</revision>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

3
src/main/java/ch/ethz/seb/sebserver/gbl/model/session/RunningExamInfo.java
View file

@ -11,6 +11,7 @@ package ch.ethz.seb.sebserver.gbl.model.session;
import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import ch.ethz.seb.sebserver.gbl.Constants;
import ch.ethz.seb.sebserver.gbl.model.exam.Exam; import ch.ethz.seb.sebserver.gbl.model.exam.Exam;
import ch.ethz.seb.sebserver.gbl.model.institution.LmsSetup.LmsType; import ch.ethz.seb.sebserver.gbl.model.institution.LmsSetup.LmsType;
@ -47,7 +48,7 @@ public final class RunningExamInfo {
this.examId = exam.getModelId(); this.examId = exam.getModelId();
this.name = exam.name; this.name = exam.name;
this.url = exam.getStartURL(); this.url = exam.getStartURL();
this.lmsType = (lmsType == null) ? "" : lmsType.name(); this.lmsType = (lmsType == null) ? Constants.EMPTY_NOTE : lmsType.name();
} }
public String getExamId() { public String getExamId() {

3
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ExamDAOImpl.java
View file

@ -648,6 +648,9 @@ public class ExamDAOImpl implements ExamDAO {
.and( .and(
ExamRecordDynamicSqlSupport.status, ExamRecordDynamicSqlSupport.status,
isEqualTo(ExamStatus.RUNNING.name())) isEqualTo(ExamStatus.RUNNING.name()))
.and(
ExamRecordDynamicSqlSupport.lmsAvailable,
isEqualToWhenPresent(BooleanUtils.toIntegerObject(true)))
.build() .build()
.execute()); .execute());
} }

13
src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/ExamAPI_V1_Controller.java
View file

@ -137,6 +137,7 @@ public class ExamAPI_V1_Controller {
.getOrThrow() .getOrThrow()
.stream() .stream()
.map(this::createRunningExamInfo) .map(this::createRunningExamInfo)
.filter(this::checkConsistency)
.collect(Collectors.toList()); .collect(Collectors.toList());
} else { } else {
final Exam exam = this.examSessionService.getExamDAO() final Exam exam = this.examSessionService.getExamDAO()
@ -158,6 +159,18 @@ public class ExamAPI_V1_Controller {
this.executor); this.executor);
} }
private boolean checkConsistency(final RunningExamInfo info) {
if (StringUtils.isNotBlank(info.name) &&
StringUtils.isNotBlank(info.url) &&
StringUtils.isNotBlank(info.examId)) {
return true;
}
log.warn("Invalid running exam detected. Filter out exam : {}", info);
return false;
}
@RequestMapping( @RequestMapping(
path = API.EXAM_API_HANDSHAKE_ENDPOINT, path = API.EXAM_API_HANDSHAKE_ENDPOINT,
method = RequestMethod.PATCH, method = RequestMethod.PATCH,

9
src/test/resources/data-test-additional.sql
View file

@ -9,13 +9,14 @@ INSERT IGNORE INTO seb_client_configuration VALUES
INSERT IGNORE INTO additional_attributes VALUES INSERT IGNORE INTO additional_attributes VALUES
(1, 'SEB_CLIENT_CONFIGURATION', 2, 'vdiSetup', 'VM_WARE'), (1, 'SEB_CLIENT_CONFIGURATION', 2, 'vdiSetup', 'VM_WARE'),
(2, 'SEB_CLIENT_CONFIGURATION', 2, 'vdiExecutable', 'vmware-view.exe') (2, 'SEB_CLIENT_CONFIGURATION', 2, 'vdiExecutable', 'vmware-view.exe'),
(3, 'EXAM', 2, 'quiz_start_url', 'https://test.lms.mockup')
; ;
INSERT IGNORE INTO exam VALUES INSERT IGNORE INTO exam VALUES
(1, 1, 1, 'quiz1', 'admin', 'admin', 'MANAGED', null, null, 'UP_COMING', 1, 0, null, 1, null, null, null, null, null, null), (1, 1, 1, 'quiz1', 'admin', 'admin', 'MANAGED', null, null, 'UP_COMING', 1, 0, null, 1, null, null, 'quiz1', null, null, 1),
(2, 1, 1, 'quiz6', 'admin', 'admin', 'MANAGED', null, null, 'RUNNING', 1, 0, null, 1, null, null, null, null, null, null), (2, 1, 1, 'quiz6', 'admin', 'admin', 'MANAGED', null, null, 'RUNNING', 1, 0, null, 1, null, null, 'quiz6', null, null, 1),
(3, 1, 1, 'quiz3', 'admin', 'admin', 'MANAGED', null, null, 'FINISHED', 1, 0, null, 1, null, null, null, null, null, null) (3, 1, 1, 'quiz3', 'admin', 'admin', 'MANAGED', null, null, 'FINISHED', 1, 0, null, 1, null, null, 'quiz3', null, null, 1)
; ;
INSERT IGNORE INTO indicator VALUES INSERT IGNORE INTO indicator VALUES