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

Moodle quiz recovery | additional attributes value size check

Browse source
This commit is contained in:
anhefti 2022-05-25 10:11:49 +02:00
parent 7b582f95dc
commit b60d5ebf61
3 changed files with 21 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/AdditionalAttributesDAOImpl.java
View file

@ -21,6 +21,7 @@ import org.springframework.transaction.annotation.Transactional;
import ch.ethz.seb.sebserver.gbl.api.EntityType; import ch.ethz.seb.sebserver.gbl.api.EntityType;
import ch.ethz.seb.sebserver.gbl.profile.WebServiceProfile; import ch.ethz.seb.sebserver.gbl.profile.WebServiceProfile;
import ch.ethz.seb.sebserver.gbl.util.Result; import ch.ethz.seb.sebserver.gbl.util.Result;
import ch.ethz.seb.sebserver.gbl.util.Utils;
import ch.ethz.seb.sebserver.webservice.datalayer.batis.mapper.AdditionalAttributeRecordDynamicSqlSupport; import ch.ethz.seb.sebserver.webservice.datalayer.batis.mapper.AdditionalAttributeRecordDynamicSqlSupport;
import ch.ethz.seb.sebserver.webservice.datalayer.batis.mapper.AdditionalAttributeRecordMapper; import ch.ethz.seb.sebserver.webservice.datalayer.batis.mapper.AdditionalAttributeRecordMapper;
import ch.ethz.seb.sebserver.webservice.datalayer.batis.model.AdditionalAttributeRecord; import ch.ethz.seb.sebserver.webservice.datalayer.batis.model.AdditionalAttributeRecord;
@ -124,7 +125,7 @@ public class AdditionalAttributesDAOImpl implements AdditionalAttributesDAO {
type.name(), type.name(),
entityId, entityId,
name, name,
value); Utils.truncateText(value, 4000));
this.additionalAttributeRecordMapper this.additionalAttributeRecordMapper
.updateByPrimaryKeySelective(rec); .updateByPrimaryKeySelective(rec);
@ -136,7 +137,7 @@ public class AdditionalAttributesDAOImpl implements AdditionalAttributesDAO {
type.name(), type.name(),
entityId, entityId,
name, name,
value); Utils.truncateText(value, 4000));
this.additionalAttributeRecordMapper this.additionalAttributeRecordMapper
.insert(rec); .insert(rec);

26
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/ExamSessionControlTask.java
View file

@ -170,19 +170,21 @@ public class ExamSessionControlTask implements DisposableBean {
}); });
// update per LMS Setup // update per LMS Setup
examToLMSMapping.entrySet().stream().forEach(updateEntry -> { examToLMSMapping.entrySet()
final Result<Set<String>> updateExamFromLMS = this.examUpdateHandler .stream()
.updateExamFromLMS(updateEntry.getKey(), updateEntry.getValue()); .forEach(updateEntry -> {
final Result<Set<String>> updateExamFromLMS = this.examUpdateHandler
.updateExamFromLMS(updateEntry.getKey(), updateEntry.getValue());
if (updateExamFromLMS.hasError()) { if (updateExamFromLMS.hasError()) {
log.error("Failed to update exams from LMS: ", updateExamFromLMS.getError()); log.error("Failed to update exams from LMS: ", updateExamFromLMS.getError());
} else { } else {
final Set<String> failedExams = updateExamFromLMS.get(); final Set<String> failedExams = updateExamFromLMS.get();
if (!failedExams.isEmpty()) { if (!failedExams.isEmpty()) {
log.warn("Failed to update following exams from LMS: {}", failedExams); log.warn("Failed to update following exams from LMS: {}", failedExams);
} }
} }
}); });
} catch (final Exception e) { } catch (final Exception e) {
log.error("Unexpected error while update exams from LMS: ", e); log.error("Unexpected error while update exams from LMS: ", e);

6
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/ExamUpdateHandler.java
View file

@ -24,6 +24,7 @@ import org.springframework.context.ApplicationEventPublisher;
import org.springframework.context.annotation.Lazy; import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
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.exam.Exam.ExamStatus; import ch.ethz.seb.sebserver.gbl.model.exam.Exam.ExamStatus;
import ch.ethz.seb.sebserver.gbl.model.exam.QuizData; import ch.ethz.seb.sebserver.gbl.model.exam.QuizData;
@ -243,7 +244,8 @@ class ExamUpdateHandler {
log.info("Try to recover quiz data for Moodle quiz with internal identifier: {}", quizId); log.info("Try to recover quiz data for Moodle quiz with internal identifier: {}", quizId);
if (exam != null && exam.name != null) { if (exam != null && exam.name != null
&& !exam.name.startsWith(Constants.SQUARE_BRACE_OPEN.toString())) {
log.debug("Found formerName quiz name: {}", exam.name); log.debug("Found formerName quiz name: {}", exam.name);
@ -282,7 +284,7 @@ class ExamUpdateHandler {
} }
} }
if (exam.isLmsAvailable()) { if (exam.lmsAvailable == null || exam.isLmsAvailable()) {
this.examDAO.markLMSAvailability(quizId, false, updateId); this.examDAO.markLMSAvailability(quizId, false, updateId);
} }
throw new RuntimeException("Not Available"); throw new RuntimeException("Not Available");