MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fix json serialization for stepic adaptive courses which has no files and no subtasks

Browse Source
This commit is contained in:
Valentina Kiryushkina
2016-12-05 14:22:23 +03:00
parent f741b6b83f
commit c4f1fffcdb
1 changed files with 31 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/educational-core/student/src/com/jetbrains/edu/learning/StudySerializationUtils.java
+31 -25
View File
@@ -476,23 +476,26 @@ public class StudySerializationUtils {
}
private static JsonObject convertSubtaskInfosToMap(JsonObject stepOptionsJson) {
for (JsonElement taskFileElement : stepOptionsJson.getAsJsonArray(FILES)) {
JsonObject taskFileObject = taskFileElement.getAsJsonObject();
JsonArray placeholders = taskFileObject.getAsJsonArray(PLACEHOLDERS);
for (JsonElement placeholder : placeholders) {
JsonObject placeholderObject = placeholder.getAsJsonObject();
JsonArray infos = placeholderObject.getAsJsonArray(SUBTASK_INFOS);
Map<Integer, JsonObject> objectsToInsert = new HashMap<>();
for (JsonElement info : infos) {
JsonObject object = info.getAsJsonObject();
int index = object.getAsJsonPrimitive(INDEX).getAsInt();
objectsToInsert.put(index, object);
}
placeholderObject.remove(SUBTASK_INFOS);
JsonObject newInfos = new JsonObject();
placeholderObject.add(SUBTASK_INFOS, newInfos);
for (Map.Entry<Integer, JsonObject> entry : objectsToInsert.entrySet()) {
newInfos.add(entry.getKey().toString(), entry.getValue());
final JsonArray files = stepOptionsJson.getAsJsonArray(FILES);
if (files != null) {
for (JsonElement taskFileElement : files) {
JsonObject taskFileObject = taskFileElement.getAsJsonObject();
JsonArray placeholders = taskFileObject.getAsJsonArray(PLACEHOLDERS);
for (JsonElement placeholder : placeholders) {
JsonObject placeholderObject = placeholder.getAsJsonObject();
JsonArray infos = placeholderObject.getAsJsonArray(SUBTASK_INFOS);
Map<Integer, JsonObject> objectsToInsert = new HashMap<>();
for (JsonElement info : infos) {
JsonObject object = info.getAsJsonObject();
int index = object.getAsJsonPrimitive(INDEX).getAsInt();
objectsToInsert.put(index, object);
}
placeholderObject.remove(SUBTASK_INFOS);
JsonObject newInfos = new JsonObject();
placeholderObject.add(SUBTASK_INFOS, newInfos);
for (Map.Entry<Integer, JsonObject> entry : objectsToInsert.entrySet()) {
newInfos.add(entry.getKey().toString(), entry.getValue());
}
}
}
}
@@ -501,14 +504,17 @@ public class StudySerializationUtils {
private static JsonObject convertToSecondVersion(JsonObject stepOptionsJson) {
Gson gson = new GsonBuilder().setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES).create();
for (JsonElement taskFileElement : stepOptionsJson.getAsJsonArray(FILES)) {
JsonObject taskFileObject = taskFileElement.getAsJsonObject();
JsonArray placeholders = taskFileObject.getAsJsonArray(PLACEHOLDERS);
for (JsonElement placeholder : placeholders) {
JsonObject placeholderObject = placeholder.getAsJsonObject();
convertToAbsoluteOffset(taskFileObject, placeholderObject);
convertMultipleHints(gson, placeholderObject);
convertToSubtaskInfo(placeholderObject);
final JsonArray files = stepOptionsJson.getAsJsonArray(FILES);
if (files != null) {
for (JsonElement taskFileElement : files) {
JsonObject taskFileObject = taskFileElement.getAsJsonObject();
JsonArray placeholders = taskFileObject.getAsJsonArray(PLACEHOLDERS);
for (JsonElement placeholder : placeholders) {
JsonObject placeholderObject = placeholder.getAsJsonObject();
convertToAbsoluteOffset(taskFileObject, placeholderObject);
convertMultipleHints(gson, placeholderObject);
convertToSubtaskInfo(placeholderObject);
}
}
}
return stepOptionsJson;