release: 0.7.7 (#83)

devxb · web-flow · commit 340a207603aa · 2024-12-01T00:12:13.000+09:00
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -73,6 +73,7 @@ jobs:
             "INTERNAL_SECRET=${{ secrets.INTERNAL_SECRET }}"
             "SLACK_TOKEN=${{ secrets.SLACK_TOKEN }}"
             "JWT_KEY=${{ secrets.JWT_KEY }}"
+            "TEST_SECRET=${{ secrets.TEST_SECRET }}"
 
   deploy:
     needs: build
diff --git a/Dockerfile b/Dockerfile
@@ -11,6 +11,7 @@ ARG GH_OAUTH_SECRET
 ARG INTERNAL_SECRET
 ARG SLACK_TOKEN
 ARG JWT_KEY
+ARG TEST_SECRET
 
 ARG JAR_FILE=./build/libs/*.jar
 COPY ${JAR_FILE} gitanimals-api.jar
@@ -25,7 +26,8 @@ ENV db_url=${DB_URL} \
   oauth_client_secret_github=${GH_OAUTH_SECRET} \
   internal_secret=${INTERNAL_SECRET} \
   slack_token=${SLACK_TOKEN} \
-  jwt_key=${JWT_KEY}
+  jwt_key=${JWT_KEY} \
+  test_secret=${TEST_SECRET}
 
 ENTRYPOINT java -Djava.net.preferIPv4Stack=true -jar gitanimals-api.jar \
   --spring.datasource.url=${db_url} \
@@ -38,4 +40,5 @@ ENTRYPOINT java -Djava.net.preferIPv4Stack=true -jar gitanimals-api.jar \
   --oauth.client.secret.github=${oauth_client_secret_github} \
   --internal.secret=${internal_secret} \
   --slack.token=${slack_token} \
-  --jwt.key=${jwt_key}
+  --jwt.key=${jwt_key} \
+  --test.secret=${test_secret}
diff --git a/src/main/kotlin/org/gitanimals/auction/app/BuyProductFacade.kt b/src/main/kotlin/org/gitanimals/auction/app/BuyProductFacade.kt
@@ -1,9 +1,11 @@
 package org.gitanimals.auction.app
 
+import org.gitanimals.auction.app.event.InboxInputEvent
 import org.gitanimals.auction.domain.Product
 import org.gitanimals.auction.domain.ProductService
 import org.rooftop.netx.api.Orchestrator
 import org.rooftop.netx.api.OrchestratorFactory
+import org.rooftop.netx.api.SagaManager
 import org.springframework.stereotype.Service
 import java.util.*
 
@@ -12,19 +14,30 @@ class BuyProductFacade(
     private val renderApi: RenderApi,
     private val identityApi: IdentityApi,
     private val productService: ProductService,
+    private val sagaManager: SagaManager,
     orchestratorFactory: OrchestratorFactory,
 ) {
 
     private lateinit var orchestrator: Orchestrator<Long, Product>
 
     fun buyProduct(token: String, productId: Long): Product {
-        return orchestrator.sagaSync(
+        val result = orchestrator.sagaSync(
             productId,
             mapOf(
                 "token" to token,
                 "idempotencyKey" to UUID.randomUUID().toString()
             )
         ).decodeResultOrThrow(Product::class)
+
+        publishSoldOutEvent(result)
+
+        return result
+    }
+
+    private fun publishSoldOutEvent(product: Product) {
+        val user = identityApi.getUserById(product.sellerId)
+
+        sagaManager.startSync(InboxInputEvent.createSoldOutInbox(user.username, product))
     }
 
     init {
diff --git a/src/main/kotlin/org/gitanimals/auction/app/IdentityApi.kt b/src/main/kotlin/org/gitanimals/auction/app/IdentityApi.kt
@@ -4,6 +4,8 @@ interface IdentityApi {
 
     fun getUserByToken(token: String): UserResponse
 
+    fun getUserById(userId: Long): UserResponse
+
     fun decreasePoint(token: String, idempotencyKey: String, point: String)
 
     fun increasePoint(token: String, idempotencyKey: String, point: String)
@@ -12,6 +14,7 @@ interface IdentityApi {
 
     fun decreasePointById(userId: Long, idempotencyKey: String, point: String)
 
+
     data class UserResponse(
         val id: String,
         val username: String,
diff --git a/src/main/kotlin/org/gitanimals/auction/app/event/InboxInputEvent.kt b/src/main/kotlin/org/gitanimals/auction/app/event/InboxInputEvent.kt
@@ -0,0 +1,42 @@
+package org.gitanimals.auction.app.event
+
+import org.gitanimals.auction.domain.Product
+import java.time.Instant
+
+data class InboxInputEvent(
+    val inboxData: InboxData,
+    val publisher: Publisher,
+) {
+
+    data class Publisher(
+        val publisher: String,
+        val publishedAt: Instant,
+    )
+
+    data class InboxData(
+        val userId: Long,
+        val type: String = "INBOX",
+        val title: String,
+        val body: String,
+        val image: String,
+        val redirectTo: String,
+    )
+
+    companion object {
+        fun createSoldOutInbox(sellerName: String, product: Product): InboxInputEvent {
+            return InboxInputEvent(
+                inboxData = InboxData(
+                    userId = product.sellerId,
+                    title = "펫이 판매되었어요",
+                    body = "$sellerName 님의 펫이 ${product.getPrice()}원에 판매되었습니다.",
+                    image = "https://avatars.githubusercontent.com/u/171903401?s=200&v=4",
+                    redirectTo = "NO_REDIRECT",
+                ),
+                publisher = Publisher(
+                    publisher = "AUCTION",
+                    publishedAt = Instant.now(),
+                )
+            )
+        }
+    }
+}
diff --git a/src/main/kotlin/org/gitanimals/auction/infra/RestIdentityApi.kt b/src/main/kotlin/org/gitanimals/auction/infra/RestIdentityApi.kt
@@ -31,11 +31,28 @@ class RestIdentityApi(
             }
     }
 
+    override fun getUserById(userId: Long): IdentityApi.UserResponse {
+        return restClient.get()
+            .uri("/users/$userId")
+            .header(INTERNAL_SECRET_KEY, internalSecret)
+            .exchange { _, response ->
+                runCatching {
+                    response.bodyTo(IdentityApi.UserResponse::class.java)
+                }.getOrElse {
+                    if (response.statusCode.is4xxClientError) {
+                        throw IllegalArgumentException("Cannot find user by id \"$userId\"")
+                    }
+
+                    throw IllegalStateException(it)
+                }
+            }
+    }
+
     override fun decreasePoint(token: String, idempotencyKey: String, point: String) {
         return restClient.post()
             .uri("/internals/users/points/decreases?point=$point&idempotency-key=$idempotencyKey")
             .header(HttpHeaders.AUTHORIZATION, token)
-            .header("Internal-Secret", internalSecret)
+            .header(INTERNAL_SECRET_KEY, internalSecret)
             .exchange { _, response ->
                 if (response.statusCode.is2xxSuccessful) {
                     return@exchange
@@ -50,7 +67,7 @@ class RestIdentityApi(
         return restClient.post()
             .uri("/internals/users/points/increases?point=$point&idempotency-key=$idempotencyKey")
             .header(HttpHeaders.AUTHORIZATION, token)
-            .header("Internal-Secret", internalSecret)
+            .header(INTERNAL_SECRET_KEY, internalSecret)
             .exchange { _, response ->
                 if (response.statusCode.is2xxSuccessful) {
                     return@exchange
@@ -64,7 +81,7 @@ class RestIdentityApi(
     override fun decreasePointById(userId: Long, idempotencyKey: String, point: String) {
         return restClient.post()
             .uri("/internals/users/points/decreases/$userId?point=$point&idempotency-key=$idempotencyKey")
-            .header("Internal-Secret", internalSecret)
+            .header(INTERNAL_SECRET_KEY, internalSecret)
             .exchange { _, response ->
                 if (response.statusCode.is2xxSuccessful) {
                     return@exchange
@@ -78,7 +95,7 @@ class RestIdentityApi(
     override fun increasePointById(userId: Long, idempotencyKey: String, point: String) {
         return restClient.post()
             .uri("/internals/users/points/increases/$userId?point=$point&idempotency-key=$idempotencyKey")
-            .header("Internal-Secret", internalSecret)
+            .header(INTERNAL_SECRET_KEY, internalSecret)
             .exchange { _, response ->
                 if (response.statusCode.is2xxSuccessful) {
                     return@exchange
@@ -88,4 +105,8 @@ class RestIdentityApi(
                 )
             }
     }
+
+    private companion object {
+        private const val INTERNAL_SECRET_KEY = "Internal-Secret"
+    }
 }
diff --git a/src/main/kotlin/org/gitanimals/identity/controller/UserController.kt b/src/main/kotlin/org/gitanimals/identity/controller/UserController.kt
@@ -14,6 +14,7 @@ class UserController(
     private val userService: UserService,
 ) {
 
+    @ResponseStatus(HttpStatus.OK)
     @GetMapping("/users")
     fun getUserByToken(
         @RequestHeader(HttpHeaders.AUTHORIZATION) token: String,
@@ -22,6 +23,15 @@ class UserController(
         return UserResponse.from(user)
     }
 
+    @ResponseStatus(HttpStatus.OK)
+    @GetMapping("/internals/users/{user-id}")
+    fun getUserById(
+        @PathVariable("user-id") userId: Long,
+    ): UserResponse {
+        val user = userService.getUserById(userId)
+        return UserResponse.from(user)
+    }
+
     @ResponseStatus(HttpStatus.OK)
     @PostMapping("/internals/users/points/decreases")
     fun decreaseUserPoints(
diff --git a/src/main/kotlin/org/gitanimals/inbox/controller/InboxTestController.kt b/src/main/kotlin/org/gitanimals/inbox/controller/InboxTestController.kt
@@ -0,0 +1,24 @@
+package org.gitanimals.inbox.controller
+
+import org.gitanimals.inbox.infra.event.InboxInputEvent
+import org.rooftop.netx.api.SagaManager
+import org.springframework.beans.factory.annotation.Value
+import org.springframework.http.HttpStatus
+import org.springframework.web.bind.annotation.*
+
+@RestController
+class InboxTestController(
+    private val sagaManager: SagaManager,
+    @Value("\$test.secret") private val testSecret: String,
+) {
+
+    @PostMapping("test/input-inbox")
+    @ResponseStatus(HttpStatus.OK)
+    fun inputInbox(
+        @RequestHeader("Test-Secret") testSecret: String,
+        @RequestBody inboxInputEvent: InboxInputEvent,
+    ) {
+        require(testSecret == this.testSecret) { "Invalid testSecret" }
+        sagaManager.startSync(inboxInputEvent)
+    }
+}
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
@@ -32,6 +32,7 @@ sentry.dsn=https://d4fd0e848b11f200766d8cd577159b04@o4505051656486912.ingest.us.
 sentry.traces-sample-rate=1.0
 
 internal.secret=
+test.secret=
 
 spring.application.name=api.gitanimals
 management.endpoints.web.exposure.include=prometheus
diff --git a/src/test/kotlin/org/gitanimals/auction/app/BuyProductFacadeTest.kt b/src/test/kotlin/org/gitanimals/auction/app/BuyProductFacadeTest.kt
@@ -58,11 +58,12 @@ internal class BuyProductFacadeTest(
             mockUserServer.enqueue200()
             mockUserServer.enqueue200()
             mockRenderServer.enqueue200()
+            mockUserServer.enqueue200(userResponse)
             it("product 구매에 성공한다.") {
                 val response = buyProductFacade.buyProduct(VALID_TOKEN, product.id)
 
                 eventually(5.seconds) {
-                    sagaCapture.startCountShouldBe(1)
+                    sagaCapture.startCountShouldBe(2)
                     sagaCapture.joinCountShouldBe(3)
                     sagaCapture.commitCountShouldBe(1)
                     sagaCapture.rollbackCountShouldBe(0)
diff --git a/src/test/resources/test.properties b/src/test/resources/test.properties
@@ -18,6 +18,7 @@ spring.jpa.properties.hibernate.highlight_sql = true
 spring.jpa.properties.hibernate.use_sql_comments = true
 
 internal.secret=foo
+test.secret=foo
 jwt.key=adsfbsadhfbsadghfavjshfvgqwehfvagvfhgasdvfghavsfvasghdfcvdsafhgadsgfhvasdhfgasdvfghdasvfas
 
 slack.token=xoxb-???
