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

Featuretoggler infotrygdsjekk #4856

Merged
merged 8 commits into from
Feb 17, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ enum class FeatureToggle(
HENT_IDENTER_TIL_PSYS_FRA_INFOTRYGD("familie-ba-sak.hent-identer-til-psys-fra-infotrygd"),
KAN_KJØRE_AUTOMATISK_VALUTAJUSTERING_FOR_ENKELT_SAK("familie-ba-sak.kan-kjore-autmatisk-valutajustering-behandling-for-enkelt-sak"),
KAN_OPPRETTE_OG_ENDRE_SAMMENSATTE_KONTROLLSAKER("familie-ba-sak.kan-opprette-og-endre-sammensatte-kontrollsaker"),
SJEKK_AKTIV_INFOTRYGD_SAK_REPLIKA("familie-ba-sak.infotrygd-replika-sak-aktiv"),

KAN_OPPRETTE_REVURDERING_MED_ÅRSAK_IVERKSETTE_KA_VEDTAK("familie-ba-sak.kan-opprette-revurdering-med-aarsak-iverksette-ka-vedtak"),

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ package no.nav.familie.ba.sak.kjerne.behandling
import no.nav.familie.ba.sak.common.FunksjonellFeil
import no.nav.familie.ba.sak.common.isSameOrAfter
import no.nav.familie.ba.sak.common.toYearMonth
import no.nav.familie.ba.sak.config.FeatureToggle
import no.nav.familie.ba.sak.config.TaskRepositoryWrapper
import no.nav.familie.ba.sak.config.featureToggle.UnleashNextMedContextService
import no.nav.familie.ba.sak.integrasjoner.infotrygd.InfotrygdService
import no.nav.familie.ba.sak.kjerne.arbeidsfordeling.ArbeidsfordelingService
import no.nav.familie.ba.sak.kjerne.behandling.behandlingstema.BehandlingstemaService
Expand Down Expand Up @@ -59,6 +61,7 @@ class BehandlingService(
private val vedtaksperiodeService: VedtaksperiodeService,
private val taskRepository: TaskRepositoryWrapper,
private val vilkårsvurderingService: VilkårsvurderingService,
private val unleashService: UnleashNextMedContextService,
) {
@Transactional
fun opprettBehandling(nyBehandling: NyBehandling): Behandling {
Expand Down Expand Up @@ -215,12 +218,16 @@ class BehandlingService(
}

fun harAktivInfotrygdSak(behandling: Behandling): Boolean {
val søkerIdenter =
behandling.fagsak.aktør.personidenter
.map { it.fødselsnummer }
return infotrygdService.harÅpenSakIInfotrygd(søkerIdenter) ||
!behandling.erMigrering() &&
infotrygdService.harLøpendeSakIInfotrygd(søkerIdenter)
if (unleashService.isEnabled(FeatureToggle.SJEKK_AKTIV_INFOTRYGD_SAK_REPLIKA, true)) {
val søkerIdenter =
behandling.fagsak.aktør.personidenter
.map { it.fødselsnummer }
return infotrygdService.harÅpenSakIInfotrygd(søkerIdenter) ||
!behandling.erMigrering() &&
infotrygdService.harLøpendeSakIInfotrygd(søkerIdenter)
}
logger.warn("Infotrygd-sjekk er skrudd av")
return false
}

fun sendBehandlingTilBeslutter(behandling: Behandling) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import io.mockk.every
import io.mockk.mockk
import no.nav.familie.ba.sak.common.FunksjonellFeil
import no.nav.familie.ba.sak.config.TaskRepositoryWrapper
import no.nav.familie.ba.sak.config.featureToggle.UnleashNextMedContextService
import no.nav.familie.ba.sak.datagenerator.lagBehandling
import no.nav.familie.ba.sak.integrasjoner.infotrygd.InfotrygdService
import no.nav.familie.ba.sak.kjerne.arbeidsfordeling.ArbeidsfordelingService
Expand Down Expand Up @@ -50,6 +51,7 @@ class LagreMigreringsdatoTest {
val behandlingMigreringsinfoRepository = mockk<BehandlingMigreringsinfoRepository>()
val vilkårsvurderingService = mockk<VilkårsvurderingService>()
val simuleringService = mockk<SimuleringService>()
val mockkUnleash = mockk<UnleashNextMedContextService>()

private val behandlingService =
BehandlingService(
Expand All @@ -68,6 +70,7 @@ class LagreMigreringsdatoTest {
vedtaksperiodeService,
taskRepository,
vilkårsvurderingService,
mockkUnleash,
)

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ class OppdragSteg {
vedtaksperiodeService = mockk(),
taskRepository = mockk(),
vilkårsvurderingService = mockk(),
unleashService = unleashNextMedContextService,
)

private val logger = LoggerFactory.getLogger(javaClass)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ import no.nav.familie.ba.sak.task.IverksettMotOppdragTask
import no.nav.familie.ba.sak.task.OpprettTaskService
import no.nav.familie.ba.sak.task.StatusFraOppdragTask
import no.nav.familie.felles.utbetalingsgenerator.Utbetalingsgenerator
import no.nav.familie.unleash.UnleashService
import org.slf4j.Logger
import org.slf4j.LoggerFactory

Expand Down Expand Up @@ -133,6 +134,7 @@ class CucumberMock(
val mockPåVentService = mockk<SettPåVentService>()
val opprettTaskService = mockk<OpprettTaskService>()
val vurderingsstrategiForValutakurserRepository = mockVurderingsstrategiForValutakurserRepository()
val mockkUnleash = mockk<UnleashService>()
val brevmottakerService = mockk<BrevmottakerService>()
val behandlingMigreringsinfoRepository = mockBehandlingMigreringsinfoRepository()

Expand Down Expand Up @@ -266,6 +268,7 @@ class CucumberMock(
vedtaksperiodeService = vedtaksperiodeService,
taskRepository = taskRepository,
vilkårsvurderingService = vilkårsvurderingService,
unleashService = unleashNextMedContextService,
)

val tilbakestillBehandlingTilBehandlingsresultatService =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package no.nav.familie.ba.sak.kjerne.vedtak

import no.nav.familie.ba.sak.config.AbstractSpringIntegrationTest
import no.nav.familie.ba.sak.config.TaskRepositoryWrapper
import no.nav.familie.ba.sak.config.featureToggle.UnleashNextMedContextService
import no.nav.familie.ba.sak.datagenerator.lagBehandlingUtenId
import no.nav.familie.ba.sak.datagenerator.lagTestPersonopplysningGrunnlag
import no.nav.familie.ba.sak.datagenerator.lagVilkårsvurdering
Expand Down Expand Up @@ -83,6 +84,8 @@ class VedtakServiceTest(
private val taskRepository: TaskRepositoryWrapper,
@Autowired
private val behandlingMigreringsinfoRepository: BehandlingMigreringsinfoRepository,
@Autowired
private val unleashService: UnleashNextMedContextService,
) : AbstractSpringIntegrationTest() {
lateinit var behandlingService: BehandlingService
lateinit var vilkårResultat1: VilkårResultat
Expand Down Expand Up @@ -113,6 +116,7 @@ class VedtakServiceTest(
vedtaksperiodeService,
taskRepository,
vilkårsvurderingService,
unleashService,
)

val personAktørId = randomAktør()
Expand Down