Merge branch 'master' into feature/etterlatte-endepunkt

navikt · Sep 17, 2024 · 8abdeba · 8abdeba
2 parents 02477f8 + a010157
commit 8abdeba
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/nais/dev-gcp.yml b/nais/dev-gcp.yml
@@ -95,10 +95,10 @@ spec:
       value: dokarkiv
     - name: AZURE_APP_SAF_CLIENT_ID
       value: dev-fss.teamdokumenthandtering.saf
-    - name: AZURE_APP_ETTERLATTE_CLIENT_ID
-      value: dev-gcp.etterlatte.etterlatte-api
     - name: ETTERLATTE_URL
       value: http://etterlatte-api.etterlatte
+    - name: AZURE_APP_ETTERLATTE_CLIENT_ID
+      value: dev-gcp.etterlatte.etterlatte-api
 
   image: {{ image }}
   ingresses:

diff --git a/src/main/kotlin/no/nav/eessi/pensjon/journalforing/JournalforingService.kt b/src/main/kotlin/no/nav/eessi/pensjon/journalforing/JournalforingService.kt
@@ -184,10 +184,10 @@ class JournalforingService(
 
                 if (journalpostRequest.bruker == null) {
                     val logMelding = if (sedHendelse.bucType in listOf(R_BUC_02, P_BUC_06, P_BUC_09) )  {
-                        journalpostService.sendJournalPost(JournalpostMedSedInfo(journalpostRequest, sedHendelse, hendelseType), "eessipensjon")
+                        journalpostService.sendJournalPost(JournalpostMedSedInfo(journalpostRequest, sedHendelse, hendelseType), navAnsattInfo?.first)
                         "Journalpost for rinanr: ${sedHendelse.rinaSakId} mangler bruker, men sendes direkte"
                     } else if(env != null && env in listOf("q2", "q1")){
-                        journalpostService.sendJournalPost(JournalpostMedSedInfo(journalpostRequest, sedHendelse, hendelseType), "eessipensjon")
+                        journalpostService.sendJournalPost(JournalpostMedSedInfo(journalpostRequest, sedHendelse, hendelseType), navAnsattInfo?.first)
                         "Journalpost for rinanr: ${sedHendelse.rinaSakId} mangler bruker, men miljøet er ${env} og sendes direkte"
                     }
                     else {
@@ -284,7 +284,7 @@ class JournalforingService(
     }
 
     fun lagJournalpostOgOppgave(journalpostRequest: JournalpostMedSedInfo, saksbehandlerIdent: String? = null){
-        val response = journalpostService.sendJournalPost(journalpostRequest, "eessipensjon")
+        val response = journalpostService.sendJournalPost(journalpostRequest, saksbehandlerIdent)
 
         logger.info("""Lagret JP hentet fra GCP: 
                 | sedHendelse: ${journalpostRequest.sedHendelse}

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -83,7 +83,6 @@ no.nav.security.jwt:
           client-jwk: ${AZURE_APP_JWK}
           client-auth-method: private_key_jwt
 
-
 management:
   endpoints:
     metrics.enabled: true