-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into feature/oppdrag-service
- Loading branch information
Showing
284 changed files
with
5,303 additions
and
2,104 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| name: fullmakt-proxy | ||
|
|
||
| on: | ||
| push: | ||
| paths: | ||
| - "plugins/**" | ||
| - "libs/reactive-core/**" | ||
| - "libs/reactive-proxy/**" | ||
| - "libs/reactive-security/**" | ||
| - "libs/security-core/**" | ||
| - "proxies/fullmakt-proxy/**" | ||
| - ".github/workflows/proxy.fullmakt-proxy.yml" | ||
|
|
||
| jobs: | ||
| workflow: | ||
| uses: ./.github/workflows/common.workflow.backend.yml | ||
| with: | ||
| cluster: "dev-fss" | ||
| working-directory: "proxies/fullmakt-proxy" | ||
| deploy-tag: "#deploy-proxy-fullmakt" | ||
| permissions: | ||
| contents: read | ||
| id-token: write | ||
| secrets: inherit |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| name: yrkesskade-proxy | ||
|
|
||
| on: | ||
| push: | ||
| paths: | ||
| - plugins/** | ||
| - libs/reactive-core/** | ||
| - libs/reactive-proxy/** | ||
| - libs/reactive-security/** | ||
| - libs/security-core/** | ||
| - proxies/yrkesskade-proxy/** | ||
| - .github/workflows/proxy.yrkesskade-proxy.yml | ||
|
|
||
| jobs: | ||
| workflow: | ||
| uses: ./.github/workflows/common.workflow.backend.yml | ||
| with: | ||
| cluster: "dev-gcp" | ||
| working-directory: "proxies/yrkesskade-proxy" | ||
| deploy-tag: "#deploy-proxy-yrkesskade" | ||
| permissions: | ||
| contents: read | ||
| id-token: write | ||
| secrets: inherit |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,10 @@ | ||
| FROM ghcr.io/navikt/baseimages/temurin:21 | ||
| LABEL maintainer="Team Dolly" | ||
|
|
||
| ADD build/libs/app.jar /app/app.jar | ||
| COPY build/libs/app.jar /app/app.jar | ||
|
|
||
| ENV JAVA_OPTS="-Dspring.profiles.active=prod" | ||
| RUN wget -q https://storage.googleapis.com/cloud-profiler/java/latest/profiler_java_agent.tar.gz -P /app/agent && tar xzf /app/agent/profiler_java_agent.tar.gz -C /app/agent && rm /app/agent/profiler_java_agent.tar.gz | ||
|
|
||
| ENV JAVA_OPTS="-Dspring.profiles.active=prod -agentpath:/app/agent/profiler_java_agent.so=-cprof_project_id=dolly-dev-ff83,-cprof_service=testnav-budpro-service,-cprof_enable_heap_sampling=true,-logtostderr,-minloglevel=1" | ||
|
|
||
| EXPOSE 8080 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
101 changes: 101 additions & 0 deletions
101
apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/fullmakt/FullmaktClient.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,101 @@ | ||
| package no.nav.dolly.bestilling.fullmakt; | ||
|
|
||
| import lombok.RequiredArgsConstructor; | ||
| import lombok.extern.slf4j.Slf4j; | ||
| import no.nav.dolly.bestilling.ClientFuture; | ||
| import no.nav.dolly.bestilling.ClientRegister; | ||
| import no.nav.dolly.bestilling.fullmakt.dto.FullmaktResponse; | ||
| import no.nav.dolly.bestilling.pdldata.PdlDataConsumer; | ||
| import no.nav.dolly.domain.jpa.BestillingProgress; | ||
| import no.nav.dolly.domain.resultset.RsDollyUtvidetBestilling; | ||
| import no.nav.dolly.domain.resultset.dolly.DollyPerson; | ||
| import no.nav.dolly.errorhandling.ErrorStatusDecoder; | ||
| import no.nav.dolly.util.TransactionHelperService; | ||
| import no.nav.testnav.libs.data.pdlforvalter.v1.PersonDTO; | ||
| import no.nav.testnav.libs.data.pdlforvalter.v1.RelasjonType; | ||
| import org.springframework.stereotype.Service; | ||
| import reactor.core.publisher.Flux; | ||
| import reactor.core.publisher.Mono; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| import static java.util.Objects.isNull; | ||
| import static no.nav.dolly.errorhandling.ErrorStatusDecoder.getInfoVenter; | ||
| import static org.apache.http.util.TextUtils.isBlank; | ||
|
|
||
| @Slf4j | ||
| @Service | ||
| @RequiredArgsConstructor | ||
| public class FullmaktClient implements ClientRegister { | ||
|
|
||
| private static final String FULLMAKT_REPRESENTASJON = "FULLMAKT_REPR#"; | ||
|
|
||
| private final ErrorStatusDecoder errorStatusDecoder; | ||
| private final TransactionHelperService transactionHelperService; | ||
| private final FullmaktConsumer fullmaktConsumer; | ||
| private final PdlDataConsumer pdlDataConsumer; | ||
|
|
||
| @Override | ||
| public Flux<ClientFuture> gjenopprett(RsDollyUtvidetBestilling bestilling, DollyPerson dollyPerson, BestillingProgress progress, boolean isOpprettEndre) { | ||
|
|
||
| if (!bestilling.getFullmakt().isEmpty()) { | ||
|
|
||
| return Flux.fromIterable(bestilling.getFullmakt()) | ||
| .doOnNext(ordre -> | ||
| transactionHelperService.persister(progress, BestillingProgress::setFullmaktStatus, | ||
| getInfoVenter("Fullmakt (Representasjon)"))) | ||
| .flatMap(fullmakt -> { | ||
| fullmakt.setFullmaktsgiver(dollyPerson.getIdent()); | ||
| if (isBlank(fullmakt.getFullmektig())) { | ||
| return pdlDataConsumer.getPersoner(List.of(dollyPerson.getIdent())) | ||
| .flatMap(person -> Flux.fromIterable(person.getRelasjoner()) | ||
| .filter(relasjon -> relasjon.getRelasjonType().equals(RelasjonType.FULLMEKTIG))) | ||
| .next() | ||
| .map(relasjon -> { | ||
| fullmakt.setFullmektigsNavn(getFullName(relasjon.getRelatertPerson())); | ||
| fullmakt.setFullmektig(relasjon.getRelatertPerson().getIdent()); | ||
| return fullmakt; | ||
| }); | ||
| } else { | ||
| return Mono.just(fullmakt); | ||
| } | ||
| }) | ||
| .collectList() | ||
| .flatMapMany(fullmakter -> fullmaktConsumer.createFullmaktData(fullmakter, dollyPerson.getIdent())) | ||
| .map(this::getStatus) | ||
| .map(status -> futurePersist(progress, status)); | ||
| } | ||
|
|
||
| return Flux.empty(); | ||
| } | ||
|
|
||
| @Override | ||
| public void release(List<String> identer) { | ||
|
|
||
| identer.forEach(ident -> fullmaktConsumer.getFullmaktData(List.of(ident)).subscribe( | ||
| fullmakter -> fullmakter.getFullmakt() | ||
| .forEach(fullmakt -> fullmaktConsumer | ||
| .deleteFullmaktData(ident, fullmakt.getFullmaktId()).subscribe()))); | ||
| } | ||
|
|
||
| private ClientFuture futurePersist(BestillingProgress progress, String status) { | ||
|
|
||
| return () -> { | ||
| transactionHelperService.persister(progress, BestillingProgress::setFullmaktStatus, status); | ||
| return progress; | ||
| }; | ||
| } | ||
|
|
||
| private String getStatus(FullmaktResponse response) { | ||
|
|
||
| return isNull(response.getStatus()) ? "OK" : | ||
| errorStatusDecoder.getErrorText(response.getStatus(), response.getMelding()); | ||
| } | ||
|
|
||
| private String getFullName(PersonDTO person) { | ||
| var navn = person.getNavn().getFirst(); | ||
| return (isBlank(navn.getMellomnavn())) | ||
| ? "%s %s".formatted(navn.getFornavn(), navn.getEtternavn()) | ||
| : "%s %s %s".formatted(navn.getFornavn(), navn.getMellomnavn(), navn.getEtternavn()); | ||
| } | ||
| } |
87 changes: 87 additions & 0 deletions
87
apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/fullmakt/FullmaktConsumer.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| package no.nav.dolly.bestilling.fullmakt; | ||
|
|
||
| import com.fasterxml.jackson.databind.ObjectMapper; | ||
| import lombok.extern.slf4j.Slf4j; | ||
| import no.nav.dolly.bestilling.ConsumerStatus; | ||
| import no.nav.dolly.bestilling.fullmakt.command.DeleteFullmaktDataCommand; | ||
| import no.nav.dolly.bestilling.fullmakt.command.GetFullmaktDataCommand; | ||
| import no.nav.dolly.bestilling.fullmakt.command.PostFullmaktDataCommand; | ||
| import no.nav.dolly.bestilling.fullmakt.dto.FullmaktResponse; | ||
| import no.nav.dolly.config.Consumers; | ||
| import no.nav.dolly.domain.resultset.fullmakt.RsFullmakt; | ||
| 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.http.ResponseEntity; | ||
| import org.springframework.stereotype.Service; | ||
| import org.springframework.web.reactive.function.client.WebClient; | ||
| import reactor.core.publisher.Flux; | ||
| import reactor.core.publisher.Mono; | ||
|
|
||
| import java.time.Duration; | ||
| import java.util.List; | ||
|
|
||
| import static no.nav.dolly.util.JacksonExchangeStrategyUtil.getJacksonStrategy; | ||
|
|
||
| @Slf4j | ||
| @Service | ||
| public class FullmaktConsumer implements ConsumerStatus { | ||
|
|
||
| private final WebClient webClient; | ||
| private final TokenExchange tokenService; | ||
| private final ServerProperties serverProperties; | ||
|
|
||
| public FullmaktConsumer( | ||
| TokenExchange tokenService, | ||
| Consumers consumers, | ||
| ObjectMapper objectMapper, | ||
| WebClient.Builder webClientBuilder | ||
| ) { | ||
| this.tokenService = tokenService; | ||
| serverProperties = consumers.getTestnavFullmaktProxy(); | ||
| this.webClient = webClientBuilder | ||
| .baseUrl(serverProperties.getUrl()) | ||
| .exchangeStrategies(getJacksonStrategy(objectMapper)) | ||
| .build(); | ||
| } | ||
|
|
||
| @Timed(name = "providers", tags = { "operation", "fullmakt_createData" }) | ||
| public Flux<FullmaktResponse> createFullmaktData(List<RsFullmakt> fullmakter, String ident) { | ||
|
|
||
| log.info("Fullmakt opprett {}", fullmakter); | ||
| return tokenService.exchange(serverProperties) | ||
| .flatMapMany(token -> | ||
| Flux.range(0, fullmakter.size()) | ||
| .delayElements(Duration.ofMillis(100)) | ||
| .flatMap(idx -> new PostFullmaktDataCommand(webClient, token.getTokenValue(), ident, fullmakter.get(idx)).call())); | ||
| } | ||
|
|
||
| @Timed(name = "providers", tags = { "operation", "fullmakt_getData" }) | ||
| public Flux<FullmaktResponse> getFullmaktData(List<String> identer) { | ||
|
|
||
| return tokenService.exchange(serverProperties) | ||
| .flatMapMany(token -> Flux.range(0, identer.size()) | ||
| .delayElements(Duration.ofMillis(50)) | ||
| .flatMap(idx -> new GetFullmaktDataCommand(webClient, identer.get(idx), | ||
| token.getTokenValue()).call())); | ||
| } | ||
|
|
||
| @Timed(name = "providers", tags = { "operation", "fullmakt_getData" }) | ||
| public Mono<ResponseEntity<Void>> deleteFullmaktData(String ident, Integer fullmaktId) { | ||
|
|
||
| return tokenService.exchange(serverProperties) | ||
| .flatMap(token -> new DeleteFullmaktDataCommand(webClient, ident, fullmaktId, | ||
| token.getTokenValue()).call()); | ||
| } | ||
|
|
||
| @Override | ||
| public String serviceUrl() { | ||
| return serverProperties.getUrl(); | ||
| } | ||
|
|
||
| @Override | ||
| public String consumerName() { | ||
| return "testnav-fullmakt-proxy"; | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.