DaVinciInfoserverParser: rooms, subjects (#50)

vertretungsplanme · Oct 12, 2017 · b850eb5 · b850eb5
1 parent 89a0c3a
commit b850eb5
Show file tree

Hide file tree

Showing 5 changed files with 66 additions and 49 deletions.
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/modules/parser/parser.iml b/.idea/modules/parser/parser.iml
diff --git a/.idea/modules/sample/sample.iml b/.idea/modules/sample/sample.iml
diff --git a/.idea/modules/substitution-schedule-parser.iml b/.idea/modules/substitution-schedule-parser.iml
diff --git a/parser/src/main/java/me/vertretungsplan/parser/DaVinciInfoserverParser.java b/parser/src/main/java/me/vertretungsplan/parser/DaVinciInfoserverParser.java
@@ -15,6 +15,7 @@
 import me.vertretungsplan.objects.SubstitutionScheduleDay;
 import me.vertretungsplan.objects.credential.UserPasswordCredential;
 import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.http.client.HttpResponseException;
@@ -132,10 +133,15 @@ private static SubstitutionSchedule parseDaVinciJson(JSONObject json, Substituti
                     timeFmt.parseLocalTime(lesson.getString("startTime")),
                     timeFmt.parseLocalTime(lesson.getString("endTime"))));
 
-            if (changes.has("lessonTitle")) {
-                substitution.setSubject(changes.getString("lessonTitle"));
-            } else if (lesson.has("courseTitle")) {
-                substitution.setSubject(lesson.getString("courseTitle"));
+            substitution.setPreviousSubject(changes.optString("subjectCode", null));
+            substitution.setSubject(changes.optString("newSubjectCode", null));
+
+            if (lesson.has("roomCodes")) {
+                substitution.setRoom(StringUtils.join(toStringList(lesson.getJSONArray("roomCodes")), ", "));
+            }
+            if (changes.has("absentRoomCodes")) {
+                substitution.setPreviousRoom(
+                        StringUtils.join(toStringList(changes.getJSONArray("absentRoomCodes")), ", "));
             }
 
             substitution.setType(changes.optString("caption", "Vertretung"));