Skip to content

Commit

Permalink
Bump the all-dependencies group across 1 directory with 13 updates (#975
Browse files Browse the repository at this point in the history
)

* Bump the all-dependencies group across 1 directory with 13 updates

Bumps the all-dependencies group with 13 updates in the / directory:

| Package | From | To |
| --- | --- | --- |
| [org.springframework.boot:spring-boot-starter-parent](https://github.com/spring-projects/spring-boot) | `3.3.4` | `3.3.5` |
| [no.nav.familie.kontrakter:felles](https://github.com/navikt/familie-kontrakter) | `3.0_20241018104853_fa92410` | `3.0_20241102131210_d65efd1` |
| [no.nav.familie.kontrakter:enslig-forsorger](https://github.com/navikt/familie-kontrakter) | `3.0_20241018104853_fa92410` | `3.0_20241102131210_d65efd1` |
| [no.nav.security:token-client-core](https://github.com/navikt/token-support) | `5.0.5` | `5.0.10` |
| [no.nav.security:token-validation-core](https://github.com/navikt/token-support) | `5.0.5` | `5.0.10` |
| [no.nav.security:token-client-spring](https://github.com/navikt/token-support) | `5.0.5` | `5.0.10` |
| [no.nav.security:token-validation-spring-test](https://github.com/navikt/token-support) | `5.0.5` | `5.0.10` |
| [no.nav.familie.felles:familie-utbetalingsgenerator](https://github.com/navikt/familie-utbetalingsgenerator) | `1.0_20240902095239_88c7bc0` | `1.0_20241021103522_3adb9fa` |
| org.flywaydb:flyway-database-postgresql | `10.20.0` | `10.21.0` |
| com.ibm.mq:com.ibm.mq.jakarta.client | `9.4.0.5` | `9.4.1.0` |
| [org.testcontainers:postgresql](https://github.com/testcontainers/testcontainers-java) | `1.20.2` | `1.20.3` |
| [com.pinterest.ktlint:ktlint-cli](https://github.com/pinterest/ktlint) | `1.3.1` | `1.4.1` |
| [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire) | `3.5.1` | `3.5.2` |



Updates `org.springframework.boot:spring-boot-starter-parent` from 3.3.4 to 3.3.5
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
- [Commits](spring-projects/spring-boot@v3.3.4...v3.3.5)

Updates `no.nav.familie.kontrakter:felles` from 3.0_20241018104853_fa92410 to 3.0_20241102131210_d65efd1
- [Commits](https://github.com/navikt/familie-kontrakter/commits)

Updates `no.nav.familie.kontrakter:enslig-forsorger` from 3.0_20241018104853_fa92410 to 3.0_20241102131210_d65efd1
- [Commits](https://github.com/navikt/familie-kontrakter/commits)

Updates `no.nav.familie.kontrakter:enslig-forsorger` from 3.0_20241018104853_fa92410 to 3.0_20241102131210_d65efd1
- [Commits](https://github.com/navikt/familie-kontrakter/commits)

Updates `no.nav.security:token-client-core` from 5.0.5 to 5.0.10
- [Release notes](https://github.com/navikt/token-support/releases)
- [Commits](navikt/token-support@5.0.5...5.0.10)

Updates `no.nav.security:token-validation-core` from 5.0.5 to 5.0.10
- [Release notes](https://github.com/navikt/token-support/releases)
- [Commits](navikt/token-support@5.0.5...5.0.10)

Updates `no.nav.security:token-client-spring` from 5.0.5 to 5.0.10
- [Release notes](https://github.com/navikt/token-support/releases)
- [Commits](navikt/token-support@5.0.5...5.0.10)

Updates `no.nav.security:token-validation-spring-test` from 5.0.5 to 5.0.10
- [Release notes](https://github.com/navikt/token-support/releases)
- [Commits](navikt/token-support@5.0.5...5.0.10)

Updates `no.nav.security:token-validation-core` from 5.0.5 to 5.0.10
- [Release notes](https://github.com/navikt/token-support/releases)
- [Commits](navikt/token-support@5.0.5...5.0.10)

Updates `no.nav.security:token-client-spring` from 5.0.5 to 5.0.10
- [Release notes](https://github.com/navikt/token-support/releases)
- [Commits](navikt/token-support@5.0.5...5.0.10)

Updates `no.nav.familie.felles:familie-utbetalingsgenerator` from 1.0_20240902095239_88c7bc0 to 1.0_20241021103522_3adb9fa
- [Commits](https://github.com/navikt/familie-utbetalingsgenerator/commits)

Updates `org.flywaydb:flyway-database-postgresql` from 10.20.0 to 10.21.0

Updates `com.ibm.mq:com.ibm.mq.jakarta.client` from 9.4.0.5 to 9.4.1.0

Updates `org.testcontainers:postgresql` from 1.20.2 to 1.20.3
- [Release notes](https://github.com/testcontainers/testcontainers-java/releases)
- [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md)
- [Commits](testcontainers/testcontainers-java@1.20.2...1.20.3)

Updates `no.nav.security:token-validation-spring-test` from 5.0.5 to 5.0.10
- [Release notes](https://github.com/navikt/token-support/releases)
- [Commits](navikt/token-support@5.0.5...5.0.10)

Updates `com.pinterest.ktlint:ktlint-cli` from 1.3.1 to 1.4.1
- [Release notes](https://github.com/pinterest/ktlint/releases)
- [Changelog](https://github.com/pinterest/ktlint/blob/master/CHANGELOG.md)
- [Commits](pinterest/ktlint@1.3.1...1.4.1)

Updates `org.apache.maven.plugins:maven-surefire-plugin` from 3.5.1 to 3.5.2
- [Release notes](https://github.com/apache/maven-surefire/releases)
- [Commits](apache/maven-surefire@surefire-3.5.1...surefire-3.5.2)

---
updated-dependencies:
- dependency-name: org.springframework.boot:spring-boot-starter-parent
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-dependencies
- dependency-name: no.nav.familie.kontrakter:felles
  dependency-type: direct:production
  dependency-group: all-dependencies
- dependency-name: no.nav.familie.kontrakter:enslig-forsorger
  dependency-type: direct:production
  dependency-group: all-dependencies
- dependency-name: no.nav.familie.kontrakter:enslig-forsorger
  dependency-type: direct:production
  dependency-group: all-dependencies
- dependency-name: no.nav.security:token-client-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-dependencies
- dependency-name: no.nav.security:token-validation-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-dependencies
- dependency-name: no.nav.security:token-client-spring
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-dependencies
- dependency-name: no.nav.security:token-validation-spring-test
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: all-dependencies
- dependency-name: no.nav.security:token-validation-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-dependencies
- dependency-name: no.nav.security:token-client-spring
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-dependencies
- dependency-name: no.nav.familie.felles:familie-utbetalingsgenerator
  dependency-type: direct:production
  dependency-group: all-dependencies
- dependency-name: org.flywaydb:flyway-database-postgresql
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: all-dependencies
- dependency-name: com.ibm.mq:com.ibm.mq.jakarta.client
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-dependencies
- dependency-name: org.testcontainers:postgresql
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: all-dependencies
- dependency-name: no.nav.security:token-validation-spring-test
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: all-dependencies
- dependency-name: com.pinterest.ktlint:ktlint-cli
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: all-dependencies
- dependency-name: org.apache.maven.plugins:maven-surefire-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-dependencies
...

Signed-off-by: dependabot[bot] <[email protected]>

* Oppdatering av kontrakter - fra BrukerIdType til AvsenderMottakerIdType

Linterendringer

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Ole Christian Kvernberg <[email protected]>
  • Loading branch information
dependabot[bot] and olekvernberg authored Nov 14, 2024
1 parent 264e422 commit d5b8bce
Show file tree
Hide file tree
Showing 14 changed files with 40 additions and 50 deletions.
18 changes: 9 additions & 9 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.3.4</version>
<version>3.3.5</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>

Expand All @@ -18,23 +18,23 @@
<kotlin.version>2.0.21</kotlin.version>
<springdoc.version>2.6.0</springdoc.version>
<felles.version>3.20240913110742_adb42f8</felles.version>
<familie.kontrakter.version>3.0_20241018104853_fa92410</familie.kontrakter.version>
<familie.kontrakter.version>3.0_20241102131210_d65efd1</familie.kontrakter.version>
<familie.eksterne-kontrakter.stonadsstatistikk-ef>2.0_20240425094647_26b983d</familie.eksterne-kontrakter.stonadsstatistikk-ef>
<familie.eksterne-kontrakter.saksstatistikk-ef>2.0_20230214104704_706e9c0</familie.eksterne-kontrakter.saksstatistikk-ef>
<familie.eksterne-kontrakter.arbeidsoppfolging>2.0_20230214104704_706e9c0</familie.eksterne-kontrakter.arbeidsoppfolging>
<prosessering.version>2.20241011144712_deb1f2c</prosessering.version>
<utbetalingsgenerator.version>1.0_20240902095239_88c7bc0</utbetalingsgenerator.version>
<utbetalingsgenerator.version>1.0_20241021103522_3adb9fa</utbetalingsgenerator.version>
<brukernotifikasjon-schemas.version>2.6.0</brukernotifikasjon-schemas.version>
<maven-surefire-plugin.version>3.5.1</maven-surefire-plugin.version>
<maven-surefire-plugin.version>3.5.2</maven-surefire-plugin.version>
<confluent.version>7.7.1</confluent.version>
<mockk-jvm.version>1.13.13</mockk-jvm.version>
<cucumber.version>7.20.1</cucumber.version>
<revision>1.0</revision>
<dotenv.version>6.4.1</dotenv.version>
<changelist>-SNAPSHOT</changelist>
<start-class>no.nav.familie.ef.iverksett.ApplicationKt</start-class>
<token-validation-spring.version>5.0.5</token-validation-spring.version>
<ibm-mq-client.version>9.4.0.5</ibm-mq-client.version>
<token-validation-spring.version>5.0.10</token-validation-spring.version>
<ibm-mq-client.version>9.4.1.0</ibm-mq-client.version>
<unleash.version>8.3.1</unleash.version>
<okhttp3.version>4.9.1</okhttp3.version> <!-- overskrever spring sin versjon, blir brukt av mock-oauth2-server -->
</properties>
Expand Down Expand Up @@ -250,7 +250,7 @@
<dependency>
<groupId>org.flywaydb</groupId>
<artifactId>flyway-database-postgresql</artifactId>
<version>10.20.0</version>
<version>10.21.0</version>
<scope>runtime</scope>
</dependency>
<!-- MQ / JMS -->
Expand All @@ -272,7 +272,7 @@
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>postgresql</artifactId>
<version>1.20.2</version>
<version>1.20.3</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -412,7 +412,7 @@
<dependency>
<groupId>com.pinterest.ktlint</groupId>
<artifactId>ktlint-cli</artifactId>
<version>1.3.1</version>
<version>1.4.1</version>
</dependency>
<!-- additional 3rd party ruleset(s) can be specified here -->
</dependencies>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package no.nav.familie.ef.iverksett.brev

import no.nav.familie.ef.iverksett.brev.domain.JournalpostResultat
import no.nav.familie.ef.iverksett.brev.domain.tilIdType
import no.nav.familie.ef.iverksett.brev.domain.tilAvsenderMottakerIdType
import no.nav.familie.ef.iverksett.infrastruktur.task.opprettNesteTask
import no.nav.familie.ef.iverksett.iverksetting.IverksettingRepository
import no.nav.familie.ef.iverksett.iverksetting.domene.Iverksett
Expand Down Expand Up @@ -171,7 +171,7 @@ class JournalførVedtaksbrevTask(
avsenderMottaker =
AvsenderMottaker(
id = mottaker.ident,
idType = mottaker.identType.tilIdType(),
idType = mottaker.identType.tilAvsenderMottakerIdType(),
navn = mottaker.navn,
),
)
Expand Down Expand Up @@ -223,8 +223,7 @@ class JournalførVedtaksbrevTask(
}
}

private fun lagDokumentTittel(iverksett: IverksettData): String =
lagVedtakstekst(iverksett) + lagStønadtypeTekst(iverksett.fagsak.stønadstype)
private fun lagDokumentTittel(iverksett: IverksettData): String = lagVedtakstekst(iverksett) + lagStønadtypeTekst(iverksett.fagsak.stønadstype)

override fun onCompletion(task: Task) {
taskService.save(task.opprettNesteTask())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package no.nav.familie.ef.iverksett.brev.domain

import no.nav.familie.kontrakter.ef.iverksett.Brevmottaker.IdentType
import no.nav.familie.kontrakter.ef.iverksett.Brevmottaker.MottakerRolle
import no.nav.familie.kontrakter.felles.BrukerIdType
import no.nav.familie.kontrakter.felles.journalpost.AvsenderMottakerIdType

data class Brevmottakere(
val mottakere: List<Brevmottaker>,
Expand All @@ -15,8 +15,8 @@ data class Brevmottaker(
val mottakerRolle: MottakerRolle,
)

fun IdentType.tilIdType(): BrukerIdType =
fun IdentType.tilAvsenderMottakerIdType(): AvsenderMottakerIdType =
when (this) {
IdentType.ORGANISASJONSNUMMER -> BrukerIdType.ORGNR
IdentType.PERSONIDENT -> BrukerIdType.FNR
IdentType.ORGANISASJONSNUMMER -> AvsenderMottakerIdType.ORGNR
IdentType.PERSONIDENT -> AvsenderMottakerIdType.FNR
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import no.nav.familie.ef.iverksett.brev.domain.Brevmottaker
import no.nav.familie.ef.iverksett.brev.domain.FrittståendeBrev
import no.nav.familie.ef.iverksett.brev.domain.JournalpostResultat
import no.nav.familie.ef.iverksett.brev.domain.JournalpostResultatMap
import no.nav.familie.ef.iverksett.brev.domain.tilIdType
import no.nav.familie.ef.iverksett.brev.domain.tilAvsenderMottakerIdType
import no.nav.familie.ef.iverksett.brev.stønadstypeTilDokumenttype
import no.nav.familie.ef.iverksett.repository.findByIdOrThrow
import no.nav.familie.kontrakter.felles.dokarkiv.AvsenderMottaker
Expand Down Expand Up @@ -98,7 +98,7 @@ class JournalførFrittståendeBrevTask(
) = if (frittståendeBrev.personIdent != brevmottaker.ident) {
AvsenderMottaker(
brevmottaker.ident,
brevmottaker.identType.tilIdType(),
brevmottaker.identType.tilAvsenderMottakerIdType(),
brevmottaker.navn,
)
} else {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
package no.nav.familie.ef.iverksett.infrastruktur.configuration

import no.nav.familie.kafka.KafkaErrorHandler
import org.springframework.beans.factory.ObjectProvider
import org.springframework.boot.autoconfigure.kafka.KafkaProperties
import org.springframework.boot.ssl.SslBundles
import org.springframework.context.annotation.Bean
import org.springframework.context.annotation.Configuration
import org.springframework.kafka.annotation.EnableKafka
Expand All @@ -15,9 +17,10 @@ class KafkaConsumerConfig {
fun concurrentTilbakekrevingListenerContainerFactory(
properties: KafkaProperties,
kafkaErrorHandler: KafkaErrorHandler,
sslBundles: ObjectProvider<SslBundles>,
): ConcurrentKafkaListenerContainerFactory<String, String> {
val factory = ConcurrentKafkaListenerContainerFactory<String, String>()
factory.consumerFactory = DefaultKafkaConsumerFactory(properties.buildConsumerProperties())
factory.consumerFactory = DefaultKafkaConsumerFactory(properties.buildConsumerProperties(sslBundles.getIfAvailable()))
factory.setCommonErrorHandler(kafkaErrorHandler)
return factory
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,7 @@ class IverksettingService(
else -> hovedflyt().first().type
}

private fun erIverksettingUtenVedtaksperioder(iverksett: IverksettData) =
iverksett.vedtak.tilkjentYtelse == null && iverksett.vedtak.vedtaksresultat == Vedtaksresultat.AVSLÅTT
private fun erIverksettingUtenVedtaksperioder(iverksett: IverksettData) = iverksett.vedtak.tilkjentYtelse == null && iverksett.vedtak.vedtaksresultat == Vedtaksresultat.AVSLÅTT

fun utledStatus(behandlingId: UUID): IverksettStatus? {
val iverksettResultat = iverksettResultatService.hentIverksettResultat(behandlingId)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,11 @@ data class AndelTilkjentYtelse(
val forrigePeriodeId: Long? = null,
val kildeBehandlingId: UUID? = null,
) {
private fun erTilsvarendeForUtbetaling(other: AndelTilkjentYtelse): Boolean = (
this.periode == other.periode &&
this.beløp == other.beløp
)
private fun erTilsvarendeForUtbetaling(other: AndelTilkjentYtelse): Boolean =
(
this.periode == other.periode &&
this.beløp == other.beløp
)

fun harNullBeløp() = this.beløp == 0

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -240,8 +240,7 @@ class OppgaveService(
forrigeBehandling: IverksettOvergangsstønad,
): Boolean = iverksett.vedtaksPeriodeMedMaksTilOgMedDato() != forrigeBehandling.vedtaksPeriodeMedMaksTilOgMedDato()

private fun IverksettOvergangsstønad.gjeldendeVedtak(): VedtaksperiodeOvergangsstønad =
this.vedtak.vedtaksperioder.maxByOrNull { it.periode } ?: error("Kunne ikke finne vedtaksperioder")
private fun IverksettOvergangsstønad.gjeldendeVedtak(): VedtaksperiodeOvergangsstønad = this.vedtak.vedtaksperioder.maxByOrNull { it.periode } ?: error("Kunne ikke finne vedtaksperioder")

private fun IverksettOvergangsstønad.vedtaksPeriodeMedMaksTilOgMedDato(): LocalDate = this.vedtak.vedtaksperioder.maxOf { it.periode.tomDato }

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,7 @@ class OpprettTilbakekrevingTask(
)
}

private fun finnesÅpenTilbakekrevingsbehandling(nyIverksett: IverksettData): Boolean =
tilbakekrevingClient.finnesÅpenBehandling(nyIverksett.fagsak.eksternId)
private fun finnesÅpenTilbakekrevingsbehandling(nyIverksett: IverksettData): Boolean = tilbakekrevingClient.finnesÅpenBehandling(nyIverksett.fagsak.eksternId)

companion object {
const val TYPE = "opprettTilbakekrevingsbehandling"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,5 @@ object VedtakstatistikkMapper {
private fun inneholderEøsUnntak(
unntak: SvarId,
vilkårsvurderinger: List<Vilkårsvurdering>,
): Boolean =
vilkårsvurderinger.any { vilkårsvurdering -> vilkårsvurdering.delvilkårsvurderinger.any { delvilkårsvurdering -> delvilkårsvurdering.vurderinger.any { vurdering -> vurdering.svar == unntak } } }
): Boolean = vilkårsvurderinger.any { vilkårsvurdering -> vilkårsvurdering.delvilkårsvurderinger.any { delvilkårsvurdering -> delvilkårsvurdering.vurderinger.any { vurdering -> vurdering.svar == unntak } } }
}
Original file line number Diff line number Diff line change
Expand Up @@ -105,11 +105,9 @@ fun fagområdeKoderForPosteringer(stønadType: StønadType): Set<FagOmrådeKode>
)
}

private fun hentNyttBeløp(posteringer: List<SimulertPostering>) =
posteringer.sumBarePositiv(YTELSE) - posteringer.sumBarePositiv(FEILUTBETALING)
private fun hentNyttBeløp(posteringer: List<SimulertPostering>) = posteringer.sumBarePositiv(YTELSE) - posteringer.sumBarePositiv(FEILUTBETALING)

private fun hentTidligereUtbetalt(posteringer: List<SimulertPostering>) =
posteringer.sumBareNegativ(FEILUTBETALING) - posteringer.sumBareNegativ(YTELSE)
private fun hentTidligereUtbetalt(posteringer: List<SimulertPostering>) = posteringer.sumBareNegativ(FEILUTBETALING) - posteringer.sumBareNegativ(YTELSE)

private fun hentResultat(posteringer: List<SimulertPostering>): BigDecimal {
val positivFeilutbetaling = posteringer.sumBarePositiv(FEILUTBETALING)
Expand Down Expand Up @@ -141,11 +139,9 @@ private fun hentTotalFeilutbetaling(
.filter { fomDatoNestePeriode == null || it.fom < fomDatoNestePeriode }
.sumOf { it.feilutbetaling }

private fun List<SimulertPostering>.sumBarePositiv(type: PosteringType) =
this.filter { it.posteringType == type && it.beløp > ZERO }.sumOf { it.beløp }
private fun List<SimulertPostering>.sumBarePositiv(type: PosteringType) = this.filter { it.posteringType == type && it.beløp > ZERO }.sumOf { it.beløp }

private fun List<SimulertPostering>.sumBareNegativ(type: PosteringType) =
this.filter { it.posteringType == type && it.beløp < ZERO }.sumOf { it.beløp }
private fun List<SimulertPostering>.sumBareNegativ(type: PosteringType) = this.filter { it.posteringType == type && it.beløp < ZERO }.sumOf { it.beløp }

private data class PeriodeMedForfall(
val fom: LocalDate,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,7 @@ fun nullAndelTilkjentYtelse(
)

object ØkonomiUtils {
fun andelerUtenNullVerdier(tilkjentYtelse: TilkjentYtelse?): List<AndelTilkjentYtelse> =
tilkjentYtelse?.andelerTilkjentYtelse?.filter { !it.harNullBeløp() } ?: emptyList()
fun andelerUtenNullVerdier(tilkjentYtelse: TilkjentYtelse?): List<AndelTilkjentYtelse> = tilkjentYtelse?.andelerTilkjentYtelse?.filter { !it.harNullBeløp() } ?: emptyList()

/**
* Lager oversikt over siste andel i hver kjede som finnes uten endring i oppdatert tilstand.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -237,9 +237,7 @@ internal class OpprettTilbakekrevingTaskTest {
opprettTilbakekrevingTask.doTask(task)
}

fun Tilbakekrevingsdetaljer.medFeilutbetaling(beløp: Long) =
this.copy(tilbakekrevingMedVarsel = this.tilbakekrevingMedVarsel?.copy(sumFeilutbetaling = beløp.toBigDecimal()))
fun Tilbakekrevingsdetaljer.medFeilutbetaling(beløp: Long) = this.copy(tilbakekrevingMedVarsel = this.tilbakekrevingMedVarsel?.copy(sumFeilutbetaling = beløp.toBigDecimal()))

fun BeriketSimuleringsresultat.medFeilutbetaling(beløp: Long) =
this.copy(oppsummering = this.oppsummering.copy(feilutbetaling = beløp.toBigDecimal()))
fun BeriketSimuleringsresultat.medFeilutbetaling(beløp: Long) = this.copy(oppsummering = this.oppsummering.copy(feilutbetaling = beløp.toBigDecimal()))
}
Original file line number Diff line number Diff line change
Expand Up @@ -369,8 +369,7 @@ fun opprettIverksettOvergangsstønad(
)
}

fun startmåned(andeler: List<AndelTilkjentYtelse>) =
andeler.minOfOrNull { it.periode.fom } ?: error("Trenger å sette startdato hvs det ikke finnes andeler")
fun startmåned(andeler: List<AndelTilkjentYtelse>) = andeler.minOfOrNull { it.periode.fom } ?: error("Trenger å sette startdato hvs det ikke finnes andeler")

fun opprettBrev(): Brev = Brev(ByteArray(256))

Expand Down Expand Up @@ -441,8 +440,7 @@ class IverksettResultatMockBuilder private constructor(
)
}

fun tilbakekrevingResultat(tilbakekrevingResultat: TilbakekrevingResultat?) =
apply { this.tilbakekrevingResultat = tilbakekrevingResultat }
fun tilbakekrevingResultat(tilbakekrevingResultat: TilbakekrevingResultat?) = apply { this.tilbakekrevingResultat = tilbakekrevingResultat }

fun build(
behandlingId: UUID,
Expand Down

0 comments on commit d5b8bce

Please sign in to comment.