Skip to content

Commit

Permalink
Slettet fullmakt som var hentet fra pdl siden vi henter den fra repre… (
Browse files Browse the repository at this point in the history 
#368)

* Slettet fullmakt som var hentet fra pdl siden vi henter den fra representasjon nå

* Renamed file hentVergeOgFullmakt til hentVerge

* Fikser codeql quality check feil
  • Loading branch information
@sneha-d-desai
sneha-d-desai authored Oct 18, 2024
1 parent eff04ff commit 9d5ba80
Show file tree
Hide file tree
Showing 14 changed files with 50 additions and 205 deletions.
16 changes: 3 additions & 13 deletions src/main/java/no/nav/veilarbperson/client/pdl/HentPerson.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -227,23 +227,13 @@ public static class Folkeregistermetadata {
}

@Data
public static class Fullmakt {
private String motpartsPersonident;
private String motpartsRolle;
private List<String> omraader;
private LocalDate gyldigFraOgMed;
private LocalDate gyldigTilOgMed;
}

@Data
public static class VergeOgFullmakt {
public static class Verge {
private List<VergemaalEllerFremtidsfullmakt> vergemaalEllerFremtidsfullmakt;
private List<Fullmakt> fullmakt;
}

@Data
public static class HentVergeOgFullmakt {
public VergeOgFullmakt hentPerson;
public static class HentVerge {
public Verge hentPerson;
}

@Data
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/no/nav/veilarbperson/client/pdl/PdlClient.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,13 @@
import no.nav.common.health.HealthCheck;
import no.nav.common.types.identer.Fnr;
import no.nav.veilarbperson.client.pdl.domain.PdlRequest;
import no.nav.veilarbperson.domain.PersonFraPdlRequest;

import java.util.List;

public interface PdlClient extends HealthCheck {
HentPerson.Person hentPerson(PdlRequest pdlRequest);

HentPerson.VergeOgFullmakt hentVergeOgFullmakt(PdlRequest pdlRequest);
HentPerson.Verge hentVerge(PdlRequest pdlRequest);

HentPerson.PersonNavn hentPersonNavn(PdlRequest pdlRequest);

Expand Down
10 changes: 5 additions & 5 deletions src/main/java/no/nav/veilarbperson/client/pdl/PdlClientImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public class PdlClientImpl implements PdlClient {

private final String hentPersonQuery;

private final String hentVergeOgFullmaktQuery;
private final String hentVergeQuery;

private final String hentPersonNavnQuery;

Expand All @@ -61,7 +61,7 @@ public PdlClientImpl(String pdlUrl, Supplier<String> userTokenProvider, Supplier
this.hentPersonQuery = FileUtils.getResourceFileAsString("graphql/hentPerson.gql");
this.hentPersonBolkQuery = FileUtils.getResourceFileAsString("graphql/hentPersonBolk.gql");
this.hentPersonNavnQuery = FileUtils.getResourceFileAsString("graphql/hentPersonNavn.gql");
this.hentVergeOgFullmaktQuery = FileUtils.getResourceFileAsString("graphql/hentVergeOgFullmakt.gql");
this.hentVergeQuery = FileUtils.getResourceFileAsString("graphql/hentVerge.gql");
this.hentGeografiskTilknytningQuery = FileUtils.getResourceFileAsString("graphql/hentGeografiskTilknytning.gql");
this.hentTilrettelagtKommunikasjonQuery = FileUtils.getResourceFileAsString("graphql/hentTilrettelagtKommunikasjon.gql");
}
Expand All @@ -73,9 +73,9 @@ public HentPerson.Person hentPerson(PdlRequest pdlRequest) {
}

@Override
public HentPerson.VergeOgFullmakt hentVergeOgFullmakt(PdlRequest pdlRequest) {
var request = new GqlRequest<>(hentVergeOgFullmaktQuery, new GqlVariables.HentPerson(pdlRequest.fnr(), false));
return graphqlRequest(request, userTokenProvider.get(), pdlRequest.behandlingsnummer(), HentPerson.HentVergeOgFullmakt.class).hentPerson;
public HentPerson.Verge hentVerge(PdlRequest pdlRequest) {
var request = new GqlRequest<>(hentVergeQuery, new GqlVariables.HentPerson(pdlRequest.fnr(), false));
return graphqlRequest(request, userTokenProvider.get(), pdlRequest.behandlingsnummer(), HentPerson.HentVerge.class).hentPerson;
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/no/nav/veilarbperson/controller/v2/PersonV2Controller.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@ public Malform malform(@RequestParam("fnr") Fnr fnr) {
@Deprecated
@GetMapping("/vergeOgFullmakt")
@Operation(summary = "Henter informasjon om verge og fullmakt for en person fra PDL")
public VergeOgFullmaktData hentVergemaalOgFullmakt(@RequestParam("fnr") Fnr fnr) throws IOException {
public VergeData hentVergemaal(@RequestParam("fnr") Fnr fnr) throws IOException {
authService.stoppHvisEksternBruker();
authService.sjekkLesetilgang(fnr);
return personV2Service.hentVergeEllerFullmakt(new PersonFraPdlRequest(fnr, null));
return personV2Service.hentVerge(new PersonFraPdlRequest(fnr, null));
}

@Deprecated
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/no/nav/veilarbperson/controller/v3/PersonV3Controller.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,10 @@ public Malform malform(@RequestBody PersonRequest personRequest) {

@PostMapping("/person/hent-vergeOgFullmakt")
@Operation(summary = "Henter informasjon om verge og fullmakt for en person fra PDL")
public VergeOgFullmaktData hentVergemaalOgFullmakt(@RequestBody PersonFraPdlRequest personFraPdlRequest) throws IOException {
public VergeData hentVergemaal(@RequestBody PersonFraPdlRequest personFraPdlRequest) throws IOException {
authService.stoppHvisEksternBruker();
authService.sjekkLesetilgang(personFraPdlRequest.getFnr());
return personV2Service.hentVergeEllerFullmakt(personFraPdlRequest);
return personV2Service.hentVerge(personFraPdlRequest);
}

@PostMapping("/person/hent-fullmakt")
Expand Down
21 changes: 2 additions & 19 deletions ...arbperson/domain/VergeOgFullmaktData.java → ...o/nav/veilarbperson/domain/VergeData.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,15 @@
import lombok.experimental.Accessors;
import no.nav.veilarbperson.client.pdl.domain.VergemaalEllerFullmaktOmfangType;
import no.nav.veilarbperson.client.pdl.domain.Vergetype;
import java.time.LocalDate;

import java.time.LocalDateTime;
import java.util.List;

@Data
@Accessors(chain=true)
public class VergeOgFullmaktData {
public class VergeData {

public List<VergemaalEllerFremtidsfullmakt> vergemaalEllerFremtidsfullmakt;
public List<Fullmakt> fullmakt;

@Data
public static class Navn {
Expand Down Expand Up @@ -50,20 +49,4 @@ public static class Folkeregistermetadata {
public LocalDateTime ajourholdstidspunkt;
public LocalDateTime gyldighetstidspunkt;
}

@Data
public static class Omraade {
public String kode;
public String beskrivelse;
}

@Data
public static class Fullmakt {
private String motpartsPersonident;
private Navn motpartsPersonNavn;
private String motpartsRolle;
private List<Omraade> omraader;
private LocalDate gyldigFraOgMed;
private LocalDate gyldigTilOgMed;
}
}
42 changes: 3 additions & 39 deletions src/main/java/no/nav/veilarbperson/service/PersonV2Service.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
import static java.util.Optional.ofNullable;
import static no.nav.veilarbperson.client.kontoregister.KontoregisterClientImpl.Mappers.fraNorg2Enhet;
import static no.nav.veilarbperson.utils.PersonV2DataMapper.*;
import static no.nav.veilarbperson.utils.SecureLog.secureLog;
import static no.nav.veilarbperson.utils.VergeOgFullmaktDataMapper.*;

@Slf4j
Expand Down Expand Up @@ -319,18 +318,9 @@ public TilrettelagtKommunikasjonData hentSpraakTolkInfo(PersonFraPdlRequest pers
return new TilrettelagtKommunikasjonData().setTegnspraak(tegnSpraak).setTalespraak(taleSpraak);
}

public VergeOgFullmaktData hentVergeEllerFullmakt(PersonFraPdlRequest personFraPdlRequest) throws IOException {
HentPerson.VergeOgFullmakt vergeOgFullmaktFraPdl = pdlClient.hentVergeOgFullmakt(new PdlRequest(personFraPdlRequest.getFnr(), personFraPdlRequest.getBehandlingsnummer()));
if (vergeOgFullmaktFraPdl.getVergemaalEllerFremtidsfullmakt().isEmpty() && vergeOgFullmaktFraPdl.getFullmakt().isEmpty()) {
throw new ResponseStatusException(HttpStatus.NO_CONTENT, "Person har ikke verge eller fullmakt i PDL");
}

VergeOgFullmaktData vergeOgFullmaktData = toVergeOgFullmaktData(vergeOgFullmaktFraPdl);

flettMotpartsPersonNavnTilFullmakt(vergeOgFullmaktData, personFraPdlRequest.getBehandlingsnummer());
flettBeskrivelseForFullmaktOmraader(vergeOgFullmaktData);

return vergeOgFullmaktData;
public VergeData hentVerge(PersonFraPdlRequest personFraPdlRequest) {
HentPerson.Verge vergeOgFullmaktFraPdl = pdlClient.hentVerge(new PdlRequest(personFraPdlRequest.getFnr(), personFraPdlRequest.getBehandlingsnummer()));
return toVerge(vergeOgFullmaktFraPdl);
}

public FullmaktDTO hentFullmakt(PersonRequest personRequest) throws IOException {
Expand Down Expand Up @@ -361,32 +351,6 @@ public void flettBeskrivelseTilFullmaktTema(FullmaktDTO fullmaktDto) {
}
}

public void flettBeskrivelseForFullmaktOmraader(VergeOgFullmaktData vergeOgFullmaktData) {
vergeOgFullmaktData.getFullmakt().forEach(fullmakt -> {
if (!fullmakt.getOmraader().isEmpty() && fullmakt.getOmraader().getFirst().getKode().equals("*")) {
fullmakt.getOmraader().getFirst().setBeskrivelse("alle ytelser");
} else {
fullmakt.getOmraader().forEach(omraade ->
omraade.setBeskrivelse(kodeverkService.getBeskrivelseForTema(omraade.getKode()))
);
}
}
);
}

public void flettMotpartsPersonNavnTilFullmakt(VergeOgFullmaktData vergeOgFullmaktData, String behandlingsnummer) {
vergeOgFullmaktData.getFullmakt().forEach(fullmakt -> {
HentPerson.PersonNavn fullmaktNavn = pdlClient.hentPersonNavn(new PdlRequest(Fnr.of(fullmakt.getMotpartsPersonident()), behandlingsnummer));

if (fullmaktNavn.getNavn().isEmpty()) {
throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Fant ikke motpartspersonnavn til fullmakt");
}

VergeOgFullmaktData.Navn personNavn = VergeOgFullmaktDataMapper.personNavnMapper(fullmaktNavn.getNavn());
fullmakt.setMotpartsPersonNavn(personNavn);
});
}

public String hentMalform(Fnr fnr) {
try {
DigdirKontaktinfo kontaktinfo = digdirClient.hentKontaktInfo(fnr);
Expand Down
50 changes: 15 additions & 35 deletions src/main/java/no/nav/veilarbperson/utils/VergeOgFullmaktDataMapper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,16 @@
import no.nav.veilarbperson.client.pdl.HentPerson;
import no.nav.veilarbperson.client.representasjon.ReprFullmaktData;
import no.nav.veilarbperson.domain.FullmaktDTO;
import no.nav.veilarbperson.domain.VergeOgFullmaktData;
import no.nav.veilarbperson.domain.VergeData;

import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;

public class VergeOgFullmaktDataMapper {

public static VergeOgFullmaktData toVergeOgFullmaktData(HentPerson.VergeOgFullmakt vergeOgFullmaktFraPdl) {
return new VergeOgFullmaktData()
.setVergemaalEllerFremtidsfullmakt(vergemaalEllerFremtidsfullmaktMapper(vergeOgFullmaktFraPdl.getVergemaalEllerFremtidsfullmakt()))
.setFullmakt(fullmaktMapper(vergeOgFullmaktFraPdl.getFullmakt()));
public static VergeData toVerge(HentPerson.Verge vergeOgFullmaktFraPdl) {
return new VergeData()
.setVergemaalEllerFremtidsfullmakt(vergemaalEllerFremtidsfullmaktMapper(vergeOgFullmaktFraPdl.getVergemaalEllerFremtidsfullmakt()));
}

public static FullmaktDTO toFullmaktDTO(List<ReprFullmaktData.Fullmakt> fullmaktListe) {
Expand All @@ -38,7 +36,7 @@ public static List<FullmaktDTO.Fullmakt> representasjonFullmaktMapper(List<ReprF
}

public static List<FullmaktDTO.OmraadeMedHandling> omraadeMapper(List<ReprFullmaktData.OmraadeMedHandling> omraade) {
List<FullmaktDTO.OmraadeMedHandling> omraadeMedHandlinger = omraade.stream().map(omraadeMedHandling -> {
return omraade.stream().map(omraadeMedHandling -> {
List<ReprFullmaktData.OmraadeHandlingType> reprHandlingTyper = omraadeMedHandling.getHandling();
List<FullmaktDTO.OmraadeHandlingType> fullmaktHandlingTyper =
reprHandlingTyper.stream().map(
Expand All @@ -50,58 +48,40 @@ public static List<FullmaktDTO.OmraadeMedHandling> omraadeMapper(List<ReprFullma
.setHandling(fullmaktHandlingTyper);
return omraadeMedHandlingMapper;
}).toList();
return omraadeMedHandlinger;
}

public static List<VergeOgFullmaktData.VergemaalEllerFremtidsfullmakt> vergemaalEllerFremtidsfullmaktMapper(List<HentPerson.VergemaalEllerFremtidsfullmakt> vergemaalEllerFremtidsfullmaktListe) {
public static List<VergeData.VergemaalEllerFremtidsfullmakt> vergemaalEllerFremtidsfullmaktMapper(List<HentPerson.VergemaalEllerFremtidsfullmakt> vergemaalEllerFremtidsfullmaktListe) {
return vergemaalEllerFremtidsfullmaktListe.stream()
.map(vergemaalEllerFremtidsfullmakt ->
new VergeOgFullmaktData.VergemaalEllerFremtidsfullmakt()
new VergeData.VergemaalEllerFremtidsfullmakt()
.setType(vergemaalEllerFremtidsfullmakt.getType())
.setEmbete(vergemaalEllerFremtidsfullmakt.getEmbete())
.setVergeEllerFullmektig(vergeEllerFullmektigMapper(vergemaalEllerFremtidsfullmakt.getVergeEllerFullmektig()))
.setFolkeregistermetadata(folkeregisterMetadataMapper(vergemaalEllerFremtidsfullmakt.getFolkeregistermetadata())))
.collect(Collectors.toList());
}

public static VergeOgFullmaktData.VergeEllerFullmektig vergeEllerFullmektigMapper(HentPerson.VergeEllerFullmektig vergeEllerFullmektig) {
return new VergeOgFullmaktData.VergeEllerFullmektig()
public static VergeData.VergeEllerFullmektig vergeEllerFullmektigMapper(HentPerson.VergeEllerFullmektig vergeEllerFullmektig) {
return new VergeData.VergeEllerFullmektig()
.setNavn(vergeNavnMapper(vergeEllerFullmektig.getNavn()))
.setMotpartsPersonident(vergeEllerFullmektig.getMotpartsPersonident())
.setOmfang(vergeEllerFullmektig.getOmfang());
}

public static VergeOgFullmaktData.VergeNavn vergeNavnMapper(HentPerson.VergeNavn vergeNavn) {
public static VergeData.VergeNavn vergeNavnMapper(HentPerson.VergeNavn vergeNavn) {
return (vergeNavn!=null)
? new VergeOgFullmaktData.VergeNavn().setFornavn(vergeNavn.getFornavn()).setMellomnavn(vergeNavn.getMellomnavn()).setEtternavn(vergeNavn.getEtternavn())
? new VergeData.VergeNavn().setFornavn(vergeNavn.getFornavn()).setMellomnavn(vergeNavn.getMellomnavn()).setEtternavn(vergeNavn.getEtternavn())
: null;
}

public static VergeOgFullmaktData.Navn personNavnMapper(List<HentPerson.Navn> motpartspersonnavn) {
public static VergeData.Navn personNavnMapper(List<HentPerson.Navn> motpartspersonnavn) {
HentPerson.Navn navn = PersonV2DataMapper.getFirstElement(motpartspersonnavn);
return new VergeOgFullmaktData.Navn().setFornavn(navn.getFornavn()).setMellomnavn(navn.getMellomnavn()).setEtternavn(navn.getEtternavn()).setForkortetNavn(navn.getForkortetNavn());
return new VergeData.Navn().setFornavn(navn.getFornavn()).setMellomnavn(navn.getMellomnavn()).setEtternavn(navn.getEtternavn()).setForkortetNavn(navn.getForkortetNavn());
}

public static VergeOgFullmaktData.Folkeregistermetadata folkeregisterMetadataMapper(HentPerson.Folkeregistermetadata folkeregistermetadata) {
return new VergeOgFullmaktData.Folkeregistermetadata()
public static VergeData.Folkeregistermetadata folkeregisterMetadataMapper(HentPerson.Folkeregistermetadata folkeregistermetadata) {
return new VergeData.Folkeregistermetadata()
.setAjourholdstidspunkt(folkeregistermetadata.getAjourholdstidspunkt())
.setGyldighetstidspunkt(folkeregistermetadata.getGyldighetstidspunkt());
}

public static List<VergeOgFullmaktData.Fullmakt> fullmaktMapper(List<HentPerson.Fullmakt> fullmaktListe) {
List<VergeOgFullmaktData.Fullmakt> fullmakter = new ArrayList<>();
fullmaktListe.forEach(fullmakt -> {
ArrayList<VergeOgFullmaktData.Omraade> omraadeKodeListe = new ArrayList<>();
fullmakt.getOmraader().forEach(omraade -> omraadeKodeListe.add(new VergeOgFullmaktData.Omraade().setKode(omraade)));

fullmakter.add(new VergeOgFullmaktData.Fullmakt()
.setMotpartsPersonident(fullmakt.getMotpartsPersonident())
.setMotpartsRolle(fullmakt.getMotpartsRolle())
.setOmraader(omraadeKodeListe)
.setGyldigFraOgMed(fullmakt.getGyldigFraOgMed())
.setGyldigTilOgMed(fullmakt.getGyldigTilOgMed()));
}
);
return fullmakter;
}
}
7 changes: 0 additions & 7 deletions ...resources/graphql/hentVergeOgFullmakt.gql → src/main/resources/graphql/hentVerge.gql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,6 @@ query($ident: ID!, $historikk: Boolean!) {
gyldighetstidspunkt
}
}
fullmakt(historikk:$historikk) {
motpartsPersonident
motpartsRolle
omraader
gyldigFraOgMed
gyldigTilOgMed
}
}
}

12 changes: 3 additions & 9 deletions src/test/java/no/nav/veilarbperson/client/PdlClientImplTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ public void hentePerson_skal_parse_request() {

@Test
public void henteVergeOgFullmakt_skal_parse_request() {
String hentVergeOgFullmaktResponseJson = TestUtils.readTestResourceFile("pdl-hentVergeOgFullmakt-response.json");
String hentVergeOgFullmaktResponseJson = TestUtils.readTestResourceFile("pdl-hentVerge-response.json");
String apiUrl = "http://localhost:" + wireMockRule.port();

givenThat(post(anyUrl())
Expand All @@ -172,22 +172,16 @@ public void henteVergeOgFullmakt_skal_parse_request() {

PdlClientImpl pdlClient = new PdlClientImpl(apiUrl, () -> PDL_AUTH, () -> PDL_AUTH);

HentPerson.VergeOgFullmakt vergeOgFullmakt = pdlClient.hentVergeOgFullmakt(new PdlRequest(FNR, null));
HentPerson.Verge verge = pdlClient.hentVerge(new PdlRequest(FNR, null));

HentPerson.VergemaalEllerFremtidsfullmakt vergemaal = vergeOgFullmakt.getVergemaalEllerFremtidsfullmakt().get(0);
HentPerson.VergemaalEllerFremtidsfullmakt vergemaal = verge.getVergemaalEllerFremtidsfullmakt().get(0);
HentPerson.VergeEllerFullmektig vergeEllerFullmektig = vergemaal.getVergeEllerFullmektig();

assertEquals(Vergetype.MIDLERTIDIG_FOR_VOKSEN, vergemaal.getType());
assertEquals("VergemallEmbete", vergemaal.getEmbete());
assertEquals(VergemaalEllerFullmaktOmfangType.OEKONOMISKE_INTERESSER, vergeEllerFullmektig.getOmfang());
assertEquals("VergeMotpartsPersonident1", vergeEllerFullmektig.getMotpartsPersonident());
assertEquals("vergeEtternavn1", vergeEllerFullmektig.getNavn().getEtternavn());

HentPerson.Fullmakt fullmakt = vergeOgFullmakt.getFullmakt().get(0);

assertEquals("motpartsPersonident1", fullmakt.getMotpartsPersonident());
assertEquals("motpartsRolle1", fullmakt.getMotpartsRolle());
assertEquals(2, fullmakt.getOmraader().size());
}

@Test
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/no/nav/veilarbperson/config/ClientTestConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ public HentPerson.Person hentPerson(PdlRequest pdlRequest) {
}

@Override
public HentPerson.VergeOgFullmakt hentVergeOgFullmakt(PdlRequest pdlRequest) {
public HentPerson.Verge hentVerge(PdlRequest pdlRequest) {
return null;
}

Expand Down
Loading

0 comments on commit 9d5ba80

Please sign in to comment.