Seil0/TheCitadelofRicks
1
1
Fork 0
Code Issues 3 Pull Requests Releases 14 Wiki Activity

count courseList requests seperat

Browse Source
This commit is contained in:
Jannik
2020-02-27 17:42:19 +01:00
parent be95af43c2
commit 2f1f65eba0
3 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/kotlin/org/mosad/thecitadelofricks/APIController.kt
View File

@ -30,9 +30,9 @@ import org.mosad.thecitadelofricks.controller.CacheController.Companion.getTimet
import org.mosad.thecitadelofricks.controller.CacheController.Companion.mensaMenu
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.updateTimetableRequests
import org.mosad.thecitadelofricks.controller.StatusController.Companion.updateTotalRequests
import org.slf4j.Logger
import org.slf4j.LoggerFactory
import org.springframework.web.bind.annotation.RequestMapping
@ -67,14 +67,13 @@ class APIController {
@RequestMapping("/courseList")
fun courseList(): CoursesList {
logger.info("courseList request at ${LocalDateTime.now()}!")
updateTotalRequests()
updateCourseListRequests()
return courseList
}
@RequestMapping("/mensamenu")
fun mensamenu(): MensaMenu {
logger.info("mensamenu request at ${LocalDateTime.now()}!")
updateTotalRequests()
updateMensaMenuRequests()
return mensaMenu
}
@ -85,7 +84,6 @@ class APIController {
@RequestParam(value = "week", defaultValue = "0") week: Int
): TimetableCourseWeek {
logger.info("timetable request at ${LocalDateTime.now()}!")
updateTotalRequests()
updateTimetableRequests(courseName)
return getTimetable(courseName, week)
}
@ -96,7 +94,7 @@ class APIController {
@RequestParam(value = "week", defaultValue = "0") week: Int
): HashSet<String> {
logger.info("lessonSubjectList request at ${LocalDateTime.now()}!")
updateTotalRequests()
updateTimetableRequests(courseName)
return getLessonSubjectList(courseName, week)
}
@ -107,7 +105,7 @@ class APIController {
@RequestParam(value = "week", defaultValue = "0") week: Int
): ArrayList<Lesson> {
logger.info("lesson request at ${LocalDateTime.now()}!")
updateTotalRequests()
updateTimetableRequests(courseName)
return getLesson(courseName, lessonSubject, week)
}