test: 실패하는 테스트들을 수정한다

Author: devxb

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"))

src/main/kotlin/org/gitanimals/render/domain/User.kt

@@ -104,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
 

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"
         )
 

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",

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