Merge branch 'master' into feature/sokos-miljoe

Author: stigus

.github/workflows/all.workflows.yml

@@ -9,10 +9,11 @@ on:
           - "frontend"
       type:
         type: choice
-        description: "Apps or proxies. Used to resolve the working directory together with name, as <type>/<name>."
+        description: "Apps, proxies or synt. Used to resolve the working directory together with name, as <type>/<name>."
         options:
           - "apps"
           - "proxies"
+          - "synt"
       cluster:
         type: choice
         description: "The cluster to deploy to."

.github/workflows/synt.synt-dagpenger.yml

@@ -0,0 +1,21 @@
+name: synt-dagpenger
+
+on:
+  push:
+    paths:
+      - .github/workflows/synt.synt-dagpenger.yml
+      - synt/synt-dagpenger/**
+      - libs/testing/**
+      - libs/texas/**
+      - plugins/**
+
+jobs:
+  workflow:
+    uses: ./.github/workflows/common.workflow.backend.yml
+    with:
+      working-directory: "synt/synt-dagpenger"
+      deploy-tag: "#deploy-synt-dagpenger"
+    permissions:
+      contents: read
+      id-token: write
+    secrets: inherit

apps/dolly-backend/src/main/java/no/nav/dolly/service/BestillingService.java

@@ -8,7 +8,6 @@
 import no.nav.dolly.domain.jpa.BestillingProgress;
 import no.nav.dolly.domain.jpa.Dokument;
 import no.nav.dolly.domain.jpa.Dokument.DokumentType;
-import no.nav.dolly.domain.projection.GruppeBestillingIdent;
 import no.nav.dolly.domain.projection.RsBestillingFragment;
 import no.nav.dolly.domain.resultset.BestilteKriterier;
 import no.nav.dolly.domain.resultset.RsDollyBestilling;
@@ -34,9 +33,7 @@
 import org.springframework.transaction.annotation.Transactional;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
-import tools.jackson.core.JacksonException;
 import tools.jackson.databind.ObjectMapper;
-import tools.jackson.databind.node.ObjectNode;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.Arrays;
@@ -351,7 +348,7 @@ public Mono<Bestilling> createBestillingForGjenopprettFraBestilling(Long bestill
                             .sistOppdatert(now())
                             .miljoer(filterAvailable(isNotBlank(miljoer) ? miljoer : tuple.getT1().getMiljoer(), tuple.getT3()))
                             .opprettetFraId(bestillingId)
-                            .bestKriterier(tuple.getT1().getBestKriterier())
+                            .bestKriterier("{}")
                             .bruker(tuple.getT2())
                             .brukerId(tuple.getT2().getId())
                             .build());
@@ -373,16 +370,12 @@ public Mono<Bestilling> createBestillingForGjenopprettFraIdent(String ident, Lis
                 .flatMap(testident -> Mono.zip(
                         Mono.just(testident),
                         brukerService.fetchOrCreateBruker(),
-                        miljoerConsumer.getMiljoer(),
-                        identRepository.getBestillingerByIdent(ident)
-                                .map(GruppeBestillingIdent::getBestkriterier)
-                                .collectList()
-                                .map(this::mergeBestKriterier)))
+                        miljoerConsumer.getMiljoer()))
                 .map(tuple -> Bestilling.builder()
                         .gruppeId(tuple.getT1().getGruppeId())
                         .ident(ident)
                         .antallIdenter(1)
-                        .bestKriterier(tuple.getT4())
+                        .bestKriterier("{}")
                         .sistOppdatert(now())
                         .miljoer(filterAvailable(miljoer, tuple.getT3()))
                         .gjenopprettetFraIdent(ident)
@@ -407,11 +400,7 @@ public Mono<Bestilling> createBestillingForGjenopprettFraGruppe(Long gruppeId, S
                         brukerService.fetchOrCreateBruker(),
                         identRepository.findByGruppeId(gruppeId, Pageable.unpaged())
                                 .collectList(),
-                        miljoerConsumer.getMiljoer(),
-                        identRepository.getBestillingerFromGruppe(gruppeId)
-                                .map(GruppeBestillingIdent::getBestkriterier)
-                                .collectList()
-                                .map(this::mergeBestKriterier)))
+                        miljoerConsumer.getMiljoer()))
                 .flatMap(tuple -> {
                     if (tuple.getT2().isEmpty()) {
                         return Mono.error(new NotFoundException(format("Ingen testpersoner funnet i gruppe: %d", gruppeId)));
@@ -422,7 +411,7 @@ public Mono<Bestilling> createBestillingForGjenopprettFraGruppe(Long gruppeId, S
                 .map(tuple -> Bestilling.builder()
                         .gruppeId(gruppeId)
                         .antallIdenter(tuple.getT2().size())
-                        .bestKriterier(tuple.getT4())
+                        .bestKriterier("{}")
                         .sistOppdatert(now())
                         .miljoer(filterAvailable(miljoer, tuple.getT3()))
                         .opprettetFraGruppeId(gruppeId)
@@ -698,26 +687,6 @@ private Mono<List<BestillingProgress>> getBestillingProgresser(Bestilling bestil
                 .collectList();
     }
 
-    private String mergeBestKriterier(List<String> kriterierList) {
-
-        var merged = objectMapper.createObjectNode();
-        for (var kriterier : kriterierList) {
-            try {
-                var node = objectMapper.readTree(kriterier);
-                if (node instanceof ObjectNode objectNode) {
-                    objectNode.properties().forEach(entry -> {
-                        if (!merged.has(entry.getKey())) {
-                            merged.set(entry.getKey(), entry.getValue());
-                        }
-                    });
-                }
-            } catch (JacksonException e) {
-                log.warn("Kunne ikke parse bestKriterier: {}", kriterier, e);
-            }
-        }
-        return merged.isEmpty() ? "{}" : merged.toString();
-    }
-
     private static void fixAaregAbstractClassProblem(List<RsAareg> aaregdata) {
 
         aaregdata.forEach(arbeidforhold -> {

apps/dolly-backend/src/main/java/no/nav/dolly/util/JacksonExchangeStrategyUtil.java

@@ -2,7 +2,6 @@
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.experimental.UtilityClass;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.codec.json.JacksonJsonDecoder;
 import org.springframework.http.codec.json.JacksonJsonEncoder;
 import org.springframework.web.reactive.function.client.ExchangeStrategies;
@@ -11,7 +10,8 @@
 import tools.jackson.databind.ObjectMapper;
 import tools.jackson.databind.json.JsonMapper;
 
-@Slf4j
+import static java.util.Objects.nonNull;
+
 @UtilityClass
 public final class JacksonExchangeStrategyUtil {
 
@@ -23,9 +23,8 @@ public static ExchangeStrategies getJacksonStrategy() {
     }
 
     public static ExchangeStrategies getJacksonStrategy(JsonMapper jsonMapper) {
-        log.info("JacksonExchangeStrategyUtil: Bruker JsonMapper: {}", 
-                jsonMapper != null ? jsonMapper.getClass().getName() : "null");
-        var mapper = jsonMapper != null ? jsonMapper : createDefaultJsonMapper();
+
+        var mapper = nonNull(jsonMapper) ? jsonMapper : createDefaultJsonMapper();
         return ExchangeStrategies.builder()
                 .codecs(config -> {
                     config.defaultCodecs().maxInMemorySize(32 * 1024 * 1024);
@@ -36,15 +35,8 @@ public static ExchangeStrategies getJacksonStrategy(JsonMapper jsonMapper) {
     }
 
     public static ExchangeStrategies getJacksonStrategy(ObjectMapper objectMapper) {
-        JsonMapper jsonMapper;
-        if (objectMapper instanceof JsonMapper jm) {
-            jsonMapper = jm;
-            log.info("JacksonExchangeStrategyUtil: Bruker eksisterende JsonMapper: {}", objectMapper.getClass().getName());
-        } else {
-            jsonMapper = createDefaultJsonMapper();
-            log.info("JacksonExchangeStrategyUtil: ObjectMapper er ikke JsonMapper ({}), oppretter ny JsonMapper med standard konfigurasjon", 
-                    objectMapper != null ? objectMapper.getClass().getName() : "null");
-        }
+
+        var jsonMapper = objectMapper instanceof JsonMapper jm ? jm : createDefaultJsonMapper();
         return ExchangeStrategies.builder()
                 .codecs(config -> {
                     config.defaultCodecs().maxInMemorySize(32 * 1024 * 1024);

apps/dolly-frontend/src/main/js/src/pages/loginPage/LoginModal.tsx

@@ -93,7 +93,7 @@ export default () => {
 							false,
 						)}
 					>
-						Logg inn med NAV epost
+						Logg inn med Nav-e-post
 					</NavButton>
 					<NavButton
 						data-testid={TestComponentSelectors.BUTTON_LOGIN_BANKID}

apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/service/BostedAdresseService.java

@@ -126,9 +126,7 @@ private Mono<BostedadresseDTO> handle(BostedadresseDTO bostedadresse, PersonDTO
                             }
                         }
 
-                    } else if (bostedadresse.countAdresser() == 0 &&
-                               person.getOppholdsadresse().isEmpty() &&
-                               person.getKontaktadresse().isEmpty()) {
+                    } else if (bostedadresse.countAdresser() == 0) {
 
                         bostedadresse.setUtenlandskAdresse(new UtenlandskAdresseDTO());
                     }

docs/modules/ROOT/pages/local/local_models.adoc

@@ -0,0 +1,15 @@
+[[lokal_generelt]]
+= Forberede synt-modeller for lokal kjøring
+
+Applikasjoner i synt kan kjøres lokalt, men er avhengig av at ONNX-modellfilene er lastet ned lokalt.
+
+== Last ned onnx-modeller
+
+Buckets finnes i https://console.cloud.google.com/storage/browser?project=dolly-dev-ff83[GCP].
+
+. Sjekk applikasjonens `application-prod.yml` for å finne ut hvilken bucket som brukes. Dette konfigureres med `app.config.bucket`. I `app.config.models` ligger en eller flere prefixer for modellene som brukes.
+
+. Last ned onnx-modellene (`*.onnx`) til `./src/main/resources/models/` for applikasjonen det gjelder, enten manuelt eller vha.
+----
+> gcloud storage cp gs://<app.config.bucket>/*.onnx .
+----

libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/pdlforvalter/v1/PersonDTO.java

@@ -37,7 +37,7 @@ public class PersonDTO implements Serializable {
 
     private String ident;
     private Identtype identtype;
-    private boolean id2032;
+    private Boolean id2032;
     private Boolean standalone;
 
     @JsonIgnore
@@ -347,7 +347,4 @@ public static boolean isId2032(String ident) {
 
         return VALIDS.contains(beregnetRestSifferK1);
     }
-
-    public void getFol() {
-    }
 }

libs/reactive-core/src/main/java/no/nav/testnav/libs/reactivecore/web/WebClientAutoConfiguration.java

@@ -88,7 +88,7 @@ WebClient webClient(ObservationRegistry observationRegistry, ObjectMapper object
                                 .option(EpollChannelOption.TCP_KEEPIDLE, 300)
                                 .option(EpollChannelOption.TCP_KEEPINTVL, 60)
                                 .option(EpollChannelOption.TCP_KEEPCNT, 8)
-                                .responseTimeout(Duration.ofSeconds(10))
+                                .responseTimeout(Duration.ofSeconds(15))
                 ))
                 .build();
 

libs/texas/build.gradle

@@ -18,6 +18,7 @@ dependencies {
     implementation "org.springframework.boot:spring-boot-starter-test"
     implementation "org.springframework.boot:spring-boot-starter-webflux"
     implementation "org.springframework.boot:spring-boot-starter-jackson"
+    implementation "org.springframework.security:spring-security-config"
     implementation "org.springframework.security:spring-security-oauth2-jose"
     implementation "org.springframework.security:spring-security-oauth2-resource-server"
 }