udapte README.md

Reviewed-on: #32

Dockerfile

@@ -1,6 +1,7 @@
-FROM adoptopenjdk/openjdk11:alpine-jre
+FROM eclipse-temurin:21-jre-alpine
 RUN addgroup -S spring && adduser -S spring -G spring
 #RUN groupadd -r spring && useradd -r -g spring spring # for openjdk:xx builds
+RUN mkdir /tcor && chown spring:spring /tcor
 USER spring:spring
 ARG JAR_FILE=build/libs/*.jar
 COPY ${JAR_FILE} thecitadelofricks.jar

README.md

@@ -1,8 +1,7 @@
 ![Website](https://img.shields.io/website?down_color=red&down_message=offline&label=tcor.mosad.xyz&up_color=brightgreen&up_message=online&url=https%3A%2F%2Ftcor.mosad.xyz%2Fhealth)
-[![Build Status](https://ci.mosad.xyz/api/badges/Seil0/TheCitadelofRicks/status.svg)](https://ci.mosad.xyz/Seil0/TheCitadelofRicks)
 [![Release](https://img.shields.io/badge/dynamic/json.svg?label=release&url=https://git.mosad.xyz/api/v1/repos/Seil0/TheCitadelofRicks/releases&query=$[0].tag_name)](https://git.mosad.xyz/Seil0/TheCitadelofRicks/releases)
 [![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
 # TheCitadelofRicks
 
 The API backend for [ProjectLaogai](https://git.mosad.xyz/Seil0/ProjectLaogai).
-The documentation can be found in the [wiki](https://git.mosad.xyz/Seil0/TheCitadelofRicks/wiki).
+The documentation can be found in the [wiki](https://git.mosad.xyz/Seil0/TheCitadelofRicks/wiki).

build.gradle

@@ -1,8 +1,8 @@
 plugins {
-    id 'org.jetbrains.kotlin.jvm' version '1.6.20'
+    id 'org.jetbrains.kotlin.jvm' version '1.9.23'
-    id 'org.jetbrains.kotlin.plugin.spring' version '1.6.20'
+    id 'org.jetbrains.kotlin.plugin.spring' version '1.9.23'
-    id 'org.springframework.boot' version '2.6.6'
+    id 'org.springframework.boot' version '3.2.4'
-    id 'io.spring.dependency-management' version '1.0.11.RELEASE'
+    id 'io.spring.dependency-management' version '1.1.4'
 }
 
 group 'org.mosad'
@@ -13,13 +13,13 @@ repositories {
 }
 
 dependencies {
-    implementation 'org.springframework.boot:spring-boot-starter-web'
+    implementation 'org.springframework.boot:spring-boot-starter-web:3.2.4'
-    implementation 'org.jetbrains.kotlin:kotlin-stdlib'
+    implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.9.23'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.1'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0'
-    implementation 'org.jsoup:jsoup:1.15.3'
+    implementation 'org.jsoup:jsoup:1.17.2'
-    implementation 'com.google.code.gson:gson:2.9.0'
+    implementation 'com.google.code.gson:gson:2.10.1'
 
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.8.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
 }
 
 test {
@@ -30,10 +30,9 @@ test {
     }
 }
 
-def jvmTargetVersion = "11"
+def jvmTargetVersion = "21"
 compileKotlin {
     kotlinOptions.jvmTarget = jvmTargetVersion
-    kotlinOptions.freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn"
 }
 compileJava {
     targetCompatibility = jvmTargetVersion

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,10 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# This is normally unused
-
+# shellcheck disable=SC2034
-APP_NAME="Gradle"
 APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
@@ -143,12 +143,16 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -205,6 +209,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+set EXIT_CODE=%ERRORLEVEL%
-exit /b 1
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

src/main/kotlin/org/mosad/thecitadelofricks/APIController.kt

@@ -26,12 +26,16 @@ import org.mosad.thecitadelofricks.controller.CacheController
 import org.mosad.thecitadelofricks.controller.CacheController.Companion.courseList
 import org.mosad.thecitadelofricks.controller.CacheController.Companion.getLesson
 import org.mosad.thecitadelofricks.controller.CacheController.Companion.getLessonSubjectList
+import org.mosad.thecitadelofricks.controller.CacheController.Companion.getRoomSchedule
 import org.mosad.thecitadelofricks.controller.CacheController.Companion.getTimetable
 import org.mosad.thecitadelofricks.controller.CacheController.Companion.mensaMenu
+import org.mosad.thecitadelofricks.controller.CacheController.Companion.roomList
 import org.mosad.thecitadelofricks.controller.StartupController
 import org.mosad.thecitadelofricks.controller.StatusController.Companion.getStatus
 import org.mosad.thecitadelofricks.controller.StatusController.Companion.updateCourseListRequests
 import org.mosad.thecitadelofricks.controller.StatusController.Companion.updateMensaMenuRequests
+import org.mosad.thecitadelofricks.controller.StatusController.Companion.updateRoomListRequests
+import org.mosad.thecitadelofricks.controller.StatusController.Companion.updateRoomScheduleRequests
 import org.mosad.thecitadelofricks.controller.StatusController.Companion.updateTimetableRequests
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
@@ -48,7 +52,7 @@ class APIController {
     private val logger: Logger = LoggerFactory.getLogger(APIController::class.java)
 
     companion object {
-        const val apiVersion = "1.3.0"
+        const val apiVersion = "1.4.0"
         const val softwareVersion = "1.3.1"
         val startTime = System.currentTimeMillis() / 1000
     }
@@ -98,12 +102,29 @@ class APIController {
         @RequestParam(value = "course", defaultValue = "AI4") courseName: String,
         @RequestParam(value = "subject", defaultValue = "Mathematik 4") lessonSubject: String,
         @RequestParam(value = "week", defaultValue = "0") week: Int
-    ): ArrayList<Lesson> {
+    ): ArrayList<LessonWithRoom> {
         logger.info("lesson request at ${LocalDateTime.now()}!")
         updateTimetableRequests(courseName)
         return getLesson(courseName, lessonSubject, week)
     }
 
+    @RequestMapping("/roomList")
+    fun roomList(): RoomsListRet {
+        logger.info("roomList request at ${LocalDateTime.now()}!")
+        updateRoomListRequests()
+        return RoomsListRet(roomList.meta, ArrayList(roomList.rooms.values))
+    }
+
+    @RequestMapping("/roomSchedule")
+    fun roomSchedule(
+        @RequestParam(value = "room", defaultValue = "B040") roomName: String,
+        @RequestParam(value = "week", defaultValue = "0") week: Int
+    ): RoomScheduleWeekRet {
+        logger.info("roomSchedule request at ${LocalDateTime.now()}!")
+        updateRoomScheduleRequests(roomName)
+        return getRoomSchedule(roomName, week)
+    }
+
     @RequestMapping("/status")
     fun status(): Status {
         logger.info("status request at ${LocalDateTime.now()}!")

src/main/kotlin/org/mosad/thecitadelofricks/DataTypes.kt

@@ -49,7 +49,7 @@ data class MensaMenu(val meta: MensaMeta, val currentWeek: MensaWeek, val nextWe
 
 data class CalendarWeek(val week: Int, val year: Int)
 
-data class Lesson(
+data class LessonWithRoom(
     val lessonID: String,
     val lessonSubject: String,
     val lessonTeacher: String,
@@ -57,13 +57,33 @@ data class Lesson(
     val lessonRemark: String
 )
 
-data class TimetableDay(val timeslots: Array<ArrayList<Lesson>> = Array(6) { ArrayList<Lesson>() })
+data class LessonWithCourse(
+    val lessonID: String,
+    val lessonSubject: String,
+    val lessonTeacher: String,
+    val lessonCourse: String,
+    val lessonRemark: String
+)
 
-data class TimetableWeek(val days: Array<TimetableDay> = Array(6) { TimetableDay() })
+data class TimetableDay<Lesson>(val timeslots: Array<ArrayList<Lesson>> = Array(6) { ArrayList<Lesson>() })
 
-data class TimetableCourseMeta(var updateTime: Long = 0, val courseName: String = "", val weekIndex: Int = 0, var weekNumberYear: Int = 0, val year: Int = 0, val link: String = "")
+data class TimetableWeek<Lesson>(val days: Array<TimetableDay<Lesson>> = Array(6) { TimetableDay() })
 
-data class TimetableCourseWeek(val meta: TimetableCourseMeta = TimetableCourseMeta(), var timetable: TimetableWeek = TimetableWeek())
+data class TimetableCourseMeta(var updateTime: Long = 0, val courseName: String = "", val weekIndex: Int = 0, var weekNumberYear: Int = 0, var year: Int = 0, val link: String = "")
+
+data class TimetableCourseWeek(val meta: TimetableCourseMeta = TimetableCourseMeta(), var timetable: TimetableWeek<LessonWithRoom> = TimetableWeek())
+
+// data classes for the room occupancy part
+data class Room(val roomName: String, val roomLink: String)
+
+data class RoomsMeta(val updateTime: Long = 0, val totalRooms: Int = 0)
+
+data class RoomsList(val meta: RoomsMeta = RoomsMeta(), val rooms: SortedMap<String, Room>)
+data class RoomsListRet(val meta: RoomsMeta = RoomsMeta(), val rooms: ArrayList<Room> = ArrayList())
+
+data class RoomScheduleMeta(var updateTime: Long = 0, val roomName: String = "", val weekIndex: Int = 0, var weekNumberYear: Int = 0, var year: Int = 0, val link: String = "")
+
+data class RoomScheduleWeekRet(val meta: RoomScheduleMeta = RoomScheduleMeta(), var timetable: TimetableWeek<LessonWithCourse> = TimetableWeek())
 
 
 // data classes for the status part
@@ -79,6 +99,10 @@ data class Status(
     val timetableRequests: HashMap<String, Int>,
     val timetableListSize: Int,
     val coursesLastUpdate: Date,
+    val roomListRequests: Int,
+    val roomScheduleRequests: HashMap<String, Int>,
+    val roomScheduleListSize: Int,
+    val roomsLastUpdate: Date,
     val mensaLastUpdate: Date,
     val hsoResponseCode: Int,
     val swfrResponseCode: Int

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

@@ -27,8 +27,10 @@ import kotlinx.coroutines.*
 import org.jsoup.Jsoup
 import org.mosad.thecitadelofricks.*
 import org.mosad.thecitadelofricks.hsoparser.CourseListParser
+import org.mosad.thecitadelofricks.hsoparser.CourseTimetableParser
 import org.mosad.thecitadelofricks.hsoparser.MensaParser
-import org.mosad.thecitadelofricks.hsoparser.TimetableParser
+import org.mosad.thecitadelofricks.hsoparser.RoomListParser
+import org.mosad.thecitadelofricks.hsoparser.RoomTimetableParser
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 import java.io.*
@@ -40,7 +42,6 @@ import kotlin.collections.HashSet
 import kotlin.concurrent.scheduleAtFixedRate
 import kotlin.time.Duration.Companion.hours
 import kotlin.time.Duration.Companion.minutes
-import kotlin.time.ExperimentalTime
 
 class CacheController {
 
@@ -55,6 +56,8 @@ class CacheController {
         var courseList = CoursesList(CoursesMeta(), sortedMapOf())
         var mensaMenu = MensaMenu(MensaMeta(0, ""), MensaWeek(), MensaWeek())
         var timetableList = ConcurrentHashMap<String, TimetableCourseWeek>() // this list contains all timetables
+        var roomList = RoomsList(RoomsMeta(), sortedMapOf())
+        var roomScheduleList = ConcurrentHashMap<String, RoomScheduleWeekRet>() // this list contains all room schedules
 
         /**
          * get a timetable, since they may not be cached, we need to make sure it's cached, otherwise download
@@ -73,7 +76,7 @@ class CacheController {
                 val instr = CacheController::class.java.getResourceAsStream("/html/Timetable_normal-week.html")
 
                 val timetableParser =
-                    TimetableParser(htmlDoc = Jsoup.parse(instr!!, "UTF-8", "https://www.hs-offenburg.de/"))
+                    CourseTimetableParser(htmlDoc = Jsoup.parse(instr!!, "UTF-8", "https://www.hs-offenburg.de/"))
                 val timetableTest = timetableParser.parseTimeTable()
 
                 return TimetableCourseWeek(
@@ -97,7 +100,7 @@ class CacheController {
                     ?.replace("week=0", "week=$weekIndex") ?: ""
                 val currentTime = System.currentTimeMillis() / 1000
 
-                val timetableParser = TimetableParser(timetableLink)
+                val timetableParser = CourseTimetableParser(timetableLink)
                 val calendarWeek = timetableParser.parseCalendarWeek()
                 val timetable = timetableParser.parseTimeTable()
 
@@ -139,8 +142,8 @@ class CacheController {
          * @param weekIndex request week number (current week = 0)
          * @return a ArrayList<[Lesson]> of every lesson with lessonSubject for one week
          */
-        fun getLesson(courseName: String, lessonSubject: String, weekIndex: Int): ArrayList<Lesson> {
+        fun getLesson(courseName: String, lessonSubject: String, weekIndex: Int): ArrayList<LessonWithRoom> {
-            val lessonList = ArrayList<Lesson>()
+            val lessonList = ArrayList<LessonWithRoom>()
 
             // get all lessons from the weeks timetable
             val flatMap = getTimetable(courseName, weekIndex).timetable.days.flatMap { it.timeslots.asIterable() }
@@ -151,6 +154,40 @@ class CacheController {
             return lessonList
         }
 
+        /**
+         * Get a room schedule.
+         * Since they may not be cached, we need to make sure it's cached. Download the schedule if it is not cached.
+         * @param roomName the name of the room to be requested
+         * @param weekIndex request week number (current week = 0)
+         * @return room schedule of the room (Type: [RoomScheduleWeekRet])
+         */
+        fun getRoomSchedule(roomName: String, weekIndex: Int): RoomScheduleWeekRet {
+            val key = "$roomName-$weekIndex"
+            return if (roomScheduleList.containsKey(key)) {
+                roomScheduleList[key]!!
+            } else {
+                val roomScheduleLink = roomList.rooms[roomName]
+                    ?.roomLink
+                    ?.replace("week=0", "week=$weekIndex") ?: ""
+                val currentTime = System.currentTimeMillis() / 1000
+
+                val roomScheduleParser = RoomTimetableParser(roomScheduleLink)
+                val calendarWeek = roomScheduleParser.parseCalendarWeek()
+                val roomSchedule = roomScheduleParser.parseTimeTable()
+
+                RoomScheduleWeekRet(
+                    RoomScheduleMeta(
+                        currentTime,
+                        roomName,
+                        weekIndex,
+                        calendarWeek?.week ?: 0,
+                        calendarWeek?.year ?: 0,
+                        roomScheduleLink
+                    ), roomSchedule ?: TimetableWeek()
+                ).also { if (roomSchedule != null) roomScheduleList[key] = it }
+            }
+        }
+
         // private cache functions
 
         /**
@@ -158,7 +195,7 @@ class CacheController {
          * during the update process the old data will be returned for an API request
          */
         private fun asyncUpdateCourseList() = CoroutineScope(Dispatchers.IO).launch {
-            CourseListParser().getCourseLinks(StartupController.courseListURL)?.let {
+            CourseListParser().getLinks(StartupController.courseListURL)?.let {
                 courseList = CoursesList(CoursesMeta(System.currentTimeMillis() / 1000, it.size), it.toSortedMap())
             }
 
@@ -166,7 +203,19 @@ class CacheController {
             courseList.courses["TEST_A"] = Course("TEST_A", "https://mosad.xyz")
             courseList.courses["TEST_B"] = Course("TEST_B", "https://mosad.xyz")
 
-            logger.info("Updated courses successful at ${Date(courseList.meta.updateTime * 1000)}")
+            logger.info("Updated courses successfully at ${Date(courseList.meta.updateTime * 1000)}")
+        }
+
+        /**
+         * this function updates the roomList
+         * during the update process the old data will be returned for an API request
+         */
+        private fun asyncUpdateRoomList() = CoroutineScope(Dispatchers.IO).launch {
+            RoomListParser().getLinks(StartupController.roomListURL)?.let {
+                roomList = RoomsList(RoomsMeta(System.currentTimeMillis() / 1000, it.size), it.toSortedMap())
+            }
+
+            logger.info("Updated room list successfully at ${Date(courseList.meta.updateTime * 1000)}")
         }
 
         /**
@@ -182,7 +231,7 @@ class CacheController {
                 mensaMenu = MensaMenu(MensaMeta(System.currentTimeMillis() / 1000, StartupController.mensaName), mensaCurrentWeek, mensaNextWeek)
             }
 
-            logger.info("Updated mensamenu successful at ${Date(mensaMenu.meta.updateTime * 1000)}")
+            logger.info("Updated mensa menu successfully at ${Date(mensaMenu.meta.updateTime * 1000)}")
         }
 
         /**
@@ -199,10 +248,12 @@ class CacheController {
             try {
                 timetableList.forEach { timetableCourse ->
                     executor.execute {
-                        val timetableParser = TimetableParser(timetableCourse.value.meta.link)
+                        val timetableParser = CourseTimetableParser(timetableCourse.value.meta.link)
                         timetableCourse.value.timetable = timetableParser.parseTimeTable() ?: return@execute
-                        timetableCourse.value.meta.weekNumberYear =
+                        timetableParser.parseCalendarWeek()?.also {
-                            timetableParser.parseCalendarWeek()?.week ?: return@execute
+                            timetableCourse.value.meta.weekNumberYear = it.week
+                            timetableCourse.value.meta.year = it.year
+                        } ?: return@execute
                         timetableCourse.value.meta.updateTime = System.currentTimeMillis() / 1000
 
                         saveTimetableToCache(timetableCourse.value) // save the updated timetable to the cache directory
@@ -234,6 +285,52 @@ class CacheController {
             }
         }
 
+        private fun asyncUpdateRoomSchedules() = CoroutineScope(Dispatchers.IO).launch {
+            logger.info("Updating ${roomScheduleList.size} room schedules ...")
+
+            // create a new ThreadPool with 5 threads
+            val executor = Executors.newFixedThreadPool(5)
+
+            try {
+                roomScheduleList.forEach { roomSchedule ->
+                    executor.execute {
+                        val roomScheduleParser = RoomTimetableParser(roomSchedule.value.meta.link)
+                        roomSchedule.value.timetable = roomScheduleParser.parseTimeTable() ?: return@execute
+                        roomScheduleParser.parseCalendarWeek()?.also {
+                            roomSchedule.value.meta.weekNumberYear = it.week
+                            roomSchedule.value.meta.year = it.year
+                        } ?: return@execute
+                        roomSchedule.value.meta.updateTime = System.currentTimeMillis() / 1000
+
+                        saveRoomScheduleToCache(roomSchedule.value) // save the updated timetable to the cache directory
+                    }
+
+                }
+            } catch (ex: Exception) {
+                logger.error("Error while updating the room schedules", ex)
+            } finally {
+                executor.shutdown()
+            }
+        }
+
+        /**
+         * save a timetable to the cache directory
+         * this is only call on async updates, it is NOT call when first getting the timetable
+         * @param roomSchedule a room schedule of the type [RoomScheduleWeekRet]
+         */
+        private fun saveRoomScheduleToCache(roomSchedule: RoomScheduleWeekRet) {
+            val file = File(StartupController.dirTcorCache, "roomSchedule-${roomSchedule.meta.roomName}-${roomSchedule.meta.weekIndex}.json")
+            val writer = BufferedWriter(FileWriter(file))
+
+            try {
+                writer.write(Gson().toJson(roomSchedule))
+            } catch (e: Exception) {
+                logger.error("something went wrong while trying to write a cache file", e)
+            } finally {
+                writer.close()
+            }
+        }
+
         /**
          * before the APIController is up, get the data fist
          * runBlocking: otherwise the api would return no data to requests for a few seconds after startup
@@ -242,9 +339,11 @@ class CacheController {
             // get all course links on startup, make sure there are course links
             val jobCourseUpdate = asyncUpdateCourseList()
             val jobMensa = asyncUpdateMensa()
+            val jobRoomListUpdate = asyncUpdateRoomList()
 
             jobCourseUpdate.join()
             jobMensa.join()
+            jobRoomListUpdate.join()
 
             logger.info("Initial updates successful")
         }
@@ -253,7 +352,6 @@ class CacheController {
          * update the CourseList every 24h, the Timetables every 3h and the Mensa Menu every hour
          * doesn't account the change between winter and summer time!
          */
-        @OptIn(ExperimentalTime::class)
         private fun scheduledUpdates() {
             val currentTime = System.currentTimeMillis()
 
@@ -268,17 +366,23 @@ class CacheController {
             val initDelay3h = calcInitDelay(duration3h)
             val initDelay1h = calcInitDelay(duration1h)
 
-            // update courseList every 24 hours (time in ms)
+            // update courseList and roomList every 24 hours (time in ms)
             Timer().scheduleAtFixedRate(initDelay24h, duration24h) {
                 asyncUpdateCourseList()
             }
+            Timer().scheduleAtFixedRate(initDelay24h, duration24h) {
+                asyncUpdateRoomList()
+            }
 
-            // update all already existing timetables every 3 hours (time in ms)
+            // update all already existing timetables and room schedules every 3 hours (time in ms)
             Timer().scheduleAtFixedRate(initDelay3h, duration3h) {
                 asyncUpdateTimetables()
             }
+            Timer().scheduleAtFixedRate(initDelay3h, duration3h) {
+                asyncUpdateRoomSchedules()
+            }
 
-            // update courses every hour (time in ms)
+            // update mensa menu every hour (time in ms)
             Timer().scheduleAtFixedRate(initDelay1h, duration1h) {
                 asyncUpdateMensa()
             }

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

@@ -29,7 +29,7 @@ import java.io.BufferedReader
 import java.io.IOException
 import java.io.InputStreamReader
 import java.net.HttpURLConnection
-import java.net.URL
+import java.net.URI
 
 class CachetAPIController {
 
@@ -41,7 +41,7 @@ class CachetAPIController {
 
          fun postTotalRequests() {
              try {
-                 val url = URL("${StartupController.cachetBaseURL}/api/v1/metrics/1/points")
+                 val url = URI("${StartupController.cachetBaseURL}/api/v1/metrics/1/points").toURL()
                  val jsonInputString = "{\"value\": ${totalRequests -oldTotalRequests}, \"timestamp\": \"${(System.currentTimeMillis() / 1000)}\"}"
                  oldTotalRequests = totalRequests
 

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

@@ -44,6 +44,7 @@ class StartupController {
         var cachetAPIKey = "0"
         var cachetBaseURL = "https://status.mosad.xyz"
         var courseListURL = "https://www.hs-offenburg.de/studium/vorlesungsplaene/"
+        val roomListURL = "https://www.hs-offenburg.de/die-hochschule/organisation/infos-services/raumbelegungen"
         var mensaMenuURL = "https://www.swfr.de/essen/mensen-cafes-speiseplaene/mensa-offenburg"
         var mensaName = "Offenburg"
     }

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

@@ -29,7 +29,7 @@ import org.mosad.thecitadelofricks.Status
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 import java.net.HttpURLConnection
-import java.net.URL
+import java.net.URI
 import java.time.LocalDateTime
 import java.util.*
 import kotlin.collections.HashMap
@@ -47,6 +47,10 @@ class StatusController {
             private set
         var timetableRequests = HashMap<String, Int>()
             private set
+        var roomListRequests = 0
+            private set
+        var roomScheduleRequests = HashMap<String, Int>()
+            private set
 
         /**
          * if a mensamenu/courseList/timetable is requested update the specific and total request count
@@ -66,6 +70,16 @@ class StatusController {
             totalRequests++
         }
 
+        fun updateRoomListRequests() {
+            roomListRequests++
+            totalRequests++
+        }
+
+        fun updateRoomScheduleRequests(roomName: String) {
+            roomScheduleRequests[roomName] = (roomScheduleRequests[roomName] ?: 0) + 1
+            totalRequests++
+        }
+
         fun getStatus(): Status {
             val currentTime = System.currentTimeMillis() / 1000
             val minutes = (currentTime - startTime) % 3600 / 60
@@ -76,8 +90,8 @@ class StatusController {
             var swfrCode = 999
 
             try {
-                val hsoURL = URL("https://www.hs-offenburg.de/")
+                val hsoURL = URI("https://www.hs-offenburg.de/").toURL()
-                val swfrURL = URL("https://www.swfr.de/")
+                val swfrURL = URI("https://www.swfr.de/").toURL()
 
                 var connection = hsoURL.openConnection() as HttpURLConnection
                 connection.requestMethod = "HEAD"
@@ -103,6 +117,10 @@ class StatusController {
                 timetableRequests,
                 CacheController.timetableList.size,
                 Date(CacheController.courseList.meta.updateTime * 1000),
+                roomListRequests,
+                roomScheduleRequests,
+                CacheController.roomScheduleList.size,
+                Date(CacheController.roomList.meta.updateTime * 1000),
                 Date(CacheController.mensaMenu.meta.updateTime * 1000),
                 hsoCode,
                 swfrCode

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

@@ -1,61 +0,0 @@
-/**
- * TheCitadelofRicks
- *
- * Copyright 2019-2020  <seil0@mosad.xyz>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- */
-
-package org.mosad.thecitadelofricks.hsoparser
-
-import org.jsoup.Jsoup
-import org.mosad.thecitadelofricks.Course
-import org.slf4j.LoggerFactory
-import java.net.SocketTimeoutException
-
-class CourseListParser {
-
-    private var logger: org.slf4j.Logger = LoggerFactory.getLogger(CourseListParser::class.java)
-
-    /**
-     * return a list of all courses at courseListURL
-     * @param courseListURL the url to the course list page
-     * @return a ArrayList<Course> with all courses or null if the request was not successful
-     */
-    fun getCourseLinks(courseListURL: String): HashMap<String, Course>? {
-        val courseLinkList = HashMap<String, Course>()
-        try {
-            val courseHTML = Jsoup.connect(courseListURL).get()
-
-            courseHTML.select("ul.index-group").select("li.Class").select("a[href]").forEachIndexed { _, element ->
-                courseLinkList[element.text()] = Course(
-                    element.text(),
-                    element.attr("href").replace("http", "https")
-                )
-            }
-            logger.info("successfully retrieved course List")
-        } catch (ex: SocketTimeoutException) {
-            logger.warn("timeout from hs-offenburg.de, updating on next attempt!")
-            return null
-        } catch (gex: Exception) {
-            logger.error("general CourseListParser error", gex)
-            return null
-        }
-
-        return courseLinkList
-    }
-}

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

@@ -24,6 +24,7 @@ package org.mosad.thecitadelofricks.hsoparser
 
 import org.jsoup.Jsoup
 import org.jsoup.nodes.Document
+import org.jsoup.parser.Parser
 import org.mosad.thecitadelofricks.Meal
 import org.mosad.thecitadelofricks.MensaWeek
 import org.slf4j.LoggerFactory
@@ -66,7 +67,7 @@ class MensaParser {
 
                     day.select("div.menu-tagesplan > div.grid").first()?.select("div.flex-col")?.forEachIndexed { _, meal ->
                         val heading = meal.select("h5").text()
-                        val parts = ArrayList(meal.select("small.extra-text").html().split("<br>").map { it.trim() })
+                        val parts = ArrayList(meal.select("small.extra-text").html().split("<br>").map { Parser.unescapeEntities(it, true).trim() })
                         val additives = meal.select("small.zusatzsstoffe[x-show=showAllergenes]").text()
                         parts.removeIf { x -> x.isEmpty() || x.isBlank() }
 

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

@@ -0,0 +1,86 @@
+/**
+ * TheCitadelofRicks
+ *
+ * Copyright 2019-2020  <seil0@mosad.xyz>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ */
+
+package org.mosad.thecitadelofricks.hsoparser
+
+import org.jsoup.Jsoup
+import org.jsoup.nodes.Element
+import org.mosad.thecitadelofricks.Course
+import org.mosad.thecitadelofricks.Room
+import org.slf4j.LoggerFactory
+import java.net.SocketTimeoutException
+
+sealed class TimetableLinkListParser<T> {
+
+    private var logger: org.slf4j.Logger = LoggerFactory.getLogger(TimetableLinkListParser::class.java)
+
+    abstract fun constructValue(key: String, link: String): T
+
+    abstract val blacklist: List<String>
+
+    abstract val liClass: String
+
+    /**
+     * return a list of all elements at listURL
+     * @param listURL the url to the list page
+     * @return a ArrayList<T> with all links or null if the request was not successful
+     */
+    fun getLinks(listURL: String): HashMap<String, T>? {
+        val linkList = HashMap<String, T>()
+        try {
+            val courseHTML = Jsoup.connect(listURL).get()
+
+            courseHTML
+                .select("ul.index-group")
+                .select("li.$liClass")
+                .select("a[href]")
+                .filter{ it: Element -> !blacklist.contains(it.text()) }
+                .forEach {
+                    linkList[it.text()] = constructValue(
+                        it.text(),
+                        it.attr("href").replace("http:", "https:")
+                    )
+                }
+            logger.info("successfully retrieved link List")
+        } catch (ex: SocketTimeoutException) {
+            logger.warn("timeout from hs-offenburg.de, updating on next attempt!")
+            return null
+        } catch (gex: Exception) {
+            logger.error("general TimetableLinkListParser error", gex)
+            return null
+        }
+
+        return linkList
+    }
+}
+
+class CourseListParser : TimetableLinkListParser<Course>() {
+    override fun constructValue(key: String, link: String) = Course(key, link)
+    override val blacklist = emptyList<String>()
+    override val liClass = "Class"
+}
+
+class RoomListParser : TimetableLinkListParser<Room>() {
+    override fun constructValue(key: String, link: String) = Room(key, link)
+    override val blacklist = listOf("STÜBER SYSTEMS")
+    override val liClass = "Room"
+}

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

@@ -27,7 +27,8 @@ import kotlinx.coroutines.sync.Semaphore
 import org.jsoup.Jsoup
 import org.jsoup.nodes.Document
 import org.mosad.thecitadelofricks.CalendarWeek
-import org.mosad.thecitadelofricks.Lesson
+import org.mosad.thecitadelofricks.LessonWithCourse
+import org.mosad.thecitadelofricks.LessonWithRoom
 import org.mosad.thecitadelofricks.TimetableWeek
 import org.slf4j.LoggerFactory
 
@@ -35,10 +36,13 @@ import org.slf4j.LoggerFactory
  * @param timetableURL the URL of the timetable you want to get
  * @param htmlDoc the html document to use (the timetableURL will be ignored if this value is present)
  */
-class TimetableParser(timetableURL: String? = null, htmlDoc: Document? = null) {
+sealed class TimetableParser<Lesson>(timetableURL: String? = null, htmlDoc: Document? = null) {
     private var logger: org.slf4j.Logger = LoggerFactory.getLogger(TimetableParser::class.java)
     private val days = arrayOf("Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday")
 
+    abstract fun constructLesson(lessonID: String, lessonSubject: String, lessonTeacher: String, value4: String, lessonRemark: String): Lesson
+    abstract val value4Class: String
+
     companion object {
         val semaphore = Semaphore(3, 0)
     }
@@ -63,13 +67,13 @@ class TimetableParser(timetableURL: String? = null, htmlDoc: Document? = null) {
      * the timetable is organised per row not per column;
      * Mon 1, Tue 1, Wed 1, Thur 1, Fri 1, Sat 1, Mon 2 and so on
      */
-    fun parseTimeTable(): TimetableWeek? = htmlDoc?.let {
+    fun parseTimeTable(): TimetableWeek<Lesson>? = htmlDoc?.let {
-        val timetableWeek = TimetableWeek()
+        val timetableWeek = TimetableWeek<Lesson>()
         val rows = it.select("table.timetable").select("tr[scope=\"row\"]")
 
         var sDay = -1
         var sRow = -1
-        var sLesson = Lesson("", "", "", "", "")
+        var sLesson = constructLesson("", "", "", "", "")
 
         // get each row with index, reflects 1 timeslot per day
         for ((rowIndex, row) in rows.withIndex()) {
@@ -86,11 +90,11 @@ class TimetableParser(timetableURL: String? = null, htmlDoc: Document? = null) {
 
                     // adjust the following slot
                     sDay++
-                    sLesson = Lesson(
+                    sLesson = constructLesson(
                         "$day.$rowIndex.$lessonIndexDay",
                         element.select("div.lesson-subject").text(),
                         element.select("div.lesson-teacher").text(),
-                        element.select("div.lesson-room").text(),
+                        element.select("div.$value4Class").text(),
                         element.select("div.lesson-remark").text()
                     )
 
@@ -101,11 +105,11 @@ class TimetableParser(timetableURL: String? = null, htmlDoc: Document? = null) {
 
                 } else {
                     timetableWeek.days[day].timeslots[rowIndex].add(
-                        Lesson(
+                        constructLesson(
                             "$day.$rowIndex.$lessonIndexDay",
                             element.select("div.lesson-subject").text(),
                             element.select("div.lesson-teacher").text(),
-                            element.select("div.lesson-room").text(),
+                            element.select("div.$value4Class").text(),
                             element.select("div.lesson-remark").text()
                         )
                     )
@@ -146,7 +150,7 @@ class TimetableParser(timetableURL: String? = null, htmlDoc: Document? = null) {
      * print a timetable
      * @param timetable the timetable to print
      */
-    fun printTimetableWeek(timetable: TimetableWeek) {
+    fun printTimetableWeek(timetable: TimetableWeek<LessonWithRoom>) {
         for (j in 0..5) print(days[j].padEnd(75, ' ') + " | ")
         println()
         for (j in 0..5) print("-".padEnd(76 + (j.toFloat().div(j).toInt()), '-') + "+")
@@ -189,4 +193,18 @@ class TimetableParser(timetableURL: String? = null, htmlDoc: Document? = null) {
         println(" \n")
     }
 
-}
+}
+
+class CourseTimetableParser(timetableURL: String? = null, htmlDoc: Document? = null) : TimetableParser<LessonWithRoom>(timetableURL, htmlDoc) {
+    override fun constructLesson(lessonID: String, lessonSubject: String, lessonTeacher: String, value4: String, lessonRemark: String)
+        = LessonWithRoom(lessonID, lessonSubject, lessonTeacher, value4, lessonRemark)
+
+    override val value4Class = "lesson-room"
+}
+
+class RoomTimetableParser(timetableURL: String? = null, htmlDoc: Document? = null) : TimetableParser<LessonWithCourse>(timetableURL, htmlDoc) {
+    override fun constructLesson(lessonID: String, lessonSubject: String, lessonTeacher: String, value4: String, lessonRemark: String)
+            = LessonWithCourse(lessonID, lessonSubject, lessonTeacher, value4, lessonRemark)
+
+    override val value4Class = "lesson-class"
+}

src/test/kotlin/org/mosad/thecitadelofricks/hsoparser/TimetableParserTest.kt

@@ -34,7 +34,7 @@ class TimetableParserTest {
     fun parseTimetableNormalWeek() {
         val htmlFile = File(TimetableParserTest::class.java.getResource("/html/Timetable_normal-week.html").path)
         val htmlDoc = Jsoup.parse(htmlFile, "UTF-8", "https://www.hs-offenburg.de/")
-        val actualTimetable = TimetableParser(htmlDoc = htmlDoc).parseTimeTable().toString().trim()
+        val actualTimetable = CourseTimetableParser(htmlDoc = htmlDoc).parseTimeTable().toString().trim()
         val expectedTimetable = TimetableParserTest::class.java.getResource("/expected/Timetable_normal-week.txt").readText().trim()
 
         Assertions.assertEquals(expectedTimetable, actualTimetable)
@@ -44,7 +44,7 @@ class TimetableParserTest {
     fun parseTimetableEmptyWeek() {
         val htmlFile = File(TimetableParserTest::class.java.getResource("/html/Timetable_empty-week.html").path)
         val htmlDoc = Jsoup.parse(htmlFile, "UTF-8", "https://www.hs-offenburg.de/")
-        val actualTimetable = TimetableParser(htmlDoc = htmlDoc).parseTimeTable().toString().trim()
+        val actualTimetable = CourseTimetableParser(htmlDoc = htmlDoc).parseTimeTable().toString().trim()
         val expectedTimetable = TimetableParserTest::class.java.getResource("/expected/Timetable_empty-week.txt").readText().trim()
 
         Assertions.assertEquals(expectedTimetable, actualTimetable)
@@ -54,7 +54,7 @@ class TimetableParserTest {
     fun parseCalendarWeek() {
         val htmlFile = File(TimetableParserTest::class.java.getResource("/html/Timetable_normal-week.html").path)
         val htmlDoc = Jsoup.parse(htmlFile, "UTF-8", "https://www.hs-offenburg.de/")
-        val actualCalendarWeek = TimetableParser(htmlDoc = htmlDoc).parseCalendarWeek()
+        val actualCalendarWeek = CourseTimetableParser(htmlDoc = htmlDoc).parseCalendarWeek()
 
         Assertions.assertEquals(CalendarWeek(42, 2019), actualCalendarWeek)
     }

src/test/resources/expected/Timetable_normal-week.txt

@@ -1 +1 @@
-TimetableWeek(days=[TimetableDay(timeslots=[[Lesson(lessonID=0.0.0, lessonSubject=, lessonTeacher=, lessonRoom=, lessonRemark=)], [Lesson(lessonID=0.1.0, lessonSubject=, lessonTeacher=, lessonRoom=, lessonRemark=)], [Lesson(lessonID=0.2.0, lessonSubject=, lessonTeacher=, lessonRoom=, lessonRemark=)], [Lesson(lessonID=0.3.0, lessonSubject=Prakt. Computernetze, lessonTeacher=Mayer E., lessonRoom=STB 0.28, A111a, lessonRemark=)], [Lesson(lessonID=0.4.0, lessonSubject=Prakt. Computernetze, lessonTeacher=Mayer E., lessonRoom=STB 0.28, A111a, lessonRemark=)], [Lesson(lessonID=0.5.0, lessonSubject=, lessonTeacher=, lessonRoom=, lessonRemark=)]]), TimetableDay(timeslots=[[Lesson(lessonID=1.0.0, lessonSubject=, lessonTeacher=, lessonRoom=, lessonRemark=)], [Lesson(lessonID=1.1.0, lessonSubject=Systemprogramm., lessonTeacher=Mayer E., lessonRoom=B040, lessonRemark=)], [Lesson(lessonID=1.2.0, lessonSubject=, lessonTeacher=, lessonRoom=, lessonRemark=)], [Lesson(lessonID=1.3.0, lessonSubject=Prakt. Computernetze, lessonTeacher=Mayer E., lessonRoom=STB 0.28, A112, lessonRemark=)], [Lesson(lessonID=1.4.0, lessonSubject=Prakt. Computernetze, lessonTeacher=Mayer E., lessonRoom=STB 0.28, A112, lessonRemark=)], [Lesson(lessonID=1.5.0, lessonSubject=, lessonTeacher=, lessonRoom=, lessonRemark=)]]), TimetableDay(timeslots=[[Lesson(lessonID=2.0.0, lessonSubject=Softw. Engin. 1, lessonTeacher=Dorer, K., lessonRoom=A213, lessonRemark=)], [Lesson(lessonID=2.1.0, lessonSubject=Datenbanksysteme 1, lessonTeacher=Grabowski, H., lessonRoom=B040, lessonRemark=)], [Lesson(lessonID=2.2.0, lessonSubject=, lessonTeacher=, lessonRoom=, lessonRemark=)], [Lesson(lessonID=2.3.0, lessonSubject=Praktikum Internet-Programmierung, lessonTeacher=Orb, J., lessonRoom=B207, lessonRemark=)], [Lesson(lessonID=2.4.0, lessonSubject=Praktikum Internet-Programmierung, lessonTeacher=Orb, J., lessonRoom=B207, lessonRemark=)], [Lesson(lessonID=2.5.0, lessonSubject=, lessonTeacher=, lessonRoom=, lessonRemark=)]]), TimetableDay(timeslots=[[Lesson(lessonID=3.0.0, lessonSubject=Prakt. Datenbanksyst., lessonTeacher=Grabowski, H., lessonRoom=D115, B204b, lessonRemark=)], [Lesson(lessonID=3.1.0, lessonSubject=Zusatzübung C++, lessonTeacher=Behr, A., lessonRoom=D116, lessonRemark=), Lesson(lessonID=3.1.1, lessonSubject=Prakt. Datenbanksyst., lessonTeacher=Grabowski, H., lessonRoom=D115, B204b, lessonRemark=)], [Lesson(lessonID=3.2.0, lessonSubject=Softw. Engin. 1, lessonTeacher=Dorer, K., lessonRoom=B013, lessonRemark=)], [Lesson(lessonID=3.3.0, lessonSubject=, lessonTeacher=, lessonRoom=, lessonRemark=)], [Lesson(lessonID=3.4.0, lessonSubject=, lessonTeacher=, lessonRoom=, lessonRemark=)], [Lesson(lessonID=3.5.0, lessonSubject=, lessonTeacher=, lessonRoom=, lessonRemark=)]]), TimetableDay(timeslots=[[Lesson(lessonID=4.0.0, lessonSubject=Computernetze 1, lessonTeacher=Mayer E., lessonRoom=A213, lessonRemark=)], [Lesson(lessonID=4.1.0, lessonSubject=Internet-Programmierung, lessonTeacher=Orb, J., lessonRoom=A213, lessonRemark=)], [Lesson(lessonID=4.2.0, lessonSubject=Prakt. Systemprogr., lessonTeacher=Mayer E., lessonRoom=STB 0.28, lessonRemark=)], [Lesson(lessonID=4.3.0, lessonSubject=Prakt. Systemprogr., lessonTeacher=Mayer E., lessonRoom=STB 0.28, lessonRemark=)], [Lesson(lessonID=4.4.0, lessonSubject=, lessonTeacher=, lessonRoom=, lessonRemark=)], [Lesson(lessonID=4.5.0, lessonSubject=, lessonTeacher=, lessonRoom=, lessonRemark=)]]), TimetableDay(timeslots=[[Lesson(lessonID=5.0.0, lessonSubject=, lessonTeacher=, lessonRoom=, lessonRemark=)], [Lesson(lessonID=5.1.0, lessonSubject=, lessonTeacher=, lessonRoom=, lessonRemark=)], [Lesson(lessonID=5.2.0, lessonSubject=, lessonTeacher=, lessonRoom=, lessonRemark=)], [Lesson(lessonID=5.3.0, lessonSubject=, lessonTeacher=, lessonRoom=, lessonRemark=)], [Lesson(lessonID=5.4.0, lessonSubject=, lessonTeacher=, lessonRoom=, lessonRemark=)], [Lesson(lessonID=5.5.0, lessonSubject=, lessonTeacher=, lessonRoom=, lessonRemark=)]])])
+TimetableWeek(days=[TimetableDay(timeslots=[[LessonWithRoom(lessonID=0.0.0, lessonSubject=, lessonTeacher=, lessonRoom=, lessonRemark=)], [LessonWithRoom(lessonID=0.1.0, lessonSubject=, lessonTeacher=, lessonRoom=, lessonRemark=)], [LessonWithRoom(lessonID=0.2.0, lessonSubject=, lessonTeacher=, lessonRoom=, lessonRemark=)], [LessonWithRoom(lessonID=0.3.0, lessonSubject=Prakt. Computernetze, lessonTeacher=Mayer E., lessonRoom=STB 0.28, A111a, lessonRemark=)], [LessonWithRoom(lessonID=0.4.0, lessonSubject=Prakt. Computernetze, lessonTeacher=Mayer E., lessonRoom=STB 0.28, A111a, lessonRemark=)], [LessonWithRoom(lessonID=0.5.0, lessonSubject=, lessonTeacher=, lessonRoom=, lessonRemark=)]]), TimetableDay(timeslots=[[LessonWithRoom(lessonID=1.0.0, lessonSubject=, lessonTeacher=, lessonRoom=, lessonRemark=)], [LessonWithRoom(lessonID=1.1.0, lessonSubject=Systemprogramm., lessonTeacher=Mayer E., lessonRoom=B040, lessonRemark=)], [LessonWithRoom(lessonID=1.2.0, lessonSubject=, lessonTeacher=, lessonRoom=, lessonRemark=)], [LessonWithRoom(lessonID=1.3.0, lessonSubject=Prakt. Computernetze, lessonTeacher=Mayer E., lessonRoom=STB 0.28, A112, lessonRemark=)], [LessonWithRoom(lessonID=1.4.0, lessonSubject=Prakt. Computernetze, lessonTeacher=Mayer E., lessonRoom=STB 0.28, A112, lessonRemark=)], [LessonWithRoom(lessonID=1.5.0, lessonSubject=, lessonTeacher=, lessonRoom=, lessonRemark=)]]), TimetableDay(timeslots=[[LessonWithRoom(lessonID=2.0.0, lessonSubject=Softw. Engin. 1, lessonTeacher=Dorer, K., lessonRoom=A213, lessonRemark=)], [LessonWithRoom(lessonID=2.1.0, lessonSubject=Datenbanksysteme 1, lessonTeacher=Grabowski, H., lessonRoom=B040, lessonRemark=)], [LessonWithRoom(lessonID=2.2.0, lessonSubject=, lessonTeacher=, lessonRoom=, lessonRemark=)], [LessonWithRoom(lessonID=2.3.0, lessonSubject=Praktikum Internet-Programmierung, lessonTeacher=Orb, J., lessonRoom=B207, lessonRemark=)], [LessonWithRoom(lessonID=2.4.0, lessonSubject=Praktikum Internet-Programmierung, lessonTeacher=Orb, J., lessonRoom=B207, lessonRemark=)], [LessonWithRoom(lessonID=2.5.0, lessonSubject=, lessonTeacher=, lessonRoom=, lessonRemark=)]]), TimetableDay(timeslots=[[LessonWithRoom(lessonID=3.0.0, lessonSubject=Prakt. Datenbanksyst., lessonTeacher=Grabowski, H., lessonRoom=D115, B204b, lessonRemark=)], [LessonWithRoom(lessonID=3.1.0, lessonSubject=Zusatzübung C++, lessonTeacher=Behr, A., lessonRoom=D116, lessonRemark=), LessonWithRoom(lessonID=3.1.1, lessonSubject=Prakt. Datenbanksyst., lessonTeacher=Grabowski, H., lessonRoom=D115, B204b, lessonRemark=)], [LessonWithRoom(lessonID=3.2.0, lessonSubject=Softw. Engin. 1, lessonTeacher=Dorer, K., lessonRoom=B013, lessonRemark=)], [LessonWithRoom(lessonID=3.3.0, lessonSubject=, lessonTeacher=, lessonRoom=, lessonRemark=)], [LessonWithRoom(lessonID=3.4.0, lessonSubject=, lessonTeacher=, lessonRoom=, lessonRemark=)], [LessonWithRoom(lessonID=3.5.0, lessonSubject=, lessonTeacher=, lessonRoom=, lessonRemark=)]]), TimetableDay(timeslots=[[LessonWithRoom(lessonID=4.0.0, lessonSubject=Computernetze 1, lessonTeacher=Mayer E., lessonRoom=A213, lessonRemark=)], [LessonWithRoom(lessonID=4.1.0, lessonSubject=Internet-Programmierung, lessonTeacher=Orb, J., lessonRoom=A213, lessonRemark=)], [LessonWithRoom(lessonID=4.2.0, lessonSubject=Prakt. Systemprogr., lessonTeacher=Mayer E., lessonRoom=STB 0.28, lessonRemark=)], [LessonWithRoom(lessonID=4.3.0, lessonSubject=Prakt. Systemprogr., lessonTeacher=Mayer E., lessonRoom=STB 0.28, lessonRemark=)], [LessonWithRoom(lessonID=4.4.0, lessonSubject=, lessonTeacher=, lessonRoom=, lessonRemark=)], [LessonWithRoom(lessonID=4.5.0, lessonSubject=, lessonTeacher=, lessonRoom=, lessonRemark=)]]), TimetableDay(timeslots=[[LessonWithRoom(lessonID=5.0.0, lessonSubject=, lessonTeacher=, lessonRoom=, lessonRemark=)], [LessonWithRoom(lessonID=5.1.0, lessonSubject=, lessonTeacher=, lessonRoom=, lessonRemark=)], [LessonWithRoom(lessonID=5.2.0, lessonSubject=, lessonTeacher=, lessonRoom=, lessonRemark=)], [LessonWithRoom(lessonID=5.3.0, lessonSubject=, lessonTeacher=, lessonRoom=, lessonRemark=)], [LessonWithRoom(lessonID=5.4.0, lessonSubject=, lessonTeacher=, lessonRoom=, lessonRemark=)], [LessonWithRoom(lessonID=5.5.0, lessonSubject=, lessonTeacher=, lessonRoom=, lessonRemark=)]])])