fix courseList
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
This commit is contained in:
parent
46c9a61124
commit
c30306c163
|
@ -6,7 +6,7 @@ plugins {
|
|||
}
|
||||
|
||||
group 'org.mosad'
|
||||
version '1.2.4'
|
||||
version '1.2.5'
|
||||
|
||||
repositories {
|
||||
jcenter()
|
||||
|
|
|
@ -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()
|
||||
}
|
||||
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in New Issue