release: 1.5.2 (#296)

Author: devxb

src/main/kotlin/org/gitanimals/rank/app/GivePointToGuildFacade.kt

@@ -51,7 +51,7 @@ class GivePointToGuildFacade(
 
     private fun givePointToLeader(guild: GuildApi.GuildResponse, point: Int) {
         runCatching {
-            identityApi.increaseUserPointsByUserId(
+            identityApi.increaseUserPointsByUsername(
                 username = guild.leader.name,
                 point = point,
                 idempotencyKey = IdGenerator.generate().toString(),
@@ -64,7 +64,7 @@ class GivePointToGuildFacade(
     private fun givePointToMembers(guild: GuildApi.GuildResponse, point: Int) {
         guild.members.forEach { member ->
             runCatching {
-                identityApi.increaseUserPointsByUserId(
+                identityApi.increaseUserPointsByUsername(
                     member.name,
                     point = point,
                     idempotencyKey = IdGenerator.generate().toString(),

src/main/kotlin/org/gitanimals/rank/app/GivePointToUsersFacade.kt

@@ -36,7 +36,7 @@ class GivePointToUsersFacade(
                     else -> 0
                 }
 
-                identityApi.increaseUserPointsByUserId(
+                identityApi.increaseUserPointsByUsername(
                     username = rankResponse.name,
                     point = point,
                     idempotencyKey = IdGenerator.generate().toString(),

src/main/kotlin/org/gitanimals/rank/app/IdentityApi.kt

@@ -11,7 +11,7 @@ interface IdentityApi {
     fun getUserByName(@PathVariable("name") name: String): UserResponse
 
     @PostExchange("/internals/users/points/increases/by-username/{username}")
-    fun increaseUserPointsByUserId(
+    fun increaseUserPointsByUsername(
         @PathVariable("username") username: String,
         @RequestParam("point") point: Int,
         @RequestParam("idempotency-key") idempotencyKey: String,

src/main/kotlin/org/gitanimals/render/app/AnimationFacade.kt

@@ -6,6 +6,7 @@ import org.gitanimals.render.domain.UserService
 import org.gitanimals.render.domain.event.NewUserCreated
 import org.gitanimals.render.domain.event.Visited
 import org.rooftop.netx.api.SagaManager
+import org.springframework.context.ApplicationEventPublisher
 import org.springframework.stereotype.Service
 import org.springframework.web.client.RestClientException
 
@@ -14,13 +15,14 @@ class AnimationFacade(
     private val userService: UserService,
     private val contributionApi: ContributionApi,
     private val sagaManager: SagaManager,
+    private val eventPublisher: ApplicationEventPublisher,
 ) {
 
     fun getFarmAnimation(username: String): String {
         return when (userService.existsByName(username)) {
             true -> {
                 val svgAnimation = userService.getFarmAnimationByUsername(username)
-                sagaManager.startSync(Visited(username))
+                eventPublisher.publishEvent(Visited(username))
                 svgAnimation
             }
 
@@ -36,7 +38,7 @@ class AnimationFacade(
         return when (userService.existsByName(username)) {
             true -> {
                 val svgAnimation = userService.getLineAnimationByUsername(username, personaId, mode)
-                sagaManager.startSync(Visited(username))
+                eventPublisher.publishEvent(Visited(username))
                 svgAnimation
             }
 

src/main/kotlin/org/gitanimals/render/app/IdentityApi.kt

@@ -1,8 +1,23 @@
 package org.gitanimals.render.app
 
-fun interface IdentityApi {
+import org.springframework.http.HttpHeaders
+import org.springframework.web.bind.annotation.PathVariable
+import org.springframework.web.bind.annotation.RequestHeader
+import org.springframework.web.bind.annotation.RequestParam
+import org.springframework.web.service.annotation.GetExchange
+import org.springframework.web.service.annotation.PostExchange
 
-    fun getUserByToken(token: String): UserResponse
+interface IdentityApi {
+
+    @GetExchange("/users")
+    fun getUserByToken(@RequestHeader(HttpHeaders.AUTHORIZATION) token: String): UserResponse
+
+    @PostExchange("/internals/users/points/increases/by-username/{username}")
+    fun increaseUserPointsByUsername(
+        @PathVariable("username") username: String,
+        @RequestParam("point") point: Int,
+        @RequestParam("idempotency-key") idempotencyKey: String,
+    )
 
     data class UserResponse(
         val id: String,

src/main/kotlin/org/gitanimals/render/infra/HttpClientErrorHandler.kt

@@ -0,0 +1,28 @@
+package org.gitanimals.render.infra
+
+import org.gitanimals.core.AuthorizationException
+import org.springframework.http.HttpStatus
+import org.springframework.http.client.ClientHttpResponse
+import org.springframework.web.client.ResponseErrorHandler
+
+
+class HttpClientErrorHandler : ResponseErrorHandler {
+
+    override fun hasError(response: ClientHttpResponse): Boolean {
+        return response.statusCode.isError
+    }
+
+    override fun handleError(response: ClientHttpResponse) {
+        val body = response.body.bufferedReader().use { it.readText() }
+        when {
+            response.statusCode.isSameCodeAs(HttpStatus.UNAUTHORIZED) ->
+                throw AuthorizationException(body)
+
+            response.statusCode.is4xxClientError ->
+                throw IllegalArgumentException(body)
+
+            response.statusCode.is5xxServerError ->
+                throw IllegalStateException(body)
+        }
+    }
+}

src/main/kotlin/org/gitanimals/render/infra/RenderHttpClientConfigurer.kt

@@ -0,0 +1,73 @@
+package org.gitanimals.render.infra
+
+import org.gitanimals.core.filter.MDCFilter
+import org.gitanimals.rank.infra.HttpClientErrorHandler
+import org.gitanimals.render.app.IdentityApi
+import org.slf4j.MDC
+import org.springframework.beans.factory.annotation.Value
+import org.springframework.context.annotation.Bean
+import org.springframework.context.annotation.Configuration
+import org.springframework.context.annotation.Profile
+import org.springframework.web.client.RestClient
+import org.springframework.web.client.support.RestClientAdapter
+import org.springframework.web.service.invoker.HttpServiceProxyFactory
+
+@Configuration
+@Profile("!test")
+class RenderHttpClientConfigurer(
+    @Value("\${internal.secret}") private val internalSecret: String,
+) {
+
+    @Bean
+    fun renderIdentityApiHttpClient(): IdentityApi {
+        val restClient = RestClient
+            .builder()
+            .requestInterceptor { request, body, execution ->
+                request.headers.add(MDCFilter.TRACE_ID, MDC.get(MDCFilter.TRACE_ID))
+                if (request.uri.path.startsWith("/internals")) {
+                    request.headers.add(INTERNAL_SECRET_KEY, internalSecret)
+                }
+                execution.execute(request, body)
+            }
+            .defaultStatusHandler(renderHttpClientErrorHandler())
+            .baseUrl("https://api.gitanimals.org")
+            .build()
+
+        val httpServiceProxyFactory = HttpServiceProxyFactory
+            .builderFor(RestClientAdapter.create(restClient))
+            .build()
+
+        return httpServiceProxyFactory.createClient(IdentityApi::class.java)
+    }
+
+    @Bean
+    fun renderHttpClientErrorHandler(): HttpClientErrorHandler = HttpClientErrorHandler()
+
+    private companion object {
+        private const val INTERNAL_SECRET_KEY = "Internal-Secret"
+    }
+}
+
+
+@Configuration
+@Profile("test")
+class RankTestHttpClientConfigurer {
+
+    @Bean
+    fun rankIdentityApiHttpClient(): IdentityApi {
+        val restClient = RestClient
+            .builder()
+            .defaultStatusHandler(renderHttpClientErrorHandler())
+            .baseUrl("http://localhost:8080")
+            .build()
+
+        val httpServiceProxyFactory = HttpServiceProxyFactory
+            .builderFor(RestClientAdapter.create(restClient))
+            .build()
+
+        return httpServiceProxyFactory.createClient(IdentityApi::class.java)
+    }
+
+    @Bean
+    fun renderHttpClientErrorHandler(): HttpClientErrorHandler = HttpClientErrorHandler()
+}

src/main/kotlin/org/gitanimals/render/infra/RestIdentityApi.kt

@@ -0,0 +1,54 @@
+package org.gitanimals.render.infra
+
+import org.gitanimals.core.IdGenerator
+import org.gitanimals.render.app.ContributionApi
+import org.gitanimals.render.app.IdentityApi
+import org.gitanimals.render.domain.UserService
+import org.gitanimals.render.domain.event.Visited
+import org.rooftop.netx.api.*
+import org.rooftop.netx.meta.SagaHandler
+import org.slf4j.LoggerFactory
+import org.springframework.context.event.EventListener
+import org.springframework.scheduling.annotation.Async
+import java.time.ZoneId
+import java.time.ZonedDateTime
+
+@SagaHandler
+class VisitedEventListener(
+    private val userService: UserService,
+    private val contributionApi: ContributionApi,
+    private val identityApi: IdentityApi,
+) {
+
+    private val logger = LoggerFactory.getLogger(this::class.simpleName)
+
+    @Async
+    @EventListener(Visited::class)
+    fun increaseUserVisited(visited: Visited) {
+        runCatching {
+            val username = visited.username
+            userService.increaseVisit(username)
+
+            logger.info("Increase visit to user. username: \"$username\"")
+
+            if (!userService.isContributionUpdatedBeforeOneHour(username)) {
+                return
+            }
+
+            val currentYear = ZonedDateTime.now(ZoneId.of("UTC")).year
+            val contribution =
+                contributionApi.getContributionCount(username, listOf(currentYear))[currentYear]
+                    ?: throw NullPointerException("Empty contribution current year \"$currentYear\"")
+
+            val increaseContributionCount = userService.updateContributions(username, contribution)
+            identityApi.increaseUserPointsByUsername(
+                username = username,
+                point = increaseContributionCount * 100,
+                idempotencyKey = IdGenerator.generate().toString(),
+            )
+            logger.info("Increase point to user. username: \"$username\", point:\"${increaseContributionCount * 100}\"")
+        }.onFailure {
+            logger.error("Cannot increase visit or point to user. username: \"${visited.username}\"", it)
+        }
+    }
+}