release: 1.3.3 (#265)

Author: devxb

src/main/kotlin/org/gitanimals/core/OrchestratorExtension.kt

@@ -0,0 +1,50 @@
+package org.gitanimals.core
+
+import org.gitanimals.core.filter.MDCFilter.Companion.TRACE_ID
+import org.rooftop.netx.api.Context
+import org.rooftop.netx.api.ContextOrchestrate
+import org.rooftop.netx.api.ContextRollback
+import org.slf4j.LoggerFactory
+import org.slf4j.MDC
+
+open class TraceIdContextOrchestrator<T : Any, V : Any>(
+    private val orchestrate: ContextOrchestrate<T, V>,
+) : ContextOrchestrate<T, V> {
+
+    override fun orchestrate(context: Context, request: T): V {
+        MDC.put(TRACE_ID, context.decodeContext(TRACE_ID, String::class))
+        return runCatching {
+            orchestrate.orchestrate(context, request)
+        }.getOrElse {
+            logger.warn("Orchestrating fail, rollback start. request: \"$request\"", it)
+            throw it
+        }.also {
+            MDC.remove(TRACE_ID)
+        }
+    }
+
+    private companion object {
+        private val logger = LoggerFactory.getLogger(this::class.simpleName)
+    }
+}
+
+open class TraceIdContextRollback<T : Any, V : Any?>(
+    private val rollback: ContextRollback<T, V>,
+) : ContextRollback<T, V> {
+
+    override fun rollback(context: Context, request: T): V {
+        MDC.put(TRACE_ID, context.decodeContext(TRACE_ID, String::class))
+        return runCatching {
+            rollback.rollback(context, request)
+        }.getOrElse {
+            logger.error("Rollback fail need to fix. request: \"$request\"", it)
+            throw it
+        }.also {
+            MDC.remove(TRACE_ID)
+        }
+    }
+
+    private companion object {
+        private val logger = LoggerFactory.getLogger(this::class.simpleName)
+    }
+}

src/main/kotlin/org/gitanimals/guild/app/CreateGuildFacade.kt

@@ -1,5 +1,7 @@
 package org.gitanimals.guild.app
 
+import org.gitanimals.core.TraceIdContextOrchestrator
+import org.gitanimals.core.TraceIdContextRollback
 import org.gitanimals.core.filter.MDCFilter.Companion.TRACE_ID
 import org.gitanimals.guild.app.request.CreateGuildRequest
 import org.gitanimals.guild.app.response.GuildResponse
@@ -51,8 +53,7 @@ class CreateGuildFacade(
         createGuildOrchestrator =
             orchestratorFactory.create<CreateGuildRequest>("Create guild orchestrator")
                 .startWithContext(
-                    contextOrchestrate = { context, createGuildRequest ->
-                        MDC.put(TRACE_ID, context.decodeContext(TRACE_ID, String::class))
+                    contextOrchestrate = TraceIdContextOrchestrator { context, createGuildRequest ->
                         val token = context.decodeContext("token", String::class)
                         val idempotencyKey = context.decodeContext(IDEMPOTENCY_KEY, String::class)
 
@@ -69,8 +70,7 @@ class CreateGuildFacade(
                         )
                         createGuildRequest
                     },
-                    contextRollback = { context, _ ->
-                        MDC.put(TRACE_ID, context.decodeContext(TRACE_ID, String::class))
+                    contextRollback = TraceIdContextRollback { context, _ ->
                         val token = context.decodeContext("token", String::class)
                         val idempotencyKey = context.decodeContext(IDEMPOTENCY_KEY, String::class)
 
@@ -85,8 +85,7 @@ class CreateGuildFacade(
                     }
                 )
                 .commitWithContext(
-                    contextOrchestrate = { context, createGuildRequest ->
-                        MDC.put(TRACE_ID, context.decodeContext(TRACE_ID, String::class))
+                    contextOrchestrate = TraceIdContextOrchestrator { context, createGuildRequest ->
                         val token = context.decodeContext("token", String::class)
 
                         val leader = identityApi.getUserByToken(token)
@@ -112,7 +111,7 @@ class CreateGuildFacade(
                             createLeaderRequest = createLeaderRequest,
                         )
 
-                        return@commitWithContext GuildResponse.from(guild)
+                        GuildResponse.from(guild)
                     }
                 )
     }