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.

Sign up for GitHub

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

IS-3152: Negative apprec when wrong combination #278

Merged
merged 3 commits into from
Mar 24, 2025
+164 −13
Merged

IS-3152: Negative apprec when wrong combination #278

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
612c1a1
IS-3152: Negative apprec when wrong combination
geir-waagboe Mar 21, 2025
c31f558
IS-3152: Negative apprec when wrong combination
geir-waagboe Mar 24, 2025
c6a97aa
IS-3152: Negative apprec when wrong combination
geir-waagboe Mar 24, 2025
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
1 change: 1 addition & 0 deletions src/main/kotlin/no/nav/syfo/validation/ValidateDialogMeldingKodeverk.kt
View file
Original file line number Diff line number Diff line change
@@ -25,6 +25,7 @@ fun isKodeverkValid(msgId: String, xmlDialogmelding: XMLDialogmelding, dialogmel
val foresporselKodeverk = xmlDialogmelding.notat.first().foresporsel?.typeForesp?.s
if (foresporselKodeverk == DialogmeldingKodeverk.INNKALLING_DIALOGMOTE_KODEVERK.kodeverkOID) {
logger.warn("Invalid kodeverk: Received foresporselsvar for foresporsel with dialogmotekodeverk: $msgId")
return false
}
val gyldigeDialogmeldingKodeverk = DialogmeldingType.DIALOGMELDING_FORESPORSEL_FRA_SAKSBEHANDLER_FORESPORSEL_SVAR.dialogmeldingKodeverk
return gyldigeDialogmeldingKodeverk.contains(xmlDialogmeldingKodeverk)
4 changes: 2 additions & 2 deletions src/test/kotlin/no/nav/syfo/CreateArenaDialogNotatTest.kt
View file
Original file line number Diff line number Diff line change
@@ -135,11 +135,11 @@ internal class CreateArenaDialogNotatTest {
arenaDialogNotat.eiaDokumentInfo.dokumentInfo.dokumentDato.year shouldBeEqualTo 2020
arenaDialogNotat.eiaDokumentInfo.dokumentInfo.dokumentDato.monthValue shouldBeEqualTo 9
arenaDialogNotat.eiaDokumentInfo.dokumentInfo.dokumentDato.dayOfMonth shouldBeEqualTo 21
arenaDialogNotat.eiaDokumentInfo.avsender.lege.legeFnr shouldBeEqualTo "12312414234"
arenaDialogNotat.eiaDokumentInfo.avsender.lege.legeFnr shouldBeEqualTo "01010112377"
arenaDialogNotat.eiaDokumentInfo.avsender.lege.tssId.shouldBeEqualTo(tssid.toBigInteger())
arenaDialogNotat.eiaDokumentInfo.avsender.lege.legeNavn.fornavn shouldBeEqualTo "Inga"
arenaDialogNotat.eiaDokumentInfo.avsender.lege.legeNavn.etternavn shouldBeEqualTo "Valda"
arenaDialogNotat.pasientData.person.personFnr shouldBeEqualTo "3143242342"
arenaDialogNotat.pasientData.person.personFnr shouldBeEqualTo "01010142365"
arenaDialogNotat.pasientData.person.personNavn.fornavn shouldBeEqualTo "Etternavn"
arenaDialogNotat.pasientData.person.personNavn.mellomnavn shouldBeEqualTo ""
arenaDialogNotat.pasientData.person.personNavn.etternavn shouldBeEqualTo "Test"
24 changes: 24 additions & 0 deletions src/test/kotlin/no/nav/syfo/dialogmelding/BlockingApplicationRunnerSpek.kt
View file
Original file line number Diff line number Diff line change
@@ -106,6 +106,30 @@ class BlockingApplicationRunnerSpek : Spek({
verify(exactly = 0) { mqSender.sendArena(any()) }
verify(exactly = 0) { dialogmeldingProducer.sendDialogmelding(any(), any(), any(), any()) }
}
it("Prosesserer innkommet dialogmotesvar (ok)") {
val fellesformat =
getFileAsString("src/test/resources/dialogmelding_dialog_svar_innkalling_dialogmote.xml")
every { incomingMessage.text } returns(fellesformat)
runBlocking {
blockingApplicationRunner.processMessage(incomingMessage)
}
verify(exactly = 1) { mqSender.sendReceipt(any()) }
verify(exactly = 0) { mqSender.sendBackout(any()) }
verify(exactly = 0) { mqSender.sendArena(any()) }
verify(exactly = 1) { dialogmeldingProducer.sendDialogmelding(any(), any(), any(), any()) }
}
it("Prosesserer innkommet dialogmotesvar (ugyldig kodeverk)") {
val fellesformat =
getFileAsString("src/test/resources/dialogmelding_dialog_svar_innkalling_dialogmote_invalid.xml")
every { incomingMessage.text } returns(fellesformat)
runBlocking {
blockingApplicationRunner.processMessage(incomingMessage)
}
verify(exactly = 1) { mqSender.sendReceipt(any()) }
verify(exactly = 0) { mqSender.sendBackout(any()) }
verify(exactly = 0) { mqSender.sendArena(any()) }
verify(exactly = 0) { dialogmeldingProducer.sendDialogmelding(any(), any(), any(), any()) }
}
it("Prosesserer innkommet test-melding fra syfomock (melding ok)") {
val fellesformat =
getFileAsString("src/test/resources/dialogmelding_dialog_notat.xml")
15 changes: 4 additions & 11 deletions src/test/resources/dialogmelding_dialog_svar_innkalling_dialogmote.xml
View file
Original file line number Diff line number Diff line change
@@ -79,23 +79,16 @@
<DateOfBirth>1991-12-4</DateOfBirth>
<Sex DN="Mann" V="1" />
<Ident>
<Id>3143242342</Id>
<Id>01010142365</Id>
<TypeId DN="Fødselsnummer" S="2.16.578.1.12.4.1.1.8116" V="FNR" />
</Ident>
<Address>
<Type DN="Folkeregisteradresse" V="HP"/>
<Type DN="Postadresse" V="PST" />
<StreetAdr>Sannergata 2</StreetAdr>
<PostalCode>0655</PostalCode>
<City>OSLO</City>
<County DN="OSLO" V="0712" />
</Address>
<TeleCom>
<TypeTelecom DN="MobilTelefon" V="MC"/>
<TeleAddress V="tel:12345678"/>
</TeleCom>
<TeleCom>
<TypeTelecom DN="Hovedtelefon" V="HP"/>
<TeleAddress V="tel:23456789"/>
</TeleCom>
</Patient>
</MsgInfo>
<Document>
@@ -136,5 +129,5 @@
</Document>
</MsgHead>
<MottakenhetBlokk
avsender="123123" avsenderFnrFraDigSignatur="12312414234" avsenderRef="SERIALNUMBER=984106610, CN=Allmennmedisinsk Senter DA, O=AMS ALLMENNMEDISINSK SENTER DA, C=NO" ebAction="MoteRespons" ebRole="Sykmelder" ebService="DialogmoteInnkalling" ebXMLSamtaleId="20200917-011356-538" ediLoggId="1901162204amsa22108.1" herIdentifikator="" meldingsType="xml" mottattDatotid="2020-09-21T21:14:27" partnerReferanse="14629"/>
avsender="123123" avsenderFnrFraDigSignatur="01010112377" avsenderRef="SERIALNUMBER=984106610, CN=Allmennmedisinsk Senter DA, O=AMS ALLMENNMEDISINSK SENTER DA, C=NO" ebAction="MoteRespons" ebRole="Sykmelder" ebService="DialogmoteInnkalling" ebXMLSamtaleId="20200917-011356-538" ediLoggId="1901162204amsa22108.1" herIdentifikator="" meldingsType="xml" mottattDatotid="2020-09-21T21:14:27" partnerReferanse="14629"/>
</EI_fellesformat>
133 changes: 133 additions & 0 deletions src/test/resources/dialogmelding_dialog_svar_innkalling_dialogmote_invalid.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,133 @@
<?xml version="1.0" encoding="UTF-8"?>
<EI_fellesformat
xmlns="http://www.nav.no/xml/eiff/2/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<MsgHead
xmlns="http://www.kith.no/xmlstds/msghead/2006-05-24" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.kith.no/xmlstds/msghead/2006-05-24 MsgHead-v1_2.xsd">
<MsgInfo>
<Type DN="Svar p.. foresp..rsel" V="DIALOG_SVAR"/>
<MIGversion>v1.2 2006-05-24</MIGversion>
<GenDate>2020-09-21T21:11:55+08:00</GenDate>
<MsgId>9be88bc5-4219-473e-954b-c0dd115ff4e0</MsgId>
<Ack DN="Ja" V="J"/>
<ConversationRef>
<RefToParent>d97c669d-484b-42ef-b4e9-79d0f290a71f</RefToParent>
<RefToConversation>d97c669d-484b-42ef-b4e9-79d0f290a71f</RefToConversation>
</ConversationRef>
<Sender>
<Organisation>
<OrganisationName>Kule helsetjenester AS</OrganisationName>
<Ident>
<Id>0123</Id>
<TypeId DN="HER-id" S="2.16.578.1.12.4.1.1.9051" V="HER"/>
</Ident>
<Ident>
<Id>223456789</Id>
<TypeId DN="Organisasjonsnummeret i Enhetsregister" S="2.16.578.1.12.4.1.1.9051" V="ENH"/>
</Ident>
<Address>
<Type DN="POSTADRESSE" V="PST"/>
<StreetAdr>Oppdiktet gate 203</StreetAdr>
<PostalCode>1234</PostalCode>
<City>Oslo</City>
</Address>
<TeleCom>
<TypeTelecom DN="Arbeidsplass" V="WP"/>
<TeleAddress V="tel:12 34 56 78"/>
</TeleCom>
<TeleCom>
<TypeTelecom DN="Fax" V="F"/>
<TeleAddress V="fax:87 65 43 21"/>
</TeleCom>
<HealthcareProfessional>
<FamilyName>Valda</FamilyName>
<MiddleName>Fos</MiddleName>
<GivenName>Inga</GivenName>
<Ident>
<Id>1234567</Id>
<TypeId DN="HPR-nummer" S="2.16.578.1.12.4.1.1.8116" V="HPR"/>
</Ident>
<Ident>
<Id>1234</Id>
<TypeId DN="HER-id" S="2.16.578.1.12.4.1.1.8116" V="HER"/>
</Ident>
</HealthcareProfessional>
</Organisation>
</Sender>
<Receiver>
<Organisation>
<OrganisationName>NAV</OrganisationName>
<Ident>
<Id>79768</Id>
<TypeId DN="Identifikator fra Helsetjenesteenhetsregisteret (HER-id)" S="2.16.578.1.12.4.1.1.9051" V="HER"/>
</Ident>
<Ident>
<Id>889640782</Id>
<TypeId DN="Organisasjonsnummeret i Enhetsregisteret" S="2.16.578.1.12.4.1.1.9051" V="ENH"/>
</Ident>
<Organisation>
<OrganisationName>NAV Oslo</OrganisationName>
<Ident>
<Id>0000</Id>
<TypeId DN="Lokal identifikator for institusjoner" S="2.16.578.1.12.4.1.1.9051" V="LIN"/>
</Ident>
</Organisation>
</Organisation>
</Receiver>
<Patient>
<FamilyName>Test</FamilyName>
<GivenName>Etternavn</GivenName>
<DateOfBirth>1991-12-4</DateOfBirth>
<Sex DN="Mann" V="1" />
<Ident>
<Id>01010142365</Id>
<TypeId DN="Fødselsnummer" S="2.16.578.1.12.4.1.1.8116" V="FNR" />
</Ident>
<Address>
<Type DN="Postadresse" V="PST" />
<StreetAdr>Sannergata 2</StreetAdr>
<PostalCode>0655</PostalCode>
<City>OSLO</City>
<County DN="OSLO" V="0712" />
</Address>
</Patient>
</MsgInfo>
<Document>
<RefDoc>
<IssueDate V="2020-09-21T21:11:26"/>
<MsgType DN="XML-instans" V="XML"/>
<Content>
<Dialogmelding
xmlns="http://www.kith.no/xmlstds/dialog/2006-10-11" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.kith.no/xmlstds/dialog/2006-10-11 dialogmelding.xsd">
<Notat>
<TemaKodet DN="Svar på forespørsel" S="2.16.578.1.12.4.1.1.9069" V="5"/>
<TekstNotatInnhold>Ta gjerne kontakt ang hvilket telefonnummer jeg skal ringe. Mvh Inga F. Valda.</TekstNotatInnhold>
<DokIdNotat>OD2009169905747</DokIdNotat>
<DatoNotat>2020-09-21</DatoNotat>
<Foresporsel>
<TypeForesp DN="Endring dialogm..te 2" S="2.16.578.1.12.4.1.1.8125" V="2"/>
<Sporsmal>
Endret møtetidspunkt for dialogmøteGjelder Test Etternavn.NAV har tidligere innkalt til et dialogmøte angående din pasient. Møtet skulle vært
avholdt 03.09.2020 klokken 14:00.Dette møtet må flyttes, og vi foreslår nytt møtetidspunkt 22.09.2020 klokken 12:00.Møtested: SvingenHvis tidspunktet ikke
passer ber vi om en rask tilbakemelding.Vi gjør oppmerksom på at det er obligatorisk å delta i dialogmøter med NAV med mindre det er gyldig grunn for
fravær.Fastlege deltar pr telefon. Med hilsenNAVJon PersonAktuelle lover: Både folketrygdloven og arbeidsmiljøloven har bestemmelser om
sykefraværsoppfølging:Folketrygdloven § 8-4 og § 8-7Arbeidsmiljøloven § 4-6InformasjonØnsker du mer informasjon om regler og ordninger for oppfølging av
sykmeldte?www.nav.no og www.arbeidstilsynet.no Lokalt NAV-kontor
</Sporsmal>
<DokIdForesp>OD2009169905747</DokIdForesp>
<RollerRelatertNotat>
<RolleNotat S="2.16.578.1.12.4.1.1.9057" V="1"/>
<Person>
<GivenName>Jon</GivenName>
<FamilyName>Person</FamilyName>
</Person>
</RollerRelatertNotat>
</Foresporsel>
</Notat>
</Dialogmelding>
</Content>
</RefDoc>
</Document>
</MsgHead>
<MottakenhetBlokk
avsender="123123" avsenderFnrFraDigSignatur="01010112377" avsenderRef="SERIALNUMBER=984106610, CN=Allmennmedisinsk Senter DA, O=AMS ALLMENNMEDISINSK SENTER DA, C=NO" ebAction="ForesporselSvar" ebRole="Sykmelder" ebService="ForesporselFraSaksbehandler" ebXMLSamtaleId="20200917-011356-538" ediLoggId="1901162204amsa22108.1" herIdentifikator="" meldingsType="xml" mottattDatotid="2020-09-21T21:14:27" partnerReferanse="14629"/>
</EI_fellesformat>