Skip to content

Revert "FIX: Henter gjeldende oppgitt opptjening for å se om det skal… #2509

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

Closed
pekern wants to merge 1 commit into from
Closed

Revert "FIX: Henter gjeldende oppgitt opptjening for å se om det skal… #2509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 0 additions & 7 deletions ...ay/src/main/java/no/nav/foreldrepenger/abakus/domene/iay/InntektArbeidYtelseGrunnlag.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,13 +192,6 @@ public Optional<OppgittOpptjening> getOverstyrtOppgittOpptjening() {
return Optional.ofNullable(overstyrtOppgittOpptjening);
}

/**
* Returnerer overstyrt oppgitt opptjening hvis det finnes, eller vanlig oppgitt opptjening
*/
public Optional<OppgittOpptjening> getGjeldendeOppgittOpptjening() {
return Optional.ofNullable(getOverstyrtOppgittOpptjening()).orElseGet(this::getOppgittOpptjening);
}

void setOverstyrtOppgittOpptjening(OppgittOpptjening overstyrtOppgittOpptjening) {
this.overstyrtOppgittOpptjening = overstyrtOppgittOpptjening;
}
Expand Down
2 changes: 1 addition & 1 deletion ...a/no/nav/foreldrepenger/abakus/registerdata/DefaultIAYRegisterInnhentingTjenesteImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public DefaultIAYRegisterInnhentingTjenesteImpl(InntektArbeidYtelseTjeneste innt
Optional<InntektArbeidYtelseGrunnlag> grunnlag = inntektArbeidYtelseTjeneste.hentGrunnlagFor(kobling.getKoblingReferanse());

//FP,SVP,FRISINN bruker ikke aggregat for oppgitt opptjening (støtter kun en pr behandling)
boolean harOppgittSNOpptjeningUtenAggregat = grunnlag.flatMap(InntektArbeidYtelseGrunnlag::getGjeldendeOppgittOpptjening)
boolean harOppgittSNOpptjeningUtenAggregat = grunnlag.flatMap(InntektArbeidYtelseGrunnlag::getOppgittOpptjening)
.map(oppgittOpptjening -> !oppgittOpptjening.getEgenNæring().isEmpty())
.orElse(false);

Expand Down