bugfix: log messages sent as slack notifications support parameters

k33hq · Jul 1, 2024 · cd6574f · cd6574f
1 parent 8e2b6b1
commit cd6574f
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 6 deletions.
diff --git a/libs/apps/vault/src/main/kotlin/com/k33/platform/app/vault/VaultService.kt b/libs/apps/vault/src/main/kotlin/com/k33/platform/app/vault/VaultService.kt
@@ -251,7 +251,7 @@ object VaultService {
         )
     }
 
-    private fun List<StripeService.CustomerDetails>.validate(): List<String> = buildList {
+    internal fun List<StripeService.CustomerDetails>.validate(): List<String> = buildList {
         if (this@validate.isEmpty()) {
             add("No stripe users found with this email")
         } else if (this@validate.size > 1) {

diff --git a/libs/apps/vault/src/test/kotlin/com/k33/platform/app/vault/VaultServiceTest.kt b/libs/apps/vault/src/test/kotlin/com/k33/platform/app/vault/VaultServiceTest.kt
@@ -1,6 +1,9 @@
 package com.k33.platform.app.vault
 
+import com.k33.platform.app.vault.VaultService.validate
+import com.k33.platform.app.vault.stripe.StripeService
 import io.kotest.core.spec.style.StringSpec
+import io.kotest.matchers.shouldBe
 import java.time.LocalDate
 
 class VaultServiceTest : StringSpec({
@@ -25,4 +28,9 @@ class VaultServiceTest : StringSpec({
             mode = Mode.FETCH,
         )
     }
+    "validate user's stripe customer details" {
+        StripeService
+            .getCustomerDetails(email = "test@k33.com")
+            .validate() shouldBe emptyList()
+    }
 })
diff --git a/...logging/slack-logging/src/main/kotlin/com/k33/platform/utils/logging/NotifySlackFilter.kt b/...logging/slack-logging/src/main/kotlin/com/k33/platform/utils/logging/NotifySlackFilter.kt
@@ -85,13 +85,13 @@ class NotifySlackFilter : Filter<ILoggingEvent>() {
                     async {
                         SlackClient.sendRichMessage(
                             channel = channel,
-                            altPlainTextMessage = header + " " + event.message,
+                            altPlainTextMessage = header + " " + event.formattedMessage,
                         ) {
                             header {
                                 text(header, emoji = true)
                             }
                             section {
-                                markdownText("```${event.message}```")
+                                markdownText("```${event.formattedMessage}```")
                                 if (mdcMap.isNotEmpty()) {
                                     fields {
                                         mdcMap.forEach { (key, value) ->

diff --git a/...ing/slack-logging/src/test/kotlin/com/k33/platform/utils/logging/NotifySlackFilterTest.kt b/...ing/slack-logging/src/test/kotlin/com/k33/platform/utils/logging/NotifySlackFilterTest.kt
@@ -9,9 +9,9 @@ class NotifySlackFilterTest : StringSpec({
             "userId" to "test-user",
             "env" to "test"
         ) {
-            logger.info(NotifySlack.ALERTS, "This is information message")
-            logger.warn(NotifySlack.ALERTS, "This is warning message")
-            logger.error(NotifySlack.ALERTS, "This is error message")
+            logger.info(NotifySlack.ALERTS, "This is {} message", "information")
+            logger.warn(NotifySlack.ALERTS, "This is {} message", "warning")
+            logger.error(NotifySlack.ALERTS, "This is {} message", "error")
         }
     }
 })
diff --git a/libs/utils/logging/slack-logging/src/test/resources/logback-test.xml b/libs/utils/logging/slack-logging/src/test/resources/logback-test.xml
@@ -0,0 +1,14 @@
+<configuration>
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{YYYY-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
+    </appender>
+    <appender name="NOP" class="ch.qos.logback.core.helpers.NOPAppender">
+        <filter class="com.k33.platform.utils.logging.NotifySlackFilter" />
+    </appender>
+    <root level="INFO">
+        <appender-ref ref="CONSOLE"/>
+        <appender-ref ref="NOP"/>
+    </root>
+</configuration>