Merge branch 'master' into change/common_testing_internal

Author: rfc3092

.github/workflows/app.dolly-search-service.yml

@@ -19,6 +19,7 @@ jobs:
     with:
       working-directory: "apps/dolly-search-service"
       deploy-tag: "#deploy-dolly-search-service"
+      deploy-tag-test: "#deploy-test-dolly-search-service"
     permissions:
       contents: read
       id-token: write

.github/workflows/proxy.brregstub-reverse-proxy.yml

@@ -0,0 +1,22 @@
+name: brregstub-reverse--proxy
+
+on:
+  push:
+    paths:
+      - "plugins/**"
+      - "libs/reactive-core/**"
+      - "libs/reactive-proxy/**"
+      - "proxies/brregstub-reverse-proxy/**"
+      - ".github/workflows/proxy.brregstub-reverse-proxy.yml"
+
+jobs:
+  workflow:
+    uses: ./.github/workflows/common.workflow.backend.yml
+    with:
+      cluster: "dev-fss"
+      working-directory: "proxies/brregstub-reverse-proxy"
+      deploy-tag: "#deploy-proxy-brregstub-reverse"
+    permissions:
+      contents: read
+      id-token: write
+    secrets: inherit

apps/brreg-stub/src/main/java/no/nav/brregstub/config/AppConfig.java

@@ -6,16 +6,12 @@
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 
 import no.nav.testnav.libs.servletcore.config.ApplicationCoreConfig;
-import no.nav.testnav.libs.database.config.FlywayConfiguration;
-import no.nav.testnav.libs.database.config.VaultHikariConfiguration;
 
 @Configuration
 @EnableJpaAuditing
 @EnableJpaRepositories(basePackages = "no.nav.brregstub.database.repository")
 @Import({
-        ApplicationCoreConfig.class,
-        VaultHikariConfiguration.class,
-        FlywayConfiguration.class,
+        ApplicationCoreConfig.class
 })
 public class AppConfig {
 }

apps/brreg-stub/src/main/resources/application-prod.yml

@@ -1,5 +1,6 @@
-
 spring:
+  config:
+    import: "vault://"
   flyway:
     locations: classpath:db/migration/postgresql
   datasource:
@@ -30,5 +31,3 @@ spring:
         role: testnav-brregstub-admin
         backend: postgresql/preprod-fss
       fail-fast: true
-  config:
-    import: vault://

apps/bruker-service/config.test.yml

@@ -20,6 +20,7 @@ spec:
   accessPolicy:
     inbound:
       rules:
+        - application: dolly-backend-dev
         - application: dolly-frontend-dev
         - application: dolly-frontend-dev-unstable
         - application: team-dolly-lokal-app

apps/bruker-service/config.yml

@@ -20,6 +20,7 @@ spec:
   accessPolicy:
     inbound:
       rules:
+        - application: dolly-backend
         - application: dolly-frontend
         - application: dolly-idporten
         - application: testnav-oversikt-frontend

apps/bruker-service/src/main/java/no/nav/testnav/apps/brukerservice/controller/TilgangController.java

@@ -0,0 +1,23 @@
+package no.nav.testnav.apps.brukerservice.controller;
+
+import lombok.RequiredArgsConstructor;
+import no.nav.testnav.apps.brukerservice.dto.TilgangDTO;
+import no.nav.testnav.apps.brukerservice.service.TilgangService;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import reactor.core.publisher.Mono;
+
+@RestController
+@RequestMapping("/api/v1/tilgang")
+@RequiredArgsConstructor
+public class TilgangController {
+
+    private final TilgangService tilgangService;
+
+    @GetMapping
+    public Mono<TilgangDTO> getBrukereISammeOrganisasjon(String brukerId) {
+
+        return tilgangService.getBrukereISammeOrganisasjon(brukerId);
+    }
+}

apps/bruker-service/src/main/java/no/nav/testnav/apps/brukerservice/dto/TilgangDTO.java

@@ -0,0 +1,17 @@
+package no.nav.testnav.apps.brukerservice.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class TilgangDTO {
+
+    private List<String> brukere;
+}

apps/bruker-service/src/main/java/no/nav/testnav/apps/brukerservice/repository/UserRepository.java

@@ -1,10 +1,19 @@
 package no.nav.testnav.apps.brukerservice.repository;
 
+import org.springframework.data.r2dbc.repository.Query;
+import org.springframework.data.repository.query.Param;
 import org.springframework.data.repository.reactive.ReactiveCrudRepository;
+import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 public interface UserRepository extends ReactiveCrudRepository<UserEntity, String> {
+
     Mono<UserEntity> findByBrukernavn(String brukernavn);
 
     Mono<Boolean> existsByBrukernavn(String brukernavn);
+
+    @Query("select * from user_entity as ue " +
+            "join user_entity as u on u.organisasjonsnummer = ue.organisasjonsnummer " +
+            "and u.id = :brukerId")
+    Flux<UserEntity> findBrukereISammeOrganisasjoner(@Param("brukerId") String brukerId);
 }

apps/bruker-service/src/main/java/no/nav/testnav/apps/brukerservice/service/TilgangService.java

@@ -0,0 +1,23 @@
+package no.nav.testnav.apps.brukerservice.service;
+
+import lombok.RequiredArgsConstructor;
+import no.nav.testnav.apps.brukerservice.dto.TilgangDTO;
+import no.nav.testnav.apps.brukerservice.repository.UserEntity;
+import no.nav.testnav.apps.brukerservice.repository.UserRepository;
+import org.springframework.stereotype.Service;
+import reactor.core.publisher.Mono;
+
+@Service
+@RequiredArgsConstructor
+public class TilgangService {
+
+    private final UserRepository userRepository;
+
+    public Mono<TilgangDTO> getBrukereISammeOrganisasjon(String brukerId) {
+
+        return userRepository.findBrukereISammeOrganisasjoner(brukerId)
+                .mapNotNull(UserEntity::getId)
+                .collectList()
+                .map(TilgangDTO::new);
+    }
+}

apps/dolly-backend/config.test.yml

@@ -32,7 +32,7 @@ spec:
         - application: testnav-arbeidsforhold-service
         - application: testnav-arbeidsplassencv-proxy
         - application: testnav-arbeidssoekerregisteret-proxy
-        - application: testnav-dolly-search-service
+        - application: testnav-bruker-service-dev
         - application: testnav-inntektsmelding-service
         - application: testnav-kodeverk-service
         - application: testnav-miljoer-service

apps/dolly-backend/config.yml

@@ -34,7 +34,7 @@ spec:
         - application: testnav-arbeidsforhold-service
         - application: testnav-arbeidsplassencv-proxy
         - application: testnav-arbeidssoekerregisteret-proxy
-        - application: testnav-dolly-search-service
+        - application: testnav-bruker-service
         - application: testnav-inntektsmelding-service
         - application: testnav-kodeverk-service
         - application: testnav-miljoer-service

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

@@ -14,4 +14,4 @@ public static void main(String[] args) {
                 .initializers(new NaisEnvironmentApplicationContextInitializer())
                 .run(args);
     }
-}
+}

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/krrstub/KrrstubConsumer.java

@@ -51,7 +51,7 @@ public Mono<DigitalKontaktdataResponse> createDigitalKontaktdata(DigitalKontaktd
                 .flatMap(token -> new KontaktdataPostCommand(webClient, digitalKontaktdata, token.getTokenValue()).call());
     }
 
-    @Timed(name = "providers", tags = { "operation", "krrstub_getKontaktdata" })
+    @Timed(name = "providers", tags = { "operation", "krrstub_deleteKontaktdata" })
     public Flux<DigitalKontaktdataResponse> deleteKontaktdata(List<String> identer) {
 
         return tokenService.exchange(serverProperties)

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/krrstub/command/GetKontaktdataCommand.java

@@ -4,23 +4,23 @@
 import lombok.extern.slf4j.Slf4j;
 import no.nav.dolly.bestilling.krrstub.dto.DigitalKontaktdataResponse;
 import no.nav.dolly.metrics.Timed;
-import no.nav.dolly.util.RequestHeaderUtil;
 import no.nav.testnav.libs.reactivecore.utils.WebClientFilter;
 import no.nav.testnav.libs.securitycore.config.UserConstant;
 import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.reactive.function.client.WebClient;
 import org.springframework.web.reactive.function.client.WebClientResponseException;
 import reactor.core.publisher.Mono;
 import reactor.util.retry.Retry;
 
 import java.time.Duration;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.concurrent.Callable;
 
 import static no.nav.dolly.domain.CommonKeysAndUtils.CONSUMER;
-import static no.nav.dolly.domain.CommonKeysAndUtils.HEADER_NAV_CALL_ID;
 import static no.nav.dolly.domain.CommonKeysAndUtils.HEADER_NAV_CONSUMER_ID;
-import static no.nav.dolly.domain.CommonKeysAndUtils.HEADER_NAV_PERSON_IDENT;
 import static no.nav.dolly.util.TokenXUtil.getUserJwt;
 
 @Slf4j
@@ -36,15 +36,18 @@ public class KontaktadataDeleteCommand implements Callable<Mono<DigitalKontaktda
     @Timed(name = "providers", tags = { "operation", "krrstub_deleteKontaktdata" })
     public Mono<DigitalKontaktdataResponse> call() {
 
-        return webClient.delete()
+
+        var body = new HashMap<>();
+        body.put("personidentifikator", ident);
+
+        return webClient.method(HttpMethod.DELETE)
                 .uri(uriBuilder -> uriBuilder
                         .path(DIGITAL_KONTAKT_URL)
                         .build())
-                .header(HEADER_NAV_CALL_ID, RequestHeaderUtil.getNavCallId())
+                .bodyValue(body)
                 .header(HEADER_NAV_CONSUMER_ID, CONSUMER)
                 .header(HttpHeaders.AUTHORIZATION, "Bearer " + token)
                 .header(UserConstant.USER_HEADER_JWT, getUserJwt())
-                .header(HEADER_NAV_PERSON_IDENT, ident)
                 .retrieve()
                 .toBodilessEntity()
                 .map(response -> DigitalKontaktdataResponse.builder()

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/krrstub/command/KontaktadataDeleteCommand.java

@@ -3,7 +3,6 @@
 import lombok.RequiredArgsConstructor;
 import no.nav.dolly.bestilling.krrstub.dto.DigitalKontaktdataResponse;
 import no.nav.dolly.domain.resultset.krrstub.DigitalKontaktdata;
-import no.nav.dolly.util.RequestHeaderUtil;
 import no.nav.testnav.libs.reactivecore.utils.WebClientFilter;
 import no.nav.testnav.libs.securitycore.config.UserConstant;
 import org.springframework.http.HttpHeaders;
@@ -17,7 +16,6 @@
 import java.util.concurrent.Callable;
 
 import static no.nav.dolly.domain.CommonKeysAndUtils.CONSUMER;
-import static no.nav.dolly.domain.CommonKeysAndUtils.HEADER_NAV_CALL_ID;
 import static no.nav.dolly.domain.CommonKeysAndUtils.HEADER_NAV_CONSUMER_ID;
 import static no.nav.dolly.util.TokenXUtil.getUserJwt;
 
@@ -38,7 +36,6 @@ public Mono<DigitalKontaktdataResponse> call() {
                         .path(DIGITAL_KONTAKT_URL)
                         .build())
                 .contentType(MediaType.APPLICATION_JSON)
-                .header(HEADER_NAV_CALL_ID, RequestHeaderUtil.getNavCallId())
                 .header(HEADER_NAV_CONSUMER_ID, CONSUMER)
                 .header(HttpHeaders.AUTHORIZATION, "Bearer " + token)
                 .header(UserConstant.USER_HEADER_JWT, getUserJwt())

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/krrstub/command/KontaktdataPostCommand.java

@@ -47,5 +47,5 @@ public class Consumers {
     private ServerProperties testnavSkattekortService;
     private ServerProperties yrkesskadeProxy;
     private ServerProperties arbeidssoekerregisteretProxy;
-    private ServerProperties dollySearchService;
+    private ServerProperties brukerService;
 }

apps/dolly-backend/src/main/java/no/nav/dolly/config/Consumers.java

@@ -1,10 +1,9 @@
-package no.nav.dolly.opensearch;
+package no.nav.dolly.consumer.brukerservice;
 
 import lombok.extern.slf4j.Slf4j;
 import no.nav.dolly.config.Consumers;
-import no.nav.dolly.opensearch.command.DollySearchServicePostCommand;
-import no.nav.testnav.libs.data.dollysearchservice.v1.SearchRequest;
-import no.nav.testnav.libs.data.dollysearchservice.v1.SearchResponse;
+import no.nav.dolly.consumer.brukerservice.command.BrukerServiceGetTilgangCommand;
+import no.nav.dolly.consumer.brukerservice.dto.TilgangDTO;
 import no.nav.testnav.libs.securitycore.domain.ServerProperties;
 import no.nav.testnav.libs.standalone.servletsecurity.exchange.TokenExchange;
 import org.springframework.stereotype.Service;
@@ -13,27 +12,28 @@
 
 @Service
 @Slf4j
-public class DollySearchServiceConsumer {
+public class BrukerServiceConsumer {
 
     private final TokenExchange tokenService;
     private final WebClient webClient;
     private final ServerProperties serverProperties;
 
-    public DollySearchServiceConsumer(
+    public BrukerServiceConsumer(
             TokenExchange tokenService,
             Consumers consumers,
             WebClient.Builder webClientBuilder) {
 
         this.tokenService = tokenService;
-        serverProperties = consumers.getDollySearchService();
+        serverProperties = consumers.getBrukerService();
         this.webClient = webClientBuilder
                 .baseUrl(serverProperties.getUrl())
                 .build();
     }
 
-    public Mono<SearchResponse> doPersonSearch(SearchRequest request) {
+    public Mono<TilgangDTO> getKollegaerIOrganisasjon(String brukerId) {
 
         return tokenService.exchange(serverProperties)
-                .flatMap(token -> new DollySearchServicePostCommand(webClient, request, token.getTokenValue()).call());
+                .flatMap(token ->
+                        new BrukerServiceGetTilgangCommand(webClient, brukerId, token.getTokenValue()).call());
     }
 }