fjerner avhengighet til egen database

sporbar henter dokumenter fra spedisjon

Co-authored-by: Simen Ullern <[email protected]>
Co-authored-by: Håkon Arneng Holmstedt <[email protected]>

build.gradle.kts

@@ -5,10 +5,6 @@ val tbdLibsVersion = "2024.11.25-10.59-6f263a10"
 val ktorVersion = "3.0.1"
 val junitJupiterVersion = "5.11.3"
 val mockkVersion = "1.13.13"
-val postgresqlVersion = "42.7.4"
-val kotliqueryVersion = "1.9.0"
-val hikariCPVersion = "6.1.0"
-val flywayVersion = "10.21.0"
 val jsonSchemaValidatorVersion = "1.0.73"
 val jsonassertVersion = "1.5.1"
 
@@ -32,13 +28,7 @@ dependencies {
         exclude(group = "junit")
     }
 
-    implementation("com.zaxxer:HikariCP:$hikariCPVersion")
-    implementation("org.postgresql:postgresql:$postgresqlVersion")
-    implementation("org.flywaydb:flyway-database-postgresql:$flywayVersion")
-    implementation("com.github.seratch:kotliquery:$kotliqueryVersion")
-
     testImplementation("com.github.navikt.tbd-libs:rapids-and-rivers-test:$tbdLibsVersion")
-    testImplementation("com.github.navikt.tbd-libs:postgres-testdatabaser:$tbdLibsVersion")
     testImplementation("io.mockk:mockk:$mockkVersion")
     testImplementation("com.networknt:json-schema-validator:$jsonSchemaValidatorVersion")
     testImplementation("org.skyscreamer:jsonassert:$jsonassertVersion")

deploy/dev.yml

@@ -30,16 +30,6 @@ spec:
     pool: nav-dev
   secureLogs:
     enabled: true
-  gcp:
-    sqlInstances:
-      - type: POSTGRES_16
-        diskAutoresize: true
-        pointInTimeRecovery: true
-        tier: db-f1-micro
-        name: sporbar
-        databases:
-          - name: sporbar
-            envVarPrefix: DATABASE
   accessPolicy:
     outbound:
       rules:

deploy/prod.yml

@@ -33,16 +33,6 @@ spec:
     pool: nav-prod
   secureLogs:
     enabled: true
-  gcp:
-    sqlInstances:
-      - type: POSTGRES_15
-        diskAutoresize: true
-        pointInTimeRecovery: true
-        tier: db-custom-4-16384
-        name: sporbar
-        databases:
-          - name: sporbar
-            envVarPrefix: DATABASE
   accessPolicy:
     outbound:
       rules:

src/main/kotlin/no/nav/helse/sporbar/App.kt

@@ -7,17 +7,12 @@ import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.github.navikt.tbd_libs.azure.createAzureTokenClientFromEnvironment
 import com.github.navikt.tbd_libs.kafka.AivenConfig
 import com.github.navikt.tbd_libs.kafka.ConsumerProducerFactory
-import com.github.navikt.tbd_libs.rapids_and_rivers_api.RapidsConnection
 import com.github.navikt.tbd_libs.spedisjon.SpedisjonClient
 import com.github.navikt.tbd_libs.speed.SpeedClient
-import java.net.http.HttpClient
 import no.nav.helse.rapids_rivers.RapidApplication
-import no.nav.helse.sporbar.sis.BehandlingForkastetRiver
-import no.nav.helse.sporbar.sis.BehandlingLukketRiver
-import no.nav.helse.sporbar.sis.BehandlingOpprettetRiver
-import no.nav.helse.sporbar.sis.KafkaSisPublisher
-import no.nav.helse.sporbar.sis.VedtaksperiodeVenterRiver
+import no.nav.helse.sporbar.sis.*
 import org.slf4j.LoggerFactory
+import java.net.http.HttpClient
 
 val objectMapper: ObjectMapper = jacksonObjectMapper()
     .registerModule(JavaTimeModule())
@@ -36,13 +31,6 @@ fun main() {
 fun launchApplication(env: Map<String, String>) {
     val factory = ConsumerProducerFactory(AivenConfig.default)
     RapidApplication.create(env, factory).apply {
-        val dataSourceBuilder = DataSourceBuilder()
-        register(object : RapidsConnection.StatusListener {
-            override fun onStartup(rapidsConnection: RapidsConnection) {
-                dataSourceBuilder.migrate()
-            }
-        })
-
         val azureClient = createAzureTokenClientFromEnvironment(env)
         val speedClient = SpeedClient(
             httpClient = HttpClient.newHttpClient(),
@@ -55,7 +43,6 @@ fun launchApplication(env: Map<String, String>) {
             tokenProvider = azureClient
         )
 
-        val dokumentDao = DokumentDao(dataSourceBuilder::dataSource)
         val aivenProducer = factory.createProducer()
 
         val vedtakFattetMediator = VedtakFattetMediator(
@@ -64,7 +51,6 @@ fun launchApplication(env: Map<String, String>) {
         )
         val utbetalingMediator = UtbetalingMediator(aivenProducer)
 
-        NyttDokumentRiver(this, dokumentDao)
         VedtakFattetRiver(this, vedtakFattetMediator, speedClient)
         VedtaksperiodeAnnullertRiver(this, aivenProducer, speedClient)
         UtbetalingUtbetaltRiver(this, utbetalingMediator, speedClient)

src/main/kotlin/no/nav/helse/sporbar/sis/Behandlingstatusmelding.kt

@@ -5,8 +5,6 @@ import com.github.navikt.tbd_libs.rapids_and_rivers.asLocalDateTime
 import java.time.OffsetDateTime
 import java.time.ZoneId
 import java.util.UUID
-import no.nav.helse.sporbar.Dokument
-import no.nav.helse.sporbar.DokumentDao
 
 data class Behandlingstatusmelding(
     val vedtaksperiodeId: UUID,
@@ -34,8 +32,5 @@ data class Behandlingstatusmelding(
 
         private val Oslo = ZoneId.of("Europe/Oslo")
         internal fun JsonNode.asOffsetDateTime() = asLocalDateTime().atZone(Oslo).toOffsetDateTime()
-
-        internal fun DokumentDao.eksterneSøknadIder(interneHendelseIder: List<UUID>) =
-            finn(interneHendelseIder).filter { it.type == Dokument.Type.Søknad }.map { it.dokumentId }.toSet().takeUnless { it.isEmpty() }
     }
 }