Skip to content

Commit 2dec5ee

Browse files
committedMar 11, 2025··
Metode for å flytte periode fram/tilbake x dager
1 parent 1ba51d6 commit 2dec5ee

File tree

3 files changed

+26
-1
lines changed

3 files changed

+26
-1
lines changed
 

‎dbconnect/src/main/kotlin/no/nav/aap/komponenter/type/Periode.kt

+8
Original file line numberDiff line numberDiff line change
@@ -117,4 +117,12 @@ public class Periode(
117117
public fun inntil(other: Periode): Boolean {
118118
return this.tom == other.fom.minusDays(1) || other.tom == this.fom.minusDays(1)
119119
}
120+
121+
/**
122+
* Lag en ny periode som er flyttet [antallDager] dager framover/bakover i tid.
123+
*
124+
*/
125+
public fun flytt(antallDager: Long): Periode {
126+
return Periode(fom.plusDays(antallDager), tom.plusDays(antallDager))
127+
}
120128
}

‎dbconnect/src/test/kotlin/no/nav/aap/komponenter/type/PeriodeTest.kt

+17
Original file line numberDiff line numberDiff line change
@@ -147,4 +147,21 @@ class PeriodeTest {
147147

148148
assertThat(periode.antallDager(MONDAY, TUESDAY, WEDNESDAY, THURSDAY, FRIDAY)).isEqualTo(13)
149149
}
150+
151+
@Test
152+
fun `flytte periode`() {
153+
val periode = Periode(
154+
LocalDate.of(2024, NOVEMBER, 6),
155+
LocalDate.of(2024, NOVEMBER, 22),
156+
)
157+
158+
val res = periode.flytt(1)
159+
160+
assertThat(res).isEqualTo(
161+
Periode(
162+
LocalDate.of(2024, NOVEMBER, 7),
163+
LocalDate.of(2024, NOVEMBER, 23),
164+
)
165+
)
166+
}
150167
}

‎httpklient/src/main/kotlin/no/nav/aap/komponenter/httpklient/httpclient/tokenprovider/tokenx/OnBehalfOfTokenProvider.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public class OnBehalfOfTokenProvider(
2020
tokenProvider = NoTokenTokenProvider(),
2121
)
2222

23-
override fun getToken(scope: String?, currentToken: OidcToken?): OidcToken? {
23+
override fun getToken(scope: String?, currentToken: OidcToken?): OidcToken {
2424
if (scope == null) throw IllegalArgumentException("scope må være definert for tokenx")
2525
if (currentToken == null) throw IllegalArgumentException("token må være tilstede for tokenx")
2626

0 commit comments

Comments
 (0)
Please sign in to comment.