release: 2.2.9 (#408)

Author: devxb

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

@@ -0,0 +1,8 @@
+package org.gitanimals.rank.app
+
+import java.time.LocalDate
+
+fun interface RankContributionApi {
+
+    fun getContributionsBySpecificDays(username: String, from: LocalDate, to: LocalDate): Int
+}

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

@@ -0,0 +1,42 @@
+package org.gitanimals.rank.app
+
+import org.gitanimals.rank.domain.UserContributionRank
+import org.gitanimals.rank.domain.UserContributionRankService
+import org.slf4j.LoggerFactory
+import org.springframework.stereotype.Component
+import java.time.LocalDate
+import java.time.temporal.WeekFields
+import java.util.*
+
+@Component
+class UpdateUserContributionFacade(
+    private val identityApi: IdentityApi,
+    private val rankContributionApi: RankContributionApi,
+    private val userContributionRankService: UserContributionRankService,
+) {
+
+    private val logger = LoggerFactory.getLogger(this::class.simpleName)
+
+    fun updateUserWeeklyContributions(username: String) {
+        val user = identityApi.getUserByName(username)
+
+        val from = LocalDate.now().with(WeekFields.of(Locale.getDefault()).dayOfWeek(), 1)
+        val to = LocalDate.now().with(WeekFields.of(Locale.getDefault()).dayOfWeek(), 7)
+
+        val weeklyContributions = rankContributionApi.getContributionsBySpecificDays(
+            username = username,
+            from = from,
+            to = to,
+        )
+
+        val updatedUserContributionRank = UserContributionRank.create(
+            image = user.profileImage,
+            userId = user.id.toLong(),
+            username = user.username,
+            weeklyContributions = weeklyContributions.toLong(),
+        )
+
+        userContributionRankService.updateContribution(updatedUserContributionRank)
+        logger.info("[UpdateUserContributionFacade] update user weekly contributions. username: \"$username\", updated contributions: $weeklyContributions")
+    }
+}

src/main/kotlin/org/gitanimals/rank/domain/UserContributionRankService.kt

@@ -19,7 +19,7 @@ class UserContributionRankService(
     fun updateContribution(updateUserContributionRank: UserContributionRank) {
         val userRank = runCatching {
             userContributionRankRepository.findByUserId(updateUserContributionRank.userId)?.also {
-                it.weeklyContributions += updateUserContributionRank.weeklyContributions
+                it.weeklyContributions = updateUserContributionRank.weeklyContributions
             }
                 ?: throw IllegalArgumentException("Cannot find UserContributionRank by userId: \"${updateUserContributionRank.userId}\"")
         }.getOrElse {

src/main/kotlin/org/gitanimals/rank/infra/github/RankGithubContributionApi.kt

@@ -0,0 +1,80 @@
+package org.gitanimals.rank.infra.github
+
+import org.gitanimals.rank.app.RankContributionApi
+import org.springframework.beans.factory.annotation.Value
+import org.springframework.core.io.ClassPathResource
+import org.springframework.http.HttpHeaders
+import org.springframework.stereotype.Component
+import org.springframework.web.client.RestClient
+import java.nio.charset.Charset
+import java.time.LocalDate
+import java.util.concurrent.Executors
+
+@Component
+class RankGithubContributionApi(
+    @Value("\${github.token}") private val token: String
+) : RankContributionApi {
+
+    private val restClient = RestClient.create("https://api.github.com/graphql")
+    private val executors = Executors.newFixedThreadPool(50)
+
+    override fun getContributionsBySpecificDays(username: String, from: LocalDate, to: LocalDate): Int {
+        val fromString = from.toString()
+        val toString = from.toString()
+
+        return restClient.post()
+            .header(HttpHeaders.AUTHORIZATION, "Bearer $token")
+            .body(
+                mapOf(
+                    "query" to contributionCountByYearAndWeekQuery
+                        .replaceFirst(NAME_FIX, username)
+                        .replaceFirst(DATE_START_FIX, fromString)
+                        .replaceFirst(DATE_END_FIX, toString)
+                )
+            ).exchange { _, response ->
+                assertIsSuccess(response)
+
+                response.bodyTo(ContributionCountByYearAndWeekQueryResponse::class.java)!!
+                    .data
+                    .user
+                    .contributionsCollection
+                    .contributionCalendar
+                    .totalContributions
+            }
+    }
+
+    private fun assertIsSuccess(response: RestClient.RequestHeadersSpec.ConvertibleClientHttpResponse) {
+        require(response.statusCode.is2xxSuccessful) {
+            "Bad request cause status : \"${response.statusText}\" message : \"${
+                response.bodyTo(
+                    String::class.java
+                )
+            }\""
+        }
+    }
+
+    private data class ContributionCountByYearAndWeekQueryResponse(val data: Data) {
+        class Data(val user: User) {
+            class User(val contributionsCollection: ContributionsCollection) {
+                class ContributionsCollection(
+                    val contributionCalendar: ContributionCalendar,
+                ) {
+                    class ContributionCalendar(
+                        val totalContributions: Int,
+                    )
+                }
+            }
+
+        }
+    }
+
+    companion object {
+        private const val NAME_FIX = "*{name}"
+        private const val DATE_START_FIX = "*{yyyy-mm-dd-start}"
+        private const val DATE_END_FIX = "*{yyyy-mm-dd-end}"
+
+        private val contributionCountByYearAndWeekQuery =
+            ClassPathResource("github-graphql/contribution-count-by-year-and-week.graphql")
+                .getContentAsString(Charset.defaultCharset())
+    }
+}

src/main/kotlin/org/gitanimals/rank/infra/RankRedisEventSubscriber.kt renamed to src/main/kotlin/org/gitanimals/rank/infra/listener/RankRedisEventSubscriber.kt

@@ -1,4 +1,4 @@
-package org.gitanimals.rank.infra
+package org.gitanimals.rank.infra.listener
 
 import org.gitanimals.core.redis.RedisPubSubChannel
 import org.springframework.context.annotation.Bean

src/main/kotlin/org/gitanimals/rank/infra/RankUpdateGuildContributionMessageListener.kt renamed to src/main/kotlin/org/gitanimals/rank/infra/listener/RankUpdateGuildContributionMessageListener.kt

@@ -1,4 +1,4 @@
-package org.gitanimals.rank.infra
+package org.gitanimals.rank.infra.listener
 
 import com.fasterxml.jackson.databind.ObjectMapper
 import org.gitanimals.core.redis.TraceableMessageListener

src/main/kotlin/org/gitanimals/rank/infra/UpdateUserContributionMessageListener.kt renamed to src/main/kotlin/org/gitanimals/rank/infra/listener/UpdateUserContributionMessageListener.kt

@@ -1,10 +1,8 @@
-package org.gitanimals.rank.infra
+package org.gitanimals.rank.infra.listener
 
 import com.fasterxml.jackson.databind.ObjectMapper
 import org.gitanimals.core.redis.TraceableMessageListener
-import org.gitanimals.rank.app.IdentityApi
-import org.gitanimals.rank.domain.UserContributionRank
-import org.gitanimals.rank.domain.UserContributionRankService
+import org.gitanimals.rank.app.UpdateUserContributionFacade
 import org.gitanimals.rank.infra.event.UserContributionUpdated
 import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Qualifier
@@ -14,10 +12,9 @@ import org.springframework.stereotype.Component
 
 @Component
 class UpdateUserContributionMessageListener(
-    private val identityApi: IdentityApi,
     private val objectMapper: ObjectMapper,
-    private val userContributionRankService: UserContributionRankService,
     @Qualifier("gitanimalsRedisTemplate") private val redisTemplate: StringRedisTemplate,
+    private val updateUserContributionFacade: UpdateUserContributionFacade,
 ) : TraceableMessageListener(
     listenerName = "UpdateUserContributionMessageListener",
     objectMapper = objectMapper,
@@ -33,18 +30,11 @@ class UpdateUserContributionMessageListener(
                 UserContributionUpdated::class.java,
             )
 
-            val updatedUserContributionRank = runCatching {
-                val user = identityApi.getUserByName(userContributionUpdated.username)
+            if (userContributionUpdated.updatedContributions == 0L) {
+                return
+            }
 
-                UserContributionRank.create(
-                    image = user.profileImage,
-                    userId = user.id.toLong(),
-                    username = user.username,
-                    weeklyContributions = userContributionUpdated.updatedContributions,
-                )
-            }.getOrElse { return }
-
-            userContributionRankService.updateContribution(updatedUserContributionRank)
+            updateUserContributionFacade.updateUserWeeklyContributions(userContributionUpdated.username)
         }.onFailure {
             logger.error("Cannot update user contributions rank by message: $message", it)
             throw it

src/main/resources/github-graphql/contribution-count-by-year-and-week.graphql

@@ -0,0 +1,9 @@
+query {
+    user(login: "*{name}") {
+        contributionsCollection(from: "*{yyyy-mm-dd-start}T00:00:00Z", to: "*{yyyy-mm-dd-end}T23:59:59Z") {
+            contributionCalendar {
+                totalContributions
+            }
+        }
+    }
+}