Skip to content

Commit 93899ab

Browse files
stigusstigus
authored
Merge branch 'master' into feature/inntektstub-fjerne-miljoe-orgnummer
2 parents 3a0c5f1 + aee9007 commit 93899ab

File tree

63 files changed

+291
-222
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+291
-222
lines changed

‎apps/budpro-service/config.yml

+6
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,12 @@ spec:
4343
replicas:
4444
min: 1
4545
max: 1
46+
resources:
47+
requests:
48+
cpu: 20m
49+
memory: 500Mi
50+
limits:
51+
memory: 2048Mi
4652
gcp:
4753
permissions:
4854
- resource:

‎apps/dolly-search-service/config.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ spec:
5959
max: 1
6060
resources:
6161
requests:
62-
cpu: 50m
63-
memory: 1024Mi
62+
cpu: 200m
63+
memory: 1250Mi
6464
limits:
6565
memory: 2048Mi
6666
env:

‎apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/ArenaForvalterConsumer.java

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package no.nav.testnav.apps.syntvedtakshistorikkservice.consumer;
22

3+
import io.swagger.v3.core.util.Json;
34
import lombok.extern.slf4j.Slf4j;
45
import no.nav.testnav.apps.syntvedtakshistorikkservice.config.Consumers;
56
import no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.command.arena.GetArenaBrukereCommand;
@@ -86,6 +87,7 @@ public Map<String, List<NyttVedtakResponse>> opprettRettighet(List<RettighetRequ
8687
for (var rettighet : rettigheter) {
8788
NyttVedtakResponse response = null;
8889
try {
90+
log.info("Ny rettighet {}", Json.pretty(rettighet));
8991
response = tokenExchange.exchange(serverProperties)
9092
.flatMap(accessToken -> new PostRettighetCommand(rettighet, accessToken.getTokenValue(), webClient).call())
9193
.block();

‎apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/request/arena/EndreInnsatsbehovRequest.java

+5-8
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,16 @@
11
package no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.request.arena;
22

33
import com.fasterxml.jackson.annotation.JsonInclude;
4-
5-
import java.util.List;
6-
7-
import lombok.Builder;
8-
import lombok.Getter;
9-
import lombok.Setter;
104
import lombok.AllArgsConstructor;
5+
import lombok.Builder;
6+
import lombok.Data;
117
import lombok.NoArgsConstructor;
128
import no.nav.testnav.libs.dto.arena.testnorge.brukere.NyEndreInnsatsbehov;
139

10+
import java.util.List;
11+
1412

15-
@Getter
16-
@Setter
13+
@Data
1714
@NoArgsConstructor
1815
@AllArgsConstructor
1916
@Builder

‎apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/request/arena/FinnTiltakRequest.java

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
package no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.request.arena;
22

33
import lombok.AllArgsConstructor;
4-
import lombok.Getter;
4+
import lombok.Data;
55
import lombok.NoArgsConstructor;
6-
import lombok.Setter;
76
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakTiltak;
87

98
import java.util.List;
109

11-
@Getter
12-
@Setter
10+
@Data
1311
@NoArgsConstructor
1412
@AllArgsConstructor
1513
public class FinnTiltakRequest{

‎apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/request/arena/rettighet/RettighetAap115Request.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22

33
import com.fasterxml.jackson.annotation.JsonProperty;
44
import lombok.AllArgsConstructor;
5-
import lombok.Getter;
5+
import lombok.Data;
6+
import lombok.EqualsAndHashCode;
67
import lombok.NoArgsConstructor;
7-
import lombok.Setter;
88
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakAap;
99
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakTillegg;
1010
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakTiltak;
1111

1212
import java.util.Collections;
1313
import java.util.List;
1414

15-
@Getter
16-
@Setter
15+
@Data
16+
@EqualsAndHashCode(callSuper = true)
1717
@NoArgsConstructor
1818
@AllArgsConstructor
1919
public class RettighetAap115Request extends RettighetRequest {

‎apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/request/arena/rettighet/RettighetAapRequest.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22

33
import com.fasterxml.jackson.annotation.JsonProperty;
44
import lombok.AllArgsConstructor;
5-
import lombok.Getter;
5+
import lombok.Data;
6+
import lombok.EqualsAndHashCode;
67
import lombok.NoArgsConstructor;
7-
import lombok.Setter;
88
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakAap;
99
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakTillegg;
1010
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakTiltak;
1111

1212
import java.util.Collections;
1313
import java.util.List;
1414

15-
@Getter
16-
@Setter
15+
@Data
16+
@EqualsAndHashCode(callSuper = true)
1717
@NoArgsConstructor
1818
@AllArgsConstructor
1919
public class RettighetAapRequest extends RettighetRequest {

‎apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/request/arena/rettighet/RettighetEndreDeltakerstatusRequest.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22

33
import com.fasterxml.jackson.annotation.JsonProperty;
44
import lombok.AllArgsConstructor;
5-
import lombok.Getter;
5+
import lombok.Data;
6+
import lombok.EqualsAndHashCode;
67
import lombok.NoArgsConstructor;
7-
import lombok.Setter;
88
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakAap;
99
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakTillegg;
1010
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakTiltak;
1111

1212
import java.util.Collections;
1313
import java.util.List;
1414

15-
@Getter
16-
@Setter
15+
@Data
16+
@EqualsAndHashCode(callSuper = true)
1717
@NoArgsConstructor
1818
@AllArgsConstructor
1919
public class RettighetEndreDeltakerstatusRequest extends RettighetRequest {

‎apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/request/arena/rettighet/RettighetFritakMeldekortRequest.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22

33
import com.fasterxml.jackson.annotation.JsonProperty;
44
import lombok.AllArgsConstructor;
5-
import lombok.Getter;
5+
import lombok.Data;
6+
import lombok.EqualsAndHashCode;
67
import lombok.NoArgsConstructor;
7-
import lombok.Setter;
88
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakAap;
99
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakTillegg;
1010
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakTiltak;
1111

1212
import java.util.Collections;
1313
import java.util.List;
1414

15-
@Getter
16-
@Setter
15+
@Data
16+
@EqualsAndHashCode(callSuper = true)
1717
@NoArgsConstructor
1818
@AllArgsConstructor
1919
public class RettighetFritakMeldekortRequest extends RettighetRequest {

‎apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/request/arena/rettighet/RettighetRequest.java

+2-4
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@
44
import com.fasterxml.jackson.annotation.JsonInclude;
55
import com.fasterxml.jackson.annotation.JsonSubTypes;
66
import lombok.AllArgsConstructor;
7-
import lombok.Getter;
7+
import lombok.Data;
88
import lombok.NoArgsConstructor;
9-
import lombok.Setter;
109
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakAap;
1110
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakTillegg;
1211
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakTiltak;
@@ -27,8 +26,7 @@
2726
@JsonSubTypes.Type(value = RettighetTilleggRequest.class, name = "tilleggstonad"),
2827
@JsonSubTypes.Type(value = RettighetEndreDeltakerstatusRequest.class, name = "endreDeltakerstatus")
2928
})
30-
@Getter
31-
@Setter
29+
@Data
3230
@NoArgsConstructor
3331
@AllArgsConstructor
3432
@JsonInclude(JsonInclude.Include.NON_EMPTY)

‎apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/request/arena/rettighet/RettighetTilleggRequest.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22

33
import com.fasterxml.jackson.annotation.JsonProperty;
44
import lombok.AllArgsConstructor;
5-
import lombok.Getter;
5+
import lombok.Data;
6+
import lombok.EqualsAndHashCode;
67
import lombok.NoArgsConstructor;
7-
import lombok.Setter;
88
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakAap;
99
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakTillegg;
1010
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakTiltak;
1111

1212
import java.util.Collections;
1313
import java.util.List;
1414

15-
@Getter
16-
@Setter
15+
@Data
16+
@EqualsAndHashCode(callSuper = true)
1717
@NoArgsConstructor
1818
@AllArgsConstructor
1919
public class RettighetTilleggRequest extends RettighetRequest {

‎apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/request/arena/rettighet/RettighetTilleggsytelseRequest.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22

33
import com.fasterxml.jackson.annotation.JsonProperty;
44
import lombok.AllArgsConstructor;
5-
import lombok.Getter;
5+
import lombok.Data;
6+
import lombok.EqualsAndHashCode;
67
import lombok.NoArgsConstructor;
7-
import lombok.Setter;
88
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakAap;
99
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakTillegg;
1010
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakTiltak;
1111

1212
import java.util.Collections;
1313
import java.util.List;
1414

15-
@Getter
16-
@Setter
15+
@Data
16+
@EqualsAndHashCode(callSuper = true)
1717
@NoArgsConstructor
1818
@AllArgsConstructor
1919
public class RettighetTilleggsytelseRequest extends RettighetRequest {

‎apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/request/arena/rettighet/RettighetTiltaksaktivitetRequest.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22

33
import com.fasterxml.jackson.annotation.JsonProperty;
44
import lombok.AllArgsConstructor;
5-
import lombok.Getter;
5+
import lombok.Data;
6+
import lombok.EqualsAndHashCode;
67
import lombok.NoArgsConstructor;
7-
import lombok.Setter;
88
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakAap;
99
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakTillegg;
1010
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakTiltak;
1111

1212
import java.util.Collections;
1313
import java.util.List;
1414

15-
@Getter
16-
@Setter
15+
@Data
16+
@EqualsAndHashCode(callSuper = true)
1717
@NoArgsConstructor
1818
@AllArgsConstructor
1919
public class RettighetTiltaksaktivitetRequest extends RettighetRequest {

‎apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/request/arena/rettighet/RettighetTiltaksdeltakelseRequest.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22

33
import com.fasterxml.jackson.annotation.JsonProperty;
44
import lombok.AllArgsConstructor;
5-
import lombok.Getter;
5+
import lombok.Data;
6+
import lombok.EqualsAndHashCode;
67
import lombok.NoArgsConstructor;
7-
import lombok.Setter;
88
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakAap;
99
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakTillegg;
1010
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakTiltak;
1111

1212
import java.util.Collections;
1313
import java.util.List;
1414

15-
@Getter
16-
@Setter
15+
@Data
16+
@EqualsAndHashCode(callSuper = true)
1717
@NoArgsConstructor
1818
@AllArgsConstructor
1919
public class RettighetTiltaksdeltakelseRequest extends RettighetRequest {

‎apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/request/arena/rettighet/RettighetTiltakspengerRequest.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22

33
import com.fasterxml.jackson.annotation.JsonProperty;
44
import lombok.AllArgsConstructor;
5-
import lombok.Getter;
5+
import lombok.Data;
6+
import lombok.EqualsAndHashCode;
67
import lombok.NoArgsConstructor;
7-
import lombok.Setter;
88
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakAap;
99
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakTillegg;
1010
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakTiltak;
1111

1212
import java.util.Collections;
1313
import java.util.List;
1414

15-
@Getter
16-
@Setter
15+
@Data
16+
@EqualsAndHashCode(callSuper = true)
1717
@NoArgsConstructor
1818
@AllArgsConstructor
1919
public class RettighetTiltakspengerRequest extends RettighetRequest {

‎apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/request/arena/rettighet/RettighetTvungenForvaltningRequest.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22

33
import com.fasterxml.jackson.annotation.JsonProperty;
44
import lombok.AllArgsConstructor;
5-
import lombok.Getter;
5+
import lombok.Data;
6+
import lombok.EqualsAndHashCode;
67
import lombok.NoArgsConstructor;
7-
import lombok.Setter;
88
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakAap;
99
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakTillegg;
1010
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakTiltak;
1111

1212
import java.util.Collections;
1313
import java.util.List;
1414

15-
@Getter
16-
@Setter
15+
@Data
16+
@EqualsAndHashCode(callSuper = true)
1717
@NoArgsConstructor
1818
@AllArgsConstructor
1919
public class RettighetTvungenForvaltningRequest extends RettighetRequest {

‎apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/request/arena/rettighet/RettighetUngUfoerRequest.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22

33
import com.fasterxml.jackson.annotation.JsonProperty;
44
import lombok.AllArgsConstructor;
5-
import lombok.Getter;
5+
import lombok.Data;
6+
import lombok.EqualsAndHashCode;
67
import lombok.NoArgsConstructor;
7-
import lombok.Setter;
88
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakAap;
99
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakTillegg;
1010
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakTiltak;
1111

1212
import java.util.Collections;
1313
import java.util.List;
1414

15-
@Getter
16-
@Setter
15+
@Data
16+
@EqualsAndHashCode(callSuper = true)
1717
@NoArgsConstructor
1818
@AllArgsConstructor
1919
public class RettighetUngUfoerRequest extends RettighetRequest {

‎apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/provider/utils/InputValidator.java

+15
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,12 @@
77
import java.util.Collections;
88
import java.util.List;
99

10+
import static java.util.Objects.isNull;
11+
1012
@UtilityClass
1113
public class InputValidator {
1214

15+
private static final int MAX_ANTALL_NYE_IDENTER = 10;
1316
private static final List<String> VALID_MLJOE = Collections.singletonList("q2");
1417

1518
public static void validateMiljoe(String miljoe) {
@@ -19,4 +22,16 @@ public static void validateMiljoe(String miljoe) {
1922
}
2023
}
2124

25+
public static void validateAntallNyeIdenter(Integer antallNyeIdenter) {
26+
if (isNull(antallNyeIdenter)) {
27+
throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "Antall nye identer må være satt.");
28+
}
29+
if (antallNyeIdenter < 1) {
30+
throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "Antall nye identer kan ikke være mindre enn 1.");
31+
}
32+
if (antallNyeIdenter > MAX_ANTALL_NYE_IDENTER) {
33+
throw new ResponseStatusException(HttpStatus.BAD_REQUEST,
34+
String.format("Antall nye identer kan ikke være større enn %d.", MAX_ANTALL_NYE_IDENTER));
35+
}
36+
}
2237
}

‎apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/TenorSearchServiceApplicationStarter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ public static void main(String[] args) {
2020
.initializers(new NaisEnvironmentApplicationContextInitializer())
2121
.run(args);
2222
}
23-
}
23+
}

0 commit comments

Comments
 (0)