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

TFP-5687: Kall til avslutt kobling returnerer 204 om kobling er allerede avsluttet #2644

Merged
merged 1 commit into from
Mar 11, 2025
Merged

TFP-5687: Kall til avslutt kobling returnerer 204 om kobling er allerede avsluttet #2644

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 8 additions & 3 deletions web/src/main/java/no/nav/foreldrepenger/abakus/kobling/KoblingRestTjeneste.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,14 @@ public Response deaktiverKobling(@Valid @NotNull KoblingRestTjeneste.AvsluttKobl

if (koblingOptional.isPresent()) {
var kobling = koblingOptional.get();
validerRequest(request, kobling);
avsluttKoblingTjeneste.avsluttKobling(kobling.getKoblingReferanse(), request.getYtelseType());
return Response.ok().build();
if (kobling.erAktiv()) {
validerRequest(request, kobling);
avsluttKoblingTjeneste.avsluttKobling(kobling.getKoblingReferanse(), request.getYtelseType());
return Response.ok().build();
} else {
LOG.info("KOBLING. Kobling er allerede avsluttet for referanse: {}", request.getReferanse());
return Response.noContent().build();
}
} else {
LOG.info("KOBLING. Fant ikke kobling for referanse: {}", request.getReferanse());
return Response.noContent().build();
Expand Down
21 changes: 21 additions & 0 deletions web/src/test/java/no/nav/foreldrepenger/abakus/kobling/KoblingRestTjenesteTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,27 @@ void sletting_av_kobling_ok() {
verify(avsluttKobling).avsluttKobling(referanse, ytelseType);
}

@Test
void sletting_av_kobling_allerede_deaktivert_ok() {
var referanse = new KoblingReferanse(UUID.randomUUID());
var saksnummer = "23234234";
var aktørId = AktørId.dummy();
var ytelseType = YtelseType.FORELDREPENGER;

var kobling = opprettKobling(saksnummer, aktørId, ytelseType, referanse);
kobling.setAktiv(false);
when(koblingTjeneste.hentFor(referanse)).thenReturn(Optional.of(kobling));

// Act
var request = new KoblingRestTjeneste.AvsluttKoblingRequestAbacDto(saksnummer, referanse.getReferanse(), ytelseType, new AktørIdPersonident(aktørId.getId()));

var response = koblingRestTjeneste.deaktiverKobling(request);

// Assert
assertThat(response.getStatus()).isEqualTo(HttpURLConnection.HTTP_NO_CONTENT);
verify(avsluttKobling, never()).avsluttKobling(referanse, ytelseType);
}

@Test
void sletting_av_kobling_feil_ytesletype_bad_request_nok() {
var referanse = new KoblingReferanse(UUID.randomUUID());
Expand Down