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

SEBSERV-400 fixed warning logs

Browse source
This commit is contained in:
anhefti 2023-03-22 15:38:39 +01:00
parent a838c96c3a
commit 97da558d18
1 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/moodle/plugin/MoodlePluginCourseRestriction.java
View file

@ -49,6 +49,7 @@ public class MoodlePluginCourseRestriction implements SEBRestrictionAPI {
public static final String ATTRIBUTE_QUIT_SECRET = "quitsecret"; public static final String ATTRIBUTE_QUIT_SECRET = "quitsecret";
private static final String DELETED_RESTRICTION_WARNING = "You have deleted restriction"; private static final String DELETED_RESTRICTION_WARNING = "You have deleted restriction";
private static final String RESTRICTION_NOT_SET_WARNING = "SEB Server is not enabled for quiz";
private final JSONMapper jsonMapper; private final JSONMapper jsonMapper;
private final MoodleRestTemplateFactory restTemplateFactory; private final MoodleRestTemplateFactory restTemplateFactory;
@ -179,9 +180,12 @@ public class MoodlePluginCourseRestriction implements SEBRestrictionAPI {
addQuery, addQuery,
queryAttributes); queryAttributes);
final SEBRestriction restrictionFromJson = restrictionFromJson(exam, srJSON); final SEBRestriction restriction = restrictionFromJson(exam, srJSON);
if (StringUtils.isNotBlank(restrictionFromJson.warningMessage)) { if (StringUtils.isNotBlank(restriction.warningMessage)) {
throw new RuntimeException("LMS Warnings: " + restrictionFromJson.warningMessage); if (restriction.warningMessage.contains(DELETED_RESTRICTION_WARNING)) {
return exam;
}
throw new RuntimeException("LMS Warnings: " + restriction.warningMessage);
} }
return exam; return exam;
@ -215,7 +219,13 @@ public class MoodlePluginCourseRestriction implements SEBRestrictionAPI {
.collect(Collectors.toList()), .collect(Collectors.toList()),
Constants.LIST_SEPARATOR); Constants.LIST_SEPARATOR);
log.warn("Warnings from Moodle: {}", moodleRestrictions.warnings); if (!warningMessages.contains(DELETED_RESTRICTION_WARNING)) {
if (warningMessages.contains(RESTRICTION_NOT_SET_WARNING)) {
log.info("Message from Moodle: {}", moodleRestrictions.warnings);
} else {
log.warn("Warnings from Moodle: {}", moodleRestrictions.warnings);
}
}
} }
return toSEBRestriction(exam, moodleRestrictions, warningMessages); return toSEBRestriction(exam, moodleRestrictions, warningMessages);
@ -238,10 +248,6 @@ public class MoodlePluginCourseRestriction implements SEBRestrictionAPI {
final MoodleQuizRestrictions moodleRestrictions, final MoodleQuizRestrictions moodleRestrictions,
final String warnings) { final String warnings) {
if (moodleRestrictions.warnings != null && !moodleRestrictions.warnings.isEmpty()) {
log.warn("Moodle restriction call warnings: {}", moodleRestrictions.warnings);
}
if (moodleRestrictions.data == null || moodleRestrictions.data.isEmpty()) { if (moodleRestrictions.data == null || moodleRestrictions.data.isEmpty()) {
if (StringUtils.isNotBlank(warnings)) { if (StringUtils.isNotBlank(warnings)) {
return new SEBRestriction( return new SEBRestriction(