Skip to content

Commit 0ba2f7d

Browse files
authored
release: 1.5.9 (#172)
2 parents eca63e3 + 519704f commit 0ba2f7d

File tree

9 files changed

+25
-3
lines changed

9 files changed

+25
-3
lines changed

src/main/kotlin/org/gitanimals/auction/app/BuyProductFacade.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import org.gitanimals.auction.domain.ProductService
77
import org.gitanimals.core.TraceIdContextOrchestrator
88
import org.gitanimals.core.TraceIdContextRollback
99
import org.gitanimals.core.filter.MDCFilter.Companion.TRACE_ID
10+
import org.gitanimals.core.filter.MDCFilter.Companion.USER_ENTRY_POINT
1011
import org.gitanimals.core.filter.MDCFilter.Companion.USER_ID
1112
import org.rooftop.netx.api.Orchestrator
1213
import org.rooftop.netx.api.OrchestratorFactory
@@ -36,6 +37,7 @@ class BuyProductFacade(
3637
"idempotencyKey" to UUID.randomUUID().toString(),
3738
TRACE_ID to MDC.get(TRACE_ID),
3839
USER_ID to MDC.get(USER_ID),
40+
USER_ENTRY_POINT to MDC.get(USER_ENTRY_POINT),
3941
)
4042
).decodeResultOrThrow(Product::class)
4143

src/main/kotlin/org/gitanimals/auction/app/DeleteProductFacade.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import org.gitanimals.auction.domain.ProductService
55
import org.gitanimals.core.TraceIdContextOrchestrator
66
import org.gitanimals.core.TraceIdContextRollback
77
import org.gitanimals.core.filter.MDCFilter.Companion.TRACE_ID
8+
import org.gitanimals.core.filter.MDCFilter.Companion.USER_ENTRY_POINT
89
import org.gitanimals.core.filter.MDCFilter.Companion.USER_ID
910
import org.rooftop.netx.api.Orchestrator
1011
import org.rooftop.netx.api.OrchestratorFactory
@@ -32,6 +33,7 @@ class DeleteProductFacade(
3233
"idempotencyKey" to UUID.randomUUID().toString(),
3334
TRACE_ID to MDC.get(TRACE_ID),
3435
USER_ID to MDC.get(USER_ID),
36+
USER_ENTRY_POINT to MDC.get(USER_ENTRY_POINT)
3537
),
3638
).decodeResultOrThrow(Long::class)
3739
}

src/main/kotlin/org/gitanimals/auction/app/RegisterProductFacade.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import org.gitanimals.auction.domain.request.RegisterProductRequest
66
import org.gitanimals.core.TraceIdContextOrchestrator
77
import org.gitanimals.core.TraceIdContextRollback
88
import org.gitanimals.core.filter.MDCFilter.Companion.TRACE_ID
9+
import org.gitanimals.core.filter.MDCFilter.Companion.USER_ENTRY_POINT
910
import org.gitanimals.core.filter.MDCFilter.Companion.USER_ID
1011
import org.rooftop.netx.api.Orchestrator
1112
import org.rooftop.netx.api.OrchestratorFactory
@@ -45,6 +46,7 @@ class RegisterProductFacade(
4546
"idempotencyKey" to UUID.randomUUID().toString(),
4647
TRACE_ID to MDC.get(TRACE_ID),
4748
USER_ID to MDC.get(USER_ID),
49+
USER_ENTRY_POINT to MDC.get(USER_ENTRY_POINT),
4850
),
4951
).decodeResultOrThrow(Product::class)
5052
}

src/main/kotlin/org/gitanimals/core/auth/InternalAuthRequestInterceptor.kt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,11 @@ class InternalAuthRequestInterceptor(
2424
MDC.get(USER_ID).toLong()
2525
}.getOrNull()
2626

27-
val userEntryPoint = runCatching {
27+
val userEntryPoint: String? = runCatching {
2828
MDC.get(USER_ENTRY_POINT)
29-
}.getOrNull()
29+
}.getOrElse {
30+
internalAuth.findUserEntryPoint()
31+
}
3032

3133
if (userId != null) {
3234
val encrypt = internalAuth.encrypt(userId = userId)
@@ -39,6 +41,9 @@ class InternalAuthRequestInterceptor(
3941
InternalAuth.INTERNAL_AUTH_IV_KEY,
4042
Base64.getEncoder().encodeToString(encrypt.iv),
4143
)
44+
}
45+
46+
if (userEntryPoint != null) {
4247
request.headers.add(
4348
InternalAuth.INTERNAL_ENTRY_POINT_KEY,
4449
userEntryPoint,

src/main/kotlin/org/gitanimals/gotcha/app/GotchaFacadeV3.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package org.gitanimals.gotcha.app
33
import org.gitanimals.core.TraceIdContextOrchestrator
44
import org.gitanimals.core.TraceIdContextRollback
55
import org.gitanimals.core.filter.MDCFilter.Companion.TRACE_ID
6+
import org.gitanimals.core.filter.MDCFilter.Companion.USER_ENTRY_POINT
67
import org.gitanimals.core.filter.MDCFilter.Companion.USER_ID
78
import org.gitanimals.gotcha.app.response.GotchaResponseV3
89
import org.gitanimals.gotcha.domain.DropRateClient
@@ -36,6 +37,7 @@ class GotchaFacadeV3(
3637
"count" to count,
3738
TRACE_ID to MDC.get(TRACE_ID),
3839
USER_ID to MDC.get(USER_ID),
40+
USER_ENTRY_POINT to MDC.get(USER_ENTRY_POINT),
3941
)
4042
).decodeResultOrThrow(object : TypeReference<List<GotchaResponseV3>>() {})
4143
}

src/main/kotlin/org/gitanimals/quiz/app/CreateQuizFacade.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import org.gitanimals.core.TraceIdContextOrchestrator
55
import org.gitanimals.core.TraceIdContextRollback
66
import org.gitanimals.core.auth.InternalAuth
77
import org.gitanimals.core.filter.MDCFilter.Companion.TRACE_ID
8+
import org.gitanimals.core.filter.MDCFilter.Companion.USER_ENTRY_POINT
89
import org.gitanimals.core.filter.MDCFilter.Companion.USER_ID
910
import org.gitanimals.quiz.app.event.NotApprovedQuizCreated
1011
import org.gitanimals.quiz.app.request.CreateQuizRequest
@@ -92,6 +93,7 @@ class CreateQuizFacade(
9293
"idempotencyKey" to IdGenerator.generate(),
9394
TRACE_ID to MDC.get(TRACE_ID),
9495
USER_ID to MDC.get(USER_ID),
96+
USER_ENTRY_POINT to MDC.get(USER_ENTRY_POINT),
9597
),
9698
).decodeResultOrThrow(CreateQuizResponse::class)
9799
}
@@ -151,6 +153,7 @@ class CreateQuizFacade(
151153
const val CREATE_QUIZ_PRICE = 5_000L
152154
private const val CREATE_QUIZ_SIMILARITY_CHECK_MESSAGE =
153155
"Your quiz has been successfully created, but a similar quiz has been found and is under review. The awarded $CREATE_QUIZ_PRICE points may be revoked."
154-
private const val CREATE_QUIZ_SUCCESS_MESSAGE = "Success to create quiz and get $CREATE_QUIZ_PRICE points"
156+
private const val CREATE_QUIZ_SUCCESS_MESSAGE =
157+
"Success to create quiz and get $CREATE_QUIZ_PRICE points"
155158
}
156159
}

src/main/kotlin/org/gitanimals/shop/app/BuyBackgroundFacade.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package org.gitanimals.shop.app
33
import org.gitanimals.core.TraceIdContextOrchestrator
44
import org.gitanimals.core.TraceIdContextRollback
55
import org.gitanimals.core.filter.MDCFilter.Companion.TRACE_ID
6+
import org.gitanimals.core.filter.MDCFilter.Companion.USER_ENTRY_POINT
67
import org.gitanimals.core.filter.MDCFilter.Companion.USER_ID
78
import org.gitanimals.shop.domain.SaleService
89
import org.gitanimals.shop.domain.SaleType
@@ -33,6 +34,7 @@ class BuyBackgroundFacade(
3334
"idempotencyKey" to UUID.randomUUID().toString(),
3435
TRACE_ID to MDC.get(TRACE_ID),
3536
USER_ID to MDC.get(USER_ID),
37+
USER_ENTRY_POINT to MDC.get(USER_ENTRY_POINT),
3638
)
3739
).decodeResultOrThrow(Unit::class)
3840
}

src/main/kotlin/org/gitanimals/shop/app/BuyCollaborationPersonaFacade.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package org.gitanimals.shop.app
33
import org.gitanimals.core.TraceIdContextOrchestrator
44
import org.gitanimals.core.TraceIdContextRollback
55
import org.gitanimals.core.filter.MDCFilter.Companion.TRACE_ID
6+
import org.gitanimals.core.filter.MDCFilter.Companion.USER_ENTRY_POINT
67
import org.gitanimals.core.filter.MDCFilter.Companion.USER_ID
78
import org.gitanimals.shop.app.request.BuyCollaborationPersonaRequest
89
import org.gitanimals.shop.domain.CollaborationPersonaService
@@ -32,6 +33,7 @@ class BuyCollaborationPersonaFacade(
3233
"idempotencyKey" to UUID.randomUUID().toString(),
3334
USER_ID to MDC.get(USER_ID),
3435
TRACE_ID to MDC.get(TRACE_ID),
36+
USER_ENTRY_POINT to MDC.get(USER_ENTRY_POINT),
3537
)
3638
)
3739

src/main/kotlin/org/gitanimals/shop/app/DropPersonaFacade.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package org.gitanimals.shop.app
33
import org.gitanimals.core.TraceIdContextOrchestrator
44
import org.gitanimals.core.TraceIdContextRollback
55
import org.gitanimals.core.filter.MDCFilter.Companion.TRACE_ID
6+
import org.gitanimals.core.filter.MDCFilter.Companion.USER_ENTRY_POINT
67
import org.gitanimals.core.filter.MDCFilter.Companion.USER_ID
78
import org.gitanimals.shop.domain.DropPersona
89
import org.gitanimals.shop.domain.DropPersonaService
@@ -88,6 +89,7 @@ class DropPersonaFacade(
8889
"idempotencyKey" to UUID.randomUUID().toString(),
8990
TRACE_ID to MDC.get(TRACE_ID),
9091
USER_ID to MDC.get(USER_ID),
92+
USER_ENTRY_POINT to MDC.get(USER_ENTRY_POINT),
9193
)
9294
).decodeResultOrThrow(DropPersona::class)
9395
}

0 commit comments

Comments
 (0)