IS-2643: Turn off JP-retry in dev (#275)

.nais/naiserator-dev.yaml

@@ -80,6 +80,8 @@ spec:
   kafka:
     pool: nav-dev
   env:
+    - name: JP_RETRY_ENABLED
+      value: "false"
     - name: MQ_HOST_NAME
       value: "b27apvl222.preprod.local"
     - name: MQ_PORT

.nais/naiserator-prod.yaml

@@ -80,6 +80,8 @@ spec:
   kafka:
     pool: nav-prod
   env:
+    - name: JP_RETRY_ENABLED
+      value: "true"
     - name: MQ_HOST_NAME
       value: "mpls04.adeo.no"
     - name: MQ_PORT

src/main/kotlin/no/nav/syfo/Environment.kt

@@ -22,6 +22,7 @@ data class Environment(
     val inputBackoutQueueName: String = getEnvVar("MQ_INPUT_BOQ_QUEUE_NAME"),
     val dokArkivClientId: String = getEnvVar("DOKARKIV_CLIENT_ID"),
     val dokArkivUrl: String = getEnvVar("DOK_ARKIV_URL"),
+    val jpRetryEnabled: Boolean = getEnvVar("JP_RETRY_ENABLED").toBoolean(),
     val syfopdfgen: String = getEnvVar("PDF_GEN_URL"),
     val arenaQueueName: String = getEnvVar("ARENA_OUTBOUND_QUEUENAME"),
     val databaseHost: String = getEnvVar("NAIS_DATABASE_PADM2_PADM2_DB_HOST"),

src/main/kotlin/no/nav/syfo/application/DialogmeldingProcessor.kt

@@ -66,6 +66,7 @@ class DialogmeldingProcessor(
         dokArkivClient = dokArkivClient,
         pdfgenClient = pdfgenClient,
         database = database,
+        jpRetryEnabled = env.jpRetryEnabled,
     )
     val signerendeLegeService = SignerendeLegeService(
         syfohelsenettproxyClient = syfohelsenettproxyClient,

src/main/kotlin/no/nav/syfo/services/JournalService.kt

@@ -13,6 +13,7 @@ class JournalService(
     private val dokArkivClient: DokArkivClient,
     private val pdfgenClient: PdfgenClient,
     private val database: DatabaseInterface,
+    private val jpRetryEnabled: Boolean = true,
 ) {
     suspend fun onJournalRequest(
         receivedDialogmelding: ReceivedDialogmelding,
@@ -50,19 +51,31 @@ class JournalService(
                 receivedDialogmelding.personNrPasient,
                 vedleggListe
             )
-            val journalpost = dokArkivClient.createJournalpost(journalpostPayload, loggingMeta)
-
+            val journalpost = try {
+                dokArkivClient.createJournalpost(journalpostPayload, loggingMeta)
+            } catch (exc: Exception) {
+                if (jpRetryEnabled) {
+                    throw exc
+                } else {
+                    logger.error("Journalføring failed, skipping retry (should only happen in dev-gcp)", exc)
+                }
+                null
+            }
+            // Defaulting'en til "0" skal bare forekomme i dev-gcp:
+            // Har dette fordi vi ellers spammer ned dokarkiv med forsøk på å journalføre
+            // på personer som mangler aktør-id.
+            val journalpostId = journalpost?.journalpostId ?: "0"
             MELDING_LAGER_I_JOARK.increment()
             logger.info(
                 "Melding lagret i Joark med journalpostId {}, {}",
-                journalpost.journalpostId,
+                journalpostId,
                 StructuredArguments.fields(loggingMeta)
             )
             database.lagreJournalforing(
                 dialogmeldingid = receivedDialogmelding.dialogmelding.id,
-                journalpostId = journalpost.journalpostId,
+                journalpostId = journalpostId,
             )
-            journalpost.journalpostId
+            journalpostId
         } else {
             journalpostId
         }

src/test/kotlin/no/nav/syfo/TestEnvironment.kt

@@ -62,6 +62,7 @@ fun testEnvironment(
     smgcpProxyUrl = smgcpUrl,
     isbehandlerdialogClientId = "isbehandlerdialog",
     isbehandlerdialogUrl = isbehandlerdialogUrl,
+    jpRetryEnabled = true,
 )
 
 fun testAppState() = ApplicationState(