Merge pull request #199 from navikt/dev/cpa-repo-timestamp-endpoints

Gjort to endpoint deprecated, med redirect til nye endpoint-adresser

Author: terjenilssen

cpa-repo/src/main/kotlin/no/nav/emottak/cpa/App.kt

@@ -92,7 +92,9 @@ fun cpaApplicationModule(
                 validateCpa(cpaRepository, PartnerRepository(oracleDb), eventRegistrationService)
             }
             getCPA(cpaRepository)
+            getTimeStampsDeprecated()
             getTimeStamps(cpaRepository)
+            getTimeStampsLatestDeprecated()
             getTimeStampsLatest(cpaRepository)
             getTimeStampsLastUsed(cpaRepository)
             getCertificate(cpaRepository)

cpa-repo/src/main/kotlin/no/nav/emottak/cpa/Routes.kt

@@ -7,6 +7,7 @@ import io.ktor.server.plugins.BadRequestException
 import io.ktor.server.plugins.NotFoundException
 import io.ktor.server.request.receive
 import io.ktor.server.response.respond
+import io.ktor.server.response.respondRedirect
 import io.ktor.server.response.respondText
 import io.ktor.server.routing.Route
 import io.ktor.server.routing.Routing
@@ -16,7 +17,6 @@ import io.ktor.server.routing.post
 import io.micrometer.prometheusmetrics.PrometheusMeterRegistry
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
-import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import no.nav.emottak.cpa.auth.AZURE_AD_AUTH
 import no.nav.emottak.cpa.feil.CpaValidationException
@@ -143,8 +143,13 @@ fun Route.deleteCpa(cpaRepository: CPARepository): Route = delete("/cpa/delete/{
     }
 }
 
-fun Route.getTimeStamps(cpaRepository: CPARepository): Route = get("/cpa/timestamps") {
-    log.info("Timestamps")
+fun Route.getTimeStampsDeprecated(): Route = get("/cpa/timestamps") {
+    log.warn("Timestamps last_updated (deprecated endpoint)")
+    call.respondRedirect("/cpa/timestamps/last_updated", permanent = true)
+}
+
+fun Route.getTimeStamps(cpaRepository: CPARepository): Route = get("/cpa/timestamps/last_updated") {
+    log.info("Timestamps last_updated")
     call.respond(
         HttpStatusCode.OK,
         cpaRepository.findTimestampsCpaUpdated(
@@ -162,8 +167,13 @@ fun Route.getTimeStamps(cpaRepository: CPARepository): Route = get("/cpa/timesta
     )
 }
 
-fun Route.getTimeStampsLatest(cpaRepository: CPARepository) = get("/cpa/timestamps/latest") {
-    log.info("Timestamplatest")
+fun Route.getTimeStampsLatestDeprecated() = get("/cpa/timestamps/latest") {
+    log.warn("Timestamps latest last_updated (deprecated endpoint)")
+    call.respondRedirect("/cpa/timestamps/last_updated/latest", permanent = true)
+}
+
+fun Route.getTimeStampsLatest(cpaRepository: CPARepository) = get("/cpa/timestamps/last_updated/latest") {
+    log.info("Timestamps latest last_updated")
     val latestTimestamp = withContext(Dispatchers.IO) {
         cpaRepository.findTimestampCpaLatestUpdated()
     }

cpa-repo/src/test/kotlin/no/nav/emottak/cpa/CPARepoIntegrationTest.kt

@@ -17,6 +17,7 @@ import io.ktor.client.request.post
 import io.ktor.client.request.setBody
 import io.ktor.client.statement.HttpResponse
 import io.ktor.client.statement.bodyAsText
+import io.ktor.client.statement.request
 import io.ktor.http.ContentType.Application.Json
 import io.ktor.http.HttpStatusCode
 import io.ktor.http.contentType
@@ -343,29 +344,45 @@ class CPARepoIntegrationTest : PostgresOracleTest() {
     }
 
     @Test
-    fun `Henter latest updated timestamp`() = cpaRepoTestApp {
+    fun `Henter latest updated timestamp (deprecated endpoint - redirected)`() = cpaRepoTestApp {
         val httpClient = createClient {
             install(ContentNegotiation) {
                 json()
             }
             installCpaRepoAuthentication()
         }
+        val latestTimestamp = setupLatestTimestampsTest(httpClient)
+        val responseMedSiste = httpClient.get("/cpa/timestamps/latest")
+        assertEquals("/cpa/timestamps/last_updated/latest", responseMedSiste.request.url.encodedPath)
+        assertEquals(latestTimestamp.toString(), responseMedSiste.bodyAsText())
+    }
 
-        // Oppdatér CPA 35065 med gårdagens dato
-        val updatedTimestamp1 = Instant.now().minus(1, ChronoUnit.DAYS).truncatedTo(ChronoUnit.SECONDS)
-        postCpaRequest(httpClient, updatedTimestamp1, "nav-qass-35065.xml")
-
-        // Oppdatér CPA 31162 med dato forgårs
-        val updatedTimestamp2 = Instant.now().minus(2, ChronoUnit.DAYS).truncatedTo(ChronoUnit.SECONDS)
-        postCpaRequest(httpClient, updatedTimestamp2, "nav-qass-31162.xml")
+    @Test
+    fun `Henter latest updated timestamp`() = cpaRepoTestApp {
+        val httpClient = createClient {
+            install(ContentNegotiation) {
+                json()
+            }
+            installCpaRepoAuthentication()
+        }
+        val latestTimestamp = setupLatestTimestampsTest(httpClient)
+        val responseMedSiste = httpClient.get("/cpa/timestamps/last_updated/latest")
+        assertEquals(latestTimestamp.toString(), responseMedSiste.bodyAsText())
+    }
 
-        // Slett den siste CPA'ene slik at vi kun har to CPA'er i databasen
-        val deleteResponse = httpClient.delete("/cpa/delete/multiple_channels_and_multiple_endpoints")
-        assertEquals(HttpStatusCode.OK, deleteResponse.status)
+    @Test
+    fun `Henter timestamps map (deprecated endpoint - redirected)`() = cpaRepoTestApp {
+        val httpClient = createClient {
+            install(ContentNegotiation) {
+                json()
+            }
+            installCpaRepoAuthentication()
+        }
+        val updatedTimestamp = Instant.now().minus(1, ChronoUnit.DAYS).truncatedTo(ChronoUnit.SECONDS)
+        postCpaRequest(httpClient, updatedTimestamp, "nav-qass-35065.xml")
 
-        // Forvent at update-datoen til CPA 35065 blir returnert
-        val responseMedSiste = httpClient.get("/cpa/timestamps/latest")
-        assertEquals(updatedTimestamp1.toString(), responseMedSiste.bodyAsText())
+        val response = httpClient.get("/cpa/timestamps")
+        assertEquals("/cpa/timestamps/last_updated", response.request.url.encodedPath)
     }
 
     @Test
@@ -379,21 +396,22 @@ class CPARepoIntegrationTest : PostgresOracleTest() {
         val updatedTimestamp = Instant.now().minus(1, ChronoUnit.DAYS).truncatedTo(ChronoUnit.SECONDS)
         postCpaRequest(httpClient, updatedTimestamp, "nav-qass-35065.xml")
 
-        val responseMedAlle = httpClient.get("/cpa/timestamps").body<Map<String, String>>()
-        assertNotNull(responseMedAlle)
+        val response = httpClient.get("/cpa/timestamps/last_updated")
+        val responseMap = response.body<Map<String, String>>()
+        assertNotNull(responseMap)
         assertEquals(
             postgresTestSetup.timestamp.toString(),
-            responseMedAlle["nav:qass:31162"],
+            responseMap["nav:qass:31162"],
             "CPA 31162 skal ha timestamp fra postgresTestSetup"
         )
         assertEquals(
             updatedTimestamp.toString(),
-            responseMedAlle["nav:qass:35065"],
+            responseMap["nav:qass:35065"],
             "CPA 35065 skal ha timestamp satt av testen"
         )
         assertEquals(
             postgresTestSetup.timestamp.toString(),
-            responseMedAlle["multiple_channels_and_multiple_endpoints"],
+            responseMap["multiple_channels_and_multiple_endpoints"],
             "CPA multiple_channels_and_multiple_endpoints skal ha timestamp fra postgresTestSetup"
         )
     }
@@ -749,6 +767,22 @@ class CPARepoIntegrationTest : PostgresOracleTest() {
         return postResponse
     }
 
+    private suspend fun setupLatestTimestampsTest(httpClient: HttpClient): Instant {
+        // Oppdatér CPA 35065 med gårdagens dato
+        val updatedTimestamp1 = Instant.now().minus(1, ChronoUnit.DAYS).truncatedTo(ChronoUnit.SECONDS)
+        postCpaRequest(httpClient, updatedTimestamp1, "nav-qass-35065.xml")
+
+        // Oppdatér CPA 31162 med dato forgårs
+        val updatedTimestamp2 = Instant.now().minus(2, ChronoUnit.DAYS).truncatedTo(ChronoUnit.SECONDS)
+        postCpaRequest(httpClient, updatedTimestamp2, "nav-qass-31162.xml")
+
+        // Slett den siste CPA'en slik at vi kun har to CPA'er i databasen
+        val deleteResponse = httpClient.delete("/cpa/delete/multiple_channels_and_multiple_endpoints")
+        assertEquals(HttpStatusCode.OK, deleteResponse.status)
+
+        return updatedTimestamp1
+    }
+
     private suspend fun getLastUsedMap(httpClient: HttpClient): Map<String, String?> {
         val lastUsedResponse = httpClient.get("/cpa/timestamps/last_used")
         assertEquals(HttpStatusCode.OK, lastUsedResponse.status, "Expected OK status for /cpa/timestamps/last_used")