From cbdcd80fef226b1d02e48d14104e6c9cf7676e18 Mon Sep 17 00:00:00 2001
From: Nathan Cannon <nathan.cannon@edf-energy.com>
Date: Wed, 10 Oct 2018 11:10:07 +0100
Subject: [PATCH] Added caching.

---
 backend/pom.xml                                          | 9 +++++++++
 .../uk/co/neviyn/observationdatabase/Controller.kt       | 2 ++
 .../ObservationDatabaseApplication.kt                    | 2 ++
 backend/src/main/resources/application.properties        | 5 ++++-
 4 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/backend/pom.xml b/backend/pom.xml
index 76f041d..b457177 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -56,6 +56,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-security</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-cache</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.module</groupId>
             <artifactId>jackson-module-kotlin</artifactId>
@@ -95,6 +99,11 @@
             <artifactId>usertype.core</artifactId>
             <version>7.0.0.CR1</version>
         </dependency>
+        <dependency>
+            <groupId>com.github.ben-manes.caffeine</groupId>
+            <artifactId>caffeine</artifactId>
+            <version>2.6.2</version>
+        </dependency>
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
diff --git a/backend/src/main/kotlin/uk/co/neviyn/observationdatabase/Controller.kt b/backend/src/main/kotlin/uk/co/neviyn/observationdatabase/Controller.kt
index 108adac..8680608 100644
--- a/backend/src/main/kotlin/uk/co/neviyn/observationdatabase/Controller.kt
+++ b/backend/src/main/kotlin/uk/co/neviyn/observationdatabase/Controller.kt
@@ -2,6 +2,7 @@ package uk.co.neviyn.observationdatabase
 
 import org.joda.time.LocalDate
 import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.cache.annotation.Cacheable
 import org.springframework.web.bind.annotation.GetMapping
 import org.springframework.web.bind.annotation.PathVariable
 import org.springframework.web.bind.annotation.PostMapping
@@ -118,6 +119,7 @@ class Controller {
      * Get all observations that are within the constraints provided in [observationsRequest].
      */
     @PostMapping("/observations")
+    @Cacheable("observations")
     fun getObservations(@Valid @RequestBody observationsRequest: ObservationsRequest): List<Observation> {
         if (observationsRequest.tutor != null) {
             return tutorRepository.findById(observationsRequest.tutor).map {
diff --git a/backend/src/main/kotlin/uk/co/neviyn/observationdatabase/ObservationDatabaseApplication.kt b/backend/src/main/kotlin/uk/co/neviyn/observationdatabase/ObservationDatabaseApplication.kt
index 3221559..5d22124 100644
--- a/backend/src/main/kotlin/uk/co/neviyn/observationdatabase/ObservationDatabaseApplication.kt
+++ b/backend/src/main/kotlin/uk/co/neviyn/observationdatabase/ObservationDatabaseApplication.kt
@@ -2,8 +2,10 @@ package uk.co.neviyn.observationdatabase
 
 import org.springframework.boot.autoconfigure.SpringBootApplication
 import org.springframework.boot.runApplication
+import org.springframework.cache.annotation.EnableCaching
 
 @SpringBootApplication
+@EnableCaching
 class ObservationDatabaseApplication {
     companion object {
         @JvmStatic
diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties
index fe8bbb9..5230070 100644
--- a/backend/src/main/resources/application.properties
+++ b/backend/src/main/resources/application.properties
@@ -1,4 +1,7 @@
 spring.jpa.properties.jadira.usertype.autoRegisterUserTypes = true
 spring.datasource.url=jdbc:h2:file:./database
 spring.jpa.hibernate.ddl-auto=update
-obsdb.password=observation
\ No newline at end of file
+obsdb.password=observation
+spring.cache.type=caffeine
+spring.cache.cache-names=observations
+spring.cache.caffeine.spec=maximumSize=500,expireAfterAccess=600s