release: 2.1.9 (#391)

devxb · web-flow · commit 5d537de97f61 · 2025-06-11T21:12:03.000+09:00
diff --git a/src/main/kotlin/org/gitanimals/render/controller/InternalPersonaController.kt b/src/main/kotlin/org/gitanimals/render/controller/InternalPersonaController.kt
@@ -38,11 +38,12 @@ class InternalPersonaController(
         )
 
         return PersonaResponse(
-            persona.id,
-            persona.type,
-            persona.level,
-            persona.visible,
-            persona.dropRate,
+            id = persona.id,
+            type = persona.type,
+            level = persona.level,
+            visible = persona.visible,
+            appVisible = persona.appVisible,
+            dropRate = persona.dropRate,
         )
     }
 
@@ -62,11 +63,12 @@ class InternalPersonaController(
             )
 
             PersonaResponse(
-                persona.id,
-                persona.type,
-                persona.level,
-                persona.visible,
-                persona.dropRate,
+                id = persona.id,
+                type = persona.type,
+                level = persona.level,
+                visible = persona.visible,
+                appVisible = persona.appVisible,
+                dropRate = persona.dropRate,
             )
         }
     }
@@ -80,11 +82,12 @@ class InternalPersonaController(
         val persona = userFacade.deletePersona(token, personaId)
 
         return PersonaResponse(
-            persona.id,
-            persona.type,
-            persona.level,
-            persona.visible,
-            persona.dropRate,
+            id = persona.id,
+            type = persona.type,
+            level = persona.level,
+            visible = persona.visible,
+            appVisible = persona.appVisible,
+            dropRate = persona.dropRate,
         )
     }
 
diff --git a/src/main/kotlin/org/gitanimals/render/controller/PersonaController.kt b/src/main/kotlin/org/gitanimals/render/controller/PersonaController.kt
@@ -1,12 +1,12 @@
 package org.gitanimals.render.controller
 
-import org.gitanimals.core.PersonaType
 import org.gitanimals.core.AuthorizationException
-import org.gitanimals.render.app.UserFacade
-import org.gitanimals.render.app.request.MergePersonaRequest
 import org.gitanimals.core.ErrorResponse
+import org.gitanimals.core.PersonaType
 import org.gitanimals.core.auth.RequiredUserEntryPoints
 import org.gitanimals.core.auth.UserEntryPoint
+import org.gitanimals.render.app.UserFacade
+import org.gitanimals.render.app.request.MergePersonaRequest
 import org.gitanimals.render.controller.response.PersonaEnumResponse
 import org.gitanimals.render.controller.response.PersonaResponse
 import org.gitanimals.render.controller.response.UserResponse
@@ -36,11 +36,12 @@ class PersonaController(
         val persona = userFacade.getPersona(token, personaId)
 
         return PersonaResponse(
-            persona.id,
-            persona.type,
-            persona.level,
-            persona.visible,
-            persona.dropRate
+            id = persona.id,
+            type = persona.type,
+            level = persona.level,
+            visible = persona.visible,
+            appVisible = persona.appVisible,
+            dropRate = persona.dropRate,
         )
     }
 
@@ -54,11 +55,12 @@ class PersonaController(
         val changedPersona = userFacade.changePersona(token, personaChangeRequest)
 
         return PersonaResponse(
-            changedPersona.id,
-            changedPersona.type,
-            changedPersona.level,
-            changedPersona.visible,
-            changedPersona.dropRate,
+            id = changedPersona.id,
+            type = changedPersona.type,
+            level = changedPersona.level,
+            visible = changedPersona.visible,
+            appVisible = changedPersona.appVisible,
+            dropRate = changedPersona.dropRate,
         )
     }
 
diff --git a/src/main/kotlin/org/gitanimals/render/controller/response/PersonaResponse.kt b/src/main/kotlin/org/gitanimals/render/controller/response/PersonaResponse.kt
@@ -8,6 +8,7 @@ data class PersonaResponse(
     val type: PersonaType,
     val level: String,
     val visible: Boolean,
+    val appVisible: Boolean,
     val dropRate: String,
 ) {
 
@@ -18,6 +19,7 @@ data class PersonaResponse(
                 type = personaResponse.type,
                 level = personaResponse.level,
                 visible = personaResponse.visible,
+                appVisible = personaResponse.appVisible,
                 dropRate = personaResponse.dropRate,
             )
         }
diff --git a/src/main/kotlin/org/gitanimals/render/controller/response/UserResponse.kt b/src/main/kotlin/org/gitanimals/render/controller/response/UserResponse.kt
@@ -17,11 +17,12 @@ data class UserResponse(
                 user.contributionCount().toString(),
                 user.personas.map {
                     PersonaResponse(
-                        it.id.toString(),
-                        it.type,
-                        it.level().toString(),
-                        it.visible,
-                        it.type.getDropRate()
+                        id = it.id.toString(),
+                        type = it.type,
+                        level = it.level().toString(),
+                        visible = it.visible,
+                        appVisible = it.appVisible,
+                        dropRate = it.type.getDropRate(),
                     )
                 }.toList()
             )
@@ -36,11 +37,12 @@ data class UserResponse(
                     it.id in personaId
                 }.map {
                     PersonaResponse(
-                        it.id.toString(),
-                        it.type,
-                        it.level().toString(),
-                        it.visible,
-                        it.type.getDropRate()
+                        id = it.id.toString(),
+                        type = it.type,
+                        level = it.level().toString(),
+                        visible = it.visible,
+                        appVisible = it.appVisible,
+                        dropRate = it.type.getDropRate(),
                     )
                 }.toList()
             )
@@ -55,11 +57,12 @@ data class UserResponse(
                     .maxBy { it.level() }
                     .let {
                         PersonaResponse(
-                            it.id.toString(),
-                            it.type,
-                            it.level().toString(),
-                            it.visible,
-                            it.type.getDropRate()
+                            id = it.id.toString(),
+                            type = it.type,
+                            level = it.level().toString(),
+                            visible = it.visible,
+                            appVisible = it.appVisible,
+                            dropRate = it.type.getDropRate(),
                         )
                     }
                 )
diff --git a/src/main/kotlin/org/gitanimals/render/domain/Persona.kt b/src/main/kotlin/org/gitanimals/render/domain/Persona.kt
@@ -24,6 +24,9 @@ class Persona(
     @Column(name = "visible", nullable = false)
     var visible: Boolean,
 
+    @Column(name = "app_visible", nullable = false, columnDefinition = "bit(1) DEFAULT 0")
+    var appVisible: Boolean = false,
+
     @JsonIgnore
     @JoinColumn(name = "user_id")
     @ManyToOne(fetch = FetchType.LAZY, optional = false)
diff --git a/src/main/kotlin/org/gitanimals/render/domain/User.kt b/src/main/kotlin/org/gitanimals/render/domain/User.kt
@@ -6,6 +6,7 @@ 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.request.VisibleChangeType
 import org.gitanimals.render.domain.response.PersonaResponse
 import org.gitanimals.render.domain.value.Contribution
 import org.gitanimals.render.domain.value.Level
@@ -97,7 +98,13 @@ class User(
     }
 
     fun addPersona(id: Long, personaType: PersonaType, level: Int): PersonaResponse {
-        val persona = Persona(id, personaType, Level(level.toLong()), personas.size < 30, this)
+        val persona = Persona(
+            id = id,
+            type = personaType,
+            level = Level(level.toLong()),
+            visible = personas.size < 30,
+            user = this,
+        )
 
         this.personas.add(persona)
 
@@ -148,11 +155,23 @@ class User(
         )
     }
 
-    fun changePersonaVisible(personaId: Long, visible: Boolean): Persona {
+    fun changePersonaVisible(
+        personaId: Long,
+        visible: Boolean,
+        visibleChangeType: VisibleChangeType
+    ): Persona {
         val persona = personas.find { it.id == personaId }
             ?: throw IllegalArgumentException("Cannot find persona by id \"$personaId\"")
 
-        persona.visible = visible
+        when (visibleChangeType) {
+            VisibleChangeType.APP -> run {
+                persona.appVisible = visible
+            }
+
+            VisibleChangeType.DEFAULT -> run {
+                persona.visible = visible
+            }
+        }
 
         val visiblePersonas = personas.filter { it.visible }
 
diff --git a/src/main/kotlin/org/gitanimals/render/domain/UserService.kt b/src/main/kotlin/org/gitanimals/render/domain/UserService.kt
@@ -94,12 +94,13 @@ class UserService(
 
     @Retryable(retryFor = [ObjectOptimisticLockingFailureException::class], maxAttempts = 10)
     @Transactional
-    fun changePersona(name: String, personChangeRequest: PersonaChangeRequest): PersonaResponse {
+    fun changePersona(name: String, personaChangeRequest: PersonaChangeRequest): PersonaResponse {
         val user = getUserByName(name)
 
         val changedPersona = user.changePersonaVisible(
-            personChangeRequest.personaId.toLong(),
-            personChangeRequest.visible
+            personaChangeRequest.personaId.toLong(),
+            personaChangeRequest.visible,
+            personaChangeRequest.type,
         )
 
         return PersonaResponse.from(changedPersona)
diff --git a/src/main/kotlin/org/gitanimals/render/domain/request/PersonaChangeRequest.kt b/src/main/kotlin/org/gitanimals/render/domain/request/PersonaChangeRequest.kt
@@ -3,4 +3,11 @@ package org.gitanimals.render.domain.request
 data class PersonaChangeRequest(
     val personaId: String,
     val visible: Boolean,
+    val type: VisibleChangeType = VisibleChangeType.DEFAULT
 )
+
+enum class VisibleChangeType {
+    DEFAULT,
+    APP,
+    ;
+}
diff --git a/src/main/kotlin/org/gitanimals/render/domain/response/PersonaResponse.kt b/src/main/kotlin/org/gitanimals/render/domain/response/PersonaResponse.kt
@@ -8,16 +8,18 @@ data class PersonaResponse(
     val type: PersonaType,
     val level: String,
     val visible: Boolean,
+    val appVisible: Boolean,
     val dropRate: String,
 ) {
     companion object {
         fun from(persona: Persona): PersonaResponse {
             return PersonaResponse(
-                persona.id.toString(),
-                persona.type,
-                persona.level.value.toString(),
-                persona.visible,
-                persona.type.getDropRate()
+                id = persona.id.toString(),
+                type = persona.type,
+                level = persona.level.value.toString(),
+                visible = persona.visible,
+                appVisible = persona.appVisible,
+                dropRate = persona.type.getDropRate(),
             )
         }
     }
diff --git a/src/test/kotlin/org/gitanimals/render/domain/UserFixture.kt b/src/test/kotlin/org/gitanimals/render/domain/UserFixture.kt
@@ -34,5 +34,6 @@ fun persona(
     type = type,
     level = Level(0),
     visible = false,
+    appVisible = false,
     user = user,
 )
diff --git a/src/test/kotlin/org/gitanimals/render/domain/UserTest.kt b/src/test/kotlin/org/gitanimals/render/domain/UserTest.kt
@@ -7,13 +7,14 @@ import io.kotest.core.annotation.DisplayName
 import io.kotest.core.spec.style.DescribeSpec
 import io.kotest.matchers.equals.shouldBeEqual
 import io.kotest.matchers.nulls.shouldNotBeNull
-import org.gitanimals.core.DomainEventPublisher
-import org.gitanimals.core.PersonaType
-import org.gitanimals.core.instant
-import org.gitanimals.core.toZonedDateTime
+import io.kotest.matchers.shouldBe
+import org.gitanimals.core.*
+import org.gitanimals.core.filter.MDCFilter.Companion.TRACE_ID
 import org.gitanimals.render.domain.event.PersonaDeleted
+import org.gitanimals.render.domain.request.VisibleChangeType
 import org.gitanimals.render.domain.value.Contribution
 import org.gitanimals.render.supports.DomainEventHolder
+import org.slf4j.MDC
 import org.springframework.test.context.ContextConfiguration
 import java.time.Instant
 import java.time.temporal.ChronoUnit
@@ -35,6 +36,7 @@ internal class UserTest(
 ) : DescribeSpec({
 
     beforeEach {
+        MDC.put(TRACE_ID, IdGenerator.generate().toString())
         domainEventHolder.deleteAll()
     }
 
@@ -167,6 +169,32 @@ internal class UserTest(
             }
         }
     }
+
+    describe("changePersonaVisible 메소드는") {
+        context("visibleChangeType이 APP일때,") {
+            val user = user().apply {
+                this.personas.add(persona(id = 1, user = this))
+            }
+
+            it("personaId에 해당하는 persona의 appVisible을 visible로 변경한다") {
+                user.changePersonaVisible(1, true, VisibleChangeType.APP)
+
+                user.personas.first().appVisible shouldBe true
+            }
+        }
+
+        context("visibleChangeType이 DEFAULT일때,") {
+            val user = user().apply {
+                this.personas.add(persona(id = 1, user = this))
+            }
+
+            it("personaId에 해당하는 persona의 visible을 visible로 변경한다") {
+                user.changePersonaVisible(1, true, VisibleChangeType.DEFAULT)
+
+                user.personas.first().visible shouldBe true
+            }
+        }
+    }
 }) {
     private companion object {
         private const val ALPHABET = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"

Original file line number	Diff line number	Diff line change
`@@ -38,11 +38,12 @@ class InternalPersonaController(`
`38`	`38`	`)`
`39`	`39`
`40`	`40`	`return PersonaResponse(`
`41`		`- persona.id,`
`42`		`- persona.type,`
`43`		`- persona.level,`
`44`		`- persona.visible,`
`45`		`- persona.dropRate,`
	`41`	`+ id = persona.id,`
	`42`	`+ type = persona.type,`
	`43`	`+ level = persona.level,`
	`44`	`+ visible = persona.visible,`
	`45`	`+ appVisible = persona.appVisible,`
	`46`	`+ dropRate = persona.dropRate,`
`46`	`47`	`)`
`47`	`48`	`}`
`48`	`49`
`@@ -62,11 +63,12 @@ class InternalPersonaController(`
`62`	`63`	`)`
`63`	`64`
`64`	`65`	`PersonaResponse(`
`65`		`- persona.id,`
`66`		`- persona.type,`
`67`		`- persona.level,`
`68`		`- persona.visible,`
`69`		`- persona.dropRate,`
	`66`	`+ id = persona.id,`
	`67`	`+ type = persona.type,`
	`68`	`+ level = persona.level,`
	`69`	`+ visible = persona.visible,`
	`70`	`+ appVisible = persona.appVisible,`
	`71`	`+ dropRate = persona.dropRate,`
`70`	`72`	`)`
`71`	`73`	`}`
`72`	`74`	`}`
`@@ -80,11 +82,12 @@ class InternalPersonaController(`
`80`	`82`	`val persona = userFacade.deletePersona(token, personaId)`
`81`	`83`
`82`	`84`	`return PersonaResponse(`
`83`		`- persona.id,`
`84`		`- persona.type,`
`85`		`- persona.level,`
`86`		`- persona.visible,`
`87`		`- persona.dropRate,`
	`85`	`+ id = persona.id,`
	`86`	`+ type = persona.type,`
	`87`	`+ level = persona.level,`
	`88`	`+ visible = persona.visible,`
	`89`	`+ appVisible = persona.appVisible,`
	`90`	`+ dropRate = persona.dropRate,`
`88`	`91`	`)`
`89`	`92`	`}`
`90`	`93`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ data class PersonaResponse(`
`8`	`8`	`val type: PersonaType,`
`9`	`9`	`val level: String,`
`10`	`10`	`val visible: Boolean,`
	`11`	`+ val appVisible: Boolean,`
`11`	`12`	`val dropRate: String,`
`12`	`13`	`) {`
`13`	`14`
`@@ -18,6 +19,7 @@ data class PersonaResponse(`
`18`	`19`	`type = personaResponse.type,`
`19`	`20`	`level = personaResponse.level,`
`20`	`21`	`visible = personaResponse.visible,`
	`22`	`+ appVisible = personaResponse.appVisible,`
`21`	`23`	`dropRate = personaResponse.dropRate,`
`22`	`24`	`)`
`23`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,5 +34,6 @@ fun persona(`
`34`	`34`	`type = type,`
`35`	`35`	`level = Level(0),`
`36`	`36`	`visible = false,`
	`37`	`+ appVisible = false,`
`37`	`38`	`user = user,`
`38`	`39`	`)`