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

change some parameters
All checks were successful
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/tag Build is passing
Details

Browse Source 
* fixes #13
* use a HashMap for timetableRequests count
* api version 1.2.0
* software version 1.2.3
This commit is contained in:
Jannik
2020-06-05 18:23:15 +02:00
parent efd8f9f9f5
commit ec7a0a7a64
4 changed files with 36 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,8 +47,8 @@ class APIController {
private val logger: Logger = LoggerFactory.getLogger(APIController::class.java)
companion object {
const val apiVersion = "1.1.4"
const val softwareVersion = "1.2.2"
const val apiVersion = "1.2.0"
const val softwareVersion = "1.2.3"
val startTime = System.currentTimeMillis() / 1000
}
@ -57,13 +57,6 @@ class APIController {
CacheController()
}
// TODO remove this with API version 2.0.0
@Deprecated("courses is replaced by courseList", replaceWith = ReplaceWith("courseList()"))
@RequestMapping("/courses")
fun courses(): CoursesList {
return courseList()
}
@RequestMapping("/courseList")
fun courseList(): CoursesList {
logger.info("courseList request at ${LocalDateTime.now()}!")
@ -80,7 +73,7 @@ class APIController {
@RequestMapping("/timetable")
fun timetable(
@RequestParam(value = "courseName", defaultValue = "AI4") courseName: String,
@RequestParam(value = "course", defaultValue = "AI4") courseName: String,
@RequestParam(value = "week", defaultValue = "0") week: Int
): TimetableCourseWeek {
logger.info("timetable request at ${LocalDateTime.now()}!")
@ -88,20 +81,20 @@ class APIController {
return getTimetable(courseName, week)
}
@RequestMapping("/lessonSubjectList")
@RequestMapping("/subjectList")
fun lessonSubjectList(
@RequestParam(value = "courseName", defaultValue = "AI4") courseName: String,
@RequestParam(value = "course", defaultValue = "AI4") courseName: String,
@RequestParam(value = "week", defaultValue = "0") week: Int
): HashSet<String> {
logger.info("lessonSubjectList request at ${LocalDateTime.now()}!")
logger.info("subjectList request at ${LocalDateTime.now()}!")
updateTimetableRequests(courseName)
return getLessonSubjectList(courseName, week)
}
@RequestMapping("/lessons")
fun lesson(
@RequestParam(value = "courseName", defaultValue = "AI4") courseName: String,
@RequestParam(value = "lessonSubject", defaultValue = "Mathematik 4") lessonSubject: String,
@RequestParam(value = "course", defaultValue = "AI4") courseName: String,
@RequestParam(value = "subject", defaultValue = "Mathematik 4") lessonSubject: String,
@RequestParam(value = "week", defaultValue = "0") week: Int
): ArrayList<Lesson> {
logger.info("lesson request at ${LocalDateTime.now()}!")
@ -121,4 +114,25 @@ class APIController {
return 200
}
/**
* Deprecated section
*/
// TODO remove this with API version 2.0.0
@Deprecated("courses is replaced by courseList", replaceWith = ReplaceWith("courseList()"))
@RequestMapping("/courses")
fun courses(): CoursesList {
return courseList()
}
// TODO remove this with API version 2.0.0
@Deprecated("the parameter courseName is deprecated please use course", ReplaceWith("timetable(courseName, week)"))
@RequestMapping("/timetable", params= ["courseName", "week"])
fun timetableDep(
@RequestParam(value = "courseName", defaultValue = "AI4") courseName: String,
@RequestParam(value = "week", defaultValue = "0") week: Int
): TimetableCourseWeek {
return timetable(courseName, week)
}
}