diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/arenaforvalter/ArenaForvalterClient.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/arenaforvalter/ArenaForvalterClient.java index 867495dc364..cf5d4f8c68e 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/arenaforvalter/ArenaForvalterClient.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/arenaforvalter/ArenaForvalterClient.java @@ -8,7 +8,7 @@ import no.nav.dolly.bestilling.arenaforvalter.service.ArenaAapService; import no.nav.dolly.bestilling.arenaforvalter.service.ArenaBrukerService; import no.nav.dolly.bestilling.arenaforvalter.service.ArenaDagpengerService; -import no.nav.dolly.bestilling.arenaforvalter.utils.ArenaEksisterendeVedtakUtil; +import no.nav.dolly.bestilling.arenaforvalter.utils.ArenaEksisterendeVedtakService; import no.nav.dolly.domain.jpa.BestillingProgress; import no.nav.dolly.domain.resultset.RsDollyUtvidetBestilling; import no.nav.dolly.domain.resultset.arenaforvalter.Arenadata; @@ -45,6 +45,7 @@ public class ArenaForvalterClient implements ClientRegister { private final ArenaAap115Service arenaAap115Service; private final ArenaAapService arenaAapService; private final ArenaDagpengerService arenaDagpengerService; + private final ArenaEksisterendeVedtakService arenaEksisterendeVedtakService; @Override public Flux gjenopprett(RsDollyUtvidetBestilling bestilling, DollyPerson dollyPerson, BestillingProgress progress, boolean isOpprettEndre) { @@ -69,7 +70,7 @@ private Mono doArenaOpprett(Arenadata arenadata, String ident, List arenaForvalterConsumer.getArenaBruker(ident, miljoe) - .map(arenaArbeidsokerStatus -> ArenaEksisterendeVedtakUtil.getArenaOperasjoner(arenadata, arenaArbeidsokerStatus)) + .map(arenaArbeidsokerStatus -> arenaEksisterendeVedtakService.getArenaOperasjoner(arenadata, arenaArbeidsokerStatus)) .flatMapMany(arenaOperasjoner -> Flux.concat( arenaBrukerService.sendBruker(arenadata, arenaOperasjoner, ident, miljoe) diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/arenaforvalter/utils/ArenaEksisterendeVedtakUtil.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/arenaforvalter/utils/ArenaEksisterendeVedtakService.java similarity index 95% rename from apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/arenaforvalter/utils/ArenaEksisterendeVedtakUtil.java rename to apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/arenaforvalter/utils/ArenaEksisterendeVedtakService.java index f44a54ff360..b3b52d22ed9 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/arenaforvalter/utils/ArenaEksisterendeVedtakUtil.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/arenaforvalter/utils/ArenaEksisterendeVedtakService.java @@ -1,6 +1,6 @@ package no.nav.dolly.bestilling.arenaforvalter.utils; -import lombok.experimental.UtilityClass; +import lombok.RequiredArgsConstructor; import no.nav.dolly.bestilling.arenaforvalter.dto.ArenaStatusResponse; import no.nav.dolly.bestilling.arenaforvalter.dto.ArenaVedtakOperasjoner; import no.nav.dolly.domain.resultset.arenaforvalter.ArenaPeriode; @@ -8,6 +8,7 @@ import no.nav.dolly.domain.resultset.arenaforvalter.RsArenaAap; import no.nav.dolly.domain.resultset.arenaforvalter.RsArenaDagpenger; import no.nav.dolly.util.NullcheckUtil; +import org.springframework.stereotype.Service; import java.time.LocalDate; import java.time.LocalDateTime; @@ -20,12 +21,13 @@ import static java.util.Objects.isNull; import static java.util.Objects.nonNull; -@UtilityClass -public class ArenaEksisterendeVedtakUtil { +@Service +@RequiredArgsConstructor +public class ArenaEksisterendeVedtakService { - enum Ytelse {AAP, DAGO} + private enum Ytelse {AAP, DAGO} - public static ArenaVedtakOperasjoner getArenaOperasjoner(Arenadata arenadata, ArenaStatusResponse response) { + public ArenaVedtakOperasjoner getArenaOperasjoner(Arenadata arenadata, ArenaStatusResponse response) { return ArenaVedtakOperasjoner.builder() .registrertDato(response.getRegistrertDato()) @@ -147,7 +149,7 @@ private static List getVedtaker(List