fix/#125 -> staging merge commit

* fix: media 생성시 width, height 입력 받기

* fix: 포즈 상세 및 랜덤포즈 오동작 문제 해결 (관리자 계정만 동작했었음)

---------

Co-authored-by: darren <darren@darrenui-MacBookPro.local>

Author: Darren4641

src/main/kotlin/com/yapp2app/media/api/converter/MediaCommandConverter.kt

@@ -21,6 +21,8 @@ class MediaCommandConverter {
                     filename = item.filename!!,
                     contentType = item.contentType!!,
                     mediaType = item.mediaType!!,
+                    width = item.width,
+                    height = item.height,
                 )
             },
         )

src/main/kotlin/com/yapp2app/media/api/dto/UploadTicketRequest.kt

@@ -28,5 +28,9 @@ data class UploadTicketRequest(
 
         @field:NotNull(message = "미디어 타입은 필수 입력값입니다.")
         val mediaType: MediaType?,
+
+        val width: Int? = null,
+
+        val height: Int? = null,
     )
 }

src/main/kotlin/com/yapp2app/media/application/command/MediaCommand.kt

@@ -11,7 +11,13 @@ import com.yapp2app.media.domain.MediaType
 data class ConfirmMediasUploadedCommand(val ownerId: Long, val mediaIds: List<Long>)
 
 data class GenerateUploadTicketCommand(val ownerId: Long, val items: List<UploadTicketItem>) {
-    data class UploadTicketItem(val filename: String, val contentType: String, val mediaType: MediaType)
+    data class UploadTicketItem(
+        val filename: String,
+        val contentType: String,
+        val mediaType: MediaType,
+        val width: Int? = null,
+        val height: Int? = null,
+    )
 }
 
 data class DeleteMediaCommand(val ownerId: Long, val mediaId: Long)
@@ -22,6 +28,6 @@ data class GetMediasCommand(val ownerId: Long, val mediaIds: List<Long>)
 
 data class GetImageByKeyCommand(val objectKey: String)
 
-data class GetMediaStorageInfoCommand(val ownerId: Long, val mediaId: Long)
+data class GetMediaStorageInfoCommand(val ownerId: Long?, val mediaId: Long)
 
 data class GetMediaStorageInfosCommand(val ownerId: Long?, val mediaIds: List<Long>)

src/main/kotlin/com/yapp2app/media/application/port/MediaRepositoryPort.kt

@@ -10,6 +10,7 @@ import com.yapp2app.media.domain.entity.Media
  */
 interface MediaRepositoryPort {
 
+    fun getActiveMedia(id: Long): Media?
     fun getActiveMedia(ownerId: Long, id: Long): Media?
     fun getActiveMedias(ids: List<Long>): List<Media>
     fun getActiveMedias(ownerId: Long, ids: List<Long>): List<Media>

src/main/kotlin/com/yapp2app/media/application/result/MediaResult.kt

@@ -51,8 +51,20 @@ data class GetImageByKeyResult(val binaryData: ByteArray, val contentType: Strin
     override fun hashCode(): Int = 31 * binaryData.contentHashCode() + contentType.hashCode()
 }
 
-data class GetMediaStorageInfoResult(val mediaId: Long, val storageKey: String, val contentType: String)
+data class GetMediaStorageInfoResult(
+    val mediaId: Long,
+    val storageKey: String,
+    val contentType: String,
+    val width: Int? = null,
+    val height: Int? = null,
+)
 
 data class GetMediaStorageInfosResult(val storageInfos: List<StorageInfo>) {
-    data class StorageInfo(val mediaId: Long, val storageKey: String, val contentType: String)
+    data class StorageInfo(
+        val mediaId: Long,
+        val storageKey: String,
+        val contentType: String,
+        val width: Int? = null,
+        val height: Int? = null,
+    )
 }

src/main/kotlin/com/yapp2app/media/application/usecase/GenerateUploadTicketUseCase.kt

@@ -38,6 +38,8 @@ class GenerateUploadTicketUseCase(
                 ownerId = command.ownerId,
                 mediaType = item.mediaType,
                 contentType = item.contentType,
+                width = item.width,
+                height = item.height,
             )
             val savedMedia = mediaRepository.save(media)
 

src/main/kotlin/com/yapp2app/media/application/usecase/GetMediaStorageInfoUseCase.kt

@@ -17,15 +17,20 @@ import com.yapp2app.media.application.result.GetMediaStorageInfoResult
 class GetMediaStorageInfoUseCase(private val mediaRepository: MediaRepositoryPort) {
 
     fun execute(command: GetMediaStorageInfoCommand): GetMediaStorageInfoResult {
-        val media = (
+        val media = command.ownerId?.let {
             mediaRepository.getActiveMedia(command.ownerId, command.mediaId)
-                ?: throw BusinessException(ResultCode.NOT_FOUND)
-            )
+        } ?: mediaRepository.getActiveMedia(command.mediaId)
+
+        if (media == null) {
+            throw BusinessException(ResultCode.NOT_FOUND)
+        }
 
         return GetMediaStorageInfoResult(
             mediaId = media.id!!,
             storageKey = media.storageKey,
             contentType = media.contentType,
+            width = media.width,
+            height = media.height,
         )
     }
 }

src/main/kotlin/com/yapp2app/media/application/usecase/GetMediaStorageInfosUseCase.kt

@@ -24,6 +24,8 @@ class GetMediaStorageInfosUseCase(private val mediaRepository: MediaRepositoryPo
                 mediaId = it.id!!,
                 storageKey = it.storageKey,
                 contentType = it.contentType,
+                width = it.width,
+                height = it.height,
             )
         }
 

src/main/kotlin/com/yapp2app/media/domain/entity/Media.kt

@@ -40,6 +40,12 @@ class Media(
 
     @Column(name = "content_type", nullable = true, length = 100)
     val contentType: String,
+
+    @Column(name = "width", nullable = true)
+    val width: Int? = null,
+
+    @Column(name = "height", nullable = true)
+    val height: Int? = null,
 ) : BaseTimeEntity() {
 
     fun markAsUploaded() {

src/main/kotlin/com/yapp2app/media/infra/persist/MediaRepositoryAdapter.kt

@@ -15,6 +15,8 @@ import org.springframework.stereotype.Repository
 @Repository
 class MediaRepositoryAdapter(private val jpaRepository: JpaMediaRepository) : MediaRepositoryPort {
 
+    override fun getActiveMedia(id: Long): Media? = jpaRepository.findByIdAndStatus(id, MediaStatus.UPLOADED)
+
     override fun getActiveMedia(ownerId: Long, id: Long): Media? =
         jpaRepository.findByOwnerIdAndIdAndStatus(ownerId, id, MediaStatus.UPLOADED)