From d824b3b371057998b35e54a8e080f08b04d32737 Mon Sep 17 00:00:00 2001 From: bragejahren <70642183+bragejahren@users.noreply.github.com> Date: Thu, 23 Jan 2025 16:35:01 +0100 Subject: [PATCH] =?UTF-8?q?Reverterer=20til=20=C3=A5=20bruke=20vilk=C3=A5r?= =?UTF-8?q?Resultat=20sin=20tom=20fremfor=20perioden=20sin=20tom=20(#1042)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Relatert til feilen: https://nav-it.slack.com/archives/C01G9BA8JKZ/p1737643929754159 --- .github/workflows/build-and-deploy-krise-rett-i-prod.yml | 4 ++-- .github/workflows/build-and-deploy-preprod-prod.yml | 8 ++++---- .github/workflows/build-and-deploy-preprod.yml | 4 ++-- .github/workflows/build-pr.yml | 6 +++--- .../deploy-eksisterende-image-rett-i-preprod.yml | 2 +- .../workflows/deploy-eksisterende-image-rett-i-prod.yml | 2 +- .github/workflows/manual-deploy-kafka-aiven.yml | 2 +- .../steg/vedtak/vedtaksperiode/VedtaksperiodeService.kt | 2 +- .../vedtak/vedtaksperiode/VedtaksperiodeServiceTest.kt | 2 +- 9 files changed, 16 insertions(+), 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 index 5ba5a0889..0e6fca7df 100644 --- 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 index 0dcbbcf9f..82a432d98 100644 --- 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 index a994b2729..fae6b216b 100644 --- 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 index b04f27eaa..e72eff7ba 100644 --- 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 index 0d7ef5565..5319be0de 100644 --- 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 index 4bd239fe1..3b1abb60c 100644 --- 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 index e4df360e1..163495ada 100644 --- 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/src/main/kotlin/no/nav/familie/ks/sak/kjerne/behandling/steg/vedtak/vedtaksperiode/VedtaksperiodeService.kt b/src/main/kotlin/no/nav/familie/ks/sak/kjerne/behandling/steg/vedtak/vedtaksperiode/VedtaksperiodeService.kt index b5f675db0..2206d4bb5 100644 --- a/src/main/kotlin/no/nav/familie/ks/sak/kjerne/behandling/steg/vedtak/vedtaksperiode/VedtaksperiodeService.kt +++ b/src/main/kotlin/no/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/src/test/enhetstester/kotlin/no/nav/familie/ks/sak/kjerne/behandling/steg/vedtak/vedtaksperiode/VedtaksperiodeServiceTest.kt b/src/test/enhetstester/kotlin/no/nav/familie/ks/sak/kjerne/behandling/steg/vedtak/vedtaksperiode/VedtaksperiodeServiceTest.kt index e7f8fa221..66acb6ef6 100644 --- a/src/test/enhetstester/kotlin/no/nav/familie/ks/sak/kjerne/behandling/steg/vedtak/vedtaksperiode/VedtaksperiodeServiceTest.kt +++ b/src/test/enhetstester/kotlin/no/nav/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) } }