From ea64eee86acc2d531d3a5d6ebdfc65aa640f343e Mon Sep 17 00:00:00 2001
From: devxb <dlwnsdud205@naver.com>
Date: Thu, 15 Feb 2024 12:42:50 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20=ED=95=B8=EB=93=A4=EB=9F=AC=EA=B0=80=20?=
 =?UTF-8?q?=EC=97=86=EC=9D=84=EB=95=8C=20=ED=8A=B8=EB=9E=9C=EC=9E=AD?=
 =?UTF-8?q?=EC=85=98=20deleteElastic=EC=9D=B4=20=ED=98=B8=EC=B6=9C?=
 =?UTF-8?q?=EB=90=98=EC=A7=80=20=EC=95=8A=EB=8A=94=20=EB=B2=84=EA=B7=B8?=
 =?UTF-8?q?=EB=A5=BC=20=EC=88=98=EC=A0=95=ED=95=9C=EB=8B=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/rooftop/netx/engine/AbstractTransactionDispatcher.kt  | 4 ++--
 .../rooftop/netx/redis/RedisStreamTransactionDispatcher.kt    | 2 +-
 .../netx/redis/NoAckRedisStreamTransactionDispatcher.kt       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/kotlin/org/rooftop/netx/engine/AbstractTransactionDispatcher.kt b/src/main/kotlin/org/rooftop/netx/engine/AbstractTransactionDispatcher.kt
index 9d5f240..4a2fc0e 100644
--- a/src/main/kotlin/org/rooftop/netx/engine/AbstractTransactionDispatcher.kt
+++ b/src/main/kotlin/org/rooftop/netx/engine/AbstractTransactionDispatcher.kt
@@ -17,6 +17,7 @@ abstract class AbstractTransactionDispatcher {
 
     fun dispatch(transaction: Transaction, messageId: String): Flux<Any> {
         return Mono.just(transaction.state)
+            .doOnNext { deleteElastic(transaction, messageId) }
             .filter { state -> transactionHandlerFunctions.containsKey(state) }
             .flatMapMany { state ->
                 Flux.fromIterable(
@@ -26,7 +27,6 @@ abstract class AbstractTransactionDispatcher {
             }
             .flatMap { (function, instance) ->
                 mapToTransactionEvent(transaction)
-                    .doOnNext { beforeInvokeHook(transaction, messageId) }
                     .flatMap { function.call(instance, it) }
             }
             .doOnComplete {
@@ -84,7 +84,7 @@ abstract class AbstractTransactionDispatcher {
         messageId: String
     ): Mono<Pair<Transaction, String>>
 
-    protected abstract fun beforeInvokeHook(
+    protected abstract fun deleteElastic(
         transaction: Transaction,
         messageId: String
     )
diff --git a/src/main/kotlin/org/rooftop/netx/redis/RedisStreamTransactionDispatcher.kt b/src/main/kotlin/org/rooftop/netx/redis/RedisStreamTransactionDispatcher.kt
index 7ecbce1..69a5948 100644
--- a/src/main/kotlin/org/rooftop/netx/redis/RedisStreamTransactionDispatcher.kt
+++ b/src/main/kotlin/org/rooftop/netx/redis/RedisStreamTransactionDispatcher.kt
@@ -89,7 +89,7 @@ class RedisStreamTransactionDispatcher(
             )
     }
 
-    override fun beforeInvokeHook(
+    override fun deleteElastic(
         transaction: Transaction,
         messageId: String
     ) = redisStreamTransactionRemover.deleteElastic(transaction)
diff --git a/src/test/kotlin/org/rooftop/netx/redis/NoAckRedisStreamTransactionDispatcher.kt b/src/test/kotlin/org/rooftop/netx/redis/NoAckRedisStreamTransactionDispatcher.kt
index a5b504d..e760edb 100644
--- a/src/test/kotlin/org/rooftop/netx/redis/NoAckRedisStreamTransactionDispatcher.kt
+++ b/src/test/kotlin/org/rooftop/netx/redis/NoAckRedisStreamTransactionDispatcher.kt
@@ -77,7 +77,7 @@ class NoAckRedisStreamTransactionDispatcher(
     override fun ack(transaction: Transaction, messageId: String): Mono<Pair<Transaction, String>> =
         Mono.just(transaction to messageId)
 
-    override fun beforeInvokeHook(
+    override fun deleteElastic(
         transaction: Transaction,
         messageId: String
     ) {