From b850eb5767d646ffb8a3289af58a3ce539ba6640 Mon Sep 17 00:00:00 2001
From: Johan von Forstner <johan.forstner@gmail.com>
Date: Thu, 12 Oct 2017 20:38:33 +0200
Subject: [PATCH] DaVinciInfoserverParser: rooms, subjects (#50)

---
 .idea/modules.xml                             |  6 +--
 .idea/modules/parser/parser.iml               | 47 ++++++++++---------
 .idea/modules/sample/sample.iml               | 43 +++++++++--------
 .../modules/substitution-schedule-parser.iml  |  5 +-
 .../parser/DaVinciInfoserverParser.java       | 14 ++++--
 5 files changed, 66 insertions(+), 49 deletions(-)

diff --git a/.idea/modules.xml b/.idea/modules.xml
index 97afdca5..b34a36b7 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -3,11 +3,11 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/parser/parser.iml" filepath="$PROJECT_DIR$/.idea/modules/parser/parser.iml" />
-      <module fileurl="file://D:\Eigene Dateien\git\substitution-schedule-parser\.idea\modules\parser\parser_main.iml" filepath="D:\Eigene Dateien\git\substitution-schedule-parser\.idea\modules\parser\parser_main.iml" group="parser" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/parser/parser_main.iml" filepath="$PROJECT_DIR$/.idea/modules/parser/parser_main.iml" group="parser" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/parser/parser_test.iml" filepath="$PROJECT_DIR$/.idea/modules/parser/parser_test.iml" group="parser" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/sample/sample.iml" filepath="$PROJECT_DIR$/.idea/modules/sample/sample.iml" />
-      <module fileurl="file://D:\Eigene Dateien\git\substitution-schedule-parser\.idea\modules\sample\sample_main.iml" filepath="D:\Eigene Dateien\git\substitution-schedule-parser\.idea\modules\sample\sample_main.iml" group="sample" />
-      <module fileurl="file://D:\Eigene Dateien\git\substitution-schedule-parser\.idea\modules\sample\sample_test.iml" filepath="D:\Eigene Dateien\git\substitution-schedule-parser\.idea\modules\sample\sample_test.iml" group="sample" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/sample/sample_main.iml" filepath="$PROJECT_DIR$/.idea/modules/sample/sample_main.iml" group="sample" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/sample/sample_test.iml" filepath="$PROJECT_DIR$/.idea/modules/sample/sample_test.iml" group="sample" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/substitution-schedule-parser.iml" filepath="$PROJECT_DIR$/.idea/modules/substitution-schedule-parser.iml" />
     </modules>
   </component>
diff --git a/.idea/modules/parser/parser.iml b/.idea/modules/parser/parser.iml
index cb78ab83..0fefde14 100644
--- a/.idea/modules/parser/parser.iml
+++ b/.idea/modules/parser/parser.iml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":parser" external.linked.project.path="$MODULE_DIR$/../../../parser" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="me.vertretungsplan" external.system.module.version="1.0.0-beta159" type="JAVA_MODULE" version="4">
+<module external.linked.project.id=":parser" external.linked.project.path="$MODULE_DIR$/../../../parser" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="me.vertretungsplan" external.system.module.version="1.0.0-beta213" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager">
-    <output url="file://$MODULE_DIR$/../../../parser/build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/../../../parser/build/classes/test" />
+    <output url="file://$MODULE_DIR$/../../../parser/out/production/classes" />
+    <output-test url="file://$MODULE_DIR$/../../../parser/out/test/classes" />
     <exclude-output />
     <content url="file://$MODULE_DIR$/../../../parser">
       <sourceFolder url="file://$MODULE_DIR$/../../../parser/src/main/java" isTestSource="false" />
@@ -11,28 +11,33 @@
       <sourceFolder url="file://$MODULE_DIR$/../../../parser/src/test/resources" type="java-test-resource" />
       <excludeFolder url="file://$MODULE_DIR$/../../../parser/.gradle" />
       <excludeFolder url="file://$MODULE_DIR$/../../../parser/build" />
+      <excludeFolder url="file://$MODULE_DIR$/../../../parser/out" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Gradle: joda-time:joda-time:2.8.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.11" level="project" />
-    <orderEntry type="library" name="Gradle: commons-codec:commons-codec:1.9" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.httpcomponents:httpcore:4.4.6" level="project" />
-    <orderEntry type="library" name="Gradle: com.fasterxml.jackson.core:jackson-core:2.6.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.github.mangstadt:vinnie:2.0.0" level="project" />
-    <orderEntry type="library" name="Gradle: dk.brics.automaton:automaton:1.11-8" level="project" />
-    <orderEntry type="library" name="Gradle: commons-logging:commons-logging:1.2" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.httpcomponents:httpclient:4.5.3" level="project" />
-    <orderEntry type="library" name="Gradle: com.googlecode.juniversalchardet:juniversalchardet:1.0.3" level="project" />
-    <orderEntry type="library" name="Gradle: net.sf.biweekly:biweekly:0.6.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.github.mifmif:generex:1.0.2" level="project" />
-    <orderEntry type="library" name="Gradle: commons-io:commons-io:2.5" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.commons:commons-lang3:3.4" level="project" />
-    <orderEntry type="library" name="Gradle: org.json:json:20090211" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.httpcomponents:httpmime:4.5.3" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.httpcomponents:fluent-hc:4.5.3" level="project" />
     <orderEntry type="library" name="Gradle: org.jsoup:jsoup:1.9.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.apache.httpcomponents:fluent-hc:4.5.3" level="project" />
+    <orderEntry type="library" name="Gradle: org.apache.httpcomponents:httpmime:4.5.3" level="project" />
+    <orderEntry type="library" name="Gradle: org.json:json:20090211" level="project" />
+    <orderEntry type="library" name="Gradle: org.apache.commons:commons-lang3:3.4" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
+    <orderEntry type="library" name="Gradle: commons-io:commons-io:2.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.github.mifmif:generex:1.0.2" level="project" />
+    <orderEntry type="library" name="Gradle: net.sf.biweekly:biweekly:0.6.1" level="project" />
+    <orderEntry type="library" name="Gradle: com.googlecode.juniversalchardet:juniversalchardet:1.0.3" level="project" />
+    <orderEntry type="library" name="Gradle: org.bouncycastle:bcprov-jdk15on:1.56" level="project" />
+    <orderEntry type="library" name="Gradle: io.jsonwebtoken:jjwt:0.7.0" level="project" />
+    <orderEntry type="library" name="Gradle: org.apache.httpcomponents:httpclient:4.5.3" level="project" />
+    <orderEntry type="library" name="Gradle: commons-logging:commons-logging:1.2" level="project" />
+    <orderEntry type="library" name="Gradle: dk.brics.automaton:automaton:1.11-8" level="project" />
+    <orderEntry type="library" name="Gradle: com.github.mangstadt:vinnie:2.0.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.fasterxml.jackson.core:jackson-databind:2.8.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.apache.httpcomponents:httpcore:4.4.6" level="project" />
+    <orderEntry type="library" name="Gradle: commons-codec:commons-codec:1.9" level="project" />
+    <orderEntry type="library" name="Gradle: com.fasterxml.jackson.core:jackson-annotations:2.8.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.fasterxml.jackson.core:jackson-core:2.8.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.11" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/.idea/modules/sample/sample.iml b/.idea/modules/sample/sample.iml
index ea314901..b64c0bd2 100644
--- a/.idea/modules/sample/sample.iml
+++ b/.idea/modules/sample/sample.iml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module external.linked.project.id=":sample" external.linked.project.path="$MODULE_DIR$/../../../sample" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="substitution-schedule-parser" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager">
-    <output url="file://$MODULE_DIR$/../../../sample/build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/../../../sample/build/classes/test" />
+    <output url="file://$MODULE_DIR$/../../../sample/out/production/classes" />
+    <output-test url="file://$MODULE_DIR$/../../../sample/out/test/classes" />
     <exclude-output />
     <content url="file://$MODULE_DIR$/../../../sample">
       <sourceFolder url="file://$MODULE_DIR$/../../../sample/src/main/java" isTestSource="false" />
@@ -11,27 +11,32 @@
       <sourceFolder url="file://$MODULE_DIR$/../../../sample/src/test/resources" type="java-test-resource" />
       <excludeFolder url="file://$MODULE_DIR$/../../../sample/.gradle" />
       <excludeFolder url="file://$MODULE_DIR$/../../../sample/build" />
+      <excludeFolder url="file://$MODULE_DIR$/../../../sample/out" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="parser" />
-    <orderEntry type="library" name="Gradle: commons-codec:commons-codec:1.9" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.httpcomponents:httpcore:4.4.6" level="project" />
-    <orderEntry type="library" name="Gradle: com.fasterxml.jackson.core:jackson-core:2.6.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.github.mangstadt:vinnie:2.0.0" level="project" />
-    <orderEntry type="library" name="Gradle: dk.brics.automaton:automaton:1.11-8" level="project" />
-    <orderEntry type="library" name="Gradle: commons-logging:commons-logging:1.2" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.httpcomponents:httpclient:4.5.3" level="project" />
-    <orderEntry type="library" name="Gradle: com.googlecode.juniversalchardet:juniversalchardet:1.0.3" level="project" />
-    <orderEntry type="library" name="Gradle: net.sf.biweekly:biweekly:0.6.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.github.mifmif:generex:1.0.2" level="project" />
-    <orderEntry type="library" name="Gradle: commons-io:commons-io:2.5" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.commons:commons-lang3:3.4" level="project" />
-    <orderEntry type="library" name="Gradle: org.json:json:20090211" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.httpcomponents:httpmime:4.5.3" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.httpcomponents:fluent-hc:4.5.3" level="project" />
-    <orderEntry type="library" name="Gradle: org.jsoup:jsoup:1.9.2" level="project" />
     <orderEntry type="library" name="Gradle: joda-time:joda-time:2.8.1" level="project" />
+    <orderEntry type="library" name="Gradle: org.jsoup:jsoup:1.9.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.apache.httpcomponents:fluent-hc:4.5.3" level="project" />
+    <orderEntry type="library" name="Gradle: org.apache.httpcomponents:httpmime:4.5.3" level="project" />
+    <orderEntry type="library" name="Gradle: org.json:json:20090211" level="project" />
+    <orderEntry type="library" name="Gradle: org.apache.commons:commons-lang3:3.4" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
+    <orderEntry type="library" name="Gradle: commons-io:commons-io:2.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.github.mifmif:generex:1.0.2" level="project" />
+    <orderEntry type="library" name="Gradle: net.sf.biweekly:biweekly:0.6.1" level="project" />
+    <orderEntry type="library" name="Gradle: com.googlecode.juniversalchardet:juniversalchardet:1.0.3" level="project" />
+    <orderEntry type="library" name="Gradle: org.bouncycastle:bcprov-jdk15on:1.56" level="project" />
+    <orderEntry type="library" name="Gradle: io.jsonwebtoken:jjwt:0.7.0" level="project" />
+    <orderEntry type="library" name="Gradle: org.apache.httpcomponents:httpclient:4.5.3" level="project" />
+    <orderEntry type="library" name="Gradle: commons-logging:commons-logging:1.2" level="project" />
+    <orderEntry type="library" name="Gradle: dk.brics.automaton:automaton:1.11-8" level="project" />
+    <orderEntry type="library" name="Gradle: com.github.mangstadt:vinnie:2.0.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.fasterxml.jackson.core:jackson-databind:2.8.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.apache.httpcomponents:httpcore:4.4.6" level="project" />
+    <orderEntry type="library" name="Gradle: commons-codec:commons-codec:1.9" level="project" />
+    <orderEntry type="library" name="Gradle: com.fasterxml.jackson.core:jackson-annotations:2.8.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.fasterxml.jackson.core:jackson-core:2.8.2" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/.idea/modules/substitution-schedule-parser.iml b/.idea/modules/substitution-schedule-parser.iml
index dd6e37ef..f268a10b 100644
--- a/.idea/modules/substitution-schedule-parser.iml
+++ b/.idea/modules/substitution-schedule-parser.iml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module external.linked.project.id="substitution-schedule-parser" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager">
-    <output url="file://$MODULE_DIR$/../../build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/../../build/classes/test" />
+    <output url="file://$MODULE_DIR$/../../out/production/classes" />
+    <output-test url="file://$MODULE_DIR$/../../out/test/classes" />
     <exclude-output />
     <content url="file://$MODULE_DIR$/../..">
       <excludeFolder url="file://$MODULE_DIR$/../../.gradle" />
       <excludeFolder url="file://$MODULE_DIR$/../../build" />
+      <excludeFolder url="file://$MODULE_DIR$/../../out" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
diff --git a/parser/src/main/java/me/vertretungsplan/parser/DaVinciInfoserverParser.java b/parser/src/main/java/me/vertretungsplan/parser/DaVinciInfoserverParser.java
index 61ffced8..e3c44502 100644
--- 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"));