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.

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

FAGSYSTEM-327210: Tar ikke med frilansandel lagt til senere enn fakta… #494

Merged
merged 1 commit into from
Apr 22, 2024

Conversation

pekern
Copy link
Contributor

@pekern pekern commented Apr 22, 2024

… om beregning

@pekern pekern requested review from a team as code owners April 22, 2024 11:53
@pekern pekern requested review from espenjv and AnjaAalerud April 22, 2024 11:53
@pekern pekern merged commit a39bb49 into master Apr 22, 2024
5 checks passed
@pekern pekern deleted the feature/fiks-kofak-dto branch April 22, 2024 11:57
@@ -94,7 +95,8 @@ private void lagFrilansDel(BeregningsgrunnlagDto beregningsgrunnlag,
Optional<FaktaAktørDto> faktaAktør) {
vurderMottarYtelseDto.setErFrilans(VurderMottarYtelseTjeneste.erFrilanser(beregningsgrunnlag));
beregningsgrunnlag.getBeregningsgrunnlagPerioder().get(0).getBeregningsgrunnlagPrStatusOgAndelList().stream()
.filter(andel -> andel.getAktivitetStatus().erFrilanser()).findFirst()
.filter(andel -> andel.getAktivitetStatus().erFrilanser()
&& (AndelKilde.PROSESS_START.equals(andel.getKilde()) || AndelKilde.SAKSBEHANDLER_KOFAKBER.equals(andel.getKilde()))).findFirst()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Litt usikker på om det er riktig å ta med dei med kilde SAKSBEHANDLER_KOFAKBER her., men trur ikkje det speler så stor rolle for oss akkurat no.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, jeg tok de med siden jeg så at AndelerForFaktaOmBeregningTjeneste(Linje 39) tok de med, men det er kanskje unødvendig der også?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants