Update MensaParser for new Mensa website

Version 1.14.3 also included a vulnerability (CVE-2022-36033) that got fixed with 1.15.3.

build.gradle

@@ -16,7 +16,7 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-web'
     implementation 'org.jetbrains.kotlin:kotlin-stdlib'
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.1'
-    implementation 'org.jsoup:jsoup:1.14.3'
+    implementation 'org.jsoup:jsoup:1.15.3'
     implementation 'com.google.code.gson:gson:2.9.0'
 
     testImplementation 'org.junit.jupiter:junit-jupiter:5.8.2'

src/main/kotlin/org/mosad/thecitadelofricks/controller/StartupController.kt

@@ -44,7 +44,7 @@ class StartupController {
         var cachetAPIKey = "0"
         var cachetBaseURL = "https://status.mosad.xyz"
         var courseListURL = "https://www.hs-offenburg.de/studium/vorlesungsplaene/"
-        var mensaMenuURL = "https://www.swfr.de/essen-trinken/speiseplaene/mensa-offenburg/"
+        var mensaMenuURL = "https://www.swfr.de/essen/mensen-cafes-speiseplaene/mensa-offenburg"
         var mensaName = "Offenburg"
     }
 
@@ -77,29 +77,21 @@ class StartupController {
         val properties = Properties()
         properties.loadFromXML(FileInputStream(fileConfig))
 
-        cachetAPIKey = try {
+        try {
-            properties.getProperty("cachetAPIKey")
+            cachetAPIKey = properties.getProperty("cachetAPIKey")
-        } catch (ex: Exception) {
+        } catch (_: Exception) {}
-            "0"
-        }
 
-        cachetBaseURL = try {
+        try {
-            properties.getProperty("cachetBaseURL")
+            cachetBaseURL = properties.getProperty("cachetBaseURL")
-        } catch (ex: Exception) {
+        } catch (_: Exception) {}
-            "https://status.mosad.xyz"
-        }
 
-        mensaMenuURL = try {
+        try {
-            properties.getProperty("mensaMenuURL")
+            mensaMenuURL = properties.getProperty("mensaMenuURL")
-        } catch (ex: Exception) {
+        } catch (_: Exception) {}
-            "https://www.swfr.de/essen-trinken/speiseplaene/mensa-offenburg/"
-        }
 
-        mensaName = try {
+        try {
-            properties.getProperty("mensaName")
+            mensaName = properties.getProperty("mensaName")
-        } catch (ex: Exception) {
+        } catch (_: Exception) {}
-            "Offenburg"
-        }
 
     } catch (ex: Exception) {
         logger.error("error while loading config", ex)
@@ -111,10 +103,10 @@ class StartupController {
     private fun createConfig() = try {
         val properties = Properties()
 
-        properties.setProperty("cachetAPIKey", "0")
+        properties.setProperty("cachetAPIKey", cachetAPIKey)
-        properties.setProperty("cachetBaseURL", "https://status.mosad.xyz")
+        properties.setProperty("cachetBaseURL", cachetBaseURL)
-        properties.setProperty("mensaMenuURL", "https://www.swfr.de/essen-trinken/speiseplaene/mensa-offenburg/")
+        properties.setProperty("mensaMenuURL", mensaMenuURL)
-        properties.setProperty("mensaName", "Offenburg")
+        properties.setProperty("mensaName", mensaName)
 
         val outputStream = FileOutputStream(fileConfig)
         properties.storeToXML(outputStream, "tcor configuration")

src/main/kotlin/org/mosad/thecitadelofricks/hsoparser/MensaParser.kt

@@ -59,14 +59,14 @@ class MensaParser {
         val mealWeekList = MensaWeek()
 
         try {
-            htmlDoc.select("#speiseplan-tabs").select("div.tab-content").select("div.menu-tagesplan")
+            htmlDoc.select("#tabsWeekdaysMenu").select("div.menu-tagesplan")
                 .forEachIndexed { dayIndex, day ->
                     val strDay = day.select("h3").text()
 
-                    day.select("div.row").forEachIndexed { _, meal ->
+                    day.select("div.menu-tagesplan > div.grid").first()?.select("div.flex-col")?.forEachIndexed { _, meal ->
-                        val heading = meal.select("h4.menu-header").text()
+                        val heading = meal.select("h5").text()
-                        val parts = ArrayList(meal.select("div.menu-info").html().substringBefore("<br><span").replace("\n", "").split("<br>"))
+                        val parts = ArrayList(meal.select("small.extra-text").html().split("<br>").map { it.trim() })
-                        val additives = meal.select("span.show-with-allergenes").text()
+                        val additives = meal.select("small.zusatzsstoffe[x-show=showAllergenes]").text()
                         parts.removeIf { x -> x.isEmpty() || x.isBlank() }
 
                         mealWeekList.days[dayIndex].meals.add(Meal(strDay, heading, parts, additives))
@@ -87,8 +87,7 @@ class MensaParser {
      */
     fun getMenuLinkNextWeek(mensaMenuURL: String): String {
         val menuHTML = Jsoup.connect(mensaMenuURL).get()
-
+        return "https://www.swfr.de" + menuHTML.select("div.section-mensa").select("a.next-week").attr("href")
-        return "https://www.swfr.de" + menuHTML.select("#speiseplan-tabs").select("a.next-week").attr("href")
     }
 
 }