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

Eksponer registrertKRR felt i OppfolgingsStatus #588

Merged
merged 5 commits into from
Jan 30, 2024
Merged

Eksponer registrertKRR felt i OppfolgingsStatus #588

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2a35f01
Bruk aktiv felt fra KRR-proxy
tu55eladd Jan 29, 2024
01642c6
Eksponer registrertKRR
tu55eladd Jan 30, 2024
a3d7605
Update test
tu55eladd Jan 30, 2024
9706310
Mer test + rydd opp
tu55eladd Jan 30, 2024
9e4a069
??
tu55eladd Jan 30, 2024
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
3 changes: 1 addition & 2 deletions src/main/java/no/nav/veilarboppfolging/client/digdir_krr/DigdirClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,5 @@
import java.util.Optional;

public interface DigdirClient extends HealthCheck {

Optional<DigdirKontaktinfo> hentKontaktInfo(Fnr fnr);
Optional<KRRData> hentKontaktInfo(Fnr fnr);
}
5 changes: 3 additions & 2 deletions src/main/java/no/nav/veilarboppfolging/client/digdir_krr/DigdirClientImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public DigdirClientImpl(String digdirUrl, Supplier<String> systemUserTokenProvid
@Cacheable(CacheConfig.DIGDIR_KONTAKTINFO_CACHE_NAME)
@SneakyThrows
@Override
public Optional<DigdirKontaktinfo> hentKontaktInfo(Fnr fnr) {
public Optional<KRRData> hentKontaktInfo(Fnr fnr) {
Request request = new Request.Builder()
.url(joinPaths(digdirUrl, "/rest/v1/person?inkluderSikkerDigitalPost=false"))
.header(ACCEPT, APPLICATION_JSON_VALUE)
Expand All @@ -57,7 +57,8 @@ public Optional<DigdirKontaktinfo> hentKontaktInfo(Fnr fnr) {

try (Response response = client.newCall(request).execute()) {
RestUtils.throwIfNotSuccessful(response);
return RestUtils.parseJsonResponse(response, DigdirKontaktinfo.class);
return RestUtils.parseJsonResponse(response, DigdirKontaktinfo.class)
.map(DigdirKontaktinfo::toKrrData);
} catch (Exception e) {
log.error("Feil under henting av data fra Digdir_KRR", e);
return empty();
Expand Down
13 changes: 13 additions & 0 deletions src/main/java/no/nav/veilarboppfolging/client/digdir_krr/DigdirKontaktinfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@

import lombok.Data;
import lombok.experimental.Accessors;
import org.checkerframework.checker.units.qual.K;

@Data
@Accessors(chain = true)
public class DigdirKontaktinfo {

String personident;
boolean aktiv;
boolean kanVarsles;
Expand All @@ -18,4 +20,15 @@ public class DigdirKontaktinfo {
String mobiltelefonnummer;
String mobiltelefonnummerOppdatert;
String mobiltelefonnummerVerifisert;

public KRRData toKrrData() {
return new KRRData(
aktiv,
personident,
kanVarsles,
reservert,
epostadresse,
mobiltelefonnummer
);
}
}
17 changes: 17 additions & 0 deletions src/main/java/no/nav/veilarboppfolging/client/digdir_krr/KRRData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
package no.nav.veilarboppfolging.client.digdir_krr;

import lombok.*;

@AllArgsConstructor
@With
@NoArgsConstructor
@Getter
@EqualsAndHashCode
public class KRRData {
boolean aktiv;
String personident;
boolean kanVarsles;
boolean reservert;
String epostadresse;
String mobiltelefonnummer;
}
1 change: 1 addition & 0 deletions src/main/java/no/nav/veilarboppfolging/controller/response/OppfolgingStatus.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ public class OppfolgingStatus {
public String aktorId;
public String veilederId;
public boolean reservasjonKRR;
public boolean registrertKRR;
public boolean kanVarsles;
public boolean manuell;
public boolean underOppfolging;
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/no/nav/veilarboppfolging/controller/v2/ManuellStatusV2Controller.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import lombok.RequiredArgsConstructor;
import no.nav.common.types.identer.Fnr;
import no.nav.veilarboppfolging.client.digdir_krr.KRRData;
import no.nav.veilarboppfolging.controller.request.VeilederBegrunnelseDTO;
import no.nav.veilarboppfolging.controller.v2.response.ManuellStatusV2Response;
import no.nav.veilarboppfolging.controller.v2.response.ManuellV2Response;
Expand Down Expand Up @@ -48,7 +49,7 @@ public ManuellStatusV2Response hentManuellStatus(@RequestParam("fnr") Fnr fnr) {
authService.sjekkLesetilgangMedFnr(fnr);
}

DigdirKontaktinfo kontaktinfo = manuellStatusService.hentDigdirKontaktinfo(fnr);
KRRData kontaktinfo = manuellStatusService.hentDigdirKontaktinfo(fnr);
boolean erManuell = manuellStatusService.erManuell(fnr);

return new ManuellStatusV2Response(
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/no/nav/veilarboppfolging/controller/v3/ManuellStatusV3Controller.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import lombok.RequiredArgsConstructor;
import no.nav.common.types.identer.Fnr;
import no.nav.veilarboppfolging.client.digdir_krr.KRRData;
import no.nav.veilarboppfolging.controller.v2.response.ManuellStatusV2Response;
import no.nav.veilarboppfolging.controller.v2.response.ManuellV2Response;
import no.nav.veilarboppfolging.client.digdir_krr.DigdirKontaktinfo;
Expand Down Expand Up @@ -47,7 +48,7 @@ public ManuellStatusV2Response hentManuellStatus(@RequestBody ManuellStatusReque
authService.sjekkLesetilgangMedFnr(manuellStatusRequest.fnr());
}

DigdirKontaktinfo kontaktinfo = manuellStatusService.hentDigdirKontaktinfo(manuellStatusRequest.fnr());
KRRData kontaktinfo = manuellStatusService.hentDigdirKontaktinfo(manuellStatusRequest.fnr());
boolean erManuell = manuellStatusService.erManuell(manuellStatusRequest.fnr());

return new ManuellStatusV2Response(
Expand Down
1 change: 1 addition & 0 deletions src/main/java/no/nav/veilarboppfolging/domain/OppfolgingStatusData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ public class OppfolgingStatusData {
public String aktorId;
public String veilederId;
public boolean reservasjonKRR;
public boolean registrertKRR;
public boolean manuell;
public boolean underOppfolging;
public boolean underKvp;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/no/nav/veilarboppfolging/service/AuthService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ public void sjekkSkrivetilgangMedAktorId(AktorId aktorId) {

public void sjekkTilgangTilEnhet(String enhetId) {
if (!harTilgangTilEnhet(enhetId)) {
throw new ResponseStatusException(HttpStatus.UNAUTHORIZED);
throw new ResponseStatusException(HttpStatus.FORBIDDEN);
}
}

Expand Down
16 changes: 8 additions & 8 deletions src/main/java/no/nav/veilarboppfolging/service/ManuellStatusService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
import lombok.val;
import no.nav.common.types.identer.AktorId;
import no.nav.common.types.identer.Fnr;
import no.nav.veilarboppfolging.client.digdir_krr.KRRData;
import no.nav.veilarboppfolging.client.veilarbarena.VeilarbArenaOppfolging;
import no.nav.veilarboppfolging.client.digdir_krr.DigdirClient;
import no.nav.veilarboppfolging.client.digdir_krr.DigdirKontaktinfo;
import no.nav.veilarboppfolging.repository.ManuellStatusRepository;
import no.nav.veilarboppfolging.repository.OppfolgingsStatusRepository;
import no.nav.veilarboppfolging.repository.entity.ManuellStatusEntity;
Expand Down Expand Up @@ -87,7 +87,7 @@ public void synkroniserManuellStatusMedDigdir(Fnr fnr) {
return;
}

DigdirKontaktinfo digdirKontaktinfo = hentDigdirKontaktinfo(fnr);
KRRData digdirKontaktinfo = hentDigdirKontaktinfo(fnr);

if (digdirKontaktinfo.isReservert()) {
settBrukerTilManuellGrunnetReservertIKRR(aktorId);
Expand Down Expand Up @@ -144,7 +144,7 @@ public void oppdaterManuellStatus(Fnr fnr, boolean manuell, String begrunnelse,
authService.sjekkTilgangTilEnhet(arenaOppfolging.getNav_kontor());
}

DigdirKontaktinfo kontaktinfo = hentDigdirKontaktinfo(fnr);
KRRData kontaktinfo = hentDigdirKontaktinfo(fnr);

boolean erUnderOppfolging = oppfolgingService.erUnderOppfolging(aktorId);
boolean gjeldendeErManuell = erManuell(aktorId);
Expand All @@ -163,12 +163,12 @@ public void oppdaterManuellStatus(Fnr fnr, boolean manuell, String begrunnelse,
}
}

public DigdirKontaktinfo hentDigdirKontaktinfo(Fnr fnr) {
public KRRData hentDigdirKontaktinfo(Fnr fnr) {
return digdirClient.hentKontaktInfo(fnr)
.orElseGet(() -> new DigdirKontaktinfo()
.setPersonident(fnr.get())
.setKanVarsles(true)
.setReservert(false));
.orElseGet(() -> new KRRData()
.withPersonident(fnr.get())
.withKanVarsles(true)
.withReservert(false));
}
private void oppdaterManuellStatus(AktorId aktorId, ManuellStatusEntity manuellStatus) {
transactor.executeWithoutResult((ignored) -> {
Expand Down
6 changes: 4 additions & 2 deletions src/main/java/no/nav/veilarboppfolging/service/OppfolgingService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import lombok.extern.slf4j.Slf4j;
import no.nav.common.types.identer.AktorId;
import no.nav.common.types.identer.Fnr;
import no.nav.veilarboppfolging.client.digdir_krr.KRRData;
import no.nav.veilarboppfolging.client.veilarbarena.ArenaOppfolgingTilstand;
import no.nav.veilarboppfolging.client.veilarbarena.VeilarbArenaOppfolging;
import no.nav.veilarboppfolging.controller.response.UnderOppfolgingDTO;
Expand Down Expand Up @@ -288,7 +289,7 @@ public void startOppfolgingHvisIkkeAlleredeStartet(AktorId aktorId) {
public void startOppfolgingHvisIkkeAlleredeStartet(Oppfolgingsbruker oppfolgingsbruker) {
AktorId aktorId = AktorId.of(oppfolgingsbruker.getAktoerId());
Fnr fnr = authService.getFnrOrThrow(aktorId);
DigdirKontaktinfo kontaktinfo = manuellStatusService.hentDigdirKontaktinfo(fnr);
KRRData kontaktinfo = manuellStatusService.hentDigdirKontaktinfo(fnr);

transactor.executeWithoutResult((ignored) -> {
Optional<OppfolgingEntity> maybeOppfolging = oppfolgingsStatusRepository.hentOppfolging(aktorId);
Expand Down Expand Up @@ -372,7 +373,7 @@ private OppfolgingStatusData getOppfolgingStatusData(Fnr fnr) {

boolean erManuell = manuellStatusService.erManuell(aktorId);

DigdirKontaktinfo digdirKontaktinfo = manuellStatusService.hentDigdirKontaktinfo(fnr);
KRRData digdirKontaktinfo = manuellStatusService.hentDigdirKontaktinfo(fnr);

// TODO: Burde kanskje heller feile istedenfor å bruke Optional
Optional<ArenaOppfolgingTilstand> maybeArenaOppfolging = arenaOppfolgingService.hentOppfolgingTilstand(fnr);
Expand Down Expand Up @@ -412,6 +413,7 @@ private OppfolgingStatusData getOppfolgingStatusData(Fnr fnr) {
.setUnderOppfolging(oppfolging.isUnderOppfolging())
.setUnderKvp(oppfolging.getGjeldendeKvp() != null)
.setReservasjonKRR(digdirKontaktinfo.isReservert())
.setRegistrertKRR(digdirKontaktinfo.isAktiv())
.setManuell(erManuell || digdirKontaktinfo.isReservert())
.setKanStarteOppfolging(kanSettesUnderOppfolging)
.setOppfolgingsperioder(oppfolging.getOppfolgingsperioder())
Expand Down
1 change: 1 addition & 0 deletions src/main/java/no/nav/veilarboppfolging/utils/DtoMappers.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ public static OppfolgingStatus tilDto(OppfolgingStatusData oppfolgingStatusData,
.setUnderOppfolging(oppfolgingStatusData.underOppfolging)
.setManuell(oppfolgingStatusData.manuell)
.setReservasjonKRR(oppfolgingStatusData.reservasjonKRR)
.setRegistrertKRR(oppfolgingStatusData.registrertKRR)
.setOppfolgingUtgang(oppfolgingStatusData.getOppfolgingUtgang())
.setKanReaktiveres(oppfolgingStatusData.kanReaktiveres)
.setOppfolgingsPerioder(oppfolgingStatusData.oppfolgingsperioder.stream().map(o -> tilOppfolgingPeriodeDTO(o, erInternBruker)).collect(toList()))
Expand Down
3 changes: 2 additions & 1 deletion src/test/java/no/nav/veilarboppfolging/client/DigdirClientImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import no.nav.veilarboppfolging.client.digdir_krr.DigdirClientImpl;
import no.nav.veilarboppfolging.client.digdir_krr.DigdirKontaktinfo;

import no.nav.veilarboppfolging.client.digdir_krr.KRRData;
import no.nav.veilarboppfolging.service.AuthService;
import no.nav.veilarboppfolging.test.TestUtils;

Expand Down Expand Up @@ -41,7 +42,7 @@ public void hentKontaktInfo__skal_hente_kontaktinfo() {
.withBody(digdirJson))
);

DigdirKontaktinfo kontaktinfo = digdirClient.hentKontaktInfo(TEST_FNR).orElseThrow();
KRRData kontaktinfo = digdirClient.hentKontaktInfo(TEST_FNR).orElseThrow();
assertEquals(kontaktinfo.getPersonident(), TEST_FNR.get());
assertFalse(kontaktinfo.isKanVarsles());
assertTrue(kontaktinfo.isReservert());
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/no/nav/veilarboppfolging/config/ClientTestConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import no.nav.common.types.identer.Fnr;
import no.nav.veilarboppfolging.client.behandle_arbeidssoker.BehandleArbeidssokerClient;
import no.nav.veilarboppfolging.client.digdir_krr.DigdirClient;
import no.nav.veilarboppfolging.client.digdir_krr.DigdirKontaktinfo;
import no.nav.veilarboppfolging.client.digdir_krr.KRRData;
import no.nav.veilarboppfolging.client.veilarbarena.ArenaOppfolging;
import no.nav.veilarboppfolging.client.veilarbarena.VeilarbArenaOppfolging;
import no.nav.veilarboppfolging.client.veilarbarena.VeilarbarenaClient;
Expand Down Expand Up @@ -104,7 +104,7 @@ public HealthCheckResult checkHealth() {
public DigdirClient digdirClient() {
return new DigdirClient() {
@Override
public Optional<DigdirKontaktinfo> hentKontaktInfo(Fnr fnr) {
public Optional<KRRData> hentKontaktInfo(Fnr fnr) {
return Optional.empty();
}

Expand Down
3 changes: 2 additions & 1 deletion src/test/java/no/nav/veilarboppfolging/controller/v3/ManuellStatusV3ControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import no.nav.common.json.JsonUtils;
import no.nav.common.types.identer.Fnr;
import no.nav.veilarboppfolging.client.digdir_krr.DigdirKontaktinfo;
import no.nav.veilarboppfolging.client.digdir_krr.KRRData;
import no.nav.veilarboppfolging.controller.v3.request.ManuellStatusRequest;
import no.nav.veilarboppfolging.service.AuthService;
import no.nav.veilarboppfolging.service.ManuellStatusService;
Expand Down Expand Up @@ -49,7 +50,7 @@ public void hent_manuell_skal_returnere_true() throws Exception {
public void manuell_hent_status_skal_returnere_riktig() throws Exception {
when(manuellStatusService.erManuell((Fnr) any())).thenReturn(true);
String expJson = "{\"erUnderManuellOppfolging\":true}, \"krrStatus\":{\"kanVarsles\":true, \"erReservert\":false}";
when(manuellStatusService.hentDigdirKontaktinfo(manuellStatusRequest.fnr())).thenReturn(new DigdirKontaktinfo().setReservert(false).setKanVarsles(true));
when(manuellStatusService.hentDigdirKontaktinfo(manuellStatusRequest.fnr())).thenReturn(new KRRData().withReservert(false).withKanVarsles(true));

mockMvc.perform(post("/api/v3/manuell/hent-status")
.contentType(MediaType.APPLICATION_JSON)
Expand Down
3 changes: 2 additions & 1 deletion src/test/java/no/nav/veilarboppfolging/controller/v3/OppfolgingV3ControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ void hentOppfolgingsStatus_skal_returnere_oppfolgingstatus() throws Exception {
.setUnderOppfolging(true)
.setManuell(false)
.setReservasjonKRR(false)
.setRegistrertKRR(true)
.setOppfolgingsperioder(Collections.emptyList())
.setKanReaktiveres(false)
.setInaktiveringsdato(null)
Expand All @@ -114,7 +115,7 @@ void hentOppfolgingsStatus_skal_returnere_oppfolgingstatus() throws Exception {
.setUnderKvp(false)
);

String expectedJson = "{\"fnr\":\"12345678900\",\"aktorId\":\"11122233334445\",\"veilederId\":null,\"reservasjonKRR\":false,\"kanVarsles\":true,\"manuell\":false,\"underOppfolging\":true,\"underKvp\":false,\"oppfolgingUtgang\":null,\"kanStarteOppfolging\":false,\"avslutningStatus\":null,\"oppfolgingsPerioder\":[],\"harSkriveTilgang\":true,\"inaktivIArena\":null,\"kanReaktiveres\":false,\"inaktiveringsdato\":null,\"erSykmeldtMedArbeidsgiver\":false,\"servicegruppe\":\"servicegruppe\",\"formidlingsgruppe\":\"formidlingsgruppe\",\"rettighetsgruppe\":\"rettighetsgruppe\",\"erIkkeArbeidssokerUtenOppfolging\":false}";
String expectedJson = "{\"fnr\":\"12345678900\",\"aktorId\":\"11122233334445\",\"veilederId\":null,\"reservasjonKRR\":false,\"registrertKRR\":true,\"kanVarsles\":true,\"manuell\":false,\"underOppfolging\":true,\"underKvp\":false,\"oppfolgingUtgang\":null,\"kanStarteOppfolging\":false,\"avslutningStatus\":null,\"oppfolgingsPerioder\":[],\"harSkriveTilgang\":true,\"inaktivIArena\":null,\"kanReaktiveres\":false,\"inaktiveringsdato\":null,\"erSykmeldtMedArbeidsgiver\":false,\"servicegruppe\":\"servicegruppe\",\"formidlingsgruppe\":\"formidlingsgruppe\",\"rettighetsgruppe\":\"rettighetsgruppe\",\"erIkkeArbeidssokerUtenOppfolging\":false}";

mockMvc.perform(post("/api/v3/oppfolging/hent-status")
.contentType(MediaType.APPLICATION_JSON)
Expand Down
3 changes: 2 additions & 1 deletion src/test/java/no/nav/veilarboppfolging/service/AktiverBrukerIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import no.nav.common.types.identer.Fnr;
import no.nav.veilarboppfolging.client.behandle_arbeidssoker.BehandleArbeidssokerClient;
import no.nav.veilarboppfolging.client.digdir_krr.DigdirKontaktinfo;
import no.nav.veilarboppfolging.client.digdir_krr.KRRData;
import no.nav.veilarboppfolging.controller.request.Innsatsgruppe;
import no.nav.veilarboppfolging.domain.Oppfolging;
import no.nav.veilarboppfolging.repository.*;
Expand Down Expand Up @@ -79,7 +80,7 @@ public void setup() {

DbTestUtils.cleanupTestDb();
when(authService.getAktorIdOrThrow(any(Fnr.class))).thenReturn(AKTOR_ID);
when(manuellStatusService.hentDigdirKontaktinfo(any())).thenReturn(new DigdirKontaktinfo());
when(manuellStatusService.hentDigdirKontaktinfo(any())).thenReturn(new KRRData());
}

@Test
Expand Down
Loading
Loading