release: 1.4.4 (#154)

Author: devxb

src/main/kotlin/org/gitanimals/notification/app/SlackDeadLetterMessageListener.kt

@@ -34,7 +34,8 @@ class SlackDeadLetterMessageListener(
                 "clicked" to "RELAY",
                 "sourceKey" to "RELAY_DEAD_LETTER",
                 "approveToken" to approveToken,
-                "deadLetterId" to deadLetterEvent.deadLetterId
+                "deadLetterId" to deadLetterEvent.deadLetterId,
+                "nodeName" to deadLetterEvent.nodeName,
             )
 
             notification.notifyWithActions(

src/main/kotlin/org/gitanimals/supports/deadletter/DeadLetterRelayEventListener.kt

@@ -20,6 +20,7 @@ class DeadLetterRelayEventListener(
     private val deadLetterRelay: DeadLetterRelay,
     private val applicationEventPublisher: ApplicationEventPublisher,
     @Value("\${relay.approve.token}") private val approveToken: String,
+    @Value("\${netx.node-name}") private val nodeName: String,
 ) : TraceableMessageListener(redisTemplate, objectMapper) {
 
     private val logger = LoggerFactory.getLogger(this::class.simpleName)
@@ -42,8 +43,9 @@ class DeadLetterRelayEventListener(
 
             val approveToken = payload["approveToken"] as String
             val deadLetterId = payload["deadLetterId"] as String
+            val nodeName = payload["nodeName"] as String
 
-            if (approveToken != this.approveToken) {
+            if (approveToken != this.approveToken || nodeName != this.nodeName) {
                 return
             }
 

src/main/kotlin/org/gitanimals/supports/deadletter/DeadLetterTestController.kt

@@ -0,0 +1,45 @@
+package org.gitanimals.supports.deadletter
+
+import org.gitanimals.core.TraceIdContextOrchestrator
+import org.gitanimals.core.TraceIdContextRollback
+import org.gitanimals.core.filter.MDCFilter.Companion.TRACE_ID
+import org.rooftop.netx.api.OrchestratorFactory
+import org.slf4j.MDC
+import org.springframework.web.bind.annotation.GetMapping
+import org.springframework.web.bind.annotation.RequestParam
+import org.springframework.web.bind.annotation.RestController
+
+@RestController
+class DeadLetterTestController(
+    private val deadLetterEventPublisher: DeadLetterEventPublisher,
+    private val orchestratorFactory: OrchestratorFactory,
+) {
+
+    @GetMapping("/test/dead-letter")
+    fun test(
+        @RequestParam("message") message: String,
+    ) {
+        val orchestrator = orchestratorFactory.create<String>("dead-letter-test")
+            .startWithContext(
+                contextOrchestrate = TraceIdContextOrchestrator { _, it -> it },
+                contextRollback = TraceIdContextRollback { _, it ->
+                    it
+                }
+            )
+            .joinWithContext(
+                contextOrchestrate = TraceIdContextOrchestrator { _, it -> it },
+                contextRollback = TraceIdContextRollback { _, it ->
+                    throw IllegalStateException("add dead letter")
+                }
+            )
+            .commitWithContext(TraceIdContextOrchestrator { _, _ ->
+                throw IllegalStateException("test dead-letter")
+            })
+
+        val result = orchestrator.sagaSync(message, context = mapOf("hello" to "world", "traceId" to MDC.get(TRACE_ID)))
+
+        if (result.isSuccess.not()) {
+            result.throwError()
+        }
+    }
+}