운영환경 1.0.0 버전 반영

build.gradle.kts

@@ -30,7 +30,7 @@ val mockkVersion = "1.13.10"
 val ktlintVersion = "1.5.0"
 
 group = "com.yapp2app"
-version = "0.0.1"
+version = "1.0.0"
 
 java {
     toolchain {

src/main/kotlin/com/yapp2app/common/exception/handler/ExceptionHandler.kt

@@ -15,6 +15,7 @@ import org.springframework.web.bind.MissingServletRequestParameterException
 import org.springframework.web.bind.annotation.ExceptionHandler
 import org.springframework.web.bind.annotation.RestControllerAdvice
 import org.springframework.web.context.request.WebRequest
+import org.springframework.web.method.annotation.HandlerMethodValidationException
 import org.springframework.web.method.annotation.MethodArgumentTypeMismatchException
 import java.util.function.Consumer
 
@@ -114,6 +115,16 @@ class ExceptionHandler {
         HttpStatus.BAD_REQUEST,
     )
 
+    @ExceptionHandler(HandlerMethodValidationException::class)
+    fun handleMethodValidationExceptionHandler(ex: HandlerMethodValidationException): ResponseEntity<ExceptionMsg> =
+        ResponseEntity(
+            ExceptionMsg(
+                resultCode = ResultCode.INVALID_PARAMETER.code,
+                message = ResultCode.INVALID_PARAMETER.message,
+            ),
+            HttpStatus.BAD_REQUEST,
+        )
+
     @ExceptionHandler(MethodArgumentTypeMismatchException::class)
     fun handleTypeMismatchHandler(ex: MethodArgumentTypeMismatchException): ResponseEntity<ExceptionMsg> =
         if (ex.requiredType?.isEnum == true) {

src/main/kotlin/com/yapp2app/photo/api/controller/FolderController.kt

@@ -18,6 +18,7 @@ import com.yapp2app.photo.application.usecase.UpdateFolderUseCase
 import io.swagger.v3.oas.annotations.Operation
 import io.swagger.v3.oas.annotations.tags.Tag
 import jakarta.validation.Valid
+import jakarta.validation.constraints.Min
 import org.springframework.security.core.annotation.AuthenticationPrincipal
 import org.springframework.web.bind.annotation.DeleteMapping
 import org.springframework.web.bind.annotation.GetMapping
@@ -72,8 +73,11 @@ class FolderController(
         description = "폴더 목록을 조회합니다.",
     )
     @GetMapping
-    fun getAllFolder(@AuthenticationPrincipal(expression = "id") userId: Long): BaseResponse<GetAllFolderResponse> {
-        val command = commandConverter.toGetFoldersCommand(userId)
+    fun getAllFolder(
+        @AuthenticationPrincipal(expression = "id") userId: Long,
+        @RequestParam("limit") @Min(1) limit: Int?,
+    ): BaseResponse<GetAllFolderResponse> {
+        val command = commandConverter.toGetFoldersCommand(userId, limit)
 
         val result = getFoldersUseCase.execute(command)
 

src/main/kotlin/com/yapp2app/photo/api/converter/FolderCommandConverter.kt

@@ -23,7 +23,7 @@ class FolderCommandConverter {
     fun toCreateFolderCommand(request: CreateFolderRequest, userId: Long): CreateFolderCommand =
         CreateFolderCommand(userId, request.name!!)
 
-    fun toGetFoldersCommand(userId: Long): GetFoldersCommand = GetFoldersCommand(userId)
+    fun toGetFoldersCommand(userId: Long, limit: Int?): GetFoldersCommand = GetFoldersCommand(userId, limit)
 
     fun toDeleteFoldersCommand(request: DeleteFoldersRequest, userId: Long, deletePhotos: Boolean) =
         DeleteFoldersCommand(userId, request.folderIds, deletePhotos)

src/main/kotlin/com/yapp2app/photo/api/converter/PhotoImageCommandConverter.kt

@@ -29,6 +29,7 @@ class PhotoImageCommandConverter {
                 memo = item.memo,
             )
         },
+        favorite = request.favorite ?: false,
     )
 
     fun toGetPhotosCommand(

src/main/kotlin/com/yapp2app/photo/api/dto/FolderRequest.kt

@@ -14,7 +14,7 @@ import jakarta.validation.constraints.Size
 data class CreateFolderRequest(
     @field:Schema(description = "폴더명", example = "즐겨찾기")
     @field:NotBlank(message = "폴더명은 필수입니다.")
-    @field:Size(min = 1, max = 16, message = "폴더명은 1 ~ 16자 사이여야 합니다.")
+    @field:Size(min = 1, max = 10, message = "폴더명은 1자 이상 10자 이하여야 합니다.")
     val name: String?,
 )
 
@@ -30,7 +30,7 @@ data class DeleteFoldersRequest(
 data class UpdateFolderRequest(
     @field:Schema(description = "변경할 폴더명", example = "대학교 친구")
     @field:NotBlank(message = "폴더명은 필수입니다.")
-    @field:Size(min = 1, max = 16, message = "폴더명은 1 ~ 16자 사이여야 합니다.")
+    @field:Size(min = 1, max = 10, message = "폴더명은 1자 이상 10자 이하여야 합니다.")
     val name: String?,
 )
 

src/main/kotlin/com/yapp2app/photo/api/dto/PhotoImageRequest.kt

@@ -5,6 +5,7 @@ import jakarta.annotation.Nullable
 import jakarta.validation.Valid
 import jakarta.validation.constraints.NotEmpty
 import jakarta.validation.constraints.NotNull
+import jakarta.validation.constraints.Size
 
 /**
  * fileName       : PhotoImageRequest
@@ -18,8 +19,11 @@ data class UploadPhotoRequest(
 
     @field:NotEmpty(message = "uploads가 비어있습니다.")
     @field:Valid
-    @field:jakarta.validation.constraints.Size(max = 10, message = "한 번에 최대 10장까지 업로드할 수 있습니다.")
+    @field:Size(max = 10, message = "한 번에 최대 10장까지 업로드할 수 있습니다.")
     val uploads: List<UploadPhotoItem>,
+
+    @field:Schema(description = "업로드 사진 즐겨찾기 등록 여부", example = "true")
+    val favorite: Boolean? = null,
 ) {
     data class UploadPhotoItem(
         @field:NotNull(message = "mediaId는 필수 입력값입니다.")

src/main/kotlin/com/yapp2app/photo/application/command/FolderCommand.kt

@@ -10,7 +10,7 @@ data class CreateFolderCommand(val userId: Long, val name: String)
 
 data class DeleteFoldersCommand(val userId: Long, val folderIds: List<Long>, val deletePhotos: Boolean = false)
 
-data class GetFoldersCommand(val userId: Long)
+data class GetFoldersCommand(val userId: Long, val limit: Int?)
 
 data class UpdateFolderCommand(val userId: Long, val folderId: Long, val newName: String)
 

src/main/kotlin/com/yapp2app/photo/application/command/PhotoImageCommand.kt

@@ -8,7 +8,12 @@ import com.yapp2app.common.domain.vo.SortOrder
  * date           : 2026. 1. 2. 오후 8:28
  * description    : Photo image domain command
  */
-data class UploadPhotoCommand(val userId: Long, val folderId: Long?, val uploads: List<UploadItem>) {
+data class UploadPhotoCommand(
+    val userId: Long,
+    val folderId: Long?,
+    val uploads: List<UploadItem>,
+    val favorite: Boolean,
+) {
     data class UploadItem(val mediaId: Long, val memo: String?)
 }
 

src/main/kotlin/com/yapp2app/photo/application/port/FavoriteImageRepositoryPort.kt

@@ -10,6 +10,8 @@ interface FavoriteImageRepositoryPort {
 
     fun add(userId: Long, photoId: Long)
 
+    fun addAll(userId: Long, photoIds: List<Long>)
+
     fun delete(userId: Long, photoId: Long)
 
     fun deleteAll(userId: Long, photoIds: List<Long>)

src/main/kotlin/com/yapp2app/photo/application/port/FolderRepositoryPort.kt

@@ -17,7 +17,7 @@ interface FolderRepositoryPort {
 
     fun listOwnedFolders(userId: Long): List<Folder>
 
-    fun listOwnedFoldersWithStats(userId: Long): List<FolderWithStats>
+    fun listOwnedFoldersWithStats(userId: Long, limit: Int?): List<FolderWithStats>
 
     fun getOwnedFolder(userId: Long, folderId: Long): Folder?
     fun getOwnedFolders(userId: Long, folderIds: List<Long>): List<Folder>

src/main/kotlin/com/yapp2app/photo/application/port/PhotoImageRepositoryPort.kt

@@ -19,6 +19,8 @@ interface PhotoImageRepositoryPort {
 
     fun saveAll(photoImages: List<PhotoImage>): List<PhotoImage>
 
+    fun getRegisteredMediaIds(mediaIds: List<Long>): Set<Long>
+
     /**
      * 조회
      */

src/main/kotlin/com/yapp2app/photo/application/usecase/GetFoldersUseCase.kt

@@ -17,7 +17,7 @@ class GetFoldersUseCase(private val folderRepository: FolderRepositoryPort) {
 
     @Transactional(readOnly = true)
     fun execute(command: GetFoldersCommand): GetFoldersResult {
-        val foldersWithStats = folderRepository.listOwnedFoldersWithStats(command.userId)
+        val foldersWithStats = folderRepository.listOwnedFoldersWithStats(command.userId, command.limit)
 
         val items = foldersWithStats.map { folder ->
             GetFoldersResult.FolderInfo(

src/main/kotlin/com/yapp2app/photo/application/usecase/UploadPhotosUseCase.kt

@@ -6,13 +6,14 @@ import com.yapp2app.common.exception.BusinessException
 import com.yapp2app.common.transaction.TransactionRunner
 import com.yapp2app.photo.application.command.UploadPhotoCommand
 import com.yapp2app.photo.application.contract.MediaAvailability
+import com.yapp2app.photo.application.port.FavoriteImageRepositoryPort
 import com.yapp2app.photo.application.port.FolderRepositoryPort
 import com.yapp2app.photo.application.port.MediaClientPort
 import com.yapp2app.photo.application.port.PhotoImageRepositoryPort
 import com.yapp2app.photo.domain.entity.PhotoImage
 
 /**
- * fileName       : BulkUploadPhotoUseCase
+ * fileName       : UploadPhotosUseCase
  * author         : koo
  * date           : 2026. 1. 20.
  * description    : 다중 사진 업로드 UseCase (최대 10장)
@@ -22,6 +23,7 @@ class UploadPhotosUseCase(
     private val mediaClient: MediaClientPort,
     private val photoImageRepository: PhotoImageRepositoryPort,
     private val folderRepository: FolderRepositoryPort,
+    private val favoriteImageRepository: FavoriteImageRepositoryPort,
 
     private val transactionRunner: TransactionRunner,
 ) {
@@ -30,17 +32,18 @@ class UploadPhotosUseCase(
         validateNoDuplicateMediaIds(command.uploads)
         validateFolderOwnership(command.userId, command.folderId)
 
-        val mediaIds = command.uploads.map { it.mediaId }
+        val newUploads = filterNewUploads(command.uploads)
+        if (newUploads.isEmpty()) return
+
+        val newMediaIds = newUploads.map { it.mediaId }
 
-        // 모든 media가 object storage에 정상적으로 저장되었는지 일괄 확인
         val availabilities = mediaClient.verifyMediasUploaded(
             ownerId = command.userId,
-            mediaIds = mediaIds,
+            mediaIds = newMediaIds,
         )
-
         rollbackIfFailed(command.userId, availabilities)
 
-        val photos = command.uploads.map { upload ->
+        val photos = newUploads.map { upload ->
             PhotoImage(
                 userId = command.userId,
                 mediaId = upload.mediaId,
@@ -51,15 +54,27 @@ class UploadPhotosUseCase(
 
         try {
             transactionRunner.run {
-                photoImageRepository.saveAll(photos)
+                val savedPhotos = photoImageRepository.saveAll(photos)
+                if (command.favorite) {
+                    favoriteImageRepository.addAll(command.userId, savedPhotos.map { it.id!! })
+                }
             }
+        } catch (e: BusinessException) {
+            if (e.resultCode == ResultCode.ALREADY_REQUEST) return
+            mediaClient.rollbackMediasUploaded(command.userId, newMediaIds)
+            throw e
         } catch (e: Exception) {
-            // 보상 트랜잭션: 모든 media 상태를 INITIATED로 롤백
-            mediaClient.rollbackMediasUploaded(command.userId, mediaIds)
+            mediaClient.rollbackMediasUploaded(command.userId, newMediaIds)
             throw e
         }
     }
 
+    private fun filterNewUploads(uploads: List<UploadPhotoCommand.UploadItem>): List<UploadPhotoCommand.UploadItem> {
+        val mediaIds = uploads.map { it.mediaId }
+        val existingMediaIds = photoImageRepository.getRegisteredMediaIds(mediaIds)
+        return uploads.filter { it.mediaId !in existingMediaIds }
+    }
+
     private fun validateNoDuplicateMediaIds(uploads: List<UploadPhotoCommand.UploadItem>) {
         val mediaIds = uploads.map { it.mediaId }
         val duplicates = mediaIds.groupingBy { it }.eachCount().filter { it.value > 1 }.keys

src/main/kotlin/com/yapp2app/photo/infra/persist/FavoriteImageRepositoryAdapter.kt

@@ -27,6 +27,12 @@ class FavoriteImageRepositoryAdapter(
         }
     }
 
+    override fun addAll(userId: Long, photoIds: List<Long>) {
+        if (photoIds.isEmpty()) return
+        val favorites = photoIds.map { photoId -> FavoritePhoto(FavoritePhotoId(userId, photoId)) }
+        jpaRepository.saveAll(favorites)
+    }
+
     override fun delete(userId: Long, photoId: Long) = jpaRepository.deleteById(
         FavoritePhotoId(userId, photoId),
     )

src/main/kotlin/com/yapp2app/photo/infra/persist/FolderRepositoryAdapter.kt

@@ -26,8 +26,8 @@ class FolderRepositoryAdapter(
 
     override fun listOwnedFolders(userId: Long): List<Folder> = jpaRepository.findAllByUserId(userId)
 
-    override fun listOwnedFoldersWithStats(userId: Long): List<FolderWithStats> =
-        queryRepository.findOwnedFoldersWithStats(userId)
+    override fun listOwnedFoldersWithStats(userId: Long, limit: Int?): List<FolderWithStats> =
+        queryRepository.findOwnedFoldersWithStats(userId, limit)
 
     override fun getOwnedFolders(userId: Long, folderIds: List<Long>): List<Folder> =
         jpaRepository.findAllByUserIdAndIdIn(userId, folderIds)

src/main/kotlin/com/yapp2app/photo/infra/persist/PhotoImageRepositoryAdapter.kt

@@ -1,11 +1,14 @@
 package com.yapp2app.photo.infra.persist
 
+import com.yapp2app.common.api.dto.ResultCode
 import com.yapp2app.common.domain.vo.SortOrder
+import com.yapp2app.common.exception.BusinessException
 import com.yapp2app.photo.application.contract.PhotoWithFavorite
 import com.yapp2app.photo.application.port.PhotoImageRepositoryPort
 import com.yapp2app.photo.domain.entity.PhotoImage
 import com.yapp2app.photo.infra.persist.jpa.JpaPhotoImageRepository
 import com.yapp2app.photo.infra.persist.jpa.PhotoImageQueryRepository
+import org.springframework.dao.DataIntegrityViolationException
 import org.springframework.stereotype.Repository
 
 /**
@@ -24,7 +27,14 @@ class PhotoImageRepositoryAdapter(
         queryRepository.findOwnedPhotoWithFavorite(userId, photoId)
 
     override fun save(photoImage: PhotoImage): PhotoImage = jpaRepository.save(photoImage)
-    override fun saveAll(photoImages: List<PhotoImage>): List<PhotoImage> = jpaRepository.saveAll(photoImages)
+    override fun saveAll(photoImages: List<PhotoImage>): List<PhotoImage> = try {
+        jpaRepository.saveAll(photoImages)
+    } catch (e: DataIntegrityViolationException) {
+        throw BusinessException(ResultCode.ALREADY_REQUEST)
+    }
+
+    override fun getRegisteredMediaIds(mediaIds: List<Long>): Set<Long> =
+        queryRepository.getRegisteredMediaIds(mediaIds)
 
     override fun listOwnedPhotos(userId: Long, offset: Int, limit: Int, sortOrder: SortOrder): List<PhotoImage> =
         queryRepository.findOwnedPhotos(userId, offset, limit, sortOrder)

src/main/kotlin/com/yapp2app/photo/infra/persist/jpa/FolderQueryRepository.kt

@@ -27,16 +27,20 @@ class FolderQueryRepository(private val queryFactory: JPAQueryFactory) {
             .execute().toInt()
     }
 
-    fun findOwnedFoldersWithStats(userId: Long): List<FolderWithStats> {
+    fun findOwnedFoldersWithStats(userId: Long, limit: Int?): List<FolderWithStats> {
+        val latestPhotoDate = photoImage.createdAt.max()
+
         val folderStats = queryFactory
-            .select(folder.id, folder.name, photoImage.id.count())
+            .select(folder.id, folder.name, photoImage.id.count(), latestPhotoDate)
             .from(folder)
             .leftJoin(photoImage).on(
                 photoImage.folderId.eq(folder.id),
                 photoImage.userId.eq(userId),
             )
             .where(folder.userId.eq(userId))
             .groupBy(folder.id, folder.name)
+            .orderBy(latestPhotoDate.desc().nullsLast(), folder.createdAt.desc())
+            .apply { limit?.let { limit(it.toLong()) } }
             .fetch()
 
         if (folderStats.isEmpty()) return emptyList()

src/main/kotlin/com/yapp2app/photo/infra/persist/jpa/PhotoImageQueryRepository.kt

@@ -148,6 +148,17 @@ class PhotoImageQueryRepository(private val queryFactory: JPAQueryFactory) {
             .fetch()
     }
 
+    fun getRegisteredMediaIds(mediaIds: List<Long>): Set<Long> {
+        if (mediaIds.isEmpty()) return emptySet()
+
+        return queryFactory
+            .select(photoImage.mediaId)
+            .from(photoImage)
+            .where(photoImage.mediaId.`in`(mediaIds))
+            .fetch()
+            .toSet()
+    }
+
     fun removePhotosFromFolder(userId: Long, folderId: Long, photoIds: List<Long>): Int {
         if (photoIds.isEmpty()) return 0
 

src/main/resources/application-staging.yaml

@@ -43,7 +43,7 @@ app:
 
 oauth:
   kakao:
-    androidClientId: ENC(Qzg5YG7q+laisg0oYQi100q1q3RRCBR8gkHtAEcgEPkmNj7Jmz+58693hruGEova3zfVL6C5N6oKR8tVHRa7fysnNTSkTvAcx3uxTcUZhR4=)
+    androidClientId: ENC(lDI6cw226mDsd0R8PMdfQZdksG0cl+UN05E4+hJI7KguRGIn1+oBB/mLDhkXfp+43Oq7gkQCo7vKLrZMxzFDLQhbeb7Mx8KMEyBCjw7LfSQ=)
     iosClientId: ENC(0KhQuAcBG2ddDzIS/WhvDbb+l+SbuCiYE/ANF8OVMvtvQcEwsY8xiFlr5lp0IAKyLEk75SSoIhM5picVY7xjV0+DPl/vA6lt8CA4Ae17Hd8=)
     clientSecret: ENC(PjnJy0hcYdqBkqvSGqCcEp61czlJpJ1n4nYMCkAcFdo7ASIJrbBUqxJay41zVg8kG45KiPhYbxTfJe+X9vQlp5qZfIbZuVtAc85SHLexQIc=)
     jwksUri: https://kauth.kakao.com/.well-known/jwks.json

src/main/resources/db/migration/V10__add_unique_constraint_media_id_to_photo_image.sql

@@ -0,0 +1,2 @@
+ALTER TABLE TB_PHOTO_IMAGE
+    ADD CONSTRAINT uk_photo_image_media_id UNIQUE (media_id);

src/main/resources/db/migration/V11__alter_folder_name_length.sql

@@ -0,0 +1,5 @@
+-- 기존 데이터 중 10자 초과 폴더명을 10자로 잘라냄
+UPDATE TB_FOLDER SET name = LEFT(name, 10) WHERE LENGTH(name) > 10;
+
+-- 폴더명 최대 길이를 10자로 제한
+ALTER TABLE TB_FOLDER ALTER COLUMN name TYPE VARCHAR(10);

src/test/kotlin/com/yapp2app/e2e/photo/folder/CreateFolderE2ETest.kt

@@ -134,4 +134,18 @@ class CreateFolderE2ETest : FolderE2ETestBase() {
             .statusCode(HttpStatus.BAD_REQUEST.value())
             .body("resultCode", equalTo(ResultCode.CONFLICT_FOLDER.code))
     }
+
+    @Test
+    @DisplayName("폴더명이 10자를 초과하면 400 에러를 반환한다")
+    fun givenTooLongFolderName_whenCreateFolder_thenReturnsBadRequest() {
+        RestAssured.given()
+            .contentType(ContentType.JSON)
+            .header("Authorization", "Bearer $accessToken")
+            .body(CreateFolderRequest(name = "일이삼사오육칠팔구십일")) // 11자
+            .`when`()
+            .post("/api/folders")
+            .then()
+            .statusCode(HttpStatus.BAD_REQUEST.value())
+            .body("resultCode", equalTo(ResultCode.INVALID_PARAMETER.code))
+    }
 }