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

Small fixes #1601

Merged
merged 4 commits into from
Jun 6, 2024
Merged

Small fixes #1601

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
08fb7f4
Merge pull request #1599 from navikt/master
dragutin-nav Jun 6, 2024
edb6e37
Small fixes
dragutin-nav Jun 6, 2024
558e0eb
Merge branch 'dev' into HuskelappSlettLogikk
dragutin-nav Jun 6, 2024
bf8eccc
Merge pull request #1600 from navikt/HuskelappSlettLogikk
dragutin-nav Jun 6, 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
4 changes: 4 additions & 0 deletions src/main/java/no/nav/pto/veilarbportefolje/huskelapp/HuskelappRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,10 @@ public List<Huskelapp> hentAlleRaderPaHuskelapp(UUID huskelappId) {
return dbReadOnly.queryForList(sql, huskelappId).stream().map(HuskelappRepository::huskelappMapper).toList();
}

public void slettAlleHuskelappRaderPaaBruker(Fnr fnr) {
String sql = String.format("DELETE FROM %s WHERE %s=? ", TABLE_NAME, FNR);
db.update(sql, fnr.get());
}

public void deaktivereAlleHuskelappRaderPaaBruker(Fnr fnr) {
String sql = String.format("UPDATE %s SET %s = ? WHERE %s = ? AND %s = ? ", TABLE_NAME, STATUS, FNR, STATUS);
Expand Down
19 changes: 17 additions & 2 deletions src/main/java/no/nav/pto/veilarbportefolje/huskelapp/HuskelappService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,11 +100,11 @@ public void settHuskelappIkkeAktiv(UUID huskelappId, Fnr brukerFnr) {
}
}

public void deaktivereAlleHuskelapperPaaBruker(AktorId aktorId, Optional<Fnr> maybeFnr) {
public void sletteAlleHuskelapperPaaBruker(AktorId aktorId, Optional<Fnr> maybeFnr) {
try {
secureLog.info("Sletter alle huskelapper paa bruker med aktoerid: " + aktorId);
if (maybeFnr.isPresent()) {
huskelappRepository.deaktivereAlleHuskelappRaderPaaBruker(maybeFnr.get());
huskelappRepository.slettAlleHuskelappRaderPaaBruker(maybeFnr.get());
opensearchIndexerV2.slettHuskelapp(aktorId);
} else {
secureLog.warn("Kunne ikke slette huskelapper for bruker med AktørID {}. Årsak fødselsnummer-parameter var tom.", aktorId.get());
Expand All @@ -115,6 +115,21 @@ public void deaktivereAlleHuskelapperPaaBruker(AktorId aktorId, Optional<Fnr> ma
}
}

public void deaktivereAlleHuskelapperPaaBruker(AktorId aktorId, Optional<Fnr> maybeFnr) {
try {
secureLog.info("Deaktiverer alle huskelapper paa bruker med aktoerid: " + aktorId);
if (maybeFnr.isPresent()) {
huskelappRepository.deaktivereAlleHuskelappRaderPaaBruker(maybeFnr.get());
opensearchIndexerV2.slettHuskelapp(aktorId);
} else {
secureLog.warn("Kunne ikke deaktivere huskelapper for bruker med AktørID {}. Årsak fødselsnummer-parameter var tom.", aktorId.get());
}
} catch (Exception e) {
secureLog.error("Kunne ikke deaktivere huskelapper for aktoerId: " + aktorId.toString());
throw new RuntimeException("Kunne ikke deaktivere huskelapper", e);
}
}

public boolean brukerHarHuskelappPaForrigeNavkontor(AktorId aktoerId) {

Fnr fnrBruker = aktorClient.hentFnr(aktoerId);
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/no/nav/pto/veilarbportefolje/oppfolging/OppfolgingAvsluttetService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public void avsluttOppfolging(AktorId aktoerId) {
arbeidssokerRegistreringService.slettRegistering(aktoerId);
endringIArbeidssokerRegistreringService.slettEndringIRegistering(aktoerId);
arbeidslisteService.slettArbeidsliste(aktoerId, maybeFnr);
huskelappService.deaktivereAlleHuskelapperPaaBruker(aktoerId, maybeFnr);
huskelappService.sletteAlleHuskelapperPaaBruker(aktoerId, maybeFnr);
sisteEndringService.slettSisteEndringer(aktoerId);
cvRepositoryV2.resetHarDeltCV(aktoerId);
siste14aVedtakService.slettSiste14aVedtak(aktoerId.get());
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/no/nav/pto/veilarbportefolje/huskelapp/HuskelappRepositoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ public void sletterAlleHuskelappRader() {
List<Huskelapp> alleHuskelappRader = repo.hentAlleRaderPaHuskelapp(huskelappFoer.get().huskelappId());
assertThat(alleHuskelappRader.size()).isEqualTo(4);

repo.deaktivereAlleHuskelappRaderPaaBruker(huskelapp2.brukerFnr());
repo.slettAlleHuskelappRaderPaaBruker(huskelapp2.brukerFnr());

List<Huskelapp> alleHuskelappRader2 = repo.hentAlleRaderPaHuskelapp(huskelappFoer.get().huskelappId());
assertThat(alleHuskelappRader2.size()).isEqualTo(0);
Expand Down
Loading