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

Hent adresse fra SAF før det som er lagret manuelt #434

Merged
merged 2 commits into from
Nov 13, 2023
Merged

Hent adresse fra SAF før det som er lagret manuelt #434

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be377ec
Hent adresse fra SAF før det som er lagret manuelt
ugur93 Nov 13, 2023
593962a
Hent adresse fra SAF før det som er lagret manuelt
ugur93 Nov 13, 2023
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
8 changes: 6 additions & 2 deletions src/main/kotlin/no/nav/bidrag/dokument/arkiv/dto/Journalpost.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ data class Journalpost(
) {

fun distribuertTilAdresse(): DistribuerTilAdresse? {
return tilleggsopplysninger.hentAdresseDo()?.toDistribuerTilAdresse() ?: parseFysiskPostadrese()
return parseFysiskPostadrese() ?: tilleggsopplysninger.hentAdresseDo()?.toDistribuerTilAdresse()
}

fun mottakerAdresse(): MottakerAdresseTo? {
Expand Down Expand Up @@ -254,7 +254,11 @@ data class Journalpost(
postnummer = postnummer,
land = landkode2
)
SECURE_LOGGER.info { "Lest og mappet postadresse fra SAF $it til $adresse" }
SECURE_LOGGER.info {
"Lest og mappet postadresse fra SAF ${
it.split("\n").joinToString("\\n")
} til $adresse"
}
return adresse
}
} catch (e: Exception) {
Expand Down