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.

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

Vedlegg er knyttet til behandling #1588

Merged
merged 1 commit into from
Mar 26, 2025
Merged

Vedlegg er knyttet til behandling #1588

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
43 changes: 22 additions & 21 deletions src/main/java/no/nav/foreldrepenger/autotest/aktoerer/saksbehandler/fpsak/Saksbehandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,25 @@
package no.nav.foreldrepenger.autotest.aktoerer.saksbehandler.fpsak;

import static no.nav.foreldrepenger.autotest.klienter.fpsak.behandlinger.dto.behandling.AksjonspunktKoder.AUTO_KØET_BEHANDLING;
import static no.nav.foreldrepenger.autotest.klienter.fpsak.behandlinger.dto.behandling.Behandling.get;
import static no.nav.foreldrepenger.autotest.util.AllureHelper.debugAksjonspunktbekreftelser;
import static no.nav.foreldrepenger.autotest.util.AllureHelper.debugBehandlingsstatus;

import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Comparator;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
import java.util.Set;
import java.util.UUID;
import java.util.stream.Collectors;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import io.qameta.allure.Step;
import no.nav.foreldrepenger.autotest.domain.foreldrepenger.AktivitetStatus;
import no.nav.foreldrepenger.autotest.domain.foreldrepenger.ArbeidInntektsmeldingAksjonspunktÅrsak;
Expand Down Expand Up @@ -49,25 +69,6 @@
import no.nav.foreldrepenger.common.domain.Saksnummer;
import no.nav.foreldrepenger.kontrakter.risk.kodeverk.RisikoklasseType;
import no.nav.vedtak.felles.prosesstask.rest.dto.ProsessTaskDataDto;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Comparator;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
import java.util.Set;
import java.util.UUID;
import java.util.stream.Collectors;

import static no.nav.foreldrepenger.autotest.klienter.fpsak.behandlinger.dto.behandling.AksjonspunktKoder.AUTO_KØET_BEHANDLING;
import static no.nav.foreldrepenger.autotest.klienter.fpsak.behandlinger.dto.behandling.Behandling.get;
import static no.nav.foreldrepenger.autotest.util.AllureHelper.debugAksjonspunktbekreftelser;
import static no.nav.foreldrepenger.autotest.util.AllureHelper.debugBehandlingsstatus;

public class Saksbehandler {
private final Logger LOG = LoggerFactory.getLogger(Saksbehandler.class);
Expand Down Expand Up @@ -635,7 +636,7 @@ public void ventTilAvsluttetBehandlingOgDetOpprettesTilbakekreving() {
}

private boolean harHistorikkinnslagPåBehandling(UUID behandlingsId, HistorikkType... type) {
if (Arrays.stream(type).anyMatch(t -> Set.of(HistorikkType.VEDLEGG_MOTTATT, HistorikkType.REVURD_OPPR).contains(t))) {
if (Arrays.asList(type).contains(HistorikkType.REVURD_OPPR)) {
behandlingsId = null;
}
return hentHistorikkinnslagPåBehandling(behandlingsId).stream().anyMatch(innslag -> innslag.erAvTypen(type));
Expand All @@ -647,7 +648,7 @@ public HistorikkInnslag hentHistorikkinnslagAvType(HistorikkType type) {

public HistorikkInnslag hentHistorikkinnslagAvType(HistorikkType type, UUID behandlingsUuid, int behandlingId) {
venterPåFerdigProssesseringOgOppdaterBehandling(behandlingsUuid, behandlingId);
if (Set.of(HistorikkType.VEDLEGG_MOTTATT, HistorikkType.REVURD_OPPR).contains(type)) {
if (Objects.equals(HistorikkType.REVURD_OPPR, type)) {
behandlingsUuid = null;
}
return hentHistorikkinnslagPåBehandling(behandlingsUuid).stream()
Expand Down
Loading