Fix typo. Scheduled job to 5 min in dev. Removed storing af failed tv…

…unget utsending
navikt · Jan 3, 2025 · 1ff5174 · 1ff5174
1 parent d53db12
commit 1ff5174
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 16 deletions.
diff --git a/nais/job-trigger-dev.yaml b/nais/job-trigger-dev.yaml
@@ -11,7 +11,7 @@ spec:
     outbound:
       rules:
         - application: esyfovarsel
-  schedule: "*/2 * * * *"
+  schedule: "*/5 * * * *"
   filesFrom:
     - secret: esyfovarsel-serviceuser
   env:

diff --git a/src/main/kotlin/no/nav/syfo/db/UtsendtVarselDAO.kt b/src/main/kotlin/no/nav/syfo/db/UtsendtVarselDAO.kt
@@ -76,7 +76,7 @@ fun DatabaseInterface.fetchAlleUferdigstilteAktivitetspliktVarsler(
     }
 }
 
-fun DatabaseInterface.setUferdigstiltUtsendtVarselToForcedLEtter(eksternRef: String): Int {
+fun DatabaseInterface.setUferdigstiltUtsendtVarselToForcedLetter(eksternRef: String): Int {
     val updateStatement = """UPDATE UTSENDT_VARSEL
                    SET is_forced_letter = ?
                    WHERE EKSTERN_REF = ?

diff --git a/src/main/kotlin/no/nav/syfo/service/SenderFacade.kt b/src/main/kotlin/no/nav/syfo/service/SenderFacade.kt
@@ -14,7 +14,7 @@ import no.nav.syfo.db.domain.Kanal.DITT_SYKEFRAVAER
 import no.nav.syfo.db.domain.PUtsendtVarsel
 import no.nav.syfo.db.domain.PUtsendtVarselFeilet
 import no.nav.syfo.db.fetchUferdigstilteVarsler
-import no.nav.syfo.db.setUferdigstiltUtsendtVarselToForcedLEtter
+import no.nav.syfo.db.setUferdigstiltUtsendtVarselToForcedLetter
 import no.nav.syfo.db.setUtsendtVarselToFerdigstilt
 import no.nav.syfo.db.storeUtsendtVarsel
 import no.nav.syfo.db.storeUtsendtVarselFeilet
@@ -80,7 +80,7 @@ class SenderFacade(
     }
 
     fun sendTilBrukernotifikasjoner(
-        uuid: String,// aktivitetskravUuid
+        uuid: String, // aktivitetskravUuid
         mottakerFnr: String,
         content: String,
         url: URL? = null,
@@ -278,20 +278,17 @@ class SenderFacade(
         } catch (e: Exception) {
             isSendingSucceed = false
             log.warn("[FORCED PHYSICAL PRINT]: Error while sending forced brev til forced fysisk print: ${e.message}")
-            lagreIkkeUtsendtArbeidstakerVarsel(
-                kanal = BREV,
-                varselHendelse = varselHendelse,
-                eksternReferanse = uuid,
-                feilmelding = e.message,
-                journalpostId = journalpostId,
-                brukernotifikasjonerMeldingType = null,
-                isForcedLetter = true,
-            )
         }
         if (isSendingSucceed) {
             log.info("[FORCED PHYSICAL PRINT]: sending forced physical letter with journalpostId ${journalpostId} succeded, storing in database")
-            lagreUtsendtArbeidstakerVarsel(BREV, varselHendelse, uuid, isForcedLetter = true, journalpostId = journalpostId)
-            database.setUferdigstiltUtsendtVarselToForcedLEtter(eksternRef = uuid)
+            lagreUtsendtArbeidstakerVarsel(
+                BREV,
+                varselHendelse,
+                uuid,
+                isForcedLetter = true,
+                journalpostId = journalpostId
+            )
+            database.setUferdigstiltUtsendtVarselToForcedLetter(eksternRef = uuid)
         }
     }
 

diff --git a/src/test/kotlin/no/nav/syfo/db/UtsendtVarselFeiletDAOSpek.kt b/src/test/kotlin/no/nav/syfo/db/UtsendtVarselFeiletDAOSpek.kt
@@ -118,7 +118,7 @@ class UtsendtVarselFeiletDAOSpek : DescribeSpec({
 
 
             // Should not pick original uferdigstilt utsend varsel to notify user by physical letter for the second time
-            embeddedDatabase.setUferdigstiltUtsendtVarselToForcedLEtter(eksternRef = "123")
+            embeddedDatabase.setUferdigstiltUtsendtVarselToForcedLetter(eksternRef = "123")
             val result2 = embeddedDatabase.fetchAlleUferdigstilteAktivitetspliktVarsler()
             result2.size shouldBeEqualTo 2
         }