change some parameters
* fixes #13 * use a HashMap for timetableRequests count * api version 1.2.0 * software version 1.2.3
This commit is contained in:
parent
efd8f9f9f5
commit
ec7a0a7a64
|
@ -16,7 +16,7 @@ dependencies {
|
||||||
implementation 'org.springframework.boot:spring-boot-starter-web'
|
implementation 'org.springframework.boot:spring-boot-starter-web'
|
||||||
implementation 'org.jetbrains.kotlin:kotlin-reflect'
|
implementation 'org.jetbrains.kotlin:kotlin-reflect'
|
||||||
implementation 'org.jetbrains.kotlin:kotlin-stdlib'
|
implementation 'org.jetbrains.kotlin:kotlin-stdlib'
|
||||||
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.6'
|
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.7'
|
||||||
implementation 'org.jsoup:jsoup:1.13.1'
|
implementation 'org.jsoup:jsoup:1.13.1'
|
||||||
implementation 'com.google.code.gson:gson:2.8.6'
|
implementation 'com.google.code.gson:gson:2.8.6'
|
||||||
|
|
||||||
|
|
|
@ -47,8 +47,8 @@ class APIController {
|
||||||
private val logger: Logger = LoggerFactory.getLogger(APIController::class.java)
|
private val logger: Logger = LoggerFactory.getLogger(APIController::class.java)
|
||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
const val apiVersion = "1.1.4"
|
const val apiVersion = "1.2.0"
|
||||||
const val softwareVersion = "1.2.2"
|
const val softwareVersion = "1.2.3"
|
||||||
val startTime = System.currentTimeMillis() / 1000
|
val startTime = System.currentTimeMillis() / 1000
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -57,13 +57,6 @@ class APIController {
|
||||||
CacheController()
|
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")
|
@RequestMapping("/courseList")
|
||||||
fun courseList(): CoursesList {
|
fun courseList(): CoursesList {
|
||||||
logger.info("courseList request at ${LocalDateTime.now()}!")
|
logger.info("courseList request at ${LocalDateTime.now()}!")
|
||||||
|
@ -80,7 +73,7 @@ class APIController {
|
||||||
|
|
||||||
@RequestMapping("/timetable")
|
@RequestMapping("/timetable")
|
||||||
fun timetable(
|
fun timetable(
|
||||||
@RequestParam(value = "courseName", defaultValue = "AI4") courseName: String,
|
@RequestParam(value = "course", defaultValue = "AI4") courseName: String,
|
||||||
@RequestParam(value = "week", defaultValue = "0") week: Int
|
@RequestParam(value = "week", defaultValue = "0") week: Int
|
||||||
): TimetableCourseWeek {
|
): TimetableCourseWeek {
|
||||||
logger.info("timetable request at ${LocalDateTime.now()}!")
|
logger.info("timetable request at ${LocalDateTime.now()}!")
|
||||||
|
@ -88,20 +81,20 @@ class APIController {
|
||||||
return getTimetable(courseName, week)
|
return getTimetable(courseName, week)
|
||||||
}
|
}
|
||||||
|
|
||||||
@RequestMapping("/lessonSubjectList")
|
@RequestMapping("/subjectList")
|
||||||
fun lessonSubjectList(
|
fun lessonSubjectList(
|
||||||
@RequestParam(value = "courseName", defaultValue = "AI4") courseName: String,
|
@RequestParam(value = "course", defaultValue = "AI4") courseName: String,
|
||||||
@RequestParam(value = "week", defaultValue = "0") week: Int
|
@RequestParam(value = "week", defaultValue = "0") week: Int
|
||||||
): HashSet<String> {
|
): HashSet<String> {
|
||||||
logger.info("lessonSubjectList request at ${LocalDateTime.now()}!")
|
logger.info("subjectList request at ${LocalDateTime.now()}!")
|
||||||
updateTimetableRequests(courseName)
|
updateTimetableRequests(courseName)
|
||||||
return getLessonSubjectList(courseName, week)
|
return getLessonSubjectList(courseName, week)
|
||||||
}
|
}
|
||||||
|
|
||||||
@RequestMapping("/lessons")
|
@RequestMapping("/lessons")
|
||||||
fun lesson(
|
fun lesson(
|
||||||
@RequestParam(value = "courseName", defaultValue = "AI4") courseName: String,
|
@RequestParam(value = "course", defaultValue = "AI4") courseName: String,
|
||||||
@RequestParam(value = "lessonSubject", defaultValue = "Mathematik 4") lessonSubject: String,
|
@RequestParam(value = "subject", defaultValue = "Mathematik 4") lessonSubject: String,
|
||||||
@RequestParam(value = "week", defaultValue = "0") week: Int
|
@RequestParam(value = "week", defaultValue = "0") week: Int
|
||||||
): ArrayList<Lesson> {
|
): ArrayList<Lesson> {
|
||||||
logger.info("lesson request at ${LocalDateTime.now()}!")
|
logger.info("lesson request at ${LocalDateTime.now()}!")
|
||||||
|
@ -121,4 +114,25 @@ class APIController {
|
||||||
return 200
|
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)
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
|
@ -24,6 +24,7 @@ package org.mosad.thecitadelofricks
|
||||||
|
|
||||||
import java.time.LocalDateTime
|
import java.time.LocalDateTime
|
||||||
import java.util.*
|
import java.util.*
|
||||||
|
import kotlin.collections.HashMap
|
||||||
|
|
||||||
// data classes for the course part
|
// data classes for the course part
|
||||||
data class Course(val courseName: String, val courseLink: String)
|
data class Course(val courseName: String, val courseLink: String)
|
||||||
|
@ -72,7 +73,7 @@ data class Status(
|
||||||
val totalRequests: Int,
|
val totalRequests: Int,
|
||||||
val mensaMenuRequests: Int,
|
val mensaMenuRequests: Int,
|
||||||
val courseListRequests: Int,
|
val courseListRequests: Int,
|
||||||
val timetableRequests: ArrayList<TimetableCounter>,
|
val timetableRequests: HashMap<String, Int>,
|
||||||
val timetableListSize: Int,
|
val timetableListSize: Int,
|
||||||
val coursesLastUpdate: Date,
|
val coursesLastUpdate: Date,
|
||||||
val mensaLastUpdate: Date,
|
val mensaLastUpdate: Date,
|
||||||
|
|
|
@ -26,14 +26,13 @@ import org.mosad.thecitadelofricks.APIController.Companion.apiVersion
|
||||||
import org.mosad.thecitadelofricks.APIController.Companion.softwareVersion
|
import org.mosad.thecitadelofricks.APIController.Companion.softwareVersion
|
||||||
import org.mosad.thecitadelofricks.APIController.Companion.startTime
|
import org.mosad.thecitadelofricks.APIController.Companion.startTime
|
||||||
import org.mosad.thecitadelofricks.Status
|
import org.mosad.thecitadelofricks.Status
|
||||||
import org.mosad.thecitadelofricks.TimetableCounter
|
|
||||||
import org.slf4j.Logger
|
import org.slf4j.Logger
|
||||||
import org.slf4j.LoggerFactory
|
import org.slf4j.LoggerFactory
|
||||||
import java.net.HttpURLConnection
|
import java.net.HttpURLConnection
|
||||||
import java.net.URL
|
import java.net.URL
|
||||||
import java.time.LocalDateTime
|
import java.time.LocalDateTime
|
||||||
import java.util.*
|
import java.util.*
|
||||||
import kotlin.collections.ArrayList
|
import kotlin.collections.HashMap
|
||||||
|
|
||||||
class StatusController {
|
class StatusController {
|
||||||
|
|
||||||
|
@ -43,7 +42,7 @@ class StatusController {
|
||||||
private var totalRequests = 0
|
private var totalRequests = 0
|
||||||
private var mensaMenuRequests = 0
|
private var mensaMenuRequests = 0
|
||||||
private var courseListRequests = 0
|
private var courseListRequests = 0
|
||||||
private var timetableRequests = ArrayList<TimetableCounter>()
|
private var timetableRequests = HashMap<String, Int>()
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* if a mensamenu/courseList/timetable is requested update the specific and total request count
|
* if a mensamenu/courseList/timetable is requested update the specific and total request count
|
||||||
|
@ -59,11 +58,7 @@ class StatusController {
|
||||||
}
|
}
|
||||||
|
|
||||||
fun updateTimetableRequests(courseName: String) {
|
fun updateTimetableRequests(courseName: String) {
|
||||||
timetableRequests.stream().filter { it.courseName == courseName }.findFirst().ifPresentOrElse({
|
timetableRequests[courseName] = timetableRequests.getOrPut(courseName) {0} + 1
|
||||||
it.requests++
|
|
||||||
}, {
|
|
||||||
timetableRequests.add(TimetableCounter(courseName, 1))
|
|
||||||
})
|
|
||||||
totalRequests++
|
totalRequests++
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -82,7 +77,7 @@ class StatusController {
|
||||||
return courseListRequests
|
return courseListRequests
|
||||||
}
|
}
|
||||||
|
|
||||||
fun getTimetableRequests(): ArrayList<TimetableCounter> {
|
fun getTimetableRequests(): HashMap<String, Int> {
|
||||||
return timetableRequests
|
return timetableRequests
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue