Merge branch 'master' into feature/vise-hendelses-id-frontend

stigus · stigus · commit c260d5b86792 · 2026-06-15T11:58:47.000+02:00
diff --git a/.github/workflows/app.dolly-auth-local.yml b/.github/workflows/app.dolly-auth-local.yml
@@ -4,8 +4,8 @@ on:
   push:
     paths:
       - plugins/**
-      - .nais/dolly-auth-local.yaml
-      - .github/workflows/app.dolly-auth-lokal.yml
+      - .nais/dolly-auth-local.yml
+      - .github/workflows/app.dolly-auth-local.yml
 
 jobs:
   deploy:
diff --git a/.github/workflows/app.team-dolly-lokal-app.yml b/.github/workflows/app.team-dolly-lokal-app.yml
diff --git a/.nais/dolly-auth-local.yml b/.nais/dolly-auth-local.yml
@@ -25,6 +25,7 @@ spec:
     application:
       enabled: true
       allowAllUsers: true
+      tenant: nav.no
   env:
     - name: LOCALAUTH_PUBLIC_URL
       value: "https://dolly-auth-local.intern.dev.nav.no"
diff --git a/.nais/dolly-local-auth.yml b/.nais/dolly-local-auth.yml
diff --git a/.nais/localauth.yml b/.nais/localauth.yml
diff --git a/.nais/team-dolly-lokal-app.yml b/.nais/team-dolly-lokal-app.yml
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/inntektstub/domain/Inntektsinformasjon.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/inntektstub/domain/Inntektsinformasjon.java
@@ -8,7 +8,7 @@
 import no.nav.testnav.libs.reactivecore.web.WebClientError;
 import reactor.core.publisher.Flux;
 
-import java.time.LocalDateTime;
+import java.time.OffsetDateTime;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -34,7 +34,7 @@ public class Inntektsinformasjon {
     @EqualsAndHashCode.Exclude
     private List<Forskuddstrekk> forskuddstrekksliste;
 
-    private LocalDateTime rapporteringsdato;
+    private OffsetDateTime rapporteringsdato;
 
     private Integer versjon;
 
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/inntektstub/mapper/InntektsinformasjonMappingStrategy.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/inntektstub/mapper/InntektsinformasjonMappingStrategy.java
@@ -13,11 +13,13 @@
 import org.springframework.stereotype.Component;
 
 import java.time.LocalDate;
+import java.time.ZoneOffset;
 import java.time.format.DateTimeFormatter;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
 
 import static java.util.Objects.isNull;
+import static java.util.Objects.nonNull;
 
 @Component
 public class InntektsinformasjonMappingStrategy implements MappingStrategy {
@@ -50,6 +52,10 @@ public void mapAtoB(InntektMultiplierWrapper inntektMultiplierWrapper, Inntektsi
 
                                         inntektsinformasjon1.setAarMaaned(yearMonth.get().format(YEAR_MONTH_FORMAT));
                                         inntektsinformasjon1.setNorskIdent((String) context.getProperty("ident"));
+                                        if (nonNull(inntektsinformasjon.getRapporteringsdato())) {
+                                            inntektsinformasjon1.setRapporteringsdato(
+                                                    inntektsinformasjon.getRapporteringsdato().atOffset(ZoneOffset.UTC));
+                                        }
 
                                         inntektsinformasjonWrapper.getInntektsinformasjon().add(inntektsinformasjon1);
 
@@ -65,7 +71,8 @@ public void mapAtoB(InntektMultiplierWrapper inntektMultiplierWrapper, Inntektsi
                                                         .fradragsliste(mapperFacade.mapAsList(historikk.getFradragsliste(), Fradrag.class))
                                                         .forskuddstrekksliste(mapperFacade.mapAsList(historikk.getForskuddstrekksliste(), Forskuddstrekk.class))
                                                         .versjon(versjon.addAndGet(1))
-                                                        .rapporteringsdato(historikk.getRapporteringsdato())
+                                                        .rapporteringsdato(nonNull(historikk.getRapporteringsdato()) ?
+                                                                historikk.getRapporteringsdato().atOffset(ZoneOffset.UTC) : null)
                                                         .build())
                                         );
 
diff --git a/apps/dolly-frontend/src/main/js/src/components/bestilling/statusListe/BestillingProgresjon/BestillingStatus.tsx b/apps/dolly-frontend/src/main/js/src/components/bestilling/statusListe/BestillingProgresjon/BestillingStatus.tsx
@@ -58,7 +58,7 @@ export const BestillingStatus = ({
 		WARNING_KEYWORDS.some((kw) => melding.toLowerCase().includes(kw))
 
 	const isInfoMessage = (melding: string) =>
-		INFO_KEYWORDS.some((kw) => melding.toLowerCase().includes(kw))
+		INFO_KEYWORDS.some((kw) => melding.toLowerCase().startsWith(kw))
 
 	const getOkIdentsFromStatuser = (statuser: Status[]) => {
 		const okStatus = statuser.find((s) => s?.melding === 'OK')
diff --git a/apps/kodeverk-service/config.yml b/apps/kodeverk-service/config.yml
@@ -19,7 +19,7 @@ spec:
         - application: dolly-frontend
         - application: dolly-frontend-dev
         - application: dolly-idporten
-        - application: team-dolly-lokal-app
+        - application: localauth
         - application: testnav-oversikt-frontend
         - application: testnav-pdl-forvalter
         - application: testnav-pdl-forvalter-dev
diff --git a/apps/oversikt-frontend/src/main/java/no/nav/testnav/apps/oversiktfrontend/OversiktFrontendApplicationStarter.java b/apps/oversikt-frontend/src/main/java/no/nav/testnav/apps/oversiktfrontend/OversiktFrontendApplicationStarter.java
@@ -54,22 +54,25 @@ public RouteLocator customRouteLocator(RouteLocatorBuilder builder) {
                 .build();
     }
 
-    public static void main(String[] args) {
+    static void main(String[] args) {
+
         new SpringApplicationBuilder(OversiktFrontendApplicationStarter.class)
                 .initializers(new NaisEnvironmentApplicationContextInitializer())
                 .run(args);
     }
 
     private GatewayFilter addAuthenticationHeaderFilterFrom(ServerProperties serverProperties) {
+
         return new AddAuthenticationHeaderToRequestGatewayFilterFactory()
-                .apply(exchange -> {
+                .apply(_ -> {
                     return tokenExchange
                             .exchange(serverProperties)
                             .map(AccessToken::getTokenValue);
                 });
     }
 
     private Function<PredicateSpec, Buildable<Route>> createRoute(String segment, String host, GatewayFilter filter) {
+
         return spec -> spec
                 .path("/" + segment + "/**")
                 .filters(filterSpec -> filterSpec
diff --git a/apps/oversikt-frontend/src/main/resources/application-local.yml b/apps/oversikt-frontend/src/main/resources/application-local.yml
@@ -5,6 +5,8 @@ spring:
   config:
     import: "sm@"
 
+TOKEN_X_ISSUER: ${sm@token-x-issuer}
+
 consumers:
   testnorge-profil-api:
     url: https://testnorge-profil-api-dev.intern.dev.nav.no/api
diff --git a/apps/oversikt-frontend/src/main/resources/application.yml b/apps/oversikt-frontend/src/main/resources/application.yml
@@ -1,3 +1,4 @@
+
 spring:
   config:
     import: "classpath:dolly-application.yml"
@@ -6,7 +7,7 @@ spring:
       resourceserver:
         aad:
           issuer-uri: ${AZURE_OPENID_CONFIG_ISSUER}
-          accepted-audience:  ${AZURE_APP_CLIENT_ID}, api:// ${AZURE_APP_CLIENT_ID}
+          accepted-audience: ${AZURE_APP_CLIENT_ID}, api:// ${AZURE_APP_CLIENT_ID}
         tokenx:
           issuer-uri: ${TOKEN_X_ISSUER}
 
