Skip to content

Commit

Permalink
hmm
Browse files Browse the repository at this point in the history
  • Loading branch information
@JulieHillRoa
JulieHillRoa committed Oct 11, 2023
1 parent 44f45ad commit 7a9e320
Show file tree
Hide file tree
Showing 5 changed files with 61 additions and 46 deletions.
12 changes: 9 additions & 3 deletions src/main/java/no/nav/veilarbperson/controller/v1/PersonController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,27 +30,29 @@ public class PersonController {

private final RegistreringService registreringService;


@Deprecated
@GetMapping("/aktorid")
public AktoerId aktorid(@RequestParam("fnr") Fnr fnr) {
authService.stoppHvisEksternBruker();
authService.sjekkLesetilgang(fnr);
return new AktoerId(authService.getAktorId(fnr));
}

@Deprecated
@GetMapping("/navn")
@Operation(summary = "Henter navnet til en person")
public PersonNavn navn(@RequestParam(value = "fnr", required = false) Fnr fnr) {
throw new ResponseStatusException(HttpStatus.GONE, "Bytt til v2 endepunkt");
}

@Deprecated
@GetMapping("/{fodselsnummer}/malform")
@Operation(summary = "Henter målform til en person")
public Malform malform(@PathVariable("fodselsnummer") Fnr fnr) {
throw new ResponseStatusException(HttpStatus.GONE,
"Bytt til v2 endepunkt");
}

@Deprecated
@GetMapping("/{fodselsnummer}/tilgangTilBruker")
public boolean tilgangTilBruker(@PathVariable("fodselsnummer") Fnr fodselsnummer) {
return authService.harLesetilgang(fodselsnummer);
Expand All @@ -67,28 +69,32 @@ public HarLoggetInnRespons harNivaa4(@PathVariable("fodselsnummer") Fnr fodselsn
.setPersonidentifikator(fodselsnummer);
}

@Deprecated
@GetMapping("/geografisktilknytning")
public GeografiskTilknytning geografisktilknytning(@RequestParam(value = "fnr", required = false) Fnr fnr) {
Fnr fodselsnummer = hentIdentForEksternEllerIntern(fnr);
authService.sjekkLesetilgang(fodselsnummer);
return personV2Service.hentGeografiskTilknytning(fodselsnummer);
}

@Deprecated
@GetMapping("/cv_jobbprofil")
public ResponseEntity<String> cvOgJobbprofil(@RequestParam(value = "fnr", required = false) Fnr fnr) {
return cvJobbprofilService.hentCvJobbprofilJson(fnr);
}

@Deprecated
@GetMapping("/registrering")
public ResponseEntity<String> registrering(@RequestParam(value = "fnr") Fnr fnr) {
authService.stoppHvisEksternBruker();
authService.sjekkLesetilgang(fnr);
return registreringService.hentRegistrering(fnr);
}

@Deprecated
@PostMapping("/registrering/endringer")
public ResponseEntity<String> endringIRegistreringdata(@RequestBody PersonRequestBody personRequestBody) {
Fnr fnr = personRequestBody.fnr();
Fnr fnr = Fnr.of(personRequestBody.fodselsnummer());
authService.stoppHvisEksternBruker();
authService.sjekkLesetilgang(fnr);
return registreringService.hentEndringIRegistreringsdata(fnr);
Expand Down
6 changes: 6 additions & 0 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 @@ -26,6 +26,7 @@ public class PersonV2Controller {

private final KontoregisterClient kontoregisterClient;

@Deprecated
@GetMapping
@Operation(summary = "Henter informasjon om en person fra PDL")
public PersonV2Data hentPerson(@RequestParam("fnr") Fnr fnr) {
Expand All @@ -34,6 +35,7 @@ public PersonV2Data hentPerson(@RequestParam("fnr") Fnr fnr) {
return personV2Service.hentFlettetPerson(fnr);
}

@Deprecated
@GetMapping("/malform")
@Operation(summary = "Henter malform fra DIGDIR tjeneste")
public Malform malform(@RequestParam("fnr") Fnr fnr) {
Expand All @@ -44,6 +46,7 @@ public Malform malform(@RequestParam("fnr") Fnr fnr) {
return new Malform(malform);
}

@Deprecated
@GetMapping("/vergeOgFullmakt")
@Operation(summary = "Henter informasjon om verge og fullmakt for en person fra PDL")
public VergeOgFullmaktData hentVergemaalOgFullmakt(@RequestParam("fnr") Fnr fnr) {
Expand All @@ -52,6 +55,7 @@ public VergeOgFullmaktData hentVergemaalOgFullmakt(@RequestParam("fnr") Fnr fnr)
return personV2Service.hentVergeEllerFullmakt(fnr);
}

@Deprecated
@GetMapping("/tolk")
@Operation(summary = "Henter tolk informajon til en person fra PDL")
public TilrettelagtKommunikasjonData hentSpraakTolk(@RequestParam("fnr") Fnr fnr) {
Expand All @@ -60,6 +64,7 @@ public TilrettelagtKommunikasjonData hentSpraakTolk(@RequestParam("fnr") Fnr fnr
return personV2Service.hentSpraakTolkInfo(fnr);
}

@Deprecated
@GetMapping("/navn")
@Operation(summary = "Henter navn til en person fra PDL")
public PersonNavnV2 hentNavn(@RequestParam("fnr") Fnr fnr) {
Expand All @@ -68,6 +73,7 @@ public PersonNavnV2 hentNavn(@RequestParam("fnr") Fnr fnr) {
return personV2Service.hentNavn(fnr);
}

@Deprecated
@GetMapping("/postadresse")
@Operation(summary = "Henter postadresse til en person fra regoppslag")
public RegoppslagResponseDTO hentPostadresse(@RequestParam("fnr") Fnr fnr) {
Expand Down
78 changes: 38 additions & 40 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 @@ -34,92 +34,90 @@ public class PersonV3Controller {

private final RegistreringService registreringService;

@PostMapping
@Operation(summary = "Henter informasjon om en person fra PDL")
public PersonV2Data hentPerson(@RequestBody PersonRequest personRequest) {
authService.stoppHvisEksternBruker();
authService.sjekkLesetilgang(personRequest.getFnr());
return personV2Service.hentFlettetPerson(personRequest.getFnr());
}
@PostMapping("/aktorid")
public AktoerId aktorid(@RequestBody PersonRequestBody personRequestBody) {
public AktoerId aktorid(@RequestBody PersonRequest personRequest) {
authService.stoppHvisEksternBruker();
Fnr fnr = personRequestBody.fnr();
authService.sjekkLesetilgang(fnr);
return new AktoerId(authService.getAktorId(fnr));
authService.sjekkLesetilgang(personRequest.getFnr());
return new AktoerId(authService.getAktorId(personRequest.getFnr()));
}

@PostMapping("/tilgangTilBruker")
public boolean tilgangTilBruker(@RequestBody PersonRequestBody personRequestBody) {
return authService.harLesetilgang(personRequestBody.fnr());
public boolean tilgangTilBruker(@RequestBody PersonRequest personRequest) {
return authService.harLesetilgang(personRequest.getFnr());
}
@GetMapping("/geografisktilknytning")
public GeografiskTilknytning geografisktilknytning(@RequestBody PersonRequestBody personRequestBody) {
Fnr fodselsnummer = hentIdentForEksternEllerIntern(personRequestBody.fnr());
public GeografiskTilknytning geografisktilknytning(@RequestBody PersonRequest personRequest) {
Fnr fodselsnummer = hentIdentForEksternEllerIntern(personRequest.getFnr());
authService.sjekkLesetilgang(fodselsnummer);
return personV2Service.hentGeografiskTilknytning(fodselsnummer);
}

@GetMapping("/cv_jobbprofil")
public ResponseEntity<String> cvOgJobbprofil(@RequestBody PersonRequestBody personRequestBody) {
return cvJobbprofilService.hentCvJobbprofilJson(personRequestBody.fnr());
public ResponseEntity<String> cvOgJobbprofil(@RequestBody PersonRequest personRequest) {
return cvJobbprofilService.hentCvJobbprofilJson(personRequest.getFnr());
}

@GetMapping("/registrering")
public ResponseEntity<String> registrering(@RequestBody PersonRequestBody personRequestBody) {
public ResponseEntity<String> registrering(@RequestBody PersonRequest personRequest) {
authService.stoppHvisEksternBruker();
Fnr fnr = personRequestBody.fnr();
authService.sjekkLesetilgang(fnr);
return registreringService.hentRegistrering(fnr);
authService.sjekkLesetilgang(personRequest.getFnr());
return registreringService.hentRegistrering(personRequest.getFnr());
}

@PostMapping
@Operation(summary = "Henter informasjon om en person fra PDL")
public PersonV2Data hentPerson(@RequestBody PersonRequestBody personRequestBody) {
@PostMapping("/registrering/endringer")
public ResponseEntity<String> endringIRegistreringdata(@RequestBody PersonRequest personRequest) {
authService.stoppHvisEksternBruker();
Fnr fnr = personRequestBody.fnr();
authService.sjekkLesetilgang(fnr);
return personV2Service.hentFlettetPerson(fnr);
authService.sjekkLesetilgang(personRequest.getFnr());
return registreringService.hentEndringIRegistreringsdata(personRequest.getFnr());
}

@PostMapping("/malform")
@Operation(summary = "Henter malform fra DIGDIR tjeneste")
public Malform malform(@RequestBody PersonRequestBody personRequestBody) {
public Malform malform(@RequestBody PersonRequest personRequest) {
authService.stoppHvisEksternBruker();
Fnr fnr = personRequestBody.fnr();
authService.sjekkLesetilgang(fnr);
authService.sjekkLesetilgang(personRequest.getFnr());

String malform = personV2Service.hentMalform(fnr);
String malform = personV2Service.hentMalform(personRequest.getFnr());
return new Malform(malform);
}

@PostMapping("/vergeOgFullmakt")
@Operation(summary = "Henter informasjon om verge og fullmakt for en person fra PDL")
public VergeOgFullmaktData hentVergemaalOgFullmakt(@RequestBody PersonRequestBody personRequestBody) {
public VergeOgFullmaktData hentVergemaalOgFullmakt(@RequestBody PersonRequest personRequest) {
authService.stoppHvisEksternBruker();
Fnr fnr = personRequestBody.fnr();
authService.sjekkLesetilgang(fnr);
return personV2Service.hentVergeEllerFullmakt(fnr);
authService.sjekkLesetilgang(personRequest.getFnr());
return personV2Service.hentVergeEllerFullmakt(personRequest.getFnr());
}

@PostMapping("/tolk")
@Operation(summary = "Henter tolk informajon til en person fra PDL")
public TilrettelagtKommunikasjonData hentSpraakTolk(@RequestBody PersonRequestBody personRequestBody) {
public TilrettelagtKommunikasjonData hentSpraakTolk(@RequestBody PersonRequest personRequest) {
authService.stoppHvisEksternBruker();
Fnr fnr = personRequestBody.fnr();
authService.sjekkLesetilgang(fnr);
return personV2Service.hentSpraakTolkInfo(fnr);
authService.sjekkLesetilgang(personRequest.getFnr());
return personV2Service.hentSpraakTolkInfo(personRequest.getFnr());
}

@PostMapping("/navn")
@Operation(summary = "Henter navn til en person fra PDL")
public PersonNavnV2 hentNavn(@RequestBody PersonRequestBody personRequestBody) {
public PersonNavnV2 hentNavn(@RequestBody PersonRequest personRequest) {
authService.stoppHvisEksternBruker();
Fnr fnr = personRequestBody.fnr();
authService.sjekkLesetilgang(fnr);
return personV2Service.hentNavn(fnr);
authService.sjekkLesetilgang(personRequest.getFnr());
return personV2Service.hentNavn(personRequest.getFnr());
}

@PostMapping("/postadresse")
@Operation(summary = "Henter postadresse til en person fra regoppslag")
public RegoppslagResponseDTO hentPostadresse(@RequestBody PersonRequestBody personRequestBody) {
public RegoppslagResponseDTO hentPostadresse(@RequestBody PersonRequest personRequest) {
authService.stoppHvisEksternBruker();
Fnr fnr = personRequestBody.fnr();
authService.sjekkLesetilgang(fnr);
return regoppslagClient.hentPostadresse(fnr);
authService.sjekkLesetilgang(personRequest.getFnr());
return regoppslagClient.hentPostadresse(personRequest.getFnr());
}
private Fnr hentIdentForEksternEllerIntern(Fnr queryParamFnr) {
Fnr fnr;
Expand Down
7 changes: 7 additions & 0 deletions src/main/java/no/nav/veilarbperson/domain/PersonRequest.kt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package no.nav.veilarbperson.domain

import no.nav.common.types.identer.Fnr

data class PersonRequest(
val fnr: Fnr
)
4 changes: 1 addition & 3 deletions src/main/java/no/nav/veilarbperson/domain/PersonRequestBody.java
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
package no.nav.veilarbperson.domain;

import no.nav.common.types.identer.Fnr;

public record PersonRequestBody(
Fnr fnr
String fodselsnummer
) {
}

0 comments on commit 7a9e320

Please sign in to comment.