release: 1.2.8 (#255)

devxb · web-flow · commit ab8395772426 · 2025-01-19T12:37:40.000+09:00
diff --git a/src/main/kotlin/org/gitanimals/core/clock.kt b/src/main/kotlin/org/gitanimals/core/clock.kt
@@ -11,4 +11,6 @@ fun instant() = Instant.now(clock)
 
 fun Instant.toZonedDateTime() = ZonedDateTime.ofInstant(this, clock.zone)
 
+fun Instant.toZonedDateTime(zoneId: ZoneId) = ZonedDateTime.ofInstant(this, zoneId)
+
 fun Instant.toKr() = ZonedDateTime.ofInstant(this, ZoneId.of("Asia/Seoul"))
diff --git a/src/main/kotlin/org/gitanimals/guild/app/response/GuildResponse.kt b/src/main/kotlin/org/gitanimals/guild/app/response/GuildResponse.kt
@@ -15,6 +15,7 @@ data class GuildResponse(
     val totalContributions: String,
     val members: List<Member>,
     val waitMembers: List<WaitMember>,
+    val autoJoin: Boolean,
     @JsonFormat(
         shape = JsonFormat.Shape.STRING,
         pattern = "yyyy-MM-dd HH:mm:ss",
@@ -59,7 +60,7 @@ data class GuildResponse(
                 leader = Leader(
                     userId = guild.getLeaderUserId().toString(),
                     name = guild.getLeaderName(),
-                    contributions = guild.getContributions().toString(),
+                    contributions = guild.getLeaderContributions().toString(),
                     personaId = guild.getLeaderPersonaId().toString(),
                     personaType = guild.getLeaderPersonaType(),
                 ),
@@ -85,6 +86,7 @@ data class GuildResponse(
                         personaType = it.personaType,
                     )
                 },
+                autoJoin = guild.isAutoJoin(),
                 createdAt = guild.createdAt,
             )
         }
diff --git a/src/main/kotlin/org/gitanimals/guild/domain/Guild.kt b/src/main/kotlin/org/gitanimals/guild/domain/Guild.kt
@@ -140,7 +140,7 @@ class Guild(
 
     fun getLeaderName(): String = leader.name
 
-    fun getContributions(): Long = leader.contributions
+    fun getLeaderContributions(): Long = leader.contributions
 
     fun getGuildFarmType(): FieldType = farmType
 
diff --git a/src/main/kotlin/org/gitanimals/guild/saga/UpdateGuildContributionSagaHandler.kt b/src/main/kotlin/org/gitanimals/guild/saga/UpdateGuildContributionSagaHandler.kt
@@ -20,7 +20,7 @@ class UpdateGuildContributionSagaHandler(
 
         guildService.updateContribution(
             username = userContributionUpdated.username,
-            contributions = userContributionUpdated.contributions.toLong(),
+            contributions = userContributionUpdated.contributions,
         )
     }
 }
diff --git a/src/main/kotlin/org/gitanimals/guild/saga/event/UserContributionUpdated.kt b/src/main/kotlin/org/gitanimals/guild/saga/event/UserContributionUpdated.kt
@@ -1,7 +1,10 @@
 package org.gitanimals.guild.saga.event
 
+import java.time.Instant
+
 data class UserContributionUpdated(
     val username: String,
-    val point: Long,
-    val contributions: Int,
+    val contributions: Long,
+    val userContributionUpdated: Boolean,
+    val contributionUpdatedAt: Instant,
 )
diff --git a/src/main/kotlin/org/gitanimals/render/domain/User.kt b/src/main/kotlin/org/gitanimals/render/domain/User.kt
@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore
 import jakarta.persistence.*
 import org.gitanimals.core.*
 import org.gitanimals.render.domain.event.PersonaDeleted
+import org.gitanimals.render.domain.event.UserContributionUpdated
 import org.gitanimals.render.domain.extension.RenderFieldTypeExtension.isRenderField
 import org.gitanimals.render.domain.listeners.DomainEventPublisher
 import org.gitanimals.render.domain.response.PersonaResponse
@@ -103,7 +104,7 @@ class User(
 
     @JsonIgnore
     fun isContributionUpdatedBeforeOneHour(): Boolean {
-        val currentYear = ZonedDateTime.now(ZoneId.of("UTC")).year
+        val currentYear = instant().toZonedDateTime(ZoneId.of("UTC")).year
         val currentYearContribution =
             contributions.firstOrNull { it.year == currentYear } ?: return true
 
@@ -144,6 +145,13 @@ class User(
         currentYearContribution.lastUpdatedContribution = Instant.now()
         levelUpPersonas(newContribution)
 
+        DomainEventPublisher.publish(
+            UserContributionUpdated(
+                username = this.name,
+                contributions = contributions.totalCount(),
+            )
+        )
+
         return newContribution
     }
 
diff --git a/src/main/kotlin/org/gitanimals/render/domain/event/UserContributionUpdated.kt b/src/main/kotlin/org/gitanimals/render/domain/event/UserContributionUpdated.kt
@@ -0,0 +1,11 @@
+package org.gitanimals.render.domain.event
+
+import org.gitanimals.core.instant
+import java.time.Instant
+
+data class UserContributionUpdated(
+    val username: String,
+    val contributions: Long,
+    val userContributionUpdated: Boolean = true,
+    val contributionUpdatedAt: Instant = instant(),
+)
diff --git a/src/test/kotlin/org/gitanimals/guild/app/CreateGuildFacadeTest.kt b/src/test/kotlin/org/gitanimals/guild/app/CreateGuildFacadeTest.kt
@@ -8,6 +8,8 @@ import io.kotest.core.annotation.DisplayName
 import io.kotest.core.spec.style.DescribeSpec
 import io.mockk.every
 import org.gitanimals.core.FieldType
+import org.gitanimals.core.IdGenerator
+import org.gitanimals.core.filter.MDCFilter.Companion.TRACE_ID
 import org.gitanimals.guild.app.request.CreateGuildRequest
 import org.gitanimals.guild.domain.GuildIcons
 import org.gitanimals.guild.domain.GuildRepository
@@ -16,6 +18,7 @@ import org.gitanimals.guild.supports.RedisContainer
 import org.gitanimals.guild.supports.GuildSagaCapture
 import org.gitanimals.guild.supports.MockApiConfiguration
 import org.rooftop.netx.meta.EnableSaga
+import org.slf4j.MDC
 import org.springframework.boot.actuate.autoconfigure.wavefront.WavefrontProperties.Application
 import org.springframework.boot.autoconfigure.domain.EntityScan
 import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest
@@ -50,6 +53,7 @@ internal class CreateGuildFacadeTest(
     beforeEach {
         guildSagaCapture.clear()
         guildRepository.deleteAll()
+        MDC.put(TRACE_ID, IdGenerator.generate().toString())
     }
 
     describe("createGuild 메소드는") {
@@ -118,7 +122,7 @@ internal class CreateGuildFacadeTest(
         private val poolIdentityUserResponse = IdentityApi.UserResponse(
             id = "1",
             username = "devxb",
-            points = "29999",
+            points = "0",
             profileImage = "https://gitanimals.org"
         )
 
diff --git a/src/test/kotlin/org/gitanimals/guild/domain/GuildServiceTest.kt b/src/test/kotlin/org/gitanimals/guild/domain/GuildServiceTest.kt
@@ -9,6 +9,7 @@ import org.gitanimals.core.FieldType
 import org.gitanimals.core.PersonaType
 import org.gitanimals.guild.domain.GuildService.Companion.loadMembers
 import org.gitanimals.guild.domain.GuildService.Companion.loadWaitMembers
+import org.gitanimals.guild.domain.extension.GuildFieldTypeExtension.isGuildField
 import org.gitanimals.guild.domain.request.CreateLeaderRequest
 import org.springframework.boot.autoconfigure.domain.EntityScan
 import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest
@@ -34,7 +35,7 @@ internal class GuildServiceTest(
             val guildIcon = GuildIcons.CAT.getImagePath()
             val title = "guildTitle"
             val body = "guildBody"
-            val farmType = FieldType.LOGO_SHOWING
+            val farmType = FieldType.entries.first { it.isGuildField() }
             val leaderRequest = CreateLeaderRequest(
                 userId = 1L,
                 name = "devxb",
diff --git a/src/test/kotlin/org/gitanimals/render/domain/UserTest.kt b/src/test/kotlin/org/gitanimals/render/domain/UserTest.kt
@@ -7,6 +7,8 @@ import io.kotest.core.spec.style.DescribeSpec
 import io.kotest.matchers.equals.shouldBeEqual
 import io.kotest.matchers.nulls.shouldNotBeNull
 import org.gitanimals.core.PersonaType
+import org.gitanimals.core.instant
+import org.gitanimals.core.toZonedDateTime
 import org.gitanimals.render.domain.event.PersonaDeleted
 import org.gitanimals.render.domain.listeners.DomainEventPublisher
 import org.gitanimals.render.domain.value.Contribution
@@ -79,7 +81,13 @@ internal class UserTest(
 
         context("user의 contribution이 업데이트 된지 1시간이 지나지 않았을 경우,") {
             val user = user(
-                contributions = mutableListOf(Contribution(2024, 0, Instant.now()))
+                contributions = mutableListOf(
+                    Contribution(
+                        instant().toZonedDateTime().year,
+                        0,
+                        instant(),
+                    )
+                )
             )
             it("false를 반환한다.") {
                 user.isContributionUpdatedBeforeOneHour() shouldBeEqual false

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ class UpdateGuildContributionSagaHandler(`
`20`	`20`
`21`	`21`	`guildService.updateContribution(`
`22`	`22`	`username = userContributionUpdated.username,`
`23`		`- contributions = userContributionUpdated.contributions.toLong(),`
	`23`	`+ contributions = userContributionUpdated.contributions,`
`24`	`24`	`)`
`25`	`25`	`}`
`26`	`26`	`}`