Skip to content

Commit 1fbb776

Browse files
rfc3092rfc3092
committed
Merge branch 'refs/heads/master' into change/from_vault_to_secretmanager
# Conflicts: # apps/sykemelding-api/src/main/java/no/nav/registre/testnorge/sykemelding/config/LocalVaultConfig.java # apps/sykemelding-api/src/main/resources/application.yml # apps/synt-sykemelding-api/src/main/java/no/nav/testnav/apps/syntsykemeldingapi/config/LocalVaultConfig.java # apps/synt-sykemelding-api/src/main/resources/application-dev.yml # apps/synt-sykemelding-api/src/main/resources/application.yml
2 parents 467c34a + ea26d4c commit 1fbb776

File tree

80 files changed

+1294
-338
lines changed

Some content is hidden

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

80 files changed

+1294
-338
lines changed

‎.github/workflows/app.sykemelding-api.yml

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ jobs:
1717
cluster: "dev-gcp"
1818
working-directory: "apps/sykemelding-api"
1919
deploy-tag: "#deploy-sykemelding-api"
20+
deploy-tag-test: "#deploy-test-sykemelding-api"
2021
permissions:
2122
contents: read
2223
id-token: write

‎.github/workflows/app.synt-sykemelding-api.yml

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ jobs:
1919
with:
2020
working-directory: "apps/synt-sykemelding-api"
2121
deploy-tag: "#deploy-synt-sykemelding-api"
22+
deploy-tag-test: "#deploy-test-synt-sykemelding-api"
2223
permissions:
2324
contents: read
2425
id-token: write

‎.github/workflows/proxy.sykemelding-proxy.yml

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: sykemelding-proxy
2+
3+
on:
4+
push:
5+
paths:
6+
- "plugins/**"
7+
- "libs/reactive-core/**"
8+
- "libs/reactive-proxy/**"
9+
- "libs/security-token-service/**"
10+
- "proxies/sykemelding-proxy/**"
11+
- ".github/workflows/proxy.sykemelding-proxy.yml"
12+
13+
jobs:
14+
workflow:
15+
uses: ./.github/workflows/common.workflow.backend.yml
16+
with:
17+
cluster: "dev-gcp"
18+
working-directory: "proxies/sykemelding-proxy"
19+
deploy-tag: "#deploy-proxy-sykemelding"
20+
permissions:
21+
contents: read
22+
id-token: write
23+
secrets: inherit

‎apps/arbeidsforhold-service/config.yml

+2
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ spec:
2828
cluster: dev-gcp
2929
- application: testnav-synt-sykemelding-api
3030
cluster: dev-gcp
31+
- application: testnav-synt-sykemelding-api-dev
32+
cluster: dev-gcp
3133
outbound:
3234
external:
3335
- host: testnav-aareg-proxy.dev-fss-pub.nais.io

‎apps/arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/arbeidsforholdservice/ArbeidsforholdApiApplicationStarter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ public class ArbeidsforholdApiApplicationStarter {
99
public static void main(String[] args) {
1010
SpringApplication.run(ArbeidsforholdApiApplicationStarter.class, args);
1111
}
12-
}
12+
}

‎apps/dolly-backend/config.test.yml

+2
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,9 @@ spec:
3939
- application: testnav-person-service
4040
- application: testnav-skattekort-service
4141
- application: testnav-sykemelding-api
42+
- application: testnav-sykemelding-api-dev
4243
- application: testnav-synt-sykemelding-api
44+
- application: testnav-synt-sykemelding-api-dev
4345
- application: testnav-tps-messaging-service
4446
- application: testnav-yrkesskade-proxy
4547
- application: testnorge-profil-api-dev

‎apps/dolly-backend/src/main/java/no/nav/dolly/DollyBackendApplicationStarter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ public static void main(String[] args) {
1010

1111
SpringApplication.run(DollyBackendApplicationStarter.class, args);
1212
}
13-
}
13+
}

‎apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/sykemelding/SykemeldingClient.java

+1
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,7 @@ private void saveTransaksjonId(SykemeldingResponse sykemelding, Long bestillingI
188188

189189
log.info("Lagrer transaksjon for {} i q1 ", sykemelding.getIdent());
190190

191+
sykemelding.getSykemeldingRequest().setSykemeldingId(sykemelding.getMsgId());
191192
transaksjonMappingService.save(TransaksjonMapping.builder()
192193
.ident(sykemelding.getIdent())
193194
.bestillingId(bestillingId)

‎apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/sykemelding/command/SykemeldingPostCommand.java

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
package no.nav.dolly.bestilling.sykemelding.command;
22

33
import lombok.RequiredArgsConstructor;
4+
import lombok.extern.slf4j.Slf4j;
45
import no.nav.dolly.bestilling.sykemelding.domain.DetaljertSykemeldingRequest;
56
import no.nav.dolly.bestilling.sykemelding.dto.SykemeldingResponse;
7+
import no.nav.testnav.libs.dto.sykemelding.v1.SykemeldingResponseDTO;
68
import no.nav.testnav.libs.reactivecore.utils.WebClientFilter;
79
import no.nav.testnav.libs.securitycore.config.UserConstant;
810
import org.springframework.http.HttpHeaders;
9-
import org.springframework.http.HttpStatus;
1011
import org.springframework.web.reactive.function.client.WebClient;
1112
import reactor.core.publisher.Mono;
1213
import reactor.util.retry.Retry;
@@ -16,6 +17,7 @@
1617

1718
import static no.nav.dolly.util.TokenXUtil.getUserJwt;
1819

20+
@Slf4j
1921
@RequiredArgsConstructor
2022
public class SykemeldingPostCommand implements Callable<Mono<SykemeldingResponse>> {
2123

@@ -35,10 +37,10 @@ public Mono<SykemeldingResponse> call() {
3537
.header(UserConstant.USER_HEADER_JWT, getUserJwt())
3638
.bodyValue(request)
3739
.retrieve()
38-
.toBodilessEntity()
39-
.timeout(Duration.ofMinutes(4))
40+
.bodyToMono(SykemeldingResponseDTO.class)
4041
.map(response -> SykemeldingResponse.builder()
41-
.status(HttpStatus.valueOf(response.getStatusCode().value()))
42+
.status(response.getStatus())
43+
.msgId(response.getSykemeldingId())
4244
.ident(request.getPasient().getIdent())
4345
.sykemeldingRequest(SykemeldingResponse.SykemeldingRequest.builder()
4446
.detaljertSykemeldingRequest(request)

‎apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/sykemelding/command/SyntSykemeldingPostCommand.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
import lombok.RequiredArgsConstructor;
44
import no.nav.dolly.bestilling.sykemelding.domain.SyntSykemeldingRequest;
55
import no.nav.dolly.bestilling.sykemelding.dto.SykemeldingResponse;
6+
import no.nav.testnav.libs.dto.sykemelding.v1.SykemeldingResponseDTO;
67
import no.nav.testnav.libs.reactivecore.utils.WebClientFilter;
78
import no.nav.testnav.libs.securitycore.config.UserConstant;
89
import org.springframework.http.HttpHeaders;
9-
import org.springframework.http.HttpStatus;
1010
import org.springframework.web.reactive.function.client.WebClient;
1111
import reactor.core.publisher.Mono;
1212
import reactor.util.retry.Retry;
@@ -34,10 +34,10 @@ public Mono<SykemeldingResponse> call() {
3434
.header(UserConstant.USER_HEADER_JWT, getUserJwt())
3535
.bodyValue(sykemeldingRequest)
3636
.retrieve()
37-
.toBodilessEntity()
38-
.timeout(Duration.ofMinutes(4))
37+
.bodyToMono(SykemeldingResponseDTO.class)
3938
.map(response -> SykemeldingResponse.builder()
40-
.status(HttpStatus.valueOf(response.getStatusCode().value()))
39+
.status(response.getStatus())
40+
.msgId(response.getSykemeldingId())
4141
.ident(sykemeldingRequest.getIdent())
4242
.sykemeldingRequest(SykemeldingResponse.SykemeldingRequest.builder()
4343
.syntSykemeldingRequest(sykemeldingRequest)

‎apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/sykemelding/dto/SykemeldingResponse.java

+2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ public class SykemeldingResponse {
1818
private HttpStatus status;
1919
private String avvik;
2020
private SykemeldingRequest sykemeldingRequest;
21+
private String msgId;
2122
private String ident;
2223

2324
@Data
@@ -27,6 +28,7 @@ public class SykemeldingResponse {
2728
@JsonInclude(JsonInclude.Include.NON_EMPTY)
2829
public static class SykemeldingRequest {
2930

31+
private String sykemeldingId;
3032
private SyntSykemeldingRequest syntSykemeldingRequest;
3133
private DetaljertSykemeldingRequest detaljertSykemeldingRequest;
3234
}

‎apps/dolly-backend/src/main/java/no/nav/dolly/consumer/kodeverk/command/KodeverkGetCommand.java

+5
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import no.nav.testnav.libs.dto.kodeverkservice.v1.KodeverkDTO;
55
import no.nav.testnav.libs.reactivecore.utils.WebClientFilter;
66
import org.springframework.http.HttpHeaders;
7+
import org.springframework.http.HttpStatus;
78
import org.springframework.web.reactive.function.client.WebClient;
89
import reactor.core.publisher.Mono;
910
import reactor.util.retry.Retry;
@@ -31,6 +32,10 @@ public Mono<KodeverkDTO> call() {
3132
.header(HttpHeaders.AUTHORIZATION, "Bearer " + token)
3233
.retrieve()
3334
.bodyToMono(KodeverkDTO.class)
35+
.map(kodeverket -> {
36+
kodeverket.setStatus(HttpStatus.OK);
37+
return kodeverket;
38+
})
3439
.doOnError(WebClientFilter::logErrorMessage)
3540
.onErrorResume(error -> Mono.just(KodeverkDTO.builder()
3641
.kodeverknavn(kodeverk)

‎apps/dolly-backend/src/main/java/no/nav/dolly/errorhandling/ErrorStatusDecoder.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,10 @@ public String getStatusMessage(String json) {
102102
if (json.contains("{")) {
103103
try {
104104
Map<String, Object> status = objectMapper.readValue(json, Map.class);
105-
if (status.containsKey(ERROR) && isNotBlank((String) status.get(ERROR))) {
106-
builder.append("error=").append(status.get(ERROR)).append("; ");
107-
} else if (status.containsKey(MESSAGE) && isNotBlank((String) status.get(MESSAGE))) {
105+
if (status.containsKey(MESSAGE) && isNotBlank((String) status.get(MESSAGE))) {
108106
builder.append("message=").append(encodeStatus((String) status.get(MESSAGE))).append("; ");
107+
} else if (status.containsKey(ERROR) && isNotBlank((String) status.get(ERROR))) {
108+
builder.append("error=").append(status.get(ERROR)).append("; ");
109109
} else if (status.containsKey(MELDING) && isNotBlank((String) status.get(MELDING))) {
110110
builder.append(encodeStatus((String) status.get(MELDING)));
111111
} else if (status.containsKey(DETAILS) && status.get(DETAILS) instanceof List) {

‎apps/dolly-backend/src/main/resources/application-dev.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,9 @@ consumers:
2222
testnav-pdl-forvalter:
2323
name: testnav-pdl-forvalter-dev
2424
url: http://testnav-pdl-forvalter-dev.dolly.svc.cluster.local
25+
testnav-sykemelding-api:
26+
name: testnav-sykemelding-api-dev
27+
url: http://testnav-sykemelding-api-dev.dolly.svc.cluster.local
28+
testnav-synt-sykemelding-api:
29+
name: testnav-synt-sykemelding-api-dev
30+
url: http://testnav-synt-sykemelding-api-dev.dolly.svc.cluster.local

‎apps/dolly-backend/src/main/resources/application-local.yaml

+4-2
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,11 @@ consumers:
5555
testnav-organisasjon-service:
5656
url: https://testnav-organisasjon-service.intern.dev.nav.no
5757
testnav-synt-sykemelding-api:
58-
url: https://testnav-synt-sykemelding-api.intern.dev.nav.no
58+
name: testnav-synt-sykemelding-api-dev
59+
url: https://testnav-synt-sykemelding-api-dev.intern.dev.nav.no
5960
testnav-sykemelding-api:
60-
url: http://testnav-sykemelding-api.intern.dev.nav.no
61+
name: testnav-sykemelding-api-dev
62+
url: https://testnav-sykemelding-api-dev.intern.dev.nav.no
6163
testnav-miljoer-service:
6264
url: https://testnav-miljoer-service.intern.dev.nav.no
6365
testnav-arbeidsplassencv-proxy:

0 commit comments

Comments
 (0)