-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #37 from navikt/dev/inntektsforesporsel
Dev/inntektsforesporsel
- Loading branch information
Showing
16 changed files
with
3,427 additions
and
28 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2,900 changes: 2,900 additions & 0 deletions
2,900
cpa-repo/src/main/resources/cpa/nav_qass_30823_modified.xml
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
143 changes: 143 additions & 0 deletions
143
ebms-send-in/src/main/kotlin/no/nav/emottak/utbetaling/UtbetalingClient.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,143 @@ | ||
| package no.nav.emottak.utbetaling | ||
|
|
||
| import no.kith.xmlstds.msghead._2006_05_24.CS | ||
| import no.kith.xmlstds.msghead._2006_05_24.ConversationRef | ||
| import no.kith.xmlstds.msghead._2006_05_24.Document | ||
| import no.kith.xmlstds.msghead._2006_05_24.MsgHead | ||
| import no.kith.xmlstds.msghead._2006_05_24.RefDoc | ||
| import no.nav.ekstern.virkemiddelokonomi.tjenester.utbetaling.v1.FinnBrukersUtbetalteYtelser | ||
| import no.nav.ekstern.virkemiddelokonomi.tjenester.utbetaling.v1.FinnUtbetalingListe | ||
| import no.nav.ekstern.virkemiddelokonomi.tjenester.utbetaling.v1.FinnUtbetalingListeBaksystemIkkeTilgjengelig | ||
| import no.nav.ekstern.virkemiddelokonomi.tjenester.utbetaling.v1.FinnUtbetalingListeBrukerIkkeFunnet | ||
| import no.nav.ekstern.virkemiddelokonomi.tjenester.utbetaling.v1.FinnUtbetalingListeFeil | ||
| import no.nav.ekstern.virkemiddelokonomi.tjenester.utbetaling.v1.FinnUtbetalingListeIngenTilgangTilEnEllerFlereYtelser | ||
| import no.nav.ekstern.virkemiddelokonomi.tjenester.utbetaling.v1.FinnUtbetalingListeUgyldigDato | ||
| import no.nav.ekstern.virkemiddelokonomi.tjenester.utbetaling.v1.FinnUtbetalingListeUgyldigKombinasjonBrukerIdOgBrukertype | ||
| import no.nav.emottak.cxf.ServiceBuilder | ||
| import no.nav.emottak.melding.model.SendInRequest | ||
| import no.nav.emottak.util.getEnvVar | ||
| import no.nav.emottak.util.toXMLGregorianCalendar | ||
| import org.slf4j.LoggerFactory | ||
| import java.io.FileInputStream | ||
| import java.time.Instant | ||
| import java.util.UUID | ||
| import javax.xml.namespace.QName | ||
|
|
||
| object UtbetalingClient { | ||
|
|
||
| val log = LoggerFactory.getLogger(UtbetalingClient::class.java) | ||
|
|
||
| val utbetalingObjectFactory: no.nav.ekstern.virkemiddelokonomi.tjenester.utbetaling.v1.ObjectFactory = | ||
| no.nav.ekstern.virkemiddelokonomi.tjenester.utbetaling.v1.ObjectFactory() | ||
|
|
||
| val YRP_URL_TEST = "https://ytelser-rest-proxy.intern.dev.nav.no" | ||
| val YRP_URL_PROD = "https://ytelser-rest-proxy.intern.nav.no" | ||
| val RESOLVED_UTBETAL_URL = | ||
| when (getEnvVar("NAIS_CLUSTER_NAME", "local")) { | ||
| "local" -> YRP_URL_TEST | ||
| "dev-fss" -> YRP_URL_TEST | ||
| "prod-fss" -> YRP_URL_PROD | ||
| else -> YRP_URL_TEST | ||
| } | ||
| val UTBETAL_SOAP_ENDPOINT = RESOLVED_UTBETAL_URL + "/Utbetaling" | ||
|
|
||
| fun behandleInntektsforesporsel(sendInRequest: SendInRequest): MsgHead { | ||
| val msgHeadRequest = utbetalingXmlMarshaller.unmarshal(sendInRequest.payload.toString(Charsets.UTF_8), MsgHead::class.java) | ||
| val melding = msgHeadRequest.document.map { it.refDoc.content.any } | ||
| .also { if (it.size > 1) log.warn("Inntektsforesporsel refdoc har size >1") } | ||
| .first().also { if (it.size > 1) log.warn("Inntektsforesporsel content har size >1") }.first() | ||
| try { | ||
| val response: Any = when (melding) { | ||
| is FinnUtbetalingListe -> inntektsforesporselSoapEndpoint.finnUtbetalingListe(melding.request) | ||
| is FinnBrukersUtbetalteYtelser -> inntektsforesporselSoapEndpoint.finnBrukersUtbetalteYtelser(melding.request) | ||
| else -> throw IllegalStateException("Ukjent meldingstype. Classname: " + melding.javaClass.name) | ||
| } | ||
| return msgHeadResponse(msgHeadRequest, sendInRequest, marshal(response)) | ||
| } catch (utbetalError: Throwable) { | ||
| log.info("Handling inntektsforesporsel error: " + utbetalError.message) | ||
| val feil = FinnUtbetalingListeFeil() | ||
| when (utbetalError) { | ||
| is FinnUtbetalingListeBrukerIkkeFunnet | ||
| -> feil.finnUtbetalingListebrukerIkkeFunnet = utbetalError.faultInfo | ||
| is FinnUtbetalingListeBaksystemIkkeTilgjengelig | ||
| -> feil.finnUtbetalingListebaksystemIkkeTilgjengelig = utbetalError.faultInfo | ||
| is FinnUtbetalingListeIngenTilgangTilEnEllerFlereYtelser | ||
| -> feil.finnUtbetalingListeingenTilgangTilEnEllerFlereYtelser = utbetalError.faultInfo | ||
| is FinnUtbetalingListeUgyldigDato | ||
| -> feil.finnUtbetalingListeugyldigDato = utbetalError.faultInfo | ||
| is FinnUtbetalingListeUgyldigKombinasjonBrukerIdOgBrukertype | ||
| -> feil.finnUtbetalingListeugyldigKombinasjonBrukerIdOgBrukertype = utbetalError.faultInfo | ||
| else -> | ||
| throw utbetalError.also { log.error("Ukjent feiltype: " + it.message, it) } | ||
| } | ||
| return msgHeadResponse(msgHeadRequest, sendInRequest, feil) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| val inntektsforesporselSoapEndpoint: no.nav.ekstern.virkemiddelokonomi.tjenester.utbetaling.v1.Utbetaling = | ||
| ServiceBuilder( | ||
| no.nav.ekstern.virkemiddelokonomi.tjenester.utbetaling.v1.Utbetaling::class.java | ||
| ) | ||
| .withAddress(getEnvVar("UTBETALING_URL", "https://ytelser-rest-proxy.dev.intern.nav.no/Utbetaling")) | ||
| .withWsdl( | ||
| "classpath:no.nav.ekstern.virkemiddelokonomi/tjenester/utbetaling/utbetaling.wsdl" | ||
| // "classpath:no.nav.ekstern.virkemiddelokonomi/tjenester.utbetaling/utbetaling.wsdl" | ||
| ) | ||
| .withServiceName(QName("http://nav.no/ekstern/virkemiddelokonomi/tjenester/utbetaling/v1", "Utbetaling")) | ||
| .withEndpointName(QName("http://nav.no/ekstern/virkemiddelokonomi/tjenester/utbetaling/v1", "UtbetalingPort")) | ||
| .build() | ||
| .withUserNameToken( | ||
| when (getEnvVar("NAIS_CLUSTER_NAME", "local")) { | ||
| "local" -> "testUserName" | ||
| else -> String(FileInputStream("/secret/serviceuser/username").readAllBytes()) | ||
| }, | ||
| when (getEnvVar("NAIS_CLUSTER_NAME", "local")) { | ||
| "local" -> "testPassword" | ||
| else -> String(FileInputStream("/secret/serviceuser/password").readAllBytes()) | ||
| } | ||
| ) | ||
| .get() | ||
|
|
||
| fun msgHeadResponse(incomingMsgHead: MsgHead, sendInRequest: SendInRequest, fagmeldingResponse: Any): MsgHead { | ||
| return incomingMsgHead.apply { | ||
| msgInfo.apply { | ||
| type = CS().apply { | ||
| dn = "Svar på forespørsel om inntekt" | ||
| v = "InntektInformasjon" | ||
| } | ||
| genDate = Instant.now().toXMLGregorianCalendar() | ||
| msgId = UUID.randomUUID().toString() | ||
| ack = CS().apply { | ||
| v = "N" | ||
| dn = "Nei" | ||
| } | ||
| val newReceiver = sender | ||
| val newSender = receiver | ||
| sender.apply { organisation = newSender.organisation } | ||
| receiver.apply { organisation = newReceiver.organisation } | ||
| conversationRef = ConversationRef().apply { | ||
| refToParent = sendInRequest.messageId | ||
| refToConversation = sendInRequest.conversationId | ||
| } | ||
| } | ||
| document.clear() | ||
| document.add( | ||
| Document().apply { | ||
| refDoc = RefDoc().apply { | ||
| msgType = CS().apply { | ||
| v = "XML" | ||
| dn = "XML-instans" | ||
| } | ||
| mimeType = "text/xml" | ||
| content = RefDoc.Content().apply { | ||
| any.add( | ||
| fagmeldingResponse | ||
| ) | ||
| } | ||
| } | ||
| } | ||
| ) | ||
| signature = null // TODO? (Dette er ikke "send-in" sin jobb, blir gjort senere) | ||
| } | ||
| } |
Oops, something went wrong.