Håndtering av exceptions og meldinger fra oebs

Co-authored-by: avoldsund <[email protected]>

Author: Gustav Lillesæter

src/main/kotlin/no/nav/hjelpemidler/Application.kt

@@ -70,26 +70,37 @@ fun main() {
                 } catch (e: Exception) {
                     // Deal with invalid json in request
                     sikkerlogg.info("Parsing incoming json request failed with exception (responding 4xx): $e")
-                    e.printStackTrace()
                     SensuMetrics().feilVedMeldingFraOebs()
                     call.respond(HttpStatusCode.BadRequest, "bad request: json not valid")
                     return@post
                 }
 
-                val uid = UUID.randomUUID()
-                val opprettet = LocalDateTime.now()
+                if (validJson!!.incidentType != "Vedtak Infotrygd") {
+                    log.info("Mottok melding fra oebs av incidentType: ${validJson.incidentType}. Avbryter prosesseringen og returnerer")
+                    call.respond(HttpStatusCode.OK)
+                    return@post
+                }
 
-                // Publish the received json to our rapid
-                rapidApp!!.publish(
-                    UUID.randomUUID().toString(),
-                    "{\"@id\": \"$uid\", \"@event_name\": \"oebs-listener-testevent\", \"@opprettet\": \"$opprettet\", \"fnrBruker\": ${validJson?.accountNumber} \"data\": ${
-                    Klaxon().toJsonString(
-                        validJson
-                    )
-                    }}"
+                val melding = Message(
+                    UUID.randomUUID(),
+                    "hm-ordrelinje",
+                    LocalDateTime.now(),
+                    validJson.accountNumber,
+                    validJson
                 )
 
-                call.respond(HttpStatusCode.OK, "ok")
+                // Publish the received json to our rapid
+                try {
+                    rapidApp!!.publish(validJson.accountNumber, Klaxon().toJsonString(melding))
+                    SensuMetrics().meldingTilRapidSuksess()
+                } catch (e: Exception) {
+                    SensuMetrics().meldingTilRapidFeilet()
+                    sikkerlogg.error("Sending til rapid feilet, exception: $e")
+                    call.respond(HttpStatusCode.InternalServerError, "Feil under prosessering")
+                    return@post
+                }
+
+                call.respond(HttpStatusCode.OK)
             }
         }
     }.build().apply {
@@ -102,6 +113,14 @@ fun main() {
     logg.info("Application ending.")
 }
 
+data class Message(
+    val eventId: UUID,
+    val eventName: String,
+    val opprettet: LocalDateTime,
+    val fnrBruker: String,
+    val data: Statusinfo,
+)
+
 data class Statusinfo(
     val system: String,
     @Json(name = "IncidentNummer")

src/main/kotlin/no/nav/hjelpemidler/metrics/SensuMetrics.kt

@@ -37,11 +37,6 @@ class SensuMetrics {
         registerPoint(OEBS_MELDING_FEIL, mapOf("counter" to 1L), emptyMap())
     }
 
-    fun test() {
-        println("writing to sensu")
-        registerPoint("testing", mapOf("counter" to 1L), emptyMap())
-    }
-
     private fun registerPoint(measurement: String, fields: Map<String, Any>, tags: Map<String, String>) {
         log.info("Posting point to Influx: measurment {} fields {} tags {} ", measurement, fields, tags)
         val point = Point.measurement(measurement)
@@ -51,7 +46,11 @@ class SensuMetrics {
             .fields(fields)
             .build()
 
-        sendEvent(SensuEvent(sensuName, point.lineProtocol()))
+        try {
+            sendEvent(SensuEvent(sensuName, point.lineProtocol()))
+        } catch (e: Exception) {
+            log.error("Feil ved sending til Sensu: eventname: $measurement")
+        }
     }
 
     private fun sendEvent(sensuEvent: SensuEvent) {