Reverterer til å bruke vilkårResultat sin tom fremfor perioden sin tom (

#1042) Relatert til feilen: https://nav-it.slack.com/archives/C01G9BA8JKZ/p1737643929754159
navikt · Jan 23, 2025 · d824b3b · d824b3b
1 parent 132336b
commit d824b3b
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 16 deletions.
diff --git a/.github/workflows/build-and-deploy-krise-rett-i-prod.yml b/.github/workflows/build-and-deploy-krise-rett-i-prod.yml
@@ -6,7 +6,7 @@ env:
 jobs:
   bygg-og-push-til-github:
     name: Bygg app/image, push til github
-    runs-on: ubuntu-latest-8-cores
+    runs-on: ubuntu-latest
     permissions:
       contents: read
       id-token: write
@@ -42,7 +42,7 @@ jobs:
   deploy-til-prod:
     name: Deploy til prod-gcp
     needs: bygg-og-push-til-github
-    runs-on: ubuntu-latest-8-cores
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - uses: nais/deploy/actions/deploy@v2

diff --git a/.github/workflows/build-and-deploy-preprod-prod.yml b/.github/workflows/build-and-deploy-preprod-prod.yml
@@ -7,7 +7,7 @@ on:
 jobs:
   bygg-og-kjor-tester:
     name: Bygg og test
-    runs-on: ubuntu-latest-8-cores
+    runs-on: ubuntu-latest
     permissions:
       contents: read
       id-token: write
@@ -28,7 +28,7 @@ jobs:
 
   bygg-og-push-til-github:
     name: Bygg app/image, push til github
-    runs-on: ubuntu-latest-8-cores
+    runs-on: ubuntu-latest
     permissions:
       contents: read
       id-token: write
@@ -65,7 +65,7 @@ jobs:
   deploy-til-preprod:
     name: Deploy to dev-gcp
     needs: [ bygg-og-kjor-tester, bygg-og-push-til-github ]
-    runs-on: ubuntu-latest-8-cores
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - uses: nais/deploy/actions/deploy@v2
@@ -78,7 +78,7 @@ jobs:
   deploy-til-prod:
     name: Deploy til prod-gcp
     needs: [ bygg-og-kjor-tester, bygg-og-push-til-github ]
-    runs-on: ubuntu-latest-4-cores
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - uses: nais/deploy/actions/deploy@v2

diff --git a/.github/workflows/build-and-deploy-preprod.yml b/.github/workflows/build-and-deploy-preprod.yml
@@ -5,7 +5,7 @@ on:
 jobs:
   bygg-og-push-til-github:
     name: Bygg og push til Github
-    runs-on: ubuntu-latest-8-cores
+    runs-on: ubuntu-latest
     permissions:
       contents: read
       id-token: write
@@ -39,7 +39,7 @@ jobs:
   deploy-til-preprod:
     name: Deploy to dev-gcp
     needs: [ bygg-og-push-til-github]
-    runs-on: ubuntu-latest-4-cores
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - uses: nais/deploy/actions/deploy@v2

diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml
@@ -41,7 +41,7 @@ jobs:
 
   enhetstester:
     name: Enhetstester
-    runs-on: ubuntu-latest-8-cores
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v4
@@ -65,7 +65,7 @@ jobs:
 
   integrasjonstester:
     name: Integrasjonstester
-    runs-on: ubuntu-latest-8-cores
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v4
@@ -90,7 +90,7 @@ jobs:
   sonar:
     if: github.actor != 'dependabot[bot]'
     name: Sonar
-    runs-on: ubuntu-latest-8-cores
+    runs-on: ubuntu-latest
     needs: [ enhetstester, integrasjonstester ]
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/deploy-eksisterende-image-rett-i-preprod.yml b/.github/workflows/deploy-eksisterende-image-rett-i-preprod.yml
@@ -11,7 +11,7 @@ env:
 jobs:
   deploy-to-prod:
     name: Deploy eksisterende image til dev-gcp
-    runs-on: ubuntu-latest-8-cores
+    runs-on: ubuntu-latest
     steps:
       - name: Deploy til prod-gcp
         uses: nais/deploy/actions/deploy@v2

diff --git a/.github/workflows/deploy-eksisterende-image-rett-i-prod.yml b/.github/workflows/deploy-eksisterende-image-rett-i-prod.yml
@@ -11,7 +11,7 @@ env:
 jobs:
   deploy-to-prod:
     name: Deploy eksisterende image til prod-gcp (MÅ KUN BRUKES VED KRISE)
-    runs-on: ubuntu-latest-8-cores
+    runs-on: ubuntu-latest
     steps:
       - name: Deploy til prod-gcp
         uses: nais/deploy/actions/deploy@v2

diff --git a/.github/workflows/manual-deploy-kafka-aiven.yml b/.github/workflows/manual-deploy-kafka-aiven.yml
@@ -5,7 +5,7 @@ on:
 
 jobs:
   deploy:
-    runs-on: ubuntu-latest-8-cores
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout code
         uses: actions/checkout@v4

diff --git a/.../nav/familie/ks/sak/kjerne/behandling/steg/vedtak/vedtaksperiode/VedtaksperiodeService.kt b/.../nav/familie/ks/sak/kjerne/behandling/steg/vedtak/vedtaksperiode/VedtaksperiodeService.kt
@@ -165,7 +165,7 @@ class VedtaksperiodeService(
                         .filterKeys { listeAvVilkårSomAlltidSkalKunneBegrunnes.contains(it) }
                         .values
                         .flatten()
-                        .mapNotNull { it.tom }
+                        .mapNotNull { it.verdi.periodeTom }
                         .maxOrNull()
                 }.maxOfOrNull { it } ?: TIDENES_MORGEN
 

diff --git a/.../familie/ks/sak/kjerne/behandling/steg/vedtak/vedtaksperiode/VedtaksperiodeServiceTest.kt b/.../familie/ks/sak/kjerne/behandling/steg/vedtak/vedtaksperiode/VedtaksperiodeServiceTest.kt
@@ -557,7 +557,7 @@ internal class VedtaksperiodeServiceTest {
         val finnSisteVedtaksperiodeVisningsdatoForBehandling =
             vedtaksperiodeService.finnSisteVedtaksperiodeVisningsdatoForBehandling(200)
 
-        assertThat(finnSisteVedtaksperiodeVisningsdatoForBehandling, Is(LocalDate.of(2027, 12, 31)))
+        assertThat(finnSisteVedtaksperiodeVisningsdatoForBehandling, Is(LocalDate.of(2027, 12, 12)))
 
         verify(exactly = 1) { vilkårsvurderingRepository.finnAktivForBehandling(200) }
     }