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

Feature/teknisk gjeld #306

Merged
merged 3 commits into from
Jan 16, 2024
Merged

Feature/teknisk gjeld #306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e8cb835
Oppdatert versjoner, justert litt på konfig, tatt inn ny avhengighet …
LarsOttoHaugen Jan 15, 2024
5b36e88
Justert innrykksfeil i nais.yaml
LarsOttoHaugen Jan 15, 2024
83a0c3e
Justert litt på konfig
LarsOttoHaugen Jan 16, 2024
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
1 change: 0 additions & 1 deletion .editorconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
ktlint_code_style = intellij_idea
max_line_length = 150
tab_width = 4
ktlint_standard_discouraged-comment-location = disabled

[**/test/**/*.{kt,kts}]
ktlint_standard_max-line-length = disabled
10 changes: 5 additions & 5 deletions .nais/nais.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,12 @@ spec:
cpu: 1000m
memory: 2048Mi
requests:
cpu: 500m
cpu: 100m
memory: 1024Mi
replicas:
cpuThresholdPercentage: 80
max: 4
min: {{ spec.replicas.min }}
replicas:
cpuThresholdPercentage: 80
max: 4
min: {{ spec.replicas.min }}
ingresses:
{{#each ingresses as |url|}}
- {{url}}
Expand Down
36 changes: 11 additions & 25 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,33 +23,19 @@
<build-helper-maven.version>3.2.0</build-helper-maven.version>
<token-support.version>3.2.0</token-support.version>
<!-- dependencies -->
<bidrag-commons.version>20231201131246_f719b2b</bidrag-commons.version>
<bidrag-commons-test.version>1.20230511093912_dc35d81</bidrag-commons-test.version>
<bidrag-transport.version>20240111084215_a364fb8</bidrag-transport.version>
<bidrag-felles.version>2024.0112.100957</bidrag-felles.version>
<bidrag-tilgangskontroll.version>1.10.4</bidrag-tilgangskontroll.version>
<mockito-kotlin.version>5.2.1</mockito-kotlin.version>
<springdoc-openapi-ui.version>2.2.0</springdoc-openapi-ui.version>
<springdoc-openapi-ui.version>2.3.0</springdoc-openapi-ui.version>
<nimbus-jose-jwt.version>9.37.3</nimbus-jose-jwt.version>
<springframework-cloud.version>4.0.4</springframework-cloud.version>
<springframework-cloud.version>4.1.0</springframework-cloud.version>
<com.squareup.okhttp3.version>4.12.0</com.squareup.okhttp3.version>
<aordningen-inntektsinformasjon-v1.version>1.7</aordningen-inntektsinformasjon-v1.version>
<jackson-datatype.version>2.16.1</jackson-datatype.version>
<ktlint.version>1.1.1</ktlint.version>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>2.2</version>
</dependency>
<dependency>
<groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-annotations</artifactId>
<version>2.2.19</version>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<!-- spring -->
<dependency>
Expand Down Expand Up @@ -85,7 +71,7 @@
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
<version>2.16.0</version>
<version>${jackson-datatype.version}</version>
</dependency>

<!-- nav -->
Expand All @@ -96,13 +82,13 @@
</dependency>
<dependency>
<groupId>no.nav.bidrag</groupId>
<artifactId>bidrag-commons</artifactId>
<version>${bidrag-commons.version}</version>
<artifactId>bidrag-commons-felles</artifactId>
<version>${bidrag-felles.version}</version>
</dependency>
<dependency>
<groupId>no.nav.bidrag</groupId>
<artifactId>bidrag-transport</artifactId>
<version>${bidrag-transport.version}</version>
<artifactId>bidrag-transport-felles</artifactId>
<version>${bidrag-felles.version}</version>
</dependency>
<dependency>
<groupId>no.nav.bidrag</groupId>
Expand Down Expand Up @@ -291,7 +277,7 @@
<dependency>
<groupId>com.pinterest.ktlint</groupId>
<artifactId>ktlint-cli</artifactId>
<version>1.1.0</version>
<version>${ktlint.version}</version>
</dependency>
<!-- additional 3rd party ruleset(s) can be specified here -->
</dependencies>
Expand Down
4 changes: 4 additions & 0 deletions src/main/kotlin/no/nav/bidrag/grunnlag/BidragGrunnlagConfig.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import org.springframework.context.annotation.Bean
import org.springframework.context.annotation.Configuration
import org.springframework.context.annotation.Import
import org.springframework.context.annotation.Scope
import org.springframework.http.client.observation.DefaultClientRequestObservationConvention

const val LIVE_PROFILE = "live"

Expand Down Expand Up @@ -68,6 +69,9 @@ class BidragGrunnlagConfig {
return httpHeaderRestTemplate
}

@Bean
fun clientRequestObservationConvention() = DefaultClientRequestObservationConvention()

@Bean
fun familieBaSakConsumer(
@Value("\${FAMILIEBASAK_URL}") url: String,
Expand Down
30 changes: 24 additions & 6 deletions src/test/kotlin/no/nav/bidrag/grunnlag/comparator/PeriodComparatorTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,10 @@ class PeriodComparatorTest {
assertFalse(ainntektPeriodComparator.isEntitiesEqual(newEntities[0], existingEntities[0]))

newEntities =
createPeriodEntities(Period(LocalDate.of(2021, 8, 1), LocalDate.of(2021, 9, 1)), listOf(createAinntektspost(beskrivelse = "Beskrivelse2")))
createPeriodEntities(
Period(LocalDate.of(2021, 8, 1), LocalDate.of(2021, 9, 1)),
listOf(createAinntektspost(beskrivelse = "Beskrivelse2")),
)

assertFalse(ainntektPeriodComparator.isEntitiesEqual(newEntities[0], existingEntities[0]))

Expand All @@ -102,12 +105,18 @@ class PeriodComparatorTest {
assertFalse(ainntektPeriodComparator.isEntitiesEqual(newEntities[0], existingEntities[0]))

newEntities =
createPeriodEntities(Period(LocalDate.of(2021, 8, 1), LocalDate.of(2021, 9, 1)), listOf(createAinntektspost(inntektType = "Inntekttype2")))
createPeriodEntities(
Period(LocalDate.of(2021, 8, 1), LocalDate.of(2021, 9, 1)),
listOf(createAinntektspost(inntektType = "Inntekttype2")),
)

assertFalse(ainntektPeriodComparator.isEntitiesEqual(newEntities[0], existingEntities[0]))

newEntities =
createPeriodEntities(Period(LocalDate.of(2021, 8, 1), LocalDate.of(2021, 9, 1)), listOf(createAinntektspost(opplysningspliktigId = "Opp2")))
createPeriodEntities(
Period(LocalDate.of(2021, 8, 1), LocalDate.of(2021, 9, 1)),
listOf(createAinntektspost(opplysningspliktigId = "Opp2")),
)

assertFalse(ainntektPeriodComparator.isEntitiesEqual(newEntities[0], existingEntities[0]))

Expand All @@ -125,7 +134,10 @@ class PeriodComparatorTest {

assertFalse(ainntektPeriodComparator.isEntitiesEqual(newEntities[0], existingEntities[0]))

newEntities = createPeriodEntities(Period(LocalDate.of(2021, 8, 1), LocalDate.of(2021, 9, 1)), listOf(createAinntektspost(virksomhetId = "Virk2")))
newEntities = createPeriodEntities(
Period(LocalDate.of(2021, 8, 1), LocalDate.of(2021, 9, 1)),
listOf(createAinntektspost(virksomhetId = "Virk2")),
)

assertFalse(ainntektPeriodComparator.isEntitiesEqual(newEntities[0], existingEntities[0]))

Expand All @@ -135,12 +147,18 @@ class PeriodComparatorTest {
assertFalse(ainntektPeriodComparator.isEntitiesEqual(newEntities[0], existingEntities[0]))

newEntities =
createPeriodEntities(Period(LocalDate.of(2021, 8, 1), LocalDate.of(2021, 9, 1)), listOf(createAinntektspost(etterbetalingsperiodeFom = LocalDate.of(2021, 10, 1))))
createPeriodEntities(
Period(LocalDate.of(2021, 8, 1), LocalDate.of(2021, 9, 1)),
listOf(createAinntektspost(etterbetalingsperiodeFom = LocalDate.of(2021, 10, 1))),
)

assertFalse(ainntektPeriodComparator.isEntitiesEqual(newEntities[0], existingEntities[0]))

newEntities =
createPeriodEntities(Period(LocalDate.of(2021, 8, 1), LocalDate.of(2021, 9, 1)), listOf(createAinntektspost(etterbetalingsperiodeTom = LocalDate.of(2021, 10, 1))))
createPeriodEntities(
Period(LocalDate.of(2021, 8, 1), LocalDate.of(2021, 9, 1)),
listOf(createAinntektspost(etterbetalingsperiodeTom = LocalDate.of(2021, 10, 1))),
)

assertFalse(ainntektPeriodComparator.isEntitiesEqual(newEntities[0], existingEntities[0]))
}
Expand Down