Retry kall til innsending-api

system-tests/system-tests/src/main/kotlin/no/nav/soknad/arkivering/innsending/InnsendingApi.kt

@@ -7,6 +7,7 @@ import no.nav.soknad.arkivering.innsending.api.*
 import no.nav.soknad.arkivering.innsending.model.*
 import no.nav.soknad.arkivering.innsending.infrastructure.Serializer.jacksonObjectMapper
 import no.nav.soknad.arkivering.tokensupport.createOkHttpAuthorizationClient
+import no.nav.soknad.arkivering.utils.retry
 import okhttp3.OkHttpClient
 import org.slf4j.LoggerFactory
 
@@ -50,19 +51,19 @@ class InnsendingApi(config: Config, useOauth: Boolean? = false) {
 				)
 			}
 		)
-		val soknad = ettersending.opprettEttersending(dto)
+		val soknad = retry(3) { ettersending.opprettEttersending(dto) }
 		logger.info("Opprettet ettersending: $soknad")
 		return SoknadTestdata(soknad, sendInnFil)
 	}
 
-	fun sendInn(soknad: SoknadTestdata) = runCatching {
+	fun sendInn(soknad: SoknadTestdata) {
 		logger.info("Sender inn søknad: ${soknad.innsendingsId}")
-		sendInnSoknad.sendInnSoknad(soknad.innsendingsId)
+		retry(3) { sendInnSoknad.sendInnSoknad(soknad.innsendingsId) }
 	}
 
-	fun sendInn(innsendingsId: String) = runCatching {
+	fun sendInn(innsendingsId: String) {
 		logger.info("Sender inn søknad: ${innsendingsId}")
-		sendInnSoknad.sendInnSoknad(innsendingsId)
+		retry(3) { sendInnSoknad.sendInnSoknad(innsendingsId) }
 	}
 
 	fun getArkiveringsstatus(innsendingsId: String): ArkiveringsStatusDto {

system-tests/system-tests/src/main/kotlin/no/nav/soknad/arkivering/innsending/SoknadTestdata.kt

@@ -2,6 +2,7 @@ package no.nav.soknad.arkivering.innsending
 
 import no.nav.soknad.arkivering.innsending.api.SendinnFilApi
 import no.nav.soknad.arkivering.innsending.model.DokumentSoknadDto
+import no.nav.soknad.arkivering.utils.retry
 import java.io.File
 
 class SoknadTestdata(
@@ -38,7 +39,7 @@ class VedleggslisteTestdata(
 	}
 
 	fun lastOppFil(index: Int, file: File): VedleggslisteTestdata {
-		sendinnFilApi.lagreFil(innsendingsId, vedleggIdListe[index].id, file)
+		retry(3) { sendinnFilApi.lagreFil(innsendingsId, vedleggIdListe[index].id, file) }
 		return this
 	}
 

system-tests/system-tests/src/main/kotlin/no/nav/soknad/arkivering/utils/Retry.kt

@@ -0,0 +1,13 @@
+package no.nav.soknad.arkivering.utils
+
+fun <R> retry(
+	maxAttempts: Int,
+	action: () -> R
+): R {
+	require(maxAttempts > 0) { "maxAttempts must be greater than 0" }
+	return runCatching(action).getOrElse {
+		val leftAttempts = maxAttempts.dec()
+		if (leftAttempts == 0) throw it
+		retry(leftAttempts, action)
+	}
+}