neviyn/ObservationDatabase
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Added caching to chart endpoint.

Browse Source
This commit is contained in:
neviyn 2018-10-10 12:23:04 +01:00
parent cbdcd80fef
commit 0fcfcfaa09
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backend/src/main/kotlin/uk/co/neviyn/observationdatabase/Controller.kt
View File

@ -119,7 +119,7 @@ class Controller {
* Get all observations that are within the constraints provided in [observationsRequest]. * Get all observations that are within the constraints provided in [observationsRequest].
*/ */
@PostMapping("/observations") @PostMapping("/observations")
@Cacheable("observations") @Cacheable("observations", key = "#observationsRequest")
fun getObservations(@Valid @RequestBody observationsRequest: ObservationsRequest): List<Observation> { fun getObservations(@Valid @RequestBody observationsRequest: ObservationsRequest): List<Observation> {
if (observationsRequest.tutor != null) { if (observationsRequest.tutor != null) {
return tutorRepository.findById(observationsRequest.tutor).map { return tutorRepository.findById(observationsRequest.tutor).map {
@ -155,6 +155,7 @@ class Controller {
* in a format compatible with ChartJS. * in a format compatible with ChartJS.
*/ */
@PostMapping("/observations/chartdata") @PostMapping("/observations/chartdata")
@Cacheable("charts", key = "#observationsRequest")
fun getObservationsChartData(@Valid @RequestBody observationsRequest: ObservationsRequest): ChartData? { fun getObservationsChartData(@Valid @RequestBody observationsRequest: ObservationsRequest): ChartData? {
val data = getObservations(observationsRequest) val data = getObservations(observationsRequest)
if (data.isEmpty()) return ChartData(listOf(), listOf()) if (data.isEmpty()) return ChartData(listOf(), listOf())

3
backend/src/main/resources/application.properties
View File

@ -3,5 +3,6 @@ spring.datasource.url=jdbc:h2:file:./database
spring.jpa.hibernate.ddl-auto=update spring.jpa.hibernate.ddl-auto=update
obsdb.password=observation obsdb.password=observation
spring.cache.type=caffeine spring.cache.type=caffeine
spring.cache.cache-names=observations spring.cache.cache-names=observations,charts
spring.cache.caffeine.spec=maximumSize=500,expireAfterAccess=600s spring.cache.caffeine.spec=maximumSize=500,expireAfterAccess=600s
management.endpoints.web.exposure.include=health,info,metrics