From ce76c43fb25416c690227c1fc5ec3a727eca6aa5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 19 Mar 2025 22:27:23 +0000 Subject: [PATCH 1/2] Bump the annet-deps group across 1 directory with 11 updates Bumps the annet-deps group with 11 updates in the / directory: | Package | From | To | | --- | --- | --- | | [io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations](https://github.com/open-telemetry/opentelemetry-java-instrumentation) | `2.13.3` | `2.14.0` | | [org.junit.jupiter:junit-jupiter-params](https://github.com/junit-team/junit5) | `5.12.0` | `5.12.1` | | [org.junit.jupiter:junit-jupiter-api](https://github.com/junit-team/junit5) | `5.12.0` | `5.12.1` | | [org.junit.jupiter:junit-jupiter-engine](https://github.com/junit-team/junit5) | `5.12.0` | `5.12.1` | | [org.junit.jupiter:junit-jupiter-migrationsupport](https://github.com/junit-team/junit5) | `5.12.0` | `5.12.1` | | [org.mockito:mockito-core](https://github.com/mockito/mockito) | `5.16.0` | `5.16.1` | | [org.flywaydb:flyway-core](https://github.com/flyway/flyway) | `11.3.4` | `11.4.0` | | org.flywaydb:flyway-database-postgresql | `11.3.4` | `11.4.0` | | [org.eclipse.jetty:jetty-bom](https://github.com/jetty/jetty.project) | `12.0.17` | `12.0.18` | | [org.eclipse.jetty.ee9:jetty-ee9-bom](https://github.com/jetty/jetty.project) | `12.0.17` | `12.0.18` | | [org.webjars:swagger-ui](https://github.com/swagger-api/swagger-ui) | `5.20.0` | `5.20.1` | Updates `io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations` from 2.13.3 to 2.14.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-java-instrumentation/blob/main/CHANGELOG.md) - [Commits](https://github.com/open-telemetry/opentelemetry-java-instrumentation/compare/v2.13.3...v2.14.0) Updates `org.junit.jupiter:junit-jupiter-params` from 5.12.0 to 5.12.1 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.12.0...r5.12.1) Updates `org.junit.jupiter:junit-jupiter-api` from 5.12.0 to 5.12.1 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.12.0...r5.12.1) Updates `org.junit.jupiter:junit-jupiter-engine` from 5.12.0 to 5.12.1 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.12.0...r5.12.1) Updates `org.junit.jupiter:junit-jupiter-migrationsupport` from 5.12.0 to 5.12.1 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.12.0...r5.12.1) Updates `org.junit.jupiter:junit-jupiter-api` from 5.12.0 to 5.12.1 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.12.0...r5.12.1) Updates `org.junit.jupiter:junit-jupiter-engine` from 5.12.0 to 5.12.1 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.12.0...r5.12.1) Updates `org.mockito:mockito-core` from 5.16.0 to 5.16.1 - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v5.16.0...v5.16.1) Updates `org.flywaydb:flyway-core` from 11.3.4 to 11.4.0 - [Release notes](https://github.com/flyway/flyway/releases) - [Commits](https://github.com/flyway/flyway/compare/flyway-11.3.4...flyway-11.4.0) Updates `org.flywaydb:flyway-database-postgresql` from 11.3.4 to 11.4.0 Updates `org.flywaydb:flyway-database-postgresql` from 11.3.4 to 11.4.0 Updates `org.junit.jupiter:junit-jupiter-migrationsupport` from 5.12.0 to 5.12.1 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.12.0...r5.12.1) Updates `org.eclipse.jetty:jetty-bom` from 12.0.17 to 12.0.18 - [Release notes](https://github.com/jetty/jetty.project/releases) - [Commits](https://github.com/jetty/jetty.project/compare/jetty-12.0.17...jetty-12.0.18) Updates `org.eclipse.jetty.ee9:jetty-ee9-bom` from 12.0.17 to 12.0.18 - [Release notes](https://github.com/jetty/jetty.project/releases) - [Commits](https://github.com/jetty/jetty.project/compare/jetty-12.0.17...jetty-12.0.18) Updates `org.webjars:swagger-ui` from 5.20.0 to 5.20.1 - [Release notes](https://github.com/swagger-api/swagger-ui/releases) - [Changelog](https://github.com/swagger-api/swagger-ui/blob/master/.releaserc) - [Commits](https://github.com/swagger-api/swagger-ui/compare/v5.20.0...v5.20.1) --- updated-dependencies: - dependency-name: io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations dependency-type: direct:production update-type: version-update:semver-minor dependency-group: annet-deps - dependency-name: org.junit.jupiter:junit-jupiter-params dependency-type: direct:production update-type: version-update:semver-patch dependency-group: annet-deps - dependency-name: org.junit.jupiter:junit-jupiter-api dependency-type: direct:production update-type: version-update:semver-patch dependency-group: annet-deps - dependency-name: org.junit.jupiter:junit-jupiter-engine dependency-type: direct:production update-type: version-update:semver-patch dependency-group: annet-deps - dependency-name: org.junit.jupiter:junit-jupiter-migrationsupport dependency-type: direct:development update-type: version-update:semver-patch dependency-group: annet-deps - dependency-name: org.junit.jupiter:junit-jupiter-api dependency-type: direct:production update-type: version-update:semver-patch dependency-group: annet-deps - dependency-name: org.junit.jupiter:junit-jupiter-engine dependency-type: direct:production update-type: version-update:semver-patch dependency-group: annet-deps - dependency-name: org.mockito:mockito-core dependency-type: direct:production update-type: version-update:semver-patch dependency-group: annet-deps - dependency-name: org.flywaydb:flyway-core dependency-type: direct:production update-type: version-update:semver-minor dependency-group: annet-deps - dependency-name: org.flywaydb:flyway-database-postgresql dependency-type: direct:production update-type: version-update:semver-minor dependency-group: annet-deps - dependency-name: org.flywaydb:flyway-database-postgresql dependency-type: direct:production update-type: version-update:semver-minor dependency-group: annet-deps - dependency-name: org.junit.jupiter:junit-jupiter-migrationsupport dependency-type: direct:development update-type: version-update:semver-patch dependency-group: annet-deps - dependency-name: org.eclipse.jetty:jetty-bom dependency-type: direct:production update-type: version-update:semver-patch dependency-group: annet-deps - dependency-name: org.eclipse.jetty.ee9:jetty-ee9-bom dependency-type: direct:production update-type: version-update:semver-patch dependency-group: annet-deps - dependency-name: org.webjars:swagger-ui dependency-type: direct:production update-type: version-update:semver-patch dependency-group: annet-deps ... Signed-off-by: dependabot[bot] --- pom.xml | 8 ++++---- web/pom.xml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 68def2081b..7cb8ad276a 100644 --- a/pom.xml +++ b/pom.xml @@ -37,16 +37,16 @@ true 4.4.16 2.2.29 - 5.12.0 + 5.12.1 11.4.2 2.18.3 9.7.1 2.1.10 3.2.7 - 11.3.4 + 11.4.0 1.1.43 7.9.0 - 5.16.0 + 5.16.1 diff --git a/web/pom.xml b/web/pom.xml index b3a241a42e..8061d449e2 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -14,8 +14,8 @@ ung-sak :: Webapp - 5.20.0 - 12.0.17 + 5.20.1 + 12.0.18 4.2.30 From 96cef8f7337808e8ab592375f092c2604c62d70b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 19 Mar 2025 22:33:21 +0000 Subject: [PATCH 2/2] ung-sak.openapi.json updated by build pipeline skip-checks:true --- .../openapi-ts-client/ung-sak.openapi.json | 103 ++++++++++++++++++ 1 file changed, 103 insertions(+) diff --git a/web/src/main/resources/openapi-ts-client/ung-sak.openapi.json b/web/src/main/resources/openapi-ts-client/ung-sak.openapi.json index 693691af05..437725391a 100644 --- a/web/src/main/resources/openapi-ts-client/ung-sak.openapi.json +++ b/web/src/main/resources/openapi-ts-client/ung-sak.openapi.json @@ -2679,6 +2679,55 @@ "type" : "string", "x-enum-varnames" : [ "K9_VILKÅRET", "MEDLEMSKAPSVILKÅRET", "OMSORGEN_FOR", "ALDERSVILKÅR", "ALDERSVILKÅR_BARN", "MEDISINSKEVILKÅR_UNDER_18_ÅR", "MEDISINSKEVILKÅR_18_ÅR", "SØKNADSFRIST", "SØKERSOPPLYSNINGSPLIKT", "OPPTJENINGSPERIODEVILKÅR", "OPPTJENINGSVILKÅRET", "BEREGNINGSGRUNNLAGVILKÅR", "I_LIVETS_SLUTTFASE", "NØDVENDIG_OPPLÆRING", "GODKJENT_OPPLÆRINGSINSTITUSJON", "GJENNOMGÅ_OPPLÆRING", "LANGVARIG_SYKDOM", "UTVIDETRETT", "UNGDOMSPROGRAMVILKÅRET", "UDEFINERT" ] }, + "KontrollerInntektDto" : { + "properties" : { + "kontrollperioder" : { + "items" : { + "$ref" : "#/components/schemas/KontrollerInntektPeriodeDto" + }, + "type" : "array" + } + }, + "type" : "object" + }, + "KontrollerInntektPeriodeDto" : { + "properties" : { + "erTilVurdering" : { + "type" : "boolean" + }, + "fastsattArbeidsinntekt" : { + "format" : "int32", + "type" : "integer" + }, + "fastsattYtelse" : { + "format" : "int32", + "type" : "integer" + }, + "periode" : { + "$ref" : "#/components/schemas/Periode" + }, + "rapporterteInntekter" : { + "$ref" : "#/components/schemas/RapporterteInntekterDto" + }, + "status" : { + "$ref" : "#/components/schemas/KontrollerInntektPeriodeDtoStatus" + }, + "valg" : { + "$ref" : "#/components/schemas/KontrollerInntektPeriodeDtoValg" + } + }, + "type" : "object" + }, + "KontrollerInntektPeriodeDtoStatus" : { + "enum" : [ "AVVIK", "INGEN_AVVIK" ], + "type" : "string", + "x-enum-varnames" : [ "AVVIK", "INGEN_AVVIK" ] + }, + "KontrollerInntektPeriodeDtoValg" : { + "enum" : [ "BRUK_BRUKERS_INNTEKT", "BRUK_REGISTER_INNTEKT", "MANUELT_FASTSATT" ], + "type" : "string", + "x-enum-varnames" : [ "BRUK_BRUKERS_INNTEKT", "BRUK_REGISTER_INNTEKT", "MANUELT_FASTSATT" ] + }, "KravDokumentMedSøktePerioder" : { "properties" : { "innsendingsTidspunkt" : { @@ -3626,6 +3675,30 @@ "required" : [ "saksnummere" ], "type" : "object" }, + "RapportertInntektDto" : { + "properties" : { + "arbeidsinntekt" : { + "format" : "int32", + "type" : "integer" + }, + "ytelse" : { + "format" : "int32", + "type" : "integer" + } + }, + "type" : "object" + }, + "RapporterteInntekterDto" : { + "properties" : { + "bruker" : { + "$ref" : "#/components/schemas/RapportertInntektDto" + }, + "register" : { + "$ref" : "#/components/schemas/RapportertInntektDto" + } + }, + "type" : "object" + }, "ReferanseDto" : { "properties" : { "referanse" : { @@ -5137,6 +5210,36 @@ "tags" : [ "beregningsresultat" ] } }, + "/api/behandling/kontrollerinntekt" : { + "get" : { + "description" : "Henter perioder for kontroll av inntekt", + "operationId" : "hentKontrollerInntekt", + "parameters" : [ { + "description" : "behandlingUUID", + "in" : "query", + "name" : "behandlingUuid", + "required" : true, + "schema" : { + "format" : "uuid", + "type" : "string" + } + } ], + "responses" : { + "default" : { + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/KontrollerInntektDto" + } + } + }, + "description" : "default response" + } + }, + "summary" : "Henter perioder for kontroll av inntekt", + "tags" : [ "kontroll" ] + } + }, "/api/behandling/perioder" : { "get" : { "description" : "Hent perioder til behandling og kilden til disse",