-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/master' into tilgangsstyring_roller
- Loading branch information
Showing
8 changed files
with
1,105 additions
and
28 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
39 changes: 39 additions & 0 deletions
39
src/main/kotlin/no/nav/arbeidsgiver/min_side/varslingstatus/VarslingStatusController.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| package no.nav.arbeidsgiver.min_side.varslingstatus | ||
|
|
||
| import no.nav.arbeidsgiver.min_side.controller.AuthenticatedUserHolder | ||
| import no.nav.arbeidsgiver.min_side.services.altinn.AltinnService | ||
| import no.nav.arbeidsgiver.min_side.varslingstatus.VarslingStatusDto.Status | ||
| import org.springframework.web.bind.annotation.PostMapping | ||
| import org.springframework.web.bind.annotation.RequestBody | ||
| import org.springframework.web.bind.annotation.RestController | ||
| import java.time.Instant | ||
| import java.time.LocalDateTime | ||
|
|
||
| @RestController | ||
| class VarslingStatusController( | ||
| private val authenticatedUserHolder: AuthenticatedUserHolder, | ||
| private val altinnService: AltinnService, | ||
| private val repository: VarslingStatusRepository, | ||
| ) { | ||
|
|
||
| @PostMapping("/api/varslingStatus/v1") | ||
| fun getVarslingStatus(@RequestBody requestBody: VarslingStatusRequest): VarslingStatus { | ||
| val virksomhetsnummer = requestBody.virksomhetsnummer | ||
| val harTilgang = altinnService.hentOrganisasjoner(authenticatedUserHolder.fnr) | ||
| .any { it.organizationNumber == virksomhetsnummer } | ||
|
|
||
| if (!harTilgang) { | ||
| return VarslingStatus( | ||
| status = Status.OK, | ||
| varselTimestamp = LocalDateTime.now(), | ||
| kvittertEventTimestamp = Instant.now(), | ||
| ) | ||
| } | ||
|
|
||
| return repository.varslingStatus(virksomhetsnummer = virksomhetsnummer) | ||
| } | ||
|
|
||
| data class VarslingStatusRequest( | ||
| val virksomhetsnummer: String, | ||
| ) | ||
| } |
109 changes: 109 additions & 0 deletions
109
src/main/kotlin/no/nav/arbeidsgiver/min_side/varslingstatus/VarslingStatusRepository.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,109 @@ | ||
| package no.nav.arbeidsgiver.min_side.varslingstatus | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonCreator | ||
| import com.fasterxml.jackson.annotation.JsonIgnoreProperties | ||
| import com.fasterxml.jackson.annotation.JsonProperty | ||
| import com.fasterxml.jackson.databind.ObjectMapper | ||
| import no.nav.arbeidsgiver.min_side.varslingstatus.VarslingStatusDto.Status | ||
| import org.apache.kafka.clients.consumer.ConsumerRecord | ||
| import org.springframework.context.annotation.Profile | ||
| import org.springframework.jdbc.core.JdbcTemplate | ||
| import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate | ||
| import org.springframework.kafka.annotation.KafkaListener | ||
| import org.springframework.stereotype.Repository | ||
| import org.springframework.stereotype.Service | ||
| import java.sql.PreparedStatement | ||
| import java.time.Instant | ||
| import java.time.LocalDateTime | ||
|
|
||
| data class VarslingStatus( | ||
| val status: Status, | ||
| val varselTimestamp: LocalDateTime, | ||
| val kvittertEventTimestamp: Instant, | ||
| ) | ||
|
|
||
| @Repository | ||
| class VarslingStatusRepository( | ||
| private val jdbcTemplate: JdbcTemplate, | ||
| private val namedParameterJdbcTemplate: NamedParameterJdbcTemplate, | ||
| ) { | ||
| fun varslingStatus(virksomhetsnummer: String): VarslingStatus { | ||
| return namedParameterJdbcTemplate.queryForList( | ||
| """ | ||
| select status, varslet_tidspunkt, status_tidspunkt | ||
| from varsling_status | ||
| where virksomhetsnummer = :virksomhetsnummer | ||
| order by status_tidspunkt desc | ||
| """.trimIndent(), | ||
| mapOf("virksomhetsnummer" to virksomhetsnummer) | ||
| ).firstOrNull()?.let { | ||
| VarslingStatus( | ||
| status = Status.valueOf(it["status"] as String), | ||
| varselTimestamp = LocalDateTime.parse(it["varslet_tidspunkt"] as String), | ||
| kvittertEventTimestamp = Instant.parse(it["status_tidspunkt"] as String), | ||
| ) | ||
| } ?: VarslingStatus( | ||
| status = Status.OK, | ||
| varselTimestamp = LocalDateTime.now(), | ||
| kvittertEventTimestamp = Instant.now(), | ||
| ) | ||
| } | ||
|
|
||
| fun processVarslingStatus(varslingStatus: VarslingStatusDto) { | ||
| jdbcTemplate.update( | ||
| """ | ||
| insert into varsling_status( | ||
| varsel_id, virksomhetsnummer, status, status_tidspunkt, varslet_tidspunkt | ||
| ) values(?, ?, ?, ?, ?) | ||
| on conflict (varsel_id) | ||
| -- upserter bare for sikkerhetsskyld, vil antakelig ikke skje | ||
| do update set | ||
| status = EXCLUDED.status, | ||
| status_tidspunkt = EXCLUDED.status_tidspunkt, | ||
| varslet_tidspunkt = EXCLUDED.varslet_tidspunkt; | ||
| """.trimIndent() | ||
| ) { ps: PreparedStatement -> | ||
| ps.setString(1, varslingStatus.varselId) | ||
| ps.setString(2, varslingStatus.virksomhetsnummer) | ||
| ps.setString(3, varslingStatus.status.toString()) | ||
| ps.setString(4, varslingStatus.eventTimestamp.toString()) | ||
| ps.setString(5, varslingStatus.varselTimestamp.toString()) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @Profile("dev-gcp", "prod-gcp") | ||
| @Service | ||
| class VarslingStatusKafkaListener( | ||
| private val varslingStatusRepository: VarslingStatusRepository, | ||
| private val objectMapper: ObjectMapper, | ||
| ) { | ||
| @Profile("dev-gcp", "prod-gcp") | ||
| @KafkaListener( | ||
| id = "min-side-arbeidsgiver-varsling-status-1", | ||
| topics = ["fager.ekstern-varsling-status"], | ||
| containerFactory = "errorLoggingKafkaListenerContainerFactory" | ||
| ) | ||
| fun processVarslingStatus(record: ConsumerRecord<String?, String?>) = | ||
| varslingStatusRepository.processVarslingStatus( | ||
| objectMapper.readValue(record.value(), VarslingStatusDto::class.java) | ||
| ) | ||
| } | ||
|
|
||
| @JsonIgnoreProperties(ignoreUnknown = true) | ||
| data class VarslingStatusDto @JsonCreator(mode = JsonCreator.Mode.PROPERTIES) constructor( | ||
| @param:JsonProperty("virksomhetsnummer") val virksomhetsnummer: String, | ||
| @param:JsonProperty("varselId") val varselId: String, | ||
| @param:JsonProperty("varselTimestamp") val varselTimestamp: LocalDateTime, | ||
| @param:JsonProperty("kvittertEventTimestamp") val eventTimestamp: Instant, | ||
| @param:JsonProperty("status") val status: Status, | ||
| @param:JsonProperty("version") val version: String, | ||
| ) { | ||
| enum class Status { | ||
| OK, | ||
| MANGLER_KOFUVI, | ||
| ANNEN_FEIL, | ||
| } | ||
| } | ||
|
|
||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| create table varsling_status | ||
| ( | ||
| varsel_id text not null primary key, | ||
| virksomhetsnummer text not null, | ||
| status text not null, | ||
| status_tidspunkt text not null, | ||
| varslet_tidspunkt text not null | ||
| ); | ||
| create index varsling_status_virksomhetsnummer_idx on varsling_status (virksomhetsnummer); | ||
|
|
||
|
|
||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.