Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fjerne veilarbregistrering via veilarbperson #603

Merged
merged 3 commits into from
Nov 1, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,9 @@ package no.nav.veilarbvedtaksstotte.client.aiaBackend

import no.nav.common.health.HealthCheck
import no.nav.veilarbvedtaksstotte.client.aiaBackend.dto.EgenvurderingResponseDTO
import no.nav.veilarbvedtaksstotte.client.aiaBackend.dto.EndringIRegistreringsdataResponse
import no.nav.veilarbvedtaksstotte.client.aiaBackend.request.EgenvurderingForPersonRequest
import no.nav.veilarbvedtaksstotte.client.aiaBackend.request.EndringIRegistreringdataRequest

interface AiaBackendClient : HealthCheck {
fun hentEgenvurdering(egenvurderingForPersonRequest: EgenvurderingForPersonRequest): EgenvurderingResponseDTO?

fun hentEndringIRegistreringdata(endringIRegistreringdataRequest: EndringIRegistreringdataRequest): EndringIRegistreringsdataResponse?
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@ import no.nav.common.rest.client.RestClient
import no.nav.common.rest.client.RestUtils
import no.nav.common.utils.UrlUtils.joinPaths
import no.nav.veilarbvedtaksstotte.client.aiaBackend.dto.EgenvurderingResponseDTO
import no.nav.veilarbvedtaksstotte.client.aiaBackend.dto.EndringIRegistreringsdataResponse
import no.nav.veilarbvedtaksstotte.client.aiaBackend.request.EgenvurderingForPersonRequest
import no.nav.veilarbvedtaksstotte.client.aiaBackend.request.EndringIRegistreringdataRequest
import no.nav.veilarbvedtaksstotte.utils.deserializeJsonOrThrow
import no.nav.veilarbvedtaksstotte.utils.toJson
import okhttp3.OkHttpClient
Expand Down Expand Up @@ -41,23 +39,6 @@ class AiaBackendClientImpl(private val aiaBackendUrl: String, private val userTo
}
}

override fun hentEndringIRegistreringdata(endringIRegistreringdataRequest: EndringIRegistreringdataRequest): EndringIRegistreringsdataResponse? {
val request = Request.Builder()
.url(joinPaths(aiaBackendUrl, "/veileder/besvarelse"))
.header(HttpHeaders.AUTHORIZATION, userTokenSupplier.get())
.post(endringIRegistreringdataRequest.toJson().toRequestBody(RestUtils.MEDIA_TYPE_JSON))
.build()

client.newCall(request).execute().use { response ->
RestUtils.throwIfNotSuccessful(response)
log.debug("Endring i registreringsdata - responsestatus: {}", response.code)
if (response.code == 204) {
return null
}
return response.deserializeJsonOrThrow()
}
}

override fun checkHealth(): HealthCheckResult {
TODO("Not yet implemented")
}
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import org.springframework.web.server.ResponseStatusException
@Slf4j
class ArbeidssoekerRegisteretService(
private val oppslagArbeidssoekerregisteretClientImpl: OppslagArbeidssoekerregisteretClient,

) {

fun hentSisteOpplysningerOmArbeidssoekerMedProfilering(fnr: Fnr): OpplysningerOmArbeidssoekerMedProfilering?{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,12 @@ import no.nav.veilarbvedtaksstotte.client.norg2.EnhetPostadresse
import no.nav.veilarbvedtaksstotte.client.norg2.EnhetPostboksadresse
import no.nav.veilarbvedtaksstotte.client.norg2.EnhetStedsadresse
import no.nav.veilarbvedtaksstotte.client.person.dto.CvInnhold
import no.nav.veilarbvedtaksstotte.client.registrering.dto.RegistreringResponseDto
import no.nav.veilarbvedtaksstotte.domain.Målform
import no.nav.veilarbvedtaksstotte.domain.oyeblikksbilde.EgenvurderingDto

interface PdfClient : HealthCheck {
fun genererPdf(brevdata: Brevdata): ByteArray
fun genererOyeblikksbildeCvPdf(cvOyeblikksbildeData: CvInnhold): ByteArray
fun genererOyeblikksbildeRegistreringPdf(registreringOyeblikksbildeData: RegistreringResponseDto): ByteArray
fun genererOyeblikksbildeEgenVurderingPdf(egenvurderingOyeblikksbildeData: EgenvurderingDto): ByteArray
fun genererOyeblikksbildeArbeidssokerRegistretPdf(registreringOyeblikksbildeData: OpplysningerOmArbeidssoekerMedProfilering): ByteArray

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import no.nav.common.rest.client.RestUtils
import no.nav.common.utils.UrlUtils.joinPaths
import no.nav.veilarbvedtaksstotte.client.arbeidssoekeregisteret.OpplysningerOmArbeidssoekerMedProfilering
import no.nav.veilarbvedtaksstotte.client.person.dto.CvInnhold
import no.nav.veilarbvedtaksstotte.client.registrering.dto.RegistreringResponseDto
import no.nav.veilarbvedtaksstotte.domain.oyeblikksbilde.EgenvurderingDto
import no.nav.veilarbvedtaksstotte.domain.oyeblikksbilde.OyeblikksbildePdfTemplate
import okhttp3.OkHttpClient
Expand Down Expand Up @@ -66,28 +65,6 @@ class PdfClientImpl(val pdfGenUrl: String) : PdfClient {
}
}

override fun genererOyeblikksbildeRegistreringPdf(registreringOyeblikksbildeData: RegistreringResponseDto): ByteArray {
val request = Request.Builder()
.url(joinPaths(pdfGenUrl, "api/v1/genpdf/vedtak14a/" + OyeblikksbildePdfTemplate.REGISTRERINGSINFO.templateName))
.post(RestUtils.toJsonRequestBody(registreringOyeblikksbildeData))
.build()

try {
client.newCall(request).execute().use { response ->
RestUtils.throwIfNotSuccessful(response)
val body = response.body
return if (body != null) body.bytes() else
throw IllegalStateException("Generering av øyeblikkbilde feilet, tøm respons.")
}
} catch (e: Exception) {
throw ResponseStatusException(
HttpStatus.INTERNAL_SERVER_ERROR,
"Feil ved kall mot " + request.url.toString(),
e
)
}
}

override fun genererOyeblikksbildeEgenVurderingPdf(egenvurderingOyeblikksbildeData: EgenvurderingDto): ByteArray {
val request = Request.Builder()
.url(joinPaths(pdfGenUrl, "api/v1/genpdf/vedtak14a/" + OyeblikksbildePdfTemplate.EGENVURDERING.templateName))
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading