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

Fjern forespørseltype #731

Merged
merged 3 commits into from
Oct 29, 2024
Merged

Fjern forespørseltype #731

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f8fb33b
Fjern forespørseltype
bjerga Oct 28, 2024
1134c19
Fjern resterende referanser til type
bjerga Oct 28, 2024
8aa862f
Merge branch 'main' into dev/fjern-forespoersel-type
bjerga Oct 29, 2024
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
2 changes: 0 additions & 2 deletions ...nav/helsearbeidsgiver/inntektsmelding/api/hentforespoersel/HentForespoerselRouteKtTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import kotlinx.serialization.json.JsonObject
import no.nav.helsearbeidsgiver.domene.inntektsmelding.v1.Periode
import no.nav.helsearbeidsgiver.domene.inntektsmelding.v1.til
import no.nav.helsearbeidsgiver.felles.domene.Forespoersel
import no.nav.helsearbeidsgiver.felles.domene.ForespoerselType
import no.nav.helsearbeidsgiver.felles.domene.ForespurtData
import no.nav.helsearbeidsgiver.felles.domene.ForrigeInntekt
import no.nav.helsearbeidsgiver.felles.domene.ForslagInntekt
Expand Down Expand Up @@ -153,7 +152,6 @@ private object Mock {

private val forespoersel =
Forespoersel(
type = ForespoerselType.KOMPLETT,
orgnr = "123",
fnr = "abc",
sykmeldingsperioder =
Expand Down
6 changes: 0 additions & 6 deletions felles/src/main/kotlin/no/nav/helsearbeidsgiver/felles/domene/Forespoersel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import java.util.UUID

@Serializable
data class Forespoersel(
val type: ForespoerselType,
val orgnr: String,
val fnr: String,
val vedtaksperiodeId: UUID,
Expand Down Expand Up @@ -57,8 +56,3 @@ data class Forespoersel(
}
}
}

enum class ForespoerselType {
KOMPLETT,
BEGRENSET,
}
2 changes: 0 additions & 2 deletions felles/src/testFixtures/kotlin/no/nav/helsearbeidsgiver/felles/test/mock/MockForespoersel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package no.nav.helsearbeidsgiver.felles.test.mock

import no.nav.helsearbeidsgiver.domene.inntektsmelding.v1.til
import no.nav.helsearbeidsgiver.felles.domene.Forespoersel
import no.nav.helsearbeidsgiver.felles.domene.ForespoerselType
import no.nav.helsearbeidsgiver.felles.domene.ForespurtData
import no.nav.helsearbeidsgiver.felles.domene.ForrigeInntekt
import no.nav.helsearbeidsgiver.felles.domene.ForslagInntekt
Expand All @@ -17,7 +16,6 @@ import java.util.UUID
fun mockForespoersel(): Forespoersel {
val orgnr = Orgnr.genererGyldig()
return Forespoersel(
type = ForespoerselType.KOMPLETT,
orgnr = orgnr.verdi,
fnr = Fnr.genererGyldig().verdi,
vedtaksperiodeId = UUID.randomUUID(),
Expand Down
2 changes: 0 additions & 2 deletions .../src/main/kotlin/no/nav/helsearbeidsgiver/inntektsmelding/helsebro/domene/Forespoersel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import kotlinx.serialization.Serializable
import kotlinx.serialization.UseSerializers
import no.nav.helsearbeidsgiver.domene.inntektsmelding.v1.Periode
import no.nav.helsearbeidsgiver.felles.domene.Forespoersel
import no.nav.helsearbeidsgiver.felles.domene.ForespoerselType
import no.nav.helsearbeidsgiver.felles.domene.ForespurtData
import no.nav.helsearbeidsgiver.utils.json.serializer.LocalDateSerializer
import no.nav.helsearbeidsgiver.utils.json.serializer.UuidSerializer
Expand All @@ -17,7 +16,6 @@ import java.util.UUID

@Serializable
data class Forespoersel(
val type: ForespoerselType,
val orgnr: Orgnr,
val fnr: Fnr,
/** Ikke bruk ved henting av én forespørsel (Storebror lekker feil id). */
Expand Down
4 changes: 0 additions & 4 deletions helsebro/src/test/kotlin/no/nav/helsearbeidsgiver/inntektsmelding/helsebro/MockUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import kotlinx.serialization.json.JsonElement
import no.nav.helsearbeidsgiver.domene.inntektsmelding.v1.til
import no.nav.helsearbeidsgiver.felles.EventName
import no.nav.helsearbeidsgiver.felles.Key
import no.nav.helsearbeidsgiver.felles.domene.ForespoerselType
import no.nav.helsearbeidsgiver.felles.json.toJson
import no.nav.helsearbeidsgiver.felles.test.mock.mockForespurtData
import no.nav.helsearbeidsgiver.felles.test.mock.mockForespurtDataMedFastsattInntekt
Expand Down Expand Up @@ -34,7 +33,6 @@ fun mockForespoerselListeSvarMedSuksess(): ForespoerselListeSvar {
resultat =
listOf(
Forespoersel(
type = ForespoerselType.KOMPLETT,
orgnr = orgnr,
fnr = Fnr.genererGyldig(),
vedtaksperiodeId = UUID.randomUUID(),
Expand Down Expand Up @@ -78,7 +76,6 @@ fun mockForespoerselListeSvarMedFeil(): ForespoerselListeSvar =
fun mockForespoerselSvarSuksess(forespoerselId: UUID): Forespoersel {
val orgnr = Orgnr.genererGyldig()
return Forespoersel(
type = ForespoerselType.KOMPLETT,
orgnr = orgnr,
fnr = Fnr.genererGyldig(),
forespoerselId = forespoerselId,
Expand All @@ -94,7 +91,6 @@ fun mockForespoerselSvarSuksess(forespoerselId: UUID): Forespoersel {
fun mockForespoerselSvarSuksessMedFastsattInntekt(forespoerselId: UUID): Forespoersel {
val orgnr = Orgnr.genererGyldig()
return Forespoersel(
type = ForespoerselType.KOMPLETT,
orgnr = orgnr,
fnr = Fnr.genererGyldig(),
forespoerselId = forespoerselId,
Expand Down
3 changes: 0 additions & 3 deletions ...o/nav/helsearbeidsgiver/inntektsmelding/integrasjonstest/BerikInntektsmeldingServiceIT.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import no.nav.helsearbeidsgiver.felles.BehovType
import no.nav.helsearbeidsgiver.felles.EventName
import no.nav.helsearbeidsgiver.felles.Key
import no.nav.helsearbeidsgiver.felles.domene.Forespoersel
import no.nav.helsearbeidsgiver.felles.domene.ForespoerselType
import no.nav.helsearbeidsgiver.felles.json.lesOrNull
import no.nav.helsearbeidsgiver.felles.json.orgMapSerializer
import no.nav.helsearbeidsgiver.felles.json.personMapSerializer
Expand Down Expand Up @@ -328,7 +327,6 @@ class BerikInntektsmeldingServiceIT : EndToEndTest() {

val forespoersel =
Forespoersel(
type = ForespoerselType.KOMPLETT,
orgnr = orgnr.verdi,
fnr = bjarneBetjent.ident!!,
vedtaksperiodeId = UUID.randomUUID(),
Expand All @@ -349,7 +347,6 @@ class BerikInntektsmeldingServiceIT : EndToEndTest() {

val forespoerselSvar =
ForespoerselBro(
type = ForespoerselType.KOMPLETT,
orgnr = Orgnr(forespoersel.orgnr),
fnr = Fnr(forespoersel.fnr),
forespoerselId = forespoerselId,
Expand Down
3 changes: 0 additions & 3 deletions ...src/test/kotlin/no/nav/helsearbeidsgiver/inntektsmelding/integrasjonstest/InnsendingIT.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import no.nav.helsearbeidsgiver.felles.BehovType
import no.nav.helsearbeidsgiver.felles.EventName
import no.nav.helsearbeidsgiver.felles.Key
import no.nav.helsearbeidsgiver.felles.domene.Forespoersel
import no.nav.helsearbeidsgiver.felles.domene.ForespoerselType
import no.nav.helsearbeidsgiver.felles.json.les
import no.nav.helsearbeidsgiver.felles.json.toJson
import no.nav.helsearbeidsgiver.felles.json.toMap
Expand Down Expand Up @@ -226,7 +225,6 @@ class InnsendingIT : EndToEndTest() {

val forespoersel =
Forespoersel(
type = ForespoerselType.KOMPLETT,
orgnr = orgnr.verdi,
fnr = bjarneBetjent.ident!!,
vedtaksperiodeId = UUID.randomUUID(),
Expand All @@ -247,7 +245,6 @@ class InnsendingIT : EndToEndTest() {

val forespoerselSvar =
ForespoerselBro(
type = ForespoerselType.KOMPLETT,
orgnr = Orgnr(forespoersel.orgnr),
fnr = Fnr(forespoersel.fnr),
forespoerselId = forespoerselId,
Expand Down
2 changes: 0 additions & 2 deletions ...t/kotlin/no/nav/helsearbeidsgiver/inntektsmelding/integrasjonstest/InnsendingServiceIT.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import no.nav.helsearbeidsgiver.domene.inntektsmelding.v1.skjema.SkjemaInntektsm
import no.nav.helsearbeidsgiver.domene.inntektsmelding.v1.til
import no.nav.helsearbeidsgiver.felles.EventName
import no.nav.helsearbeidsgiver.felles.Key
import no.nav.helsearbeidsgiver.felles.domene.ForespoerselType
import no.nav.helsearbeidsgiver.felles.domene.ResultJson
import no.nav.helsearbeidsgiver.felles.json.lesOrNull
import no.nav.helsearbeidsgiver.felles.json.toJson
Expand Down Expand Up @@ -160,7 +159,6 @@ class InnsendingServiceIT : EndToEndTest() {

val forespoerselSvar =
Forespoersel(
type = ForespoerselType.KOMPLETT,
orgnr = orgnr,
fnr = Fnr.genererGyldig(),
forespoerselId = skjema.forespoerselId,
Expand Down
3 changes: 0 additions & 3 deletions ...rc/test/kotlin/no/nav/helsearbeidsgiver/inntektsmelding/integrasjonstest/mock/MockData.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package no.nav.helsearbeidsgiver.inntektsmelding.integrasjonstest.mock

import no.nav.helsearbeidsgiver.domene.inntektsmelding.v1.til
import no.nav.helsearbeidsgiver.felles.domene.ForespoerselType
import no.nav.helsearbeidsgiver.felles.test.mock.mockForespurtData
import no.nav.helsearbeidsgiver.inntektsmelding.helsebro.domene.Forespoersel
import no.nav.helsearbeidsgiver.utils.test.date.januar
Expand All @@ -13,7 +12,6 @@ import java.util.UUID
fun mockForespoerselSvarSuksess(): Forespoersel {
val orgnr = Orgnr.genererGyldig()
return Forespoersel(
type = ForespoerselType.KOMPLETT,
orgnr = orgnr,
fnr = Fnr.genererGyldig(),
forespoerselId = UUID.randomUUID(),
Expand All @@ -37,7 +35,6 @@ fun mockForespoerselListeSvarResultat(
val orgnr = Orgnr.genererGyldig()
val forespoersel =
Forespoersel(
type = ForespoerselType.KOMPLETT,
orgnr = orgnr,
fnr = Fnr.genererGyldig(),
forespoerselId = UUID.randomUUID(),
Expand Down
Loading