Skip to content

Commit

Permalink
IS-2643: Turn off journalforing-retry in dev
Browse files Browse the repository at this point in the history
  • Loading branch information
@geir-waagboe
geir-waagboe committed Dec 18, 2024
1 parent ff73ebd commit 02b7a55
Showing 1 changed file with 38 additions and 53 deletions.
91 changes: 38 additions & 53 deletions src/main/kotlin/no/nav/syfo/cronjob/journalforing/DialogmoteVarselJournalforingCronjob.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,14 +61,11 @@ class DialogmoteVarselJournalforingCronjob(
pdf = pdf,
)
val journalpostId = journalfor(journalpostRequest)

journalpostId?.let { it ->
dialogmotedeltakerVarselJournalpostService.updateArbeidstakerVarselJournalpostId(
arbeidstakerVarsel,
it,
)
journalforingResult.updated++
} ?: throw RuntimeException("Failed to Journalfor ArbeidstakerVarsel: response missing JournalpostId")
dialogmotedeltakerVarselJournalpostService.updateArbeidstakerVarselJournalpostId(
arbeidstakerVarsel,
journalpostId,
)
journalforingResult.updated++
} catch (e: Exception) {
log.error("Exception caught while attempting Journalforing of ArbeidstakerVarsel, will try again later", e)
journalforingResult.failed++
Expand All @@ -92,14 +89,11 @@ class DialogmoteVarselJournalforingCronjob(
pdf = pdf,
)
val journalpostId = journalfor(journalpostRequest)

journalpostId?.let { it ->
dialogmotedeltakerVarselJournalpostService.updateArbeidsgiverVarselJournalpostId(
arbeidsgiverVarsel,
it,
)
journalforingResult.updated++
} ?: throw RuntimeException("Failed to Journalfor ArbeidsgiverVarsel: response missing JournalpostId")
dialogmotedeltakerVarselJournalpostService.updateArbeidsgiverVarselJournalpostId(
arbeidsgiverVarsel,
journalpostId,
)
journalforingResult.updated++
} catch (e: Exception) {
log.error("Exception caught while attempting Journalforing of ArbeidsgiverVarsel", e)
journalforingResult.failed++
Expand All @@ -122,13 +116,11 @@ class DialogmoteVarselJournalforingCronjob(
pdf = pdf,
)
val journalpostId = journalfor(journalpostRequest)
journalpostId?.let { it ->
dialogmotedeltakerVarselJournalpostService.updateBehandlerVarselJournalpostId(
behandlerVarsel,
it,
)
journalforingResult.updated++
} ?: throw RuntimeException("Failed to Journalfor BehandlerVarsel: response missing JournalpostId")
dialogmotedeltakerVarselJournalpostService.updateBehandlerVarselJournalpostId(
behandlerVarsel,
journalpostId,
)
journalforingResult.updated++
} catch (e: Exception) {
log.error("Exception caught while attempting Journalforing of BehandlerVarsel", e)
journalforingResult.failed++
Expand All @@ -153,14 +145,11 @@ class DialogmoteVarselJournalforingCronjob(
)
log.info("Journalfør referat to arbeidstaker with uuid ${referat.uuid} and eksternReferanseId: ${journalpostRequest.eksternReferanseId}")
val journalpostId = journalfor(journalpostRequest)

journalpostId?.let { it ->
referatJournalpostService.updateJournalpostIdArbeidstakerForReferat(
referat,
it,
)
journalforingResult.updated++
} ?: throw RuntimeException("Failed to Journalfor Referat: response missing JournalpostId")
referatJournalpostService.updateJournalpostIdArbeidstakerForReferat(
referat,
journalpostId,
)
journalforingResult.updated++
} catch (e: Exception) {
log.error("Exception caught while attempting Journalforing of Referat", e)
journalforingResult.failed++
Expand All @@ -186,14 +175,11 @@ class DialogmoteVarselJournalforingCronjob(
)
log.info("Journalfør referat to arbeidsgiver with uuid ${referat.uuid} and eksternReferanseId: ${journalpostRequest.eksternReferanseId}")
val journalpostId = journalfor(journalpostRequest)

journalpostId?.let { it ->
referatJournalpostService.updateJournalpostIdArbeidsgiverForReferat(
referat,
it,
)
journalforingResult.updated++
} ?: throw RuntimeException("Failed to Journalfor Referat: response missing JournalpostId")
referatJournalpostService.updateJournalpostIdArbeidsgiverForReferat(
referat,
journalpostId,
)
journalforingResult.updated++
} catch (e: Exception) {
log.error("Exception caught while attempting Journalforing of Referat", e)
journalforingResult.failed++
Expand All @@ -218,35 +204,34 @@ class DialogmoteVarselJournalforingCronjob(
)
log.info("Journalfør referat to behandler with uuid ${referat.uuid} and eksternReferanseId: ${journalpostRequest.eksternReferanseId}")
val journalpostId = journalfor(journalpostRequest)

journalpostId?.let { it ->
referatJournalpostService.updateJournalpostIdBehandlerForReferat(
referat,
it,
)
journalforingResult.updated++
} ?: throw RuntimeException("Failed to Journalfor Referat: response missing JournalpostId")
referatJournalpostService.updateJournalpostIdBehandlerForReferat(
referat,
journalpostId,
)
journalforingResult.updated++
} catch (e: Exception) {
log.error("Exception caught while attempting Journalforing of Referat", e)
journalforingResult.failed++
}
}
}

private suspend fun journalfor(journalpostRequest: JournalpostRequest) =
try {
dokarkivClient.journalfor(journalpostRequest)?.journalpostId
} catch (exc: Exception) {
private suspend fun journalfor(journalpostRequest: JournalpostRequest): Int {
val journalpostResponse = dokarkivClient.journalfor(journalpostRequest)
return if (journalpostResponse?.journalpostId == null) {
if (isJournalforingRetryEnabled) {
throw exc
throw RuntimeException("Failed journalforing: response missing journalpostId")
} else {
log.error("Journalføring failed, skipping retry (should only happen in dev-gcp)", exc)
log.error("Journalforing failed, skipping retry (should only happen in dev-gcp)")
// Defaulting'en til DEFAULT_FAILED_JP_ID 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.
DEFAULT_FAILED_JP_ID
}
} else {
journalpostResponse.journalpostId
}
}

companion object {
private const val DEFAULT_FAILED_JP_ID = 0
Expand Down

0 comments on commit 02b7a55

Please sign in to comment.