Skip to content

TFP-5430 deserialiser oppgavetype til enum #1421

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

Merged
merged 1 commit into from
Mar 11, 2025
Merged

TFP-5430 deserialiser oppgavetype til enum #1421

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
6 changes: 3 additions & 3 deletions ...ppgave-rest-klient/src/main/java/no/nav/vedtak/felles/integrasjon/oppgave/v1/Oppgave.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package no.nav.vedtak.felles.integrasjon.oppgave.v1;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;

import java.time.LocalDate;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;

@JsonIgnoreProperties(ignoreUnknown = true)
public record Oppgave(Long id,
String journalpostId,
Expand All @@ -12,7 +12,7 @@ public record Oppgave(Long id,
String aktoerId,
String tema,
String behandlingstema,
String oppgavetype,
Oppgavetype oppgavetype,
String behandlingstype,
Integer versjon,
String tildeltEnhetsnr,
Expand Down
2 changes: 2 additions & 0 deletions ...ve-rest-klient/src/main/java/no/nav/vedtak/felles/integrasjon/oppgave/v1/Oppgavetype.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
package no.nav.vedtak.felles.integrasjon.oppgave.v1;

import com.fasterxml.jackson.annotation.JsonEnumDefaultValue;
import com.fasterxml.jackson.annotation.JsonValue;

public enum Oppgavetype {

@JsonEnumDefaultValue UKJENT("UKJENT"),
JOURNALFØRING("JFR"),
VURDER_KONSEKVENS_YTELSE("VUR_KONS_YTE"),
VURDER_DOKUMENT("VUR"),
Expand Down
5 changes: 2 additions & 3 deletions .../src/test/java/no/nav/vedtak/felles/integrasjon/oppgave/v1/AbstractOppgaveKlientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package no.nav.vedtak.felles.integrasjon.oppgave.v1;

import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.when;
Expand Down Expand Up @@ -33,7 +32,7 @@ void setUp() {
oppgaver = new TestOppgave(restKlient);
}

private static final String json = """
private static final String JSON_SER = """
{
"id": 357736794,
"tildeltEnhetsnr":"1234",
Expand Down Expand Up @@ -61,7 +60,7 @@ void setUp() {
void skal_returnere_dokumentoversikt_fagsak() {
var captor = ArgumentCaptor.forClass(RestRequest.class);

when(restKlient.send(any(RestRequest.class), eq(Oppgave.class))).thenReturn(DefaultJsonMapper.fromJson(json, Oppgave.class));
when(restKlient.send(any(RestRequest.class), eq(Oppgave.class))).thenReturn(DefaultJsonMapper.fromJson(JSON_SER, Oppgave.class));
when(restKlient.sendExpectConflict(captor.capture(), eq(String.class))).thenReturn("test");

oppgaver.reserverOppgave("1", "testSbh");
Expand Down
32 changes: 28 additions & 4 deletions ...est-klient/src/test/java/no/nav/vedtak/felles/integrasjon/oppgave/v1/OppgaveRestTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

class OppgaveRestTest {

private static final String json = """
private static final String JSON_SER = """
{
"id": 357736794,
"tildeltEnhetsnr":"1234",
Expand All @@ -32,10 +32,34 @@ class OppgaveRestTest {
""";

@Test
void test_response() throws Exception {
var deserialized = DefaultJsonMapper.fromJson(json, Oppgave.class);
void test_response() {
var deserialized = DefaultJsonMapper.fromJson(JSON_SER, Oppgave.class);
assertThat(deserialized).isNotNull();
assertThat(deserialized.tildeltEnhetsnr()).isEqualTo("1234");
assertThat(deserialized.oppgavetype()).isEqualTo(Oppgavetype.BEHANDLE_SAK.getKode());
assertThat(deserialized.oppgavetype()).isEqualTo(Oppgavetype.BEHANDLE_SAK);
}

@Test
void test_response_ukjent_oppgave_type() {
var deserialized = DefaultJsonMapper.fromJson(JSON_SER.replace("BEH_SAK", "EN_VILL_EN"), Oppgave.class);
assertThat(deserialized).isNotNull();
assertThat(deserialized.tildeltEnhetsnr()).isEqualTo("1234");
assertThat(deserialized.oppgavetype()).isEqualTo(Oppgavetype.UKJENT);
}

@Test
void test_response_vurder_dok() {
var deserialized = DefaultJsonMapper.fromJson(JSON_SER.replace("BEH_SAK", "VUR"), Oppgave.class);
assertThat(deserialized).isNotNull();
assertThat(deserialized.tildeltEnhetsnr()).isEqualTo("1234");
assertThat(deserialized.oppgavetype()).isEqualTo(Oppgavetype.VURDER_DOKUMENT);
}

@Test
void test_response_vurder_konsekvens() {
var deserialized = DefaultJsonMapper.fromJson(JSON_SER.replace("BEH_SAK", "VUR_KONS_YTE"), Oppgave.class);
assertThat(deserialized).isNotNull();
assertThat(deserialized.tildeltEnhetsnr()).isEqualTo("1234");
assertThat(deserialized.oppgavetype()).isEqualTo(Oppgavetype.VURDER_KONSEKVENS_YTELSE);
}
}