Skip to content

Commit

Permalink
Henter ikke kontonummer, setter kontonummer til null.
Browse files Browse the repository at this point in the history
Co-authored-by: Julie Hill Roa <[email protected]>
  • Loading branch information
klaramargrethehelgemo and JulieHillRoa committed Nov 25, 2024
1 parent f0c3ea1 commit 09b94ef
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 15 deletions.
18 changes: 6 additions & 12 deletions src/main/java/no/nav/veilarbperson/service/PersonV2Service.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@
import no.nav.common.types.identer.Fnr;
import no.nav.veilarbperson.client.digdir.DigdirClient;
import no.nav.veilarbperson.client.digdir.DigdirKontaktinfo;
import no.nav.veilarbperson.client.kontoregister.HentKontoRequestDTO;
import no.nav.veilarbperson.client.kontoregister.HentKontoResponseDTO;
import no.nav.veilarbperson.client.kontoregister.KontoregisterClient;
import no.nav.veilarbperson.client.nom.SkjermetClient;
import no.nav.veilarbperson.client.pdl.HentPerson;
import no.nav.veilarbperson.client.pdl.PdlClient;
Expand All @@ -16,7 +13,6 @@
import no.nav.veilarbperson.client.representasjon.RepresentasjonClient;
import no.nav.veilarbperson.domain.*;
import no.nav.veilarbperson.utils.PersonV2DataMapper;
import no.nav.veilarbperson.utils.VergeOgFullmaktDataMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.http.HttpStatus;
Expand All @@ -43,7 +39,7 @@ public class PersonV2Service {
private final SkjermetClient skjermetClient;
private final KodeverkService kodeverkService;
private final RepresentasjonClient representasjonClient;
private final KontoregisterClient kontoregisterClient;


@Autowired
public PersonV2Service(PdlClient pdlClient,
Expand All @@ -52,16 +48,14 @@ public PersonV2Service(PdlClient pdlClient,
Norg2Client norg2Client,
SkjermetClient skjermetClient,
KodeverkService kodeverkService,
RepresentasjonClient representasjonClient,
KontoregisterClient kontoregisterClient) {
RepresentasjonClient representasjonClient) {
this.pdlClient = pdlClient;
this.authService = authServiceWithoutAuditLogg;
this.digdirClient = digdirClient;
this.norg2Client = norg2Client;
this.skjermetClient = skjermetClient;
this.kodeverkService = kodeverkService;
this.representasjonClient = representasjonClient;
this.kontoregisterClient = kontoregisterClient;
}

public HentPerson.Person hentPerson(PersonFraPdlRequest personFraPdlRequest) {
Expand All @@ -87,10 +81,10 @@ public PersonV2Data hentFlettetPerson(PersonFraPdlRequest personFraPdlRequest) {
}

public void flettInnKontonummer(PersonV2Data person) {
HentKontoRequestDTO kontohaver = new HentKontoRequestDTO();
kontohaver.setKontohaver(person.getFodselsnummer().toString());
HentKontoResponseDTO kontoregisterKonto = kontoregisterClient.hentKontonummer(kontohaver);
person.setKontonummer(kontoregisterKonto.getNorskKontonummer());
// HentKontoRequestDTO kontohaver = new HentKontoRequestDTO();
// kontohaver.setKontohaver(person.getFodselsnummer().toString());
// HentKontoResponseDTO kontoregisterKonto = kontoregisterClient.hentKontonummer(kontohaver);
person.setKontonummer(null);
}

public List<Familiemedlem> hentFamiliemedlemOpplysninger(List<Fnr> familemedlemFnr, Bostedsadresse bostedsadresse, String behandlingsnummer) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
import no.nav.veilarbperson.domain.*;
import no.nav.veilarbperson.utils.PersonV2DataMapper;
import no.nav.veilarbperson.utils.TestUtils;
import no.nav.veilarbperson.utils.VergeOgFullmaktDataMapper;
import org.junit.Before;
import org.junit.Test;

Expand Down Expand Up @@ -74,8 +73,7 @@ public void setup() {
norg2Client,
skjermetClient,
kodeverkService,
representasjonClient,
kontoregisterClient
representasjonClient
);
person = hentPerson(FNR);
}
Expand Down

0 comments on commit 09b94ef

Please sign in to comment.