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

Prodsette: Oppdatert filtermodell med Innsatsgruppefilter § 14 a #400

Merged
merged 4 commits into from
Nov 21, 2024
Merged

Prodsette: Oppdatert filtermodell med Innsatsgruppefilter § 14 a #400

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
8a4c91a
Legg til filter for innsatsgruppe 14a
sneha-d-desai Nov 19, 2024
9ba13a4
Merge branch 'dev' into legg-til-innsatsgruppe-filter
klaramargrethehelgemo Nov 20, 2024
e98719a
Merge pull request #397 from navikt/legg-til-innsatsgruppe-filter
ingfo Nov 21, 2024
7babe7c
Merge branch 'main' into dev
ingfo Nov 21, 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
6 changes: 5 additions & 1 deletion src/main/java/no/nav/pto/veilarbfilter/domene/PortefoljeFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,9 @@ public class PortefoljeFilter {
@JsonSetter(nulls = Nulls.AS_EMPTY)
private List<String> gjeldendeVedtak14a = emptyList();

@JsonSetter(nulls = Nulls.AS_EMPTY)
private List<String> innsatsgruppeGjeldendeVedtak14a = emptyList();

@JsonIgnore
public Boolean isNotEmpty() {
return (kjonn != null && !kjonn.isEmpty()) ||
Expand Down Expand Up @@ -163,6 +166,7 @@ public Boolean isNotEmpty() {
(barnUnder18Aar != null && !barnUnder18Aar.isEmpty()) ||
(barnUnder18AarAlder != null && !barnUnder18AarAlder.isEmpty()) ||
(fargekategorier != null && !fargekategorier.isEmpty()) ||
(gjeldendeVedtak14a != null && !gjeldendeVedtak14a.isEmpty());
(gjeldendeVedtak14a != null && !gjeldendeVedtak14a.isEmpty()) ||
(innsatsgruppeGjeldendeVedtak14a != null && !innsatsgruppeGjeldendeVedtak14a.isEmpty());
}
}
6 changes: 3 additions & 3 deletions src/test/java/no/nav/pto/veilarbfilter/domene/PortefoljeFilterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ public void testDeserializationAndSettingDefaultValue() throws JsonProcessingExc
@Test
public void testSerializationOfEmptyFilter() throws JsonProcessingException {
String correctOutput = """
{"aktiviteter":null,"aktiviteterForenklet":[],"alder":[],"arbeidslisteKategori":[],"avvik14aVedtak":[],"barnUnder18Aar":[],"barnUnder18AarAlder":[],"cvJobbprofil":"","ensligeForsorgere":[],"fargekategorier":[],"ferdigfilterListe":[],"fodselsdagIMnd":[],"foedeland":[],"formidlingsgruppe":[],"geografiskBosted":[],"gjeldendeVedtak14a":[],"hovedmal":[],"innsatsgruppe":[],"kjonn":"","landgruppe":[],"manuellBrukerStatus":[],"navnEllerFnrQuery":"","registreringstype":[],"rettighetsgruppe":[],"servicegruppe":[],"sisteEndringKategori":[],"stillingFraNavFilter":[],"tiltakstyper":[],"tolkBehovSpraak":[],"tolkebehov":[],"ulesteEndringer":"","utdanning":[],"utdanningBestatt":[],"utdanningGodkjent":[],"veilederNavnQuery":"","veiledere":[],"visGeografiskBosted":[],"ytelse":""}""";
{"aktiviteter":null,"aktiviteterForenklet":[],"alder":[],"arbeidslisteKategori":[],"avvik14aVedtak":[],"barnUnder18Aar":[],"barnUnder18AarAlder":[],"cvJobbprofil":"","ensligeForsorgere":[],"fargekategorier":[],"ferdigfilterListe":[],"fodselsdagIMnd":[],"foedeland":[],"formidlingsgruppe":[],"geografiskBosted":[],"gjeldendeVedtak14a":[],"hovedmal":[],"innsatsgruppe":[],"innsatsgruppeGjeldendeVedtak14a":[],"kjonn":"","landgruppe":[],"manuellBrukerStatus":[],"navnEllerFnrQuery":"","registreringstype":[],"rettighetsgruppe":[],"servicegruppe":[],"sisteEndringKategori":[],"stillingFraNavFilter":[],"tiltakstyper":[],"tolkBehovSpraak":[],"tolkebehov":[],"ulesteEndringer":"","utdanning":[],"utdanningBestatt":[],"utdanningGodkjent":[],"veilederNavnQuery":"","veiledere":[],"visGeografiskBosted":[],"ytelse":""}""";
PortefoljeFilter portefoljeFilter = new PortefoljeFilter();
String jsonString = objectMapper.writeValueAsString(portefoljeFilter);
Assertions.assertEquals(jsonString, correctOutput);
Expand All @@ -107,10 +107,10 @@ public void testSerializationOfEmptyFilter() throws JsonProcessingException {
@Test
public void testSerializationOfVeiledere() throws JsonProcessingException {
String correctOutput = """
{"aktiviteter":null,"aktiviteterForenklet":null,"alder":null,"arbeidslisteKategori":null,"avvik14aVedtak":null,"barnUnder18Aar":null,"barnUnder18AarAlder":null,"cvJobbprofil":null,"ensligeForsorgere":null,"fargekategorier":null,"ferdigfilterListe":null,"fodselsdagIMnd":null,"foedeland":null,"formidlingsgruppe":null,"geografiskBosted":null,"gjeldendeVedtak14a":null,"hovedmal":null,"innsatsgruppe":null,"kjonn":null,"landgruppe":null,"manuellBrukerStatus":null,"navnEllerFnrQuery":null,"registreringstype":null,"rettighetsgruppe":null,"servicegruppe":null,"sisteEndringKategori":null,"stillingFraNavFilter":null,"tiltakstyper":null,"tolkBehovSpraak":null,"tolkebehov":null,"ulesteEndringer":null,"utdanning":null,"utdanningBestatt":null,"utdanningGodkjent":null,"veilederNavnQuery":null,"veiledere":["A123","B123"],"visGeografiskBosted":null,"ytelse":null}""";
{"aktiviteter":null,"aktiviteterForenklet":null,"alder":null,"arbeidslisteKategori":null,"avvik14aVedtak":null,"barnUnder18Aar":null,"barnUnder18AarAlder":null,"cvJobbprofil":null,"ensligeForsorgere":null,"fargekategorier":null,"ferdigfilterListe":null,"fodselsdagIMnd":null,"foedeland":null,"formidlingsgruppe":null,"geografiskBosted":null,"gjeldendeVedtak14a":null,"hovedmal":null,"innsatsgruppe":null,"innsatsgruppeGjeldendeVedtak14a":null,"kjonn":null,"landgruppe":null,"manuellBrukerStatus":null,"navnEllerFnrQuery":null,"registreringstype":null,"rettighetsgruppe":null,"servicegruppe":null,"sisteEndringKategori":null,"stillingFraNavFilter":null,"tiltakstyper":null,"tolkBehovSpraak":null,"tolkebehov":null,"ulesteEndringer":null,"utdanning":null,"utdanningBestatt":null,"utdanningGodkjent":null,"veilederNavnQuery":null,"veiledere":["A123","B123"],"visGeografiskBosted":null,"ytelse":null}""";
PortefoljeFilter portefoljeFilter = new PortefoljeFilter(null, null, null, null, null, null, null, null, null, null,
null, null, null, null, List.of("A123", "B123"), null, null, null, null, null, null, null, null, null, null,
null, null, null, null, null,null, null, null, null, null, null, null, null);
null, null, null, null, null,null, null, null, null, null, null, null, null, null);
String jsonString = objectMapper.writeValueAsString(portefoljeFilter);
Assertions.assertEquals(jsonString, correctOutput);
}
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/no/nav/pto/veilarbfilter/rest/MineLagredeFilterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,7 +415,7 @@ public PortefoljeFilter getRandomPortefoljeFilter() {
emptyList(), emptyList(), emptyList(), emptyList(), kjonnVelg.get(random.nextInt(1)), emptyList(),
String.valueOf(rndChar()), emptyList(), emptyList(), emptyList(), "", emptyList(), "", emptyList(), "",
emptyList(), emptyList(), emptyList(), emptyList(), emptyList(), "", emptyList(), emptyList(), emptyList(),
emptyList(), emptyList(), emptyList(), emptyList(), emptyList(), emptyList(), emptyList(), emptyList(), emptyList(), emptyList(), emptyList());
emptyList(), emptyList(), emptyList(), emptyList(), emptyList(), emptyList(), emptyList(), emptyList(), emptyList(), emptyList(), emptyList(), emptyList());
}

private static char rndChar() {
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/no/nav/pto/veilarbfilter/rest/VeilederGruppeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,6 @@ private NyttFilterModel getRandomNyttFilter(List<String> veiledersList) {
public PortefoljeFilter getRandomPortefoljeFilter(List<String> veiledersList) {
return new PortefoljeFilter(null, emptyList(), emptyList(), emptyList(), emptyList(), emptyList(), emptyList(), "",
emptyList(), "", emptyList(), emptyList(), emptyList(), "", veiledersList, "", emptyList(), "", emptyList(),
emptyList(), emptyList(), emptyList(), emptyList(), "", emptyList(), emptyList(), emptyList(), emptyList(), emptyList(), emptyList(), emptyList(), emptyList(), emptyList(), emptyList(), emptyList(), emptyList(), emptyList(), emptyList());
emptyList(), emptyList(), emptyList(), emptyList(), "", emptyList(), emptyList(), emptyList(), emptyList(), emptyList(), emptyList(), emptyList(), emptyList(), emptyList(), emptyList(), emptyList(), emptyList(), emptyList(), emptyList(), emptyList());
}
}