From c30306c163f0b036504158d1b195cc4850fd8604 Mon Sep 17 00:00:00 2001
From: Seil0 <seil0@mosad.xyz>
Date: Thu, 11 Jun 2020 17:22:31 +0200
Subject: [PATCH] fix courseList

---
 build.gradle                                           |  2 +-
 .../org/mosad/thecitadelofricks/APIController.kt       | 10 ++++++----
 .../kotlin/org/mosad/thecitadelofricks/DataTypes.kt    |  1 +
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index c238db4..bffffdc 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ plugins {
 }
 
 group 'org.mosad'
-version '1.2.4'
+version '1.2.5'
 
 repositories {
     jcenter()
diff --git a/src/main/kotlin/org/mosad/thecitadelofricks/APIController.kt b/src/main/kotlin/org/mosad/thecitadelofricks/APIController.kt
index 7918a03..675e9eb 100644
--- a/src/main/kotlin/org/mosad/thecitadelofricks/APIController.kt
+++ b/src/main/kotlin/org/mosad/thecitadelofricks/APIController.kt
@@ -40,6 +40,7 @@ import org.springframework.web.bind.annotation.RequestParam
 import org.springframework.web.bind.annotation.RestController
 import java.time.LocalDateTime
 import java.util.*
+import kotlin.collections.ArrayList
 
 @RestController
 class APIController {
@@ -48,7 +49,7 @@ class APIController {
 
     companion object {
         const val apiVersion = "1.2.0"
-        const val softwareVersion = "1.2.4"
+        const val softwareVersion = "1.2.5"
         val startTime = System.currentTimeMillis() / 1000
     }
 
@@ -58,10 +59,11 @@ class APIController {
     }
 
     @RequestMapping("/courseList")
-    fun courseList(): CoursesList {
+    fun courseList(): CoursesListRet {
         logger.info("courseList request at ${LocalDateTime.now()}!")
         updateCourseListRequests()
-        return courseList
+
+        return CoursesListRet(courseList.meta, ArrayList(courseList.courses.values))
     }
 
     @RequestMapping("/mensamenu")
@@ -121,7 +123,7 @@ class APIController {
     // TODO remove this with API version 2.0.0
     @Deprecated("courses is replaced by courseList", replaceWith = ReplaceWith("courseList()"))
     @RequestMapping("/courses")
-    fun courses(): CoursesList {
+    fun courses(): CoursesListRet {
         return courseList()
     }
 
diff --git a/src/main/kotlin/org/mosad/thecitadelofricks/DataTypes.kt b/src/main/kotlin/org/mosad/thecitadelofricks/DataTypes.kt
index 8ef387f..41d45da 100644
--- a/src/main/kotlin/org/mosad/thecitadelofricks/DataTypes.kt
+++ b/src/main/kotlin/org/mosad/thecitadelofricks/DataTypes.kt
@@ -32,6 +32,7 @@ data class Course(val courseName: String, val courseLink: String)
 data class CoursesMeta(val updateTime: Long = 0, val totalCourses: Int = 0)
 
 data class CoursesList(val meta: CoursesMeta = CoursesMeta(), val courses: HashMap<String, Course> = HashMap())
+data class CoursesListRet(val meta: CoursesMeta = CoursesMeta(), val courses: ArrayList<Course> = ArrayList())
 
 // data classes for the Mensa part
 data class Meal(val day: String, val heading: String, val parts: ArrayList<String>, val additives: String)