Merge pull request #473 from navikt/jpa

Rewrite to JPA and refactor.

build.gradle.kts

@@ -1,7 +1,6 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 val exposedVersion = "0.45.0"
-val mockkVersion = "1.13.8"
 val h2Version = "2.2.224"
 val pamGeographyVersion = "2.9"
 val tokenValidationVersion = "1.3.0"
@@ -14,9 +13,12 @@ val resilience4jVersion = "2.2.0"
 val problemSpringWebStartVersion = "0.27.0"
 val shedlockVersion = "5.10.2"
 val springDocVersion = "2.3.0"
-val kodeverkVersion = "1.5.5"
+val kodeverkVersion = "1.7.28"
 val simpleSlackPosterVersion = "0.1.4"
 val mockitoInlineVersion = "5.2.0"
+val testContainersVersion = "1.19.3"
+val mockkVersion = "1.13.8"
+val springMockkVersion = "4.0.2"
 
 val githubUser: String by project
 val githubPassword: String by project
@@ -33,6 +35,7 @@ plugins {
     id("org.jetbrains.kotlin.jvm") version kotlinVersion
     id("org.springframework.boot") version "3.2.1"
     id("org.jetbrains.kotlin.plugin.spring") version kotlinVersion
+    kotlin("plugin.jpa") version kotlinVersion
     idea
 }
 
@@ -45,6 +48,7 @@ dependencies {
     implementation("org.springframework.boot:spring-boot-starter-actuator")
     implementation("org.springframework.boot:spring-boot-starter-webflux")
     implementation("org.springframework.boot:spring-boot-starter-validation")
+    implementation("org.springframework.boot:spring-boot-starter-data-jpa")
 
     implementation("io.micrometer:micrometer-registry-prometheus")
     implementation("io.micrometer:micrometer-tracing-bridge-brave")
@@ -53,8 +57,6 @@ dependencies {
 
     implementation("org.flywaydb:flyway-core")
     implementation("com.zaxxer:HikariCP")
-    implementation("org.jetbrains.exposed:exposed-spring-boot-starter:$exposedVersion")
-    implementation("org.jetbrains.exposed:exposed-java-time:$exposedVersion")
     implementation("org.postgresql:postgresql")
 
     implementation("io.github.resilience4j:resilience4j-retry:$resilience4jVersion")
@@ -84,12 +86,19 @@ dependencies {
 
     implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:$springDocVersion")
 
-    testImplementation("io.mockk:mockk:$mockkVersion")
+    testImplementation("org.testcontainers:testcontainers:$testContainersVersion")
+    testImplementation("org.testcontainers:junit-jupiter:$testContainersVersion")
+    testImplementation("org.testcontainers:postgresql:$testContainersVersion")
+
     testImplementation("com.h2database:h2:$h2Version")
     testImplementation("org.springframework.boot:spring-boot-starter-test") {
         exclude(group = "org.junit.vintage")
+        exclude(group = "org.mockito")
     }
-    testImplementation("org.mockito:mockito-inline:$mockitoInlineVersion")
+
+    testImplementation("io.mockk:mockk:$mockkVersion")
+    testImplementation("com.ninja-squad:springmockk:$springMockkVersion")
+
     testImplementation("no.nav.security:token-validation-spring-test:$tokenSupportVersion")
 }
 

deploy/dev.yaml

@@ -15,4 +15,6 @@ kafka_pool: nav-dev
 
 db_tier: db-f1-micro
 db_type: POSTGRES_15
-db_high_availability: false
+db_high_availability: false
+
+max_replicas: 2

deploy/nais.yaml

@@ -34,7 +34,7 @@ spec:
       memory: 2048Mi
   replicas:
     min: 2
-    max: 4
+    max: {{max_replicas}}
     cpuThresholdPercentage: 80
   prometheus:
     enabled: true

deploy/prod.yaml

@@ -10,4 +10,6 @@ kafka_pool: nav-prod
 
 db_tier: db-custom-1-3840
 db_type: POSTGRES_15
-db_high_availability: true
+db_high_availability: true
+
+max_replicas: 4

src/main/kotlin/no/nav/klage/Application.kt

@@ -1,22 +1,11 @@
 package no.nav.klage
 
-import no.nav.security.token.support.client.spring.oauth2.EnableOAuth2Client
-import no.nav.security.token.support.spring.api.EnableJwtTokenValidation
-import org.jetbrains.exposed.spring.autoconfigure.ExposedAutoConfiguration
 import org.springframework.boot.autoconfigure.SpringBootApplication
-import org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration
 import org.springframework.boot.runApplication
-import org.springframework.context.annotation.Import
-import org.springframework.scheduling.annotation.EnableScheduling
 
-@SpringBootApplication(exclude = [DataSourceTransactionManagerAutoConfiguration::class])
-@EnableJwtTokenValidation(ignore = ["org.springdoc", "org.springframework.boot.autoconfigure.web.servlet.error.BasicErrorController"])
-@EnableOAuth2Client(cacheEnabled = true)
-@Import(value = [ExposedAutoConfiguration::class])
-@EnableScheduling
+@SpringBootApplication
 class Application
 
-//TODO: EnableOAuth er nødvendig for ny, sjekk om kompatibelt med gammel.
 fun main() {
     runApplication<Application>()
 }

src/main/kotlin/no/nav/klage/clients/KlageDittnavPdfgenClient.kt

@@ -17,21 +17,21 @@ class KlageDittnavPdfgenClient(
         private val logger = getLogger(javaClass.enclosingClass)
     }
 
-    fun getKlagePDF(input: PDFInput): ByteArray {
-        logger.debug("Creating PDF from klage.")
+    fun getKlageAnkePDF(input: PDFInput): ByteArray {
+        logger.debug("Creating PDF for ${input.type}.")
         return klageDittnavPdfgenWebClient.post()
-            .uri { it.path("/klage").build() }
+            .uri { it.path("/klageanke").build() }
             .contentType(MediaType.APPLICATION_JSON)
             .bodyValue(input)
             .retrieve()
             .bodyToMono<ByteArray>()
             .block() ?: throw RuntimeException("PDF could not be generated")
     }
 
-    fun getAnkePDF(input: PDFInput): ByteArray {
-        logger.debug("Creating PDF from anke.")
+    fun getEttersendelsePDF(input: PDFInput): ByteArray {
+        logger.debug("Creating PDF for ettersendelse for ${input.type}")
         return klageDittnavPdfgenWebClient.post()
-            .uri { it.path("/anke").build() }
+            .uri { it.path("/ettersendelse").build() }
             .contentType(MediaType.APPLICATION_JSON)
             .bodyValue(input)
             .retrieve()

src/main/kotlin/no/nav/klage/common/KlageAnkeMetrics.kt

@@ -5,6 +5,7 @@ import no.nav.klage.domain.klage.CheckboxEnum
 import no.nav.klage.domain.titles.Innsendingsytelse
 import no.nav.klage.util.getLogger
 import org.springframework.stereotype.Component
+
 @Component
 class KlageAnkeMetrics(private val meterRegistry: MeterRegistry) {
 
@@ -15,7 +16,6 @@ class KlageAnkeMetrics(private val meterRegistry: MeterRegistry) {
         private const val COUNTER_KLAGER_FINALIZED = "klager_finalized"
         private const val COUNTER_KLAGER_INITIALIZED = "klager_initialized"
         private const val COUNTER_KLAGER_FINALIZED_GRUNN = "klager_finalized_grunn"
-        private const val COUNTER_KLAGER_FINALIZED_FULLMAKT = "klager_finalized_fullmakt"
         private const val COUNTER_KLAGER_OPTIONAL_SAKSNUMMER = "klager_optional_saksnummer"
         private const val COUNTER_KLAGER_OPTIONAL_VEDTAKSDATO = "klager_optional_vedtaksdato"
         private const val COUNTER_KLAGER_FINALIZED_TITLE = "klager_finalized_title"
@@ -40,7 +40,7 @@ class KlageAnkeMetrics(private val meterRegistry: MeterRegistry) {
         }
     }
 
-    fun incrementKlagerGrunn(ytelse: String, checkboxesSelected: Set<CheckboxEnum>) {
+    fun incrementKlagerGrunn(ytelse: String, checkboxesSelected: List<CheckboxEnum>) {
         try {
             checkboxesSelected.forEach {
                 meterRegistry.counter(COUNTER_KLAGER_FINALIZED_GRUNN, "ytelse", ytelse, "grunn", it.name).increment()
@@ -50,14 +50,6 @@ class KlageAnkeMetrics(private val meterRegistry: MeterRegistry) {
         }
     }
 
-    fun incrementFullmakt(ytelse: String) {
-        try {
-            meterRegistry.counter(COUNTER_KLAGER_FINALIZED_FULLMAKT, "ytelse", ytelse).increment()
-        } catch (e: Exception) {
-            logger.warn("incrementFullmakt failed", e)
-        }
-    }
-
     fun incrementOptionalSaksnummer(ytelse: String) {
         try {
             meterRegistry.counter(COUNTER_KLAGER_OPTIONAL_SAKSNUMMER, "ytelse", ytelse).increment()

src/main/kotlin/no/nav/klage/config/SchedulingConfiguration.kt

@@ -7,12 +7,14 @@ import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import org.springframework.jdbc.core.JdbcTemplate
 import org.springframework.scheduling.annotation.EnableAsync
+import org.springframework.scheduling.annotation.EnableScheduling
 import javax.sql.DataSource
 
 
 @Configuration
 @EnableSchedulerLock(defaultLockAtMostFor = "10m")
 @EnableAsync
+@EnableScheduling
 class SchedulingConfiguration {
 
     @Bean

src/main/kotlin/no/nav/klage/config/SecurityConfiguration.kt

@@ -0,0 +1,12 @@
+package no.nav.klage.config
+
+import no.nav.security.token.support.client.spring.oauth2.EnableOAuth2Client
+import no.nav.security.token.support.spring.api.EnableJwtTokenValidation
+import org.springframework.context.annotation.Configuration
+
+@EnableJwtTokenValidation(ignore = ["org.springdoc", "org.springframework.boot.autoconfigure.web.servlet.error.BasicErrorController"])
+@EnableOAuth2Client(cacheEnabled = true)
+@Configuration
+internal class SecurityConfiguration {
+
+}