feat: Desktop 펫 조회기능 추가

devxb · devxb · commit 8471da8a589a · 2026-04-17T21:23:56.000+09:00
diff --git a/skills/add-pet-emotion-animation.md b/skills/add-pet-emotion-animation.md
@@ -227,8 +227,100 @@ emotion이 base 펫과 동일한 위치에 나타나도록 `emotionYOffsets` 값
 - 디버깅 시 `minGap`과 `maxGap`을 `1.0`으로 설정하면 1초마다 emotion이 나타나서 위치 확인이 쉬움
 - standing 포즈와 sitting 포즈는 보정값이 다를 수 있음 (DESSERT_FOX 기준: standing `5.0`, sitting `2.5`)
 
-### 6. PersonaEmotionType 구현하기
-org.gitanimals.render.app.PersonaEmotionAssets에 PersonaEmotionAssets.dessertFox를 참고하여 새롭게 추가한 emotion의 PersonaEmotionAssets을 추가하세요. 
+### 6. PersonaEmotionAssets 구현하기
+
+`src/main/kotlin/org/gitanimals/render/app/PersonaEmotionAssets.kt` 파일의 `PersonaEmotionAssets` sealed interface에 새로운 펫의 구현체를 추가해야 합니다. 이 인터페이스는 펫의 메타데이터와 애니메이션 다운로드 URL 정보를 포함합니다.
+
+**구현 예시 (DESSERT_FOX 참고):**
+
+```kotlin
+data object {PetClassName} : PersonaEmotionAssets {
+    override val personaType: PersonaType = PersonaType.{PET_ENUM_NAME}
+    override val name: String = "{Display Name}"
+    override val author: String = "{Author Name}"
+    override val description: String = "{Detailed Description}"
+    
+    // SVG 좌표계 설정 (보통 -15 -25 45 45 사용)
+    override val viewBox = ViewBox(x = -15, y = -25, width = 45, height = 45)
+    
+    // 레이아웃 설정
+    override val layout = Layout(
+        contentBox = Box(x = -2, y = -2, width = 20, height = 18),
+        centerX = 7.5,
+        baselineY = 15.0,
+        visibleHeightRatio = 0.58,
+        baselineBottomRatio = 0.05
+    )
+    
+    // 눈 추적(Eye Tracking) 설정 (미지원 시 enabled = false)
+    override val eyeTracking = EyeTracking(
+        enabled = false,
+        states = listOf("idle"),
+        eyeRatioX = 0.52,
+        eyeRatioY = 0.45,
+        maxOffset = 1.5,
+        bodyScale = 0.25,
+        shadowStretch = 0.15,
+        shadowShift = 0.3,
+        ids = EyeTrackingIds(eyes = "eyes-js", body = "body-js", shadow = "shadow-js"),
+        shadowOrigin = "7.5px 14px"
+    )
+    
+    // 애니메이션 타이밍 설정 (ms 단위)
+    override val timings = Timings(
+        minDisplay = mapOf(
+            "attention" to 4000,
+            "error" to 5000,
+            "notification" to 2500,
+            "working" to 1000,
+            "thinking" to 1000
+        ),
+        autoReturn = mapOf(
+            "attention" to 4000,
+            "error" to 5000,
+            "notification" to 2500
+        ),
+        mouseIdleTimeout = 20000,
+        mouseSleepTimeout = 60000,
+        wakeDuration = 5000
+    )
+    
+    // 히트박스 설정
+    override val hitBoxes = HitBoxes(
+        default = Box(x = -3, y = -8, width = 22, height = 20),
+        sleeping = Box(x = -3, y = -5, width = 22, height = 18)
+    )
+    
+    override val sleepingHitboxFiles = listOf("sleeping.svg")
+    override val miniMode = MiniMode(supported = false)
+    
+    // 오브젝트 스케일 보정
+    override val objectScale = ObjectScale(
+        widthRatio = 1.9,
+        heightRatio = 1.3,
+        offsetX = -0.45,
+        offsetY = -0.25
+    )
+
+    // 실제 SVG 컨텐츠 반환 로직 구현
+    override fun getAsset(emotion: String): String {
+        return when (emotion) {
+            "error" -> {petName}ErrorEmotionSvg
+            "happy" -> {petName}HappyEmotionSvg
+            "idleFollow" -> {petName}IdleFollowEmotionSvg
+            "notification" -> {petName}NotificationEmotionSvg
+            "thinking" -> {petName}ThinkingEmotionSvg
+            "typing" -> {petName}TypingEmotionSvg
+            else -> throw IllegalArgumentException("Invalid emotion: $emotion")
+        }
+    }
+}
+```
+
+**참고 사항:**
+- `error`, `happy`, `idleFollow` 등의 프로퍼티는 인터페이스의 기본 구현(`get()` 접근자)을 통해 자동으로 다운로드 URL (`/assets/images?...`)을 반환합니다.
+- `getAsset` 메서드는 `AnimationController`의 `/assets/images` API에서 실제 SVG 파일을 응답할 때 사용됩니다.
+- 새로운 펫 구현체를 추가한 후 `companion object`의 `from` 메서드에서 해당 펫이 올바르게 조회되는지 확인하세요 (Sealed interface의 `sealedSubclasses`를 사용하므로 자동으로 포함됩니다).
 
 ## buildEmotionAnimation 파라미터
 
diff --git a/src/main/kotlin/org/gitanimals/core/PersonaType.kt b/src/main/kotlin/org/gitanimals/core/PersonaType.kt
@@ -8,6 +8,7 @@ import kotlin.random.Random
 
 enum class PersonaType(
     val weight: Double,
+    val haveAnimation: Boolean = false,
     val grade: PersonaGrade = PersonaGrade.DEFAULT,
     val personaEvolution: PersonaEvolution = PersonaEvolution.nothing,
 ) {
@@ -1770,7 +1771,7 @@ enum class PersonaType(
                 .toString()
     },
 
-    DESSERT_FOX(0.05) {
+    DESSERT_FOX(0.05, haveAnimation = true) {
         override fun loadSvg(name: String, animationId: Long, level: Long, mode: Mode): String {
             val emotion = buildEmotionAnimation(
                 idPrefix = "dessert-fox",
diff --git a/src/main/kotlin/org/gitanimals/render/app/AssetsFacade.kt b/src/main/kotlin/org/gitanimals/render/app/AssetsFacade.kt
@@ -37,4 +37,21 @@ class AssetsFacade(
             AssetsResponse.createSvg(PersonaEmotionAssets.from(personaType))
         }
     }
+
+    fun findAssetSvg(
+        token: String,
+        personaType: PersonaType,
+        emotion: String,
+    ): String {
+        if (!ProfileIdentifier.isLocal()) {
+            val identityUser = identityApi.getUserByToken(token)
+            val renderUser = userService.getUserByName(name = identityUser.username)
+
+            require(renderUser.havePersona(personaType)) {
+                "personaType에 해당하는 Persona가 존재하지 않습니다."
+            }
+        }
+
+        return PersonaEmotionAssets.from(personaType).getAsset(emotion)
+    }
 }
diff --git a/src/main/kotlin/org/gitanimals/render/app/PersonaEmotionAssets.kt b/src/main/kotlin/org/gitanimals/render/app/PersonaEmotionAssets.kt
@@ -4,21 +4,107 @@ import org.gitanimals.core.*
 
 sealed interface PersonaEmotionAssets {
     val personaType: PersonaType
+    val schemaVersion: Int get() = 1
+    val name: String
+    val author: String
+    val version: String get() = "1.0.0"
+    val description: String
+    val license: String get() = "MIT"
+    val viewBox: ViewBox
+    val layout: Layout
+    val eyeTracking: EyeTracking
+    val timings: Timings
+    val hitBoxes: HitBoxes
+    val sleepingHitboxFiles: List<String>
+    val miniMode: MiniMode
+    val objectScale: ObjectScale
+
     val error: String
+        get() = "/assets/images?personaType=${personaType}&emotion=error"
     val happy: String
+        get() = "/assets/images?personaType=${personaType}&emotion=happy"
     val idleFollow: String
+        get() = "/assets/images?personaType=${personaType}&emotion=idleFollow"
     val notification: String
+        get() = "/assets/images?personaType=${personaType}&emotion=notification"
     val thinking: String
+        get() = "/assets/images?personaType=${personaType}&emotion=thinking"
     val typing: String
+        get() = "/assets/images?personaType=${personaType}&emotion=typing"
+    val sleeping: String?
+        get() = null
+    val waking: String?
+        get() = null
+
+    fun getAsset(emotion: String): String
 
     data object DessertFox : PersonaEmotionAssets {
         override val personaType: PersonaType = PersonaType.DESSERT_FOX
-        override val error: String = dessertFoxErrorEmotionSvg
-        override val happy: String = dessertFoxHappyEmotionSvg
-        override val idleFollow: String = dessertFoxIdleFollowEmotionSvg
-        override val notification: String = dessertFoxNotificationEmotionSvg
-        override val typing: String = dessertFoxTypingEmotionSvg
-        override val thinking: String = dessertFoxThinkingEmotionSvg
+        override val name: String = "Tanning Fox"
+        override val author: String = "sumi"
+        override val description: String =
+            "A coding fox with a pocket notebook — pixel-perfect fennec inspired by GitAnimals"
+        override val viewBox = ViewBox(x = -15, y = -25, width = 45, height = 45)
+        override val layout = Layout(
+            contentBox = Box(x = -2, y = -2, width = 20, height = 18),
+            centerX = 7.5,
+            baselineY = 15.0,
+            visibleHeightRatio = 0.58,
+            baselineBottomRatio = 0.05
+        )
+        override val eyeTracking = EyeTracking(
+            enabled = false,
+            states = listOf("idle"),
+            eyeRatioX = 0.52,
+            eyeRatioY = 0.45,
+            maxOffset = 1.5,
+            bodyScale = 0.25,
+            shadowStretch = 0.15,
+            shadowShift = 0.3,
+            ids = EyeTrackingIds(eyes = "eyes-js", body = "body-js", shadow = "shadow-js"),
+            shadowOrigin = "7.5px 14px"
+        )
+        override val timings = Timings(
+            minDisplay = mapOf(
+                "attention" to 4000,
+                "error" to 5000,
+                "notification" to 2500,
+                "working" to 1000,
+                "thinking" to 1000
+            ),
+            autoReturn = mapOf(
+                "attention" to 4000,
+                "error" to 5000,
+                "notification" to 2500
+            ),
+            mouseIdleTimeout = 20000,
+            mouseSleepTimeout = 60000,
+            wakeDuration = 5000
+        )
+        override val hitBoxes = HitBoxes(
+            default = Box(x = -3, y = -8, width = 22, height = 20),
+            sleeping = Box(x = -3, y = -5, width = 22, height = 18)
+        )
+        override val sleepingHitboxFiles = listOf("sleeping.svg")
+        override val miniMode = MiniMode(supported = false)
+        override val objectScale = ObjectScale(
+            widthRatio = 1.9,
+            heightRatio = 1.3,
+            offsetX = -0.45,
+            offsetY = -0.25
+        )
+
+        override fun getAsset(emotion: String): String {
+            return when (emotion) {
+                "error" -> dessertFoxErrorEmotionSvg
+                "happy" -> dessertFoxHappyEmotionSvg
+                "idleFollow" -> dessertFoxIdleFollowEmotionSvg
+                "notification" -> dessertFoxNotificationEmotionSvg
+                "thinking" -> dessertFoxThinkingEmotionSvg
+                "typing" -> dessertFoxTypingEmotionSvg
+                else -> throw IllegalArgumentException("Invalid emotion: $emotion")
+            }
+        }
     }
 
     companion object {
@@ -30,3 +116,44 @@ sealed interface PersonaEmotionAssets {
         }
     }
 }
+
+data class ViewBox(val x: Int, val y: Int, val width: Int, val height: Int)
+data class Layout(
+    val contentBox: Box,
+    val centerX: Double,
+    val baselineY: Double,
+    val visibleHeightRatio: Double,
+    val baselineBottomRatio: Double
+)
+
+data class Box(val x: Int, val y: Int, val width: Int, val height: Int)
+data class EyeTracking(
+    val enabled: Boolean,
+    val states: List<String>,
+    val eyeRatioX: Double,
+    val eyeRatioY: Double,
+    val maxOffset: Double,
+    val bodyScale: Double,
+    val shadowStretch: Double,
+    val shadowShift: Double,
+    val ids: EyeTrackingIds,
+    val shadowOrigin: String
+)
+
+data class EyeTrackingIds(val eyes: String, val body: String, val shadow: String)
+data class Timings(
+    val minDisplay: Map<String, Int>,
+    val autoReturn: Map<String, Int>,
+    val mouseIdleTimeout: Int,
+    val mouseSleepTimeout: Int,
+    val wakeDuration: Int
+)
+
+data class HitBoxes(val default: Box, val sleeping: Box)
+data class MiniMode(val supported: Boolean)
+data class ObjectScale(
+    val widthRatio: Double,
+    val heightRatio: Double,
+    val offsetX: Double,
+    val offsetY: Double
+)
diff --git a/src/main/kotlin/org/gitanimals/render/app/response/AssetsResponse.kt b/src/main/kotlin/org/gitanimals/render/app/response/AssetsResponse.kt
@@ -1,9 +1,24 @@
 package org.gitanimals.render.app.response
 
-import org.gitanimals.render.app.PersonaEmotionAssets
+import com.fasterxml.jackson.annotation.JsonProperty
+import org.gitanimals.render.app.*
 
 data class AssetsResponse(
-    val animationAssets: PersonaEmotionAssets,
+    val schemaVersion: Int,
+    val name: String,
+    val author: String,
+    val version: String,
+    val description: String,
+    val license: String,
+    val viewBox: ViewBox,
+    val layout: Layout,
+    val eyeTracking: EyeTracking,
+    val states: Map<String, List<String?>>,
+    val timings: Timings,
+    val hitBoxes: HitBoxes,
+    val sleepingHitboxFiles: List<String>,
+    val miniMode: MiniMode,
+    val objectScale: ObjectScale,
     val mimeType: String,
 ) {
 
@@ -15,9 +30,33 @@ data class AssetsResponse(
             animationAssets: PersonaEmotionAssets,
         ): AssetsResponse {
             return AssetsResponse(
-                animationAssets = animationAssets,
+                schemaVersion = animationAssets.schemaVersion,
+                name = animationAssets.name,
+                author = animationAssets.author,
+                version = animationAssets.version,
+                description = animationAssets.description,
+                license = animationAssets.license,
+                viewBox = animationAssets.viewBox,
+                layout = animationAssets.layout,
+                eyeTracking = animationAssets.eyeTracking,
+                states = mapOf(
+                    "idle" to listOf(animationAssets.idleFollow),
+                    "thinking" to listOf(animationAssets.thinking),
+                    "working" to listOf(animationAssets.typing),
+                    "error" to listOf(animationAssets.error),
+                    "attention" to listOf(animationAssets.happy),
+                    "notification" to listOf(animationAssets.notification),
+                    "sleeping" to listOf(animationAssets.sleeping),
+                    "waking" to listOf(animationAssets.waking),
+                ),
+                timings = animationAssets.timings,
+                hitBoxes = animationAssets.hitBoxes,
+                sleepingHitboxFiles = animationAssets.sleepingHitboxFiles,
+                miniMode = animationAssets.miniMode,
+                objectScale = animationAssets.objectScale,
                 mimeType = MIME_TYPE_SVG_IMAGE,
             )
         }
     }
 }
+
diff --git a/src/main/kotlin/org/gitanimals/render/controller/AnimationController.kt b/src/main/kotlin/org/gitanimals/render/controller/AnimationController.kt
@@ -55,4 +55,13 @@ class AnimationController(
     ): AssetsResponse {
         return assetsFacade.findAllAssets(token, personaType)
     }
+
+    @GetMapping(value = ["/assets/images"], produces = ["image/svg+xml"])
+    fun getAssetImage(
+        @RequestHeader(HttpHeaders.AUTHORIZATION) token: String,
+        @RequestParam("personaType") personaType: PersonaType,
+        @RequestParam("emotion") emotion: String,
+    ): String {
+        return assetsFacade.findAssetSvg(token, personaType, emotion)
+    }
 }
diff --git a/src/main/kotlin/org/gitanimals/render/controller/PersonaController.kt b/src/main/kotlin/org/gitanimals/render/controller/PersonaController.kt
@@ -24,8 +24,14 @@ class PersonaController(
 ) {
 
     @GetMapping("/users/{username}")
-    fun getUserByName(@PathVariable("username") username: String): UserResponse {
-        return UserResponse.from(userService.getUserByNameWithAllContributions(username))
+    fun getUserByName(
+        @PathVariable("username") username: String,
+        @RequestParam("filter-animation", defaultValue = "false") filterAnimation: Boolean,
+    ): UserResponse {
+        return UserResponse.of(
+            user = userService.getUserByNameWithAllContributions(username),
+            filterAnimation = filterAnimation,
+        )
     }
 
     @GetMapping("/personas/{persona-id}")
diff --git a/src/main/kotlin/org/gitanimals/render/controller/response/UserResponse.kt b/src/main/kotlin/org/gitanimals/render/controller/response/UserResponse.kt
diff --git a/src/test/kotlin/org/gitanimals/render/app/PersonaEmotionTypeTest.kt b/src/test/kotlin/org/gitanimals/render/app/PersonaEmotionTypeTest.kt

Original file line number	Diff line number	Diff line change
`@@ -55,4 +55,13 @@ class AnimationController(`
`55`	`55`	`): AssetsResponse {`
`56`	`56`	`return assetsFacade.findAllAssets(token, personaType)`
`57`	`57`	`}`
	`58`	`+`
	`59`	`+ @GetMapping(value = ["/assets/images"], produces = ["image/svg+xml"])`
	`60`	`+ fun getAssetImage(`
	`61`	`+ @RequestHeader(HttpHeaders.AUTHORIZATION) token: String,`
	`62`	`+ @RequestParam("personaType") personaType: PersonaType,`
	`63`	`+ @RequestParam("emotion") emotion: String,`
	`64`	`+ ): String {`
	`65`	`+ return assetsFacade.findAssetSvg(token, personaType, emotion)`
	`66`	`+ }`
`58`	`67`	`}`