Skip to content

Commit 8d34077

Browse files
committed
Remove obsolete 'regler' functionality
1 parent 2dfcfa8 commit 8d34077

30 files changed

+3
-804
lines changed

Diff for: .nais/deploy-dev.yml

-2
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,6 @@ spec:
128128
value: dev-fss:pensjon-q2:pensjon-pen-q2
129129
- name: PEN_URL
130130
value: https://pensjon-pen-q2.dev-fss-pub.nais.io
131-
- name: PENSJON_REGLER_URL
132-
value: https://pensjon-selvbetjening-fss-gateway.dev-fss-pub.nais.io
133131
- name: PENSJON_REPRESENTASJON_SERVICE_ID
134132
value: dev-fss:pensjon-person:pensjon-representasjon-q2
135133
- name: PENSJON_REPRESENTASJON_URL

Diff for: .nais/deploy-prod.yml

-2
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,6 @@ spec:
9898
value: prod-fss:pensjondeployer:pensjon-pen
9999
- name: PEN_URL
100100
value: https://pensjon-pen.prod-fss-pub.nais.io
101-
- name: PENSJON_REGLER_URL
102-
value: https://pensjon-selvbetjening-fss-gateway.prod-fss-pub.nais.io
103101
- name: PENSJON_REPRESENTASJON_SERVICE_ID
104102
value: prod-fss:pensjon-person:pensjon-representasjon
105103
- name: PENSJON_REPRESENTASJON_URL

Diff for: src/main/kotlin/no/nav/pensjon/kalkulator/KalkulatorController.kt

-16
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,17 @@
11
package no.nav.pensjon.kalkulator
22

33
import io.swagger.v3.oas.annotations.Operation
4-
import no.nav.pensjon.kalkulator.grunnbeloep.Grunnbeloep
5-
import no.nav.pensjon.kalkulator.grunnbeloep.client.GrunnbeloepClient
6-
import no.nav.pensjon.kalkulator.grunnbeloep.client.GrunnbeloepSpec
74
import no.nav.pensjon.kalkulator.tech.security.egress.maskinporten.dev.SimulatorDevClient
85
import no.nav.pensjon.kalkulator.tech.security.egress.maskinporten.dev.TmuResult
96
import org.springframework.web.bind.annotation.GetMapping
107
import org.springframework.web.bind.annotation.RequestMapping
118
import org.springframework.web.bind.annotation.RestController
12-
import java.time.LocalDate
139

1410
@RestController
1511
@RequestMapping("api")
1612
class KalkulatorController(
17-
private val grunnbeloepClient: GrunnbeloepClient,
1813
private val simulatorClient: SimulatorDevClient
1914
) {
20-
@GetMapping("grunnbeloep")
21-
@Operation(
22-
summary = "Hent grunnbeløp",
23-
description = "Hent grunnbeløpet i folketrygden (G) for nåværende tidspunkt"
24-
)
25-
fun getGrunnbeloep(): Grunnbeloep {
26-
val now = LocalDate.now()
27-
val spec = GrunnbeloepSpec(now, now)
28-
return grunnbeloepClient.getGrunnbeloep(spec)
29-
}
30-
3115
@GetMapping("simulator-status-test")
3216
@Operation(
3317
summary = "Simulator status-test"

Diff for: src/main/kotlin/no/nav/pensjon/kalkulator/grunnbeloep/Grunnbeloep.kt

-3
This file was deleted.

Diff for: src/main/kotlin/no/nav/pensjon/kalkulator/grunnbeloep/client/GrunnbeloepClient.kt

-8
This file was deleted.

Diff for: src/main/kotlin/no/nav/pensjon/kalkulator/grunnbeloep/client/GrunnbeloepSpec.kt

-8
This file was deleted.

Diff for: src/main/kotlin/no/nav/pensjon/kalkulator/grunnbeloep/client/regler/PensjonReglerGrunnbeloepClient.kt

-38
This file was deleted.

Diff for: src/main/kotlin/no/nav/pensjon/kalkulator/grunnbeloep/client/regler/dto/GrunnbeloepRequestDto.kt

-8
This file was deleted.

Diff for: src/main/kotlin/no/nav/pensjon/kalkulator/grunnbeloep/client/regler/dto/GrunnbeloepResponseDto.kt

-8
This file was deleted.

Diff for: src/main/kotlin/no/nav/pensjon/kalkulator/grunnbeloep/client/regler/dto/SatsResponse.kt

-3
This file was deleted.

Diff for: src/main/kotlin/no/nav/pensjon/kalkulator/grunnbeloep/client/regler/dto/SatsResultat.kt

-5
This file was deleted.

Diff for: src/main/kotlin/no/nav/pensjon/kalkulator/grunnbeloep/client/regler/map/GrunnbeloepMapper.kt

-23
This file was deleted.

Diff for: src/main/kotlin/no/nav/pensjon/kalkulator/opptjening/client/OpptjeningClient.kt

-7
This file was deleted.

Diff for: src/main/kotlin/no/nav/pensjon/kalkulator/opptjening/client/regler/PensjonReglerOpptjeningClient.kt

-38
This file was deleted.

Diff for: src/main/kotlin/no/nav/pensjon/kalkulator/opptjening/client/regler/dto/OpptjeningRequestDto.kt

-22
This file was deleted.

Diff for: src/main/kotlin/no/nav/pensjon/kalkulator/opptjening/client/regler/dto/OpptjeningResponseDto.kt

-20
This file was deleted.

Diff for: src/main/kotlin/no/nav/pensjon/kalkulator/opptjening/client/regler/map/OpptjeningMapper.kt

-34
This file was deleted.

Diff for: src/main/kotlin/no/nav/pensjon/kalkulator/regler/LocalDateDeserializer.kt

-21
This file was deleted.

0 commit comments

Comments
 (0)