fix courseList
continuous-integration/drone/push Build is passing Details

This commit is contained in:
Jannik 2020-06-11 17:22:31 +02:00
parent 46c9a61124
commit c30306c163
Signed by: Seil0
GPG Key ID: E8459F3723C52C24
3 changed files with 8 additions and 5 deletions

View File

@ -6,7 +6,7 @@ plugins {
} }
group 'org.mosad' group 'org.mosad'
version '1.2.4' version '1.2.5'
repositories { repositories {
jcenter() jcenter()

View File

@ -40,6 +40,7 @@ import org.springframework.web.bind.annotation.RequestParam
import org.springframework.web.bind.annotation.RestController import org.springframework.web.bind.annotation.RestController
import java.time.LocalDateTime import java.time.LocalDateTime
import java.util.* import java.util.*
import kotlin.collections.ArrayList
@RestController @RestController
class APIController { class APIController {
@ -48,7 +49,7 @@ class APIController {
companion object { companion object {
const val apiVersion = "1.2.0" const val apiVersion = "1.2.0"
const val softwareVersion = "1.2.4" const val softwareVersion = "1.2.5"
val startTime = System.currentTimeMillis() / 1000 val startTime = System.currentTimeMillis() / 1000
} }
@ -58,10 +59,11 @@ class APIController {
} }
@RequestMapping("/courseList") @RequestMapping("/courseList")
fun courseList(): CoursesList { fun courseList(): CoursesListRet {
logger.info("courseList request at ${LocalDateTime.now()}!") logger.info("courseList request at ${LocalDateTime.now()}!")
updateCourseListRequests() updateCourseListRequests()
return courseList
return CoursesListRet(courseList.meta, ArrayList(courseList.courses.values))
} }
@RequestMapping("/mensamenu") @RequestMapping("/mensamenu")
@ -121,7 +123,7 @@ class APIController {
// TODO remove this with API version 2.0.0 // TODO remove this with API version 2.0.0
@Deprecated("courses is replaced by courseList", replaceWith = ReplaceWith("courseList()")) @Deprecated("courses is replaced by courseList", replaceWith = ReplaceWith("courseList()"))
@RequestMapping("/courses") @RequestMapping("/courses")
fun courses(): CoursesList { fun courses(): CoursesListRet {
return courseList() return courseList()
} }

View File

@ -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 CoursesMeta(val updateTime: Long = 0, val totalCourses: Int = 0)
data class CoursesList(val meta: CoursesMeta = CoursesMeta(), val courses: HashMap<String, Course> = HashMap()) 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 classes for the Mensa part
data class Meal(val day: String, val heading: String, val parts: ArrayList<String>, val additives: String) data class Meal(val day: String, val heading: String, val parts: ArrayList<String>, val additives: String)