Flytt dokument/pdfgen inn i vedtak

Author: hestad

.nais/nais.yml

@@ -56,12 +56,13 @@ spec:
     outbound:
       rules:
         - application: tiltakspenger-tiltak
-        - application: tiltakspenger-dokument
         - application: utsjekk
           namespace: helved
       external:
         - host: {{ urlPdl }}
         - host: {{ urlSkjerming }}
+        - host: {{ urlJoark }}
+        - host: {{ urlDokdist }}
     inbound:
       rules:
         - application: tiltakspenger-saksbehandler
@@ -79,12 +80,6 @@ spec:
           permissions:
             roles:
               - "lage_hendelser"
-        - application: tiltakspenger-vedtak-rivers
-          namespace: tpts
-          cluster: {{ cluster }}
-          permissions:
-            roles:
-              - "lage_hendelser"
   env:
   {{#each azure.groups}}
     - name: {{this.name}}

.nais/vars/dev.yml

@@ -8,6 +8,8 @@ cluster: dev-gcp
 tenant: trygdeetaten.no
 urlPdl: pdl-api.dev-fss-pub.nais.io
 urlSkjerming: skjermede-personer-pip.intern.dev.nav.no
+urlJoark: dokarkiv.dev-fss-pub.nais.io
+urlDokdist: dokdistfordeling.dev-fss-pub.nais.io
 azure:
   groups:
     - name: ROLE_SAKSBEHANDLER

.nais/vars/prod.yml

@@ -8,6 +8,8 @@ cluster: prod-gcp
 tenant: nav.no
 urlPdl: pdl-api.prod-fss-pub.nais.io
 urlSkjerming: skjermede-personer-pip.intern.nav.no
+urlJoark: dokarkiv.prod-fss-pub.nais.io
+urlDokdist: dokdistfordeling.prod-fss-pub.nais.io
 azure:
   groups:
     - name: ROLE_SAKSBEHANDLER

app/build.gradle.kts

@@ -83,7 +83,11 @@ dependencies {
     // Helved/Utsjekk/Utbetaling
     implementation("no.nav.utsjekk.kontrakter:iverksett:$iverksettVersjon")
 
-    // DIV
+    // TODO post-mvp jah: Fjern denne når meldekort er over på pdfgen
+    implementation("org.apache.pdfbox:pdfbox:2.0.28")
+
+
+    // Arrow
     implementation("io.arrow-kt:arrow-core:1.2.4")
 
     testImplementation(platform("org.junit:junit-bom:5.11.0"))

app/src/main/kotlin/no/nav/tiltakspenger/vedtak/App.kt

@@ -61,7 +61,8 @@ fun main() {
             listOf { correlationId ->
                 applicationContext.utbetalingContext.opprettUtbetalingsvedtakService.opprettUtbetalingsvedtak()
                 applicationContext.utbetalingContext.sendUtbetalingerService.send(correlationId)
-                applicationContext.utbetalingContext.journalførUtbetalingsvedtakService.send(correlationId)
+                applicationContext.utbetalingContext.journalførUtbetalingsvedtakService.journalfør(correlationId)
+                applicationContext.førstegangsbehandlingContext.journalførVedtaksbrevService.journalfør(correlationId)
             },
         )
 

app/src/main/kotlin/no/nav/tiltakspenger/vedtak/Configuration.kt

@@ -64,8 +64,10 @@ object Configuration {
                 "TILTAK_URL" to "http://host.docker.internal:8091",
                 "UTBETALING_SCOPE" to "localhost",
                 "UTBETALING_URL" to "http://localhost:8091",
-                "DOKUMENT_SCOPE" to "localhost",
-                "DOKUMENT_URL" to "http://localhost:8091",
+                "JOARK_SCOPE" to "localhost",
+                "JOARK_URL" to "http://localhost:8091",
+                "DOKDIST_SCOPE" to "localhost",
+                "DOKDIST_URL" to "http://localhost:8091",
                 "NAIS_APP_IMAGE" to "http://localhost8080:githubhash",
                 "AZURE_APP_CLIENT_ID" to "tiltakspenger-vedtak",
                 "AZURE_APP_CLIENT_SECRET" to "secret",
@@ -92,8 +94,10 @@ object Configuration {
                 "TILTAK_URL" to "http://tiltakspenger-tiltak",
                 "UTBETALING_SCOPE" to "api://dev-gcp.helved.utsjekk/.default",
                 "UTBETALING_URL" to "http://utsjekk.helved",
-                "DOKUMENT_SCOPE" to "api://dev-gcp.tpts.tiltakspenger-dokument/.default",
-                "DOKUMENT_URL" to "http://tiltakspenger-dokument",
+                "JOARK_SCOPE" to "api://dev-fss.teamdokumenthandtering.dokarkiv-q1/.default",
+                "JOARK_URL" to "https://dokarkiv.dev-fss-pub.nais.io",
+                "DOKDIST_SCOPE" to "api://dev-fss.teamdokumenthandtering.saf-q1/.default",
+                "DOKDIST_URL" to "https://dokdistfordeling-q1.dev-fss-pub.nais.io",
             ),
         )
     private val prodProperties =
@@ -108,8 +112,10 @@ object Configuration {
                 "TILTAK_URL" to "http://tiltakspenger-tiltak",
                 "UTBETALING_SCOPE" to "api://prod-gcp.helved.utsjekk/.default",
                 "UTBETALING_URL" to "http://utsjekk.helved",
-                "DOKUMENT_SCOPE" to "api://prod-gcp.tpts.tiltakspenger-dokument/.default",
-                "DOKUMENT_URL" to "http://tiltakspenger-dokument",
+                "JOARK_SCOPE" to "api://prod-fss.teamdokumenthandtering.dokarkiv/.default",
+                "JOARK_URL" to "https://dokarkiv.prod-fss-pub.nais.io",
+                "DOKDIST_SCOPE" to "api://prod-fss.teamdokumenthandtering.saf/.default",
+                "DOKDIST_URL" to "https://dokdistfordeling.prod-fss-pub.nais.io",
             ),
         )
 
@@ -198,8 +204,20 @@ object Configuration {
         wellknownUrl = wellknownUrl,
     )
 
-    fun oauthConfigDokument(
-        scope: String = config()[Key("DOKUMENT_SCOPE", stringType)],
+    fun oauthConfigJoark(
+        scope: String = config()[Key("JOARK_SCOPE", stringType)],
+        clientId: String = config()[Key("AZURE_APP_CLIENT_ID", stringType)],
+        clientSecret: String = config()[Key("AZURE_APP_CLIENT_SECRET", stringType)],
+        wellknownUrl: String = config()[Key("AZURE_APP_WELL_KNOWN_URL", stringType)],
+    ) = AzureTokenProvider.OauthConfig(
+        scope = scope,
+        clientId = clientId,
+        clientSecret = clientSecret,
+        wellknownUrl = wellknownUrl,
+    )
+
+    fun oauthConfigDokdist(
+        scope: String = config()[Key("DOKDIST_SCOPE", stringType)],
         clientId: String = config()[Key("AZURE_APP_CLIENT_ID", stringType)],
         clientSecret: String = config()[Key("AZURE_APP_CLIENT_SECRET", stringType)],
         wellknownUrl: String = config()[Key("AZURE_APP_WELL_KNOWN_URL", stringType)],
@@ -228,7 +246,8 @@ object Configuration {
 
     fun tiltakClientConfig(baseUrl: String = config()[Key("TILTAK_URL", stringType)]) = ClientConfig(baseUrl = baseUrl)
 
-    fun dokumentClientConfig(baseUrl: String = config()[Key("DOKUMENT_URL", stringType)]) = ClientConfig(baseUrl = baseUrl)
+    fun joarkClientConfig(baseUrl: String = config()[Key("JOARK_URL", stringType)]) = ClientConfig(baseUrl = baseUrl)
+    fun dokdistClientConfig(baseUrl: String = config()[Key("DOKDIST_URL", stringType)]) = ClientConfig(baseUrl = baseUrl)
 
     fun utbetalingClientConfig(baseUrl: String = config()[Key("UTBETALING_URL", stringType)]) = ClientConfig(baseUrl = baseUrl)