fire and forget for slack og ntfy

Author: di0nys1us

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

@@ -38,7 +38,7 @@ internal object Configuration {
         "HTTP_PORT" to "8085",
 
         "NAIS_APP_NAME" to "hm-oebs-listener",
-        "NAIS_CLUSTER_NAME" to "local",
+        "NAIS_CLUSTER_NAME" to Profile.LOCAL.name,
         "NAIS_NAMESPACE" to "teamdigihot",
 
         "OEBSTOKEN" to "token",

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

@@ -24,15 +24,19 @@ object Ntfy {
         }
     }
 
-    fun publish(notification: Notification) = runBlocking(Dispatchers.IO) {
-        val response = client.post(Configuration.ntfyUrl) {
-            contentType(ContentType.Application.Json)
-            setBody(notification)
-        }
-        when (response.status) {
-            HttpStatusCode.OK -> Unit
-            else -> log.warn("Feil ved publisering til ntfy: ${response.body<Map<String, Any?>>()}")
+    fun publish(notification: Notification) = runCatching {
+        runBlocking(Dispatchers.IO) {
+            val response = client.post(Configuration.ntfyUrl) {
+                contentType(ContentType.Application.Json)
+                setBody(notification.copy(tags = notification.tags + setOf(Configuration.profile.name)))
+            }
+            when (response.status) {
+                HttpStatusCode.OK -> Unit
+                else -> log.warn("Feil under publisering til ntfy: ${response.body<Map<String, Any?>>()}")
+            }
         }
+    }.getOrElse {
+        log.warn(it) { "Feil under publisering til ntfy" }
     }
 
     data class Notification(

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

@@ -23,7 +23,7 @@ object Slack {
         }
     }
 
-    fun post(url: String = Configuration.slackHook, text: String, channel: String) =
+    fun post(url: String = Configuration.slackHook, text: String, channel: String) = runCatching {
         runBlocking(Dispatchers.IO) {
             val response = client
                 .post(url) {
@@ -42,4 +42,7 @@ object Slack {
                 else -> log.info(response.body<String>())
             }
         }
+    }.getOrElse {
+        log.warn(it) { "Feil under publisering til Slack" }
+    }
 }

src/test/kotlin/no/nav/hjelpemidler/api/OrdreAPITest.kt

@@ -47,6 +47,30 @@ internal class OrdreAPITest {
         }
     }
 
+    @Test
+    internal fun `sender ut ordrefeilmelding på rapid`() = testApplication {
+        configure()
+        val body = context.jsonMapper.writeValueAsString(
+            Ordrefeilmelding(
+                id = "1",
+                saksnummer = "2",
+                feilmelding = "Feilmelding",
+                system = "HOTSAK",
+                status = "ERROR"
+            )
+        )
+        client.post("/ordrefeilmelding") {
+            bearerAuth("qwer1234")
+            contentType(ContentType.Application.Json)
+            setBody(body)
+        }.apply {
+            status shouldBe HttpStatusCode.OK
+            verify {
+                context.publish("2", match { it.contains(body) })
+            }
+        }
+    }
+
     private fun ApplicationTestBuilder.configure() {
         install(ContentNegotiation) {
             jackson()