Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
1308a45
- Refactor Consumers and RouteLocatorConfig to support new services: …
stigus Sep 19, 2025
6ffdd0a
Add support for routing `syfosmregler` and `tsm-input-dolly` services…
stigus Sep 19, 2025
7440613
Update syfosmregler validation URL; comment out auth filter in TSM ro…
stigus Sep 19, 2025
6c3b525
Enable auth filter for TSM route in RouteLocatorConfig
stigus Sep 22, 2025
0c30235
Enable auth filter for TSM route in RouteLocatorConfig
stigus Sep 22, 2025
f162832
Merge branch 'refs/heads/master' into feature/ny-sykemelding-frontend
stigus Sep 22, 2025
f7909ee
Add support for TSM sykemelding processing and routing; refactor syke…
stigus Sep 22, 2025
e324ba4
Merge branch 'master' into feature/ny-sykemelding-frontend
stigus Sep 22, 2025
00b23ed
Merge branch 'master' into feature/ny-sykemelding-frontend
stigus Sep 23, 2025
dd2e8ae
Refactor Sykemelding handling to remove unused MapperFacade; add supp…
stigus Sep 23, 2025
a2ace89
Merge branch 'refs/heads/master' into feature/ny-sykemelding-frontend
stigus Sep 24, 2025
ff35096
Add TSM sykemelding delete command and integrate deletion logic in Sy…
stigus Sep 24, 2025
9c2a9af
Deploy backend test
stigus Sep 25, 2025
e3e7089
Fix missing newline at EOF in SykemeldingProxyApplicationStarter.
stigus Sep 25, 2025
28aff41
Add reordered proxy rules for sykemelding and other services in confi…
stigus Sep 25, 2025
1466f6b
Simplify status messages in SykemeldingClient by removing redundant p…
stigus Sep 25, 2025
8d6aed2
Refactor Sykemelding classes and logic: replace `TsmSykemelding` with…
stigus Sep 25, 2025
7b1682f
- Add support for "Ny Sykemelding" in Sykemelding UI and backend inte…
stigus Sep 25, 2025
ec9429b
- Add support for "Ny Sykemelding" in Sykemelding UI and backend inte…
stigus Sep 25, 2025
a65f32a
Merge branch 'master' into feature/ny-sykemelding-frontend
stigus Sep 25, 2025
9fe26e3
- Replace `defaultSelected` fallback value in Datepicker component wi…
stigus Sep 25, 2025
9a85674
- Remove unused `data` prop from `Visning` component in `MiljoTabs`.
stigus Sep 25, 2025
665a5f9
- Remove unused `ident` prop from `VisningAvBestilling` in `Visning` …
stigus Sep 25, 2025
45b52c4
- Fix typo in help text for "Ny Sykemelding" component.
stigus Sep 25, 2025
7b231b7
Refactor sykemelding handling: adjust error logging, update DTO struc…
stigus Sep 25, 2025
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
9 changes: 5 additions & 4 deletions apps/dolly-backend/config.test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,12 @@ spec:
outbound:
rules:
- application: generer-navn-service
- application: testnav-arbeidsplassencv-proxy
- application: testnav-arbeidssoekerregisteret-proxy
- application: testnav-bruker-service-dev
- application: testnav-inntektsmelding-service
- application: testnav-kodeverk-service
- application: testnav-miljoer-service
- application: testnav-organisasjon-forvalter
- application: testnav-organisasjon-service
- application: testnav-nom-proxy
- application: testnav-pdl-forvalter-dev
- application: testnav-person-service
- application: testnav-skattekort-service
Expand All @@ -45,12 +42,16 @@ spec:
- application: testnav-synt-sykemelding-api
- application: testnav-synt-sykemelding-api-dev
- application: testnav-tps-messaging-service
- application: testnav-yrkesskade-proxy
- application: testnorge-profil-api-dev
- application: etterlatte-testdata
namespace: etterlatte
- application: logging
namespace: nais-system
- application: testnav-yrkesskade-proxy
- application: testnav-nom-proxy
- application: testnav-sykemelding-proxy
- application: testnav-arbeidsplassencv-proxy
- application: testnav-arbeidssoekerregisteret-proxy
external:
- host: testnav-arena-forvalteren-proxy.dev-fss-pub.nais.io
- host: testnav-brregstub-proxy.dev-fss-pub.nais.io
Expand Down
9 changes: 5 additions & 4 deletions apps/dolly-backend/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,27 +28,28 @@ spec:
outbound:
rules:
- application: generer-navn-service
- application: testnav-arbeidsplassencv-proxy
- application: testnav-arbeidssoekerregisteret-proxy
- application: testnav-bruker-service
- application: testnav-inntektsmelding-service
- application: testnav-kodeverk-service
- application: testnav-miljoer-service
- application: testnav-organisasjon-forvalter
- application: testnav-organisasjon-service
- application: testnav-nom-proxy
- application: testnav-pdl-forvalter
- application: testnav-person-service
- application: testnav-skattekort-service
- application: testnav-sykemelding-api
- application: testnav-synt-sykemelding-api
- application: testnav-tps-messaging-service
- application: testnav-yrkesskade-proxy
- application: testnorge-profil-api
- application: etterlatte-testdata
namespace: etterlatte
- application: logging
namespace: nais-system
- application: testnav-yrkesskade-proxy
- application: testnav-nom-proxy
- application: testnav-arbeidsplassencv-proxy
- application: testnav-arbeidssoekerregisteret-proxy
- application: testnav-sykemelding-proxy
external:
- host: testnav-arena-forvalteren-proxy.dev-fss-pub.nais.io
- host: testnav-brregstub-proxy.dev-fss-pub.nais.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ public static void main(String[] args) {
.initializers(new NaisEnvironmentApplicationContextInitializer())
.run(args);
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
package no.nav.dolly.bestilling.sykemelding;

import com.fasterxml.jackson.databind.ObjectMapper;
import io.swagger.v3.core.util.Json;
import lombok.extern.slf4j.Slf4j;
import no.nav.dolly.bestilling.ConsumerStatus;
import no.nav.dolly.bestilling.sykemelding.command.NySykemeldingDeleteCommand;
import no.nav.dolly.bestilling.sykemelding.command.NySykemeldingPostCommand;
import no.nav.dolly.bestilling.sykemelding.domain.dto.NySykemeldingRequestDTO;
import no.nav.dolly.bestilling.sykemelding.domain.dto.NySykemeldingResponseDTO;
import no.nav.dolly.config.Consumers;
import no.nav.dolly.metrics.Timed;
import no.nav.testnav.libs.securitycore.domain.ServerProperties;
import no.nav.testnav.libs.standalone.servletsecurity.exchange.TokenExchange;
import org.springframework.stereotype.Service;
import org.springframework.web.reactive.function.client.WebClient;
import reactor.core.publisher.Mono;

import static no.nav.dolly.util.JacksonExchangeStrategyUtil.getJacksonStrategy;

@Slf4j
@Service
public class NySykemeldingConsumer extends ConsumerStatus {

private final WebClient webClient;
private final TokenExchange tokenService;
private final ServerProperties serverProperties;

public NySykemeldingConsumer(
TokenExchange accessTokenService,
Consumers consumers,
ObjectMapper objectMapper,
WebClient webClient) {

this.tokenService = accessTokenService;
serverProperties = consumers.getTestnavSykemeldingProxy();
this.webClient = webClient
.mutate()
.exchangeStrategies(getJacksonStrategy(objectMapper))
.baseUrl(serverProperties.getUrl())
.build();
}

@Timed(name = "providers", tags = { "operation", "nysykemelding_opprett" })
public Mono<NySykemeldingResponseDTO> postTsmSykemelding(NySykemeldingRequestDTO nySykemeldingRequestDTO) {

log.info("Sykemelding sendt til tsm-input-dolly {}", Json.pretty(nySykemeldingRequestDTO));

return tokenService.exchange(serverProperties)
.flatMap(token -> new NySykemeldingPostCommand(webClient, nySykemeldingRequestDTO, token.getTokenValue()).call());
}

@Timed(name = "providers", tags = { "operation", "nysykemelding_delete" })
public Mono<Void> deleteTsmSykemeldinger(String ident) {

log.info("Sletter nye sykemeldinger for ident: {}", ident);

return tokenService.exchange(serverProperties)
.flatMap(token -> new NySykemeldingDeleteCommand(webClient, ident, token.getTokenValue()).call());
}

@Override
public String serviceUrl() {
return serverProperties.getUrl();
}

@Override
public String consumerName() {
return "testnav-sykemelding-proxy";
}
}
Loading