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

SEBSERV-479 fixed

Browse source
This commit is contained in:
anhefti 2023-11-21 16:46:20 +01:00
parent 6be552b8d3
commit 455d9809c3
1 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/moodle/MoodleUtils.java
View file

@ -37,7 +37,7 @@ public abstract class MoodleUtils {
private static final Logger log = LoggerFactory.getLogger(MoodleUtils.class); private static final Logger log = LoggerFactory.getLogger(MoodleUtils.class);
public static final String getInternalQuizId( public static String getInternalQuizId(
final String quizId, final String quizId,
final String courseId, final String courseId,
final String shortname, final String shortname,
@ -47,13 +47,25 @@ public abstract class MoodleUtils {
new String[] { new String[] {
quizId, quizId,
courseId, courseId,
StringUtils.isNotBlank(shortname) ? shortname : Constants.EMPTY_NOTE, StringUtils.isNotBlank(shortname) ? maskShortName(shortname) : Constants.EMPTY_NOTE,
StringUtils.isNotBlank(idnumber) ? idnumber : Constants.EMPTY_NOTE StringUtils.isNotBlank(idnumber) ? idnumber : Constants.EMPTY_NOTE
}, },
Constants.COLON); Constants.COLON);
} }
public static final String getQuizId(final String internalQuizId) { private static String maskShortName(final String shortname) {
return shortname
.replace(Constants.SEMICOLON.toString(), "_SC_")
.replace(Constants.COLON.toString(), "_COLON_");
}
private static String unmaskShortName(final String shortname) {
return shortname
.replace("_SC_", Constants.SEMICOLON.toString())
.replace("_COLON_", Constants.COLON.toString());
}
public static String getQuizId(final String internalQuizId) {
if (StringUtils.isBlank(internalQuizId)) { if (StringUtils.isBlank(internalQuizId)) {
return null; return null;
} }
@ -61,7 +73,7 @@ public abstract class MoodleUtils {
return StringUtils.split(internalQuizId, Constants.COLON)[0]; return StringUtils.split(internalQuizId, Constants.COLON)[0];
} }
public static final String getCourseId(final String internalQuizId) { public static String getCourseId(final String internalQuizId) {
if (StringUtils.isBlank(internalQuizId)) { if (StringUtils.isBlank(internalQuizId)) {
return null; return null;
} }
@ -69,7 +81,7 @@ public abstract class MoodleUtils {
return StringUtils.split(internalQuizId, Constants.COLON)[1]; return StringUtils.split(internalQuizId, Constants.COLON)[1];
} }
public static final String getShortname(final String internalQuizId) { public static String getShortname(final String internalQuizId) {
if (StringUtils.isBlank(internalQuizId)) { if (StringUtils.isBlank(internalQuizId)) {
return null; return null;
} }
@ -80,7 +92,7 @@ public abstract class MoodleUtils {
} }
final String shortName = split[2]; final String shortName = split[2];
return shortName.equals(Constants.EMPTY_NOTE) ? null : shortName; return shortName.equals(Constants.EMPTY_NOTE) ? null : unmaskShortName(shortName);
} }
public static final String getIdnumber(final String internalQuizId) { public static final String getIdnumber(final String internalQuizId) {