From f9f0564a91e93fa66a79d65a36b77d40eb7eff70 Mon Sep 17 00:00:00 2001 From: Seil0 Date: Sat, 16 Mar 2019 00:00:34 +0100 Subject: [PATCH] time is now updateTime --- src/main/kotlin/org/mosad/thecitadelofricks/APIController.kt | 4 ++-- src/main/kotlin/org/mosad/thecitadelofricks/DataTypes.kt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/kotlin/org/mosad/thecitadelofricks/APIController.kt b/src/main/kotlin/org/mosad/thecitadelofricks/APIController.kt index 5ab0505..77ecfb4 100644 --- a/src/main/kotlin/org/mosad/thecitadelofricks/APIController.kt +++ b/src/main/kotlin/org/mosad/thecitadelofricks/APIController.kt @@ -86,13 +86,13 @@ class APIController { @RequestMapping("/courses") fun courses(): CoursesList { logger.info("courses request at ${LocalDateTime.now()}!") - return CoursesList(CoursesMeta(coursesLinkList.size, coursesLastUpdate), coursesLinkList) + return CoursesList(CoursesMeta(coursesLastUpdate, coursesLinkList.size), coursesLinkList) } @RequestMapping("/mensamenu") fun mensamenu(): Mensa { logger.info("mensamenu request at ${LocalDateTime.now()}!") - return Mensa(MensaMeta(mensaName, mensaLastUpdate), mensaCurrentWeek, mensaNextWeek) + return Mensa(MensaMeta(mensaLastUpdate, mensaName), mensaCurrentWeek, mensaNextWeek) } @RequestMapping("/timetable") diff --git a/src/main/kotlin/org/mosad/thecitadelofricks/DataTypes.kt b/src/main/kotlin/org/mosad/thecitadelofricks/DataTypes.kt index c17264a..4c2f2c8 100644 --- a/src/main/kotlin/org/mosad/thecitadelofricks/DataTypes.kt +++ b/src/main/kotlin/org/mosad/thecitadelofricks/DataTypes.kt @@ -28,7 +28,7 @@ import java.util.* // data classes for the course part data class Course(val courseName: String, val courseLink: String) -data class CoursesMeta(val totalCourses: Int, val time: Long) +data class CoursesMeta(val updateTime: Long, val totalCourses: Int) data class CoursesList(val meta: CoursesMeta, val courses: ArrayList) @@ -39,7 +39,7 @@ data class Meals(val meals: ArrayList) data class MensaWeek(val days: Array = Array(7) { Meals(ArrayList()) }) -data class MensaMeta(val mensaName: String, val time: Long) +data class MensaMeta(val updateTime: Long, val mensaName: String) data class Mensa(val meta: MensaMeta, val currentWeek: MensaWeek, val nextWeek: MensaWeek)