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

version 1.1.6
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source 
* API version 1.1.4
* added /health, returns 200 (OK, for status checks)
* moved status code to a separate class
* added status.mosad.xyz reporting
This commit is contained in:
Jannik
2019-10-21 18:46:21 +02:00
parent 132cf2df0e
commit db57059727
5 changed files with 205 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,14 +28,15 @@ import org.mosad.thecitadelofricks.controller.CacheController.Companion.getLesso
import org.mosad.thecitadelofricks.controller.CacheController.Companion.getLessonSubjectList
import org.mosad.thecitadelofricks.controller.CacheController.Companion.getTimetable
import org.mosad.thecitadelofricks.controller.CacheController.Companion.mensaMenu
import org.mosad.thecitadelofricks.controller.CacheController.Companion.timetableList
import org.mosad.thecitadelofricks.controller.StatusController.Companion.getStatus
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
import org.springframework.web.bind.annotation.RequestParam
import org.springframework.web.bind.annotation.RestController
import java.net.HttpURLConnection
import java.net.URL
import java.time.LocalDateTime
import java.util.*
import kotlin.collections.ArrayList
@ -45,13 +46,11 @@ class APIController {
private val logger: Logger = LoggerFactory.getLogger(APIController::class.java)
private val apiVersion = "1.1.3"
private val softwareVersion = "1.1.5"
private val startTime = System.currentTimeMillis() / 1000
var totalRequests = 0
private var mensaMenuRequests = 0
private var timetableRequests = ArrayList<TimetableCounter>()
companion object {
const val apiVersion = "1.1.4"
const val softwareVersion = "1.1.6"
val startTime = System.currentTimeMillis() / 1000
}
init {
CacheController() // initialize the CacheController
@ -67,15 +66,15 @@ class APIController {
@RequestMapping("/courseList")
fun courseList(): CourseList {
logger.info("courseList request at ${LocalDateTime.now()}!")
totalRequests++
updateTotalRequests()
return courseList
}
@RequestMapping("/mensamenu")
fun mensamenu(): MensaMenu {
logger.info("mensamenu request at ${LocalDateTime.now()}!")
mensaMenuRequests++
totalRequests++
updateTotalRequests()
updateMensaMenuRequests()
return mensaMenu
}
@ -85,8 +84,8 @@ class APIController {
@RequestParam(value = "week", defaultValue = "0") week: Int
): TimetableCourseWeek {
logger.info("timetable request at ${LocalDateTime.now()}!")
updateTotalRequests()
updateTimetableRequests(courseName)
totalRequests++
return getTimetable(courseName, week)
}
@ -96,7 +95,7 @@ class APIController {
@RequestParam(value = "week", defaultValue = "0") week: Int
): HashSet<String> {
logger.info("lessonSubjectList request at ${LocalDateTime.now()}!")
totalRequests++
updateTotalRequests()
return getLessonSubjectList(courseName, week)
}
@ -107,75 +106,20 @@ class APIController {
@RequestParam(value = "week", defaultValue = "0") week: Int
): ArrayList<Lesson> {
logger.info("lesson request at ${LocalDateTime.now()}!")
totalRequests++
updateTotalRequests()
return getLesson(courseName, lessonSubject, week)
}
@RequestMapping("/status")
fun status(): Status {
logger.info("status request at ${LocalDateTime.now()}!")
return getStatus()
}
// non direct api functions
/**
* if a timetable is requested update the request counter
*/
private fun updateTimetableRequests(courseName: String) {
when (timetableRequests.stream().filter { x -> x.courseName == courseName }.findAny().orElse(null)) {
null -> timetableRequests.add(TimetableCounter(courseName, 0))
}
timetableRequests.stream().filter { x ->x.courseName == courseName }.findFirst().ifPresent { x -> x.requests++ }
// TODO Java 11
// timetableRequests.stream().filter { it.courseName == courseName }.findFirst().ifPresentOrElse({
// it.requests++
// }, {
//
// })
}
private fun getStatus(): Status {
val currentTime = System.currentTimeMillis() / 1000
val minutes = (currentTime - startTime) % 3600 / 60
val hours = (currentTime - startTime) % 86400 / 3600
val days = (currentTime - startTime) / 86400
var hsoCode = 999
var swfrCode = 999
logger.info("status request at ${LocalDateTime.now()}!")
try {
val hsoURL = URL("https://www.hs-offenburg.de/")
val swfrURL = URL("https://www.swfr.de/")
var connection = hsoURL.openConnection() as HttpURLConnection
connection.requestMethod = "HEAD"
connection.connectTimeout = 15000
hsoCode = connection.responseCode
connection = swfrURL.openConnection() as HttpURLConnection
connection.connectTimeout = 15000
swfrCode = connection.responseCode
} catch (e: Exception) {
logger.error("Error while fetching url response codes!", e)
}
return Status(
LocalDateTime.now(),
"$days days, $hours:$minutes",
apiVersion,
softwareVersion,
totalRequests,
mensaMenuRequests,
timetableRequests,
timetableList.size,
Date(courseList.meta.updateTime * 1000),
Date(mensaMenu.meta.updateTime * 1000),
hsoCode,
swfrCode
)
@RequestMapping("/health")
fun health(): Int {
logger.info("health request at ${LocalDateTime.now()}!")
return 200
}
}