Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump the annet-deps group across 1 directory with 11 updates #244

Closed
wants to merge 2 commits into from
Closed

Bump the annet-deps group across 1 directory with 11 updates #244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce76c43
Bump the annet-deps group across 1 directory with 11 updates
dependabot[bot] Mar 19, 2025
96cef8f
ung-sak.openapi.json updated by build pipeline
github-actions[bot] Mar 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,16 +37,16 @@
<maven.deploy.skip>true</maven.deploy.skip>
<felles.version>4.4.16</felles.version>
<swagger.version>2.2.29</swagger.version>
<junit.version>5.12.0</junit.version>
<junit.version>5.12.1</junit.version>
<k9format.version>11.4.2</k9format.version>
<jackson.version>2.18.3</jackson.version>
<asm.version>9.7.1</asm.version>
<kotlin-stdlib.version>2.1.10</kotlin-stdlib.version>
<jandex.version>3.2.7</jandex.version>
<flyway.version>11.3.4</flyway.version>
<flyway.version>11.4.0</flyway.version>
<pdfgen-core.version>1.1.43</pdfgen-core.version>
<confluent.platform.version>7.9.0</confluent.platform.version>
<mockito.version>5.16.0</mockito.version>
<mockito.version>5.16.1</mockito.version>
</properties>

<!-- NB: Unngå å put scope (test, provided) i dependency management. Det
Expand Down Expand Up @@ -165,7 +165,7 @@
<dependency>
<groupId>io.opentelemetry.instrumentation</groupId>
<artifactId>opentelemetry-instrumentation-annotations</artifactId>
<version>2.13.3</version>
<version>2.14.0</version>
</dependency>

<!-- Prosjektets egne biblioteker -->
Expand Down
4 changes: 2 additions & 2 deletions web/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
<name>ung-sak :: Webapp</name>

<properties>
<swagger-ui.version>5.20.0</swagger-ui.version>
<jetty.version>12.0.17</jetty.version>
<swagger-ui.version>5.20.1</swagger-ui.version>
<jetty.version>12.0.18</jetty.version>
<metrics.version>4.2.30</metrics.version>
</properties>

Expand Down
103 changes: 103 additions & 0 deletions web/src/main/resources/openapi-ts-client/ung-sak.openapi.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" : {
Expand Down Expand Up @@ -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" : {
Expand Down Expand Up @@ -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",
Expand Down