Feat/#28

src/main/kotlin/com/yapp2app/auth/infra/security/token/AuthTokenProvider.kt

@@ -45,7 +45,7 @@ class AuthTokenProvider(private val appProperties: AppProperties) {
             .claim(AUTHORITIES_KEY, roles)
             .apply {
                 name?.let { claim(NAME_KEY, it) }
-                providerType?.let { claim(PROVIDER_TYPE_KEY, it) }
+                providerType?.let { claim(PROVIDER_TYPE_KEY, it.name) }
             }
             .issuedAt(Date.from(now))
             .expiration(Date.from(now.plusMillis(expiryMillis)))

src/main/kotlin/com/yapp2app/common/api/dto/ResultCode.kt

@@ -16,6 +16,7 @@ enum class ResultCode(val code: String, val message: String) {
     NOT_FOUND_USER("D-03", "가입된 계정이 없습니다."),
     NOT_FOUND("D-04", "데이터를 찾을 수 없습니다."),
     ALREADY_REQUEST("D-05", "이미 처리된 요청입니다."),
+    UPLOAD_FAILED("D-06", "파일 업로드에 실패했습니다."),
 
     CONFLICT_FOLDER("D-06", message = "해당하는 폴더가 존재합니다."),
 

src/main/kotlin/com/yapp2app/media/api/controller/MediaController.kt

@@ -0,0 +1,61 @@
+package com.yapp2app.media.api.controller
+
+import com.yapp2app.common.api.document.RequiresSecurity
+import com.yapp2app.common.api.dto.BaseResponse
+import com.yapp2app.media.api.converter.MediaCommandConverter
+import com.yapp2app.media.api.converter.MediaResultConverter
+import com.yapp2app.media.api.dto.GenerateUploadTicketRequest
+import com.yapp2app.media.api.dto.GenerateUploadTicketResponse
+import com.yapp2app.media.application.usecase.GenerateUploadTicketUseCase
+import io.swagger.v3.oas.annotations.Operation
+import io.swagger.v3.oas.annotations.tags.Tag
+import org.springframework.security.core.annotation.AuthenticationPrincipal
+import org.springframework.web.bind.annotation.PostMapping
+import org.springframework.web.bind.annotation.RequestBody
+import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RestController
+
+/**
+ * fileName       : MediaController
+ * author         : koo
+ * date           : 2026. 1. 2. 오후 7:34
+ * description    : Media api endpoint
+ */
+@Tag(name = "MediaController", description = "미디어 업로드 API")
+@RequiresSecurity
+@RestController
+@RequestMapping("/api/media")
+class MediaController(
+    private val generateUploadTicketUseCase: GenerateUploadTicketUseCase,
+    private val commandConverter: MediaCommandConverter,
+    private val resultConverter: MediaResultConverter,
+) {
+
+    @Operation(
+        summary = "미디어 업로드 ticket 발급",
+        description = """
+            mediaType:
+            * USER_PROFILE("user-profiles") : 사용자 프로필
+            * PHOTO_BOOTH("photo-booth") : 인생네컷
+            * ATTACHMENT("attachments") : 확장성을 고려한 첨부 이미지
+            * TEMP("temp") : 업로드 검증, 테스트 등
+
+            contentType:
+            * image/jpeg
+            * image/png
+        """,
+    )
+    @PostMapping("/upload")
+    fun generateUploadTicket(
+        @AuthenticationPrincipal(expression = "id") ownerId: Long,
+        @RequestBody request: GenerateUploadTicketRequest,
+    ): BaseResponse<GenerateUploadTicketResponse> {
+        val command = commandConverter.toGenerateUploadTicketCommand(ownerId, request)
+
+        val result = generateUploadTicketUseCase.execute(command)
+
+        val response = resultConverter.toGenerateUploadTicketResponse(result)
+
+        return BaseResponse(data = response)
+    }
+}

src/main/kotlin/com/yapp2app/media/api/MediaTestController.kt → src/main/kotlin/com/yapp2app/media/api/controller/MediaTestController.kt

@@ -1,4 +1,4 @@
-package com.yapp2app.media.api
+package com.yapp2app.media.api.controller
 
 import com.yapp2app.media.application.port.MediaStoragePort
 import com.yapp2app.media.domain.MediaKey
@@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.PostMapping
 import org.springframework.web.bind.annotation.RequestMapping
 import org.springframework.web.bind.annotation.RequestParam
 import org.springframework.web.bind.annotation.RestController
+import java.time.Instant
 
 /**
  * fileName       : MediaTestController
@@ -44,24 +45,23 @@ class MediaTestController(private val mediaStorage: MediaStoragePort) {
     fun generatePresignedUrl(
         @RequestParam(required = false) filename: String?,
         @RequestParam(defaultValue = "image/jpeg") contentType: String,
-        @RequestParam(defaultValue = "15") expirationMinutes: Long,
     ): PresignedUrlResponse {
         // filename이 없는 경우 contentType에서 확장자 추출하여 기본 파일명 생성
         val effectiveFilename = filename ?: "upload.${contentType.substringAfter("/", "jpg")}"
 
-        val key = MediaKey.generate(MediaType.TEMP, effectiveFilename)
+        val key = MediaKey.generate(MediaType.TEMP, effectiveFilename, contentType)
 
         // Presigned URL 생성
-        val presignedUrl = mediaStorage.generatePresignedUrl(
+        val uploadTicket = mediaStorage.generateUploadTicket(
             key = key,
             contentType = contentType,
-            expirationMinutes = expirationMinutes,
         )
 
         return PresignedUrlResponse(
             key = key,
-            presignedUrl = presignedUrl,
-            expiresIn = expirationMinutes,
+            presignedUrl = uploadTicket.url,
+            method = uploadTicket.method,
+            expiresAt = uploadTicket.expiresAt,
             contentType = contentType,
         )
     }
@@ -107,6 +107,7 @@ data class MediaItem(val key: String, val url: String, val type: String)
 data class PresignedUrlResponse(
     val key: String,
     val presignedUrl: String,
-    val expiresIn: Long,
+    val method: String,
+    val expiresAt: Instant,
     val contentType: String,
 )

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

@@ -0,0 +1,25 @@
+package com.yapp2app.media.api.converter
+
+import com.yapp2app.media.api.dto.GenerateUploadTicketRequest
+import com.yapp2app.media.application.command.GenerateUploadTicketCommand
+import org.springframework.stereotype.Component
+
+/**
+ * fileName       : MediaCommandConverter
+ * author         : koo
+ * date           : 2026. 1. 2. 오후 7:48
+ * description    : Media application layer command 변경을 위한 converter
+ */
+@Component
+class MediaCommandConverter {
+
+    fun toGenerateUploadTicketCommand(
+        ownerId: Long,
+        request: GenerateUploadTicketRequest,
+    ): GenerateUploadTicketCommand = GenerateUploadTicketCommand(
+        ownerId = ownerId,
+        filename = request.filename,
+        contentType = request.contentType,
+        mediaType = request.mediaType,
+    )
+}

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

@@ -0,0 +1,24 @@
+package com.yapp2app.media.api.converter
+
+import com.yapp2app.media.api.dto.GenerateUploadTicketResponse
+import com.yapp2app.media.application.result.GenerateUploadTicketResult
+import org.springframework.stereotype.Component
+
+/**
+ * fileName       : MediaResultConverter
+ * author         : koo
+ * date           : 2026. 1. 2. 오후 7:48
+ * description    : Media api layer response 변경을 위한 converter
+ */
+@Component
+class MediaResultConverter {
+
+    fun toGenerateUploadTicketResponse(result: GenerateUploadTicketResult): GenerateUploadTicketResponse =
+        GenerateUploadTicketResponse(
+            mediaId = result.mediaId,
+            uploadUrl = result.uploadUrl,
+            method = result.method,
+            expiresIn = result.expiresAt,
+            contentType = result.contentType,
+        )
+}

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

@@ -0,0 +1,11 @@
+package com.yapp2app.media.api.dto
+
+import com.yapp2app.media.domain.MediaType
+
+/**
+ * fileName       : GenerateUploadTicketRequest
+ * author         : koo
+ * date           : 2026. 1. 2. 오후 7:47
+ * description    : object storage 저장 요청
+ */
+data class GenerateUploadTicketRequest(val filename: String, val contentType: String, val mediaType: MediaType)

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

@@ -0,0 +1,17 @@
+package com.yapp2app.media.api.dto
+
+import java.time.Instant
+
+/**
+ * fileName       : GenerateUploadTicketResponse
+ * author         : koo
+ * date           : 2026. 1. 2. 오후 7:47
+ * description    : object storage 저장 응답
+ */
+data class GenerateUploadTicketResponse(
+    val mediaId: Long,
+    val uploadUrl: String,
+    val method: String,
+    val expiresIn: Instant,
+    val contentType: String,
+)

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

@@ -0,0 +1,24 @@
+package com.yapp2app.media.application.command
+
+import com.yapp2app.media.domain.MediaType
+
+/**
+ * fileName       : MediaCommand
+ * author         : koo
+ * date           : 2026. 1. 3. 오전 12:04
+ * description    : Media domain command
+ */
+data class ConfirmMediaUploadedCommand(val ownerId: Long, val mediaId: Long)
+
+data class GenerateUploadTicketCommand(
+    val ownerId: Long,
+    val filename: String,
+    val contentType: String,
+    val mediaType: MediaType,
+)
+
+data class DeleteMediaCommand(val ownerId: Long, val mediaId: Long)
+
+data class DeleteMediasCommand(val ownerId: Long, val mediaIds: List<Long>)
+
+data class GetMediasCommand(val ownerId: Long, val mediaIds: List<Long>)

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

@@ -0,0 +1,16 @@
+package com.yapp2app.media.application.port
+
+/**
+ * fileName       : MediaBinaryCachePort
+ * author         : koo
+ * date           : 2026. 1. 8. 오후 4:19
+ * description    : MediaBinary를 가져오기 위한 cache port
+ */
+interface MediaBinaryCachePort {
+
+    fun get(key: String): ByteArray?
+
+    fun put(key: String, value: ByteArray)
+
+    fun evict(key: String)
+}

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

@@ -0,0 +1,21 @@
+package com.yapp2app.media.application.port
+
+import com.yapp2app.media.domain.entity.Media
+
+/**
+ * fileName       : MediaRepositoryPort
+ * author         : koo
+ * date           : 2026. 1. 2. 오후 8:06
+ * description    : Media repository port
+ */
+interface MediaRepositoryPort {
+
+    fun getActiveMedia(ownerId: Long, id: Long): Media?
+    fun getActiveMedias(ownerId: Long, ids: List<Long>): List<Media>
+    fun getMediaForUploadConfirmation(ownerId: Long, id: Long): Media?
+
+    fun save(media: Media): Media
+
+    fun delete(id: Long)
+    fun deleteAll(ids: List<Long>)
+}

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

@@ -1,6 +1,7 @@
 package com.yapp2app.media.application.port
 
 import com.yapp2app.media.application.dto.MediaRef
+import java.time.Instant
 
 /**
  * fileName       : MediaStorage
@@ -14,7 +15,14 @@ interface MediaStoragePort {
 
     fun findByKey(key: String): String
 
+    fun fetchBinaryByKey(key: String): ByteArray
+
     fun findAll(prefix: String): List<MediaRef>
 
-    fun generatePresignedUrl(key: String, contentType: String, expirationMinutes: Long = 10): String
+    fun exists(key: String): Boolean
+
+    fun generateUploadTicket(key: String, contentType: String): UploadTicket
+
+    // contract
+    data class UploadTicket(val url: String, val method: String, val expiresAt: Instant, val contentType: String)
 }

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

@@ -0,0 +1,31 @@
+package com.yapp2app.media.application.result
+
+import java.time.Instant
+
+/**
+ * fileName       : MediaResult
+ * author         : koo
+ * date           : 2026. 1. 3. 오전 12:04
+ * description    : Media domain application result
+ */
+data class ConfirmMediaUploadedResult(val success: Boolean)
+
+data class GenerateUploadTicketResult(
+    val mediaId: Long,
+    val uploadUrl: String,
+    val method: String,
+    val expiresAt: Instant,
+    val contentType: String,
+)
+
+data class GetMediasResult(val medias: List<MediaInfo>) {
+    data class MediaInfo(val mediaId: Long, val binaryData: ByteArray, val contentType: String) {
+        override fun equals(other: Any?): Boolean {
+            if (this === other) return true
+            if (other !is MediaInfo) return false
+            return mediaId == other.mediaId
+        }
+
+        override fun hashCode(): Int = mediaId.hashCode()
+    }
+}

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

@@ -0,0 +1,61 @@
+package com.yapp2app.media.application.usecase
+
+import com.yapp2app.common.annotation.UseCase
+import com.yapp2app.common.api.dto.ResultCode
+import com.yapp2app.common.exception.BusinessException
+import com.yapp2app.common.transaction.TransactionRunner
+import com.yapp2app.media.application.command.ConfirmMediaUploadedCommand
+import com.yapp2app.media.application.port.MediaRepositoryPort
+import com.yapp2app.media.application.port.MediaStoragePort
+import com.yapp2app.media.application.result.ConfirmMediaUploadedResult
+
+/**
+ * fileName       : VerifyMediaUseCase
+ * author         : koo
+ * date           : 2026. 1. 2. 오후 8:47
+ * description    : Object Storage에 정상적으로 저장됐는지 확인하는 usecase
+ */
+@UseCase
+class ConfirmMediaUploadedUseCase(
+    private val mediaRepository: MediaRepositoryPort,
+    private val mediaStorage: MediaStoragePort,
+    private val transactionRunner: TransactionRunner,
+) {
+
+    fun execute(command: ConfirmMediaUploadedCommand): ConfirmMediaUploadedResult {
+        val media = mediaRepository.getMediaForUploadConfirmation(command.ownerId, command.mediaId)
+            ?: throw BusinessException(ResultCode.NOT_FOUND)
+
+        // 이미 업로드된 경우 무시
+        if (media.isUploaded()) {
+            return ConfirmMediaUploadedResult(true)
+        }
+
+        // 오브젝트 스토리지에 해당 키가 존재하는지 확인
+        val exists = mediaStorage.exists(media.storageKey)
+
+        return transactionRunner.runNew {
+            val media = mediaRepository.getMediaForUploadConfirmation(command.ownerId, command.mediaId)
+                ?: throw BusinessException(ResultCode.NOT_FOUND)
+
+            if (media.isUploaded() || exists) {
+                media.markAsUploaded()
+                ConfirmMediaUploadedResult(true)
+            } else {
+                ConfirmMediaUploadedResult(false)
+            }
+        }
+    }
+
+    /**
+     * 보상 트랜잭션: media 상태를 INITIATED로 롤백
+     * PhotoImage 저장 실패 시 호출
+     */
+    fun rollback(command: ConfirmMediaUploadedCommand) {
+        transactionRunner.runNew {
+            val media = mediaRepository.getMediaForUploadConfirmation(command.ownerId, command.mediaId)
+                ?: return@runNew
+            media.markAsInitiated()
+        }
+    }
+}