Skip to content

Commit 390078a

Browse files
committed
Ny versjon av sfEndring
1 parent 37970a3 commit 390078a

File tree

1 file changed

+17
-5
lines changed

1 file changed

+17
-5
lines changed

src/main/kotlin/no/nav/hjelpemidler/api/ServiceForespørselAPI.kt

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package no.nav.hjelpemidler.api
22

3+
import com.fasterxml.jackson.annotation.JsonCreator
4+
import com.fasterxml.jackson.annotation.JsonProperty
35
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule
46
import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
57
import io.ktor.application.call
@@ -33,13 +35,12 @@ internal fun Route.serviceforespørselAPI(context: Context) {
3335
val serviceForespørselEndring = call.receive<ServiceForespørselEndring>()
3436
val sfMessage = SfMessage(
3537
eventId = UUID.randomUUID(),
36-
eventName = "hm-EndretSF-oebs",
38+
eventName = "hm-EndretSF-oebs-v2",
3739
opprettet = LocalDateTime.now(),
3840
data = serviceForespørselEndring
3941
)
4042
publiserMelding(context, serviceForespørselEndring, sfMessage)
4143
call.respond(HttpStatusCode.OK)
42-
4344
} catch (e: RapidsAndRiverException) {
4445
call.respond(HttpStatusCode.InternalServerError, "Feil under prosessering")
4546
return@post
@@ -56,14 +57,25 @@ data class ServiceForespørselEndring(
5657
val sfnummer: String,
5758
val saknummer: String,
5859
val ordre: List<ServiceForespørselOrdre>? = null,
59-
val status: String?,
60+
@JsonProperty("status")
61+
val status: SFEndringType,
6062
)
6163

6264
data class ServiceForespørselOrdre(
6365
val ordrenummer: String,
6466
val status: String,
6567
)
6668

69+
enum class SFEndringType(value: String) {
70+
OPPRETTET("opprettet"), LUKKET("Lukket"), TILORDNET("Tilordnet");
71+
72+
companion object {
73+
@JvmStatic
74+
@JsonCreator
75+
fun fromString(value: String) = valueOf(value.uppercase())
76+
}
77+
}
78+
6779
private fun publiserMelding(
6880
context: Context,
6981
serviceForespørselEndring: ServiceForespørselEndring,
@@ -72,8 +84,8 @@ private fun publiserMelding(
7284
try {
7385
logg.info(
7486
"Publiserer oppdatering for SF fra OEBS med id ${serviceForespørselEndring.id}, " +
75-
"sfNummer: ${serviceForespørselEndring.sfnummer}, saknr: ${serviceForespørselEndring.saknummer}" +
76-
"status: ${serviceForespørselEndring.status}, ordre: ${serviceForespørselEndring.ordre}"
87+
"sfNummer: ${serviceForespørselEndring.sfnummer}, saknr: ${serviceForespørselEndring.saknummer}" +
88+
"status: ${serviceForespørselEndring.status}, ordre: ${serviceForespørselEndring.ordre}"
7789
)
7890
context.publish(
7991
serviceForespørselEndring.saknummer,

0 commit comments

Comments
 (0)