[feat] #55 #56 사진 즐겨찾기, 사진 API 수정사항 반영

core/common/build.gradle.kts

@@ -1,6 +1,7 @@
 plugins {
     alias(libs.plugins.neki.android.library)
     alias(libs.plugins.neki.android.library.compose)
+    alias(libs.plugins.neki.hilt)
 }
 
 android {

core/common/src/main/java/com/neki/android/core/common/coroutine/di/CoroutineScopeModule.kt

@@ -0,0 +1,26 @@
+package com.neki.android.core.common.coroutine.di
+
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import javax.inject.Qualifier
+import javax.inject.Singleton
+
+@Qualifier
+@Retention(AnnotationRetention.RUNTIME)
+annotation class ApplicationScope
+
+@Module
+@InstallIn(SingletonComponent::class)
+object CoroutineScopeModule {
+
+    @Provides
+    @Singleton
+    @ApplicationScope
+    fun provideApplicationScope(): CoroutineScope =
+        CoroutineScope(SupervisorJob() + Dispatchers.Default)
+}

core/data-api/src/main/java/com/neki/android/core/dataapi/repository/MediaUploadRepository.kt

@@ -5,10 +5,11 @@ import com.neki.android.core.model.MediaUploadTicket
 
 interface MediaUploadRepository {
     suspend fun getUploadTicket(
+        uploadCount: Int = 1,
         fileName: String,
         contentType: String,
         mediaType: String,
-    ): Result<MediaUploadTicket>
+    ): Result<List<MediaUploadTicket>>
 
     suspend fun uploadImage(
         uploadUrl: String,

core/data-api/src/main/java/com/neki/android/core/dataapi/repository/PhotoRepository.kt

@@ -1,6 +1,8 @@
 package com.neki.android.core.dataapi.repository
 
+import com.neki.android.core.model.AlbumPreview
 import com.neki.android.core.model.Photo
+import com.neki.android.core.model.SortOrder
 
 interface PhotoRepository {
     suspend fun getPhotos(
@@ -10,9 +12,20 @@ interface PhotoRepository {
     ): Result<List<Photo>>
 
     suspend fun registerPhoto(
-        mediaId: Long,
+        mediaIds: List<Long>,
         folderId: Long? = null,
-    ): Result<Long>
+    ): Result<Unit>
 
     suspend fun deletePhoto(photoId: Long): Result<Unit>
+    suspend fun deletePhoto(photoIds: List<Long>): Result<Unit>
+
+    suspend fun updateFavorite(photoId: Long, favorite: Boolean): Result<Unit>
+
+    suspend fun getFavoritePhotos(
+        page: Int = 0,
+        size: Int = 20,
+        sortOrder: SortOrder = SortOrder.DESC,
+    ): Result<List<Photo>>
+
+    suspend fun getFavoriteSummary(): Result<AlbumPreview>
 }

core/data/src/main/java/com/neki/android/core/data/remote/api/PhotoService.kt

@@ -1,15 +1,20 @@
 package com.neki.android.core.data.remote.api
 
+import com.neki.android.core.data.remote.model.request.DeletePhotoRequest
 import com.neki.android.core.data.remote.model.request.RegisterPhotoRequest
-import com.neki.android.core.data.remote.model.response.BasicResponse
+import com.neki.android.core.data.remote.model.request.UpdateFavoriteRequest
 import com.neki.android.core.data.remote.model.response.BasicNullableResponse
+import com.neki.android.core.data.remote.model.response.BasicResponse
+import com.neki.android.core.data.remote.model.response.FavoritePhotoResponse
+import com.neki.android.core.data.remote.model.response.FavoriteSummaryResponse
 import com.neki.android.core.data.remote.model.response.PhotoResponse
 import com.neki.android.core.data.remote.model.response.RegisterPhotoResponse
 import io.ktor.client.HttpClient
 import io.ktor.client.call.body
 import io.ktor.client.request.delete
 import io.ktor.client.request.get
 import io.ktor.client.request.parameter
+import io.ktor.client.request.patch
 import io.ktor.client.request.post
 import io.ktor.client.request.setBody
 import javax.inject.Inject
@@ -31,12 +36,37 @@ class PhotoService @Inject constructor(
     }
 
     // 사진 등록
-    suspend fun registerPhoto(requestBody: RegisterPhotoRequest): BasicResponse<RegisterPhotoResponse> {
+    suspend fun registerPhoto(requestBody: RegisterPhotoRequest): BasicNullableResponse<RegisterPhotoResponse> {
         return client.post("/api/photos") { setBody(requestBody) }.body()
     }
 
     // 사진 삭제
-    suspend fun deletePhoto(photoId: Long): BasicNullableResponse<Unit> {
-        return client.delete("/api/photos/$photoId").body()
+    suspend fun deletePhoto(requestBody: DeletePhotoRequest): BasicNullableResponse<Unit> {
+        return client.delete("/api/photos") { setBody(requestBody) }.body()
+    }
+
+    // 즐겨찾기 업데이트
+    suspend fun updateFavorite(photoId: Long, favorite: Boolean): BasicNullableResponse<Unit> {
+        return client.patch("/api/photos/$photoId/favorite") {
+            setBody(UpdateFavoriteRequest(favorite))
+        }.body()
+    }
+
+    // 즐겨찾기 사진 조회
+    suspend fun getFavoritePhotos(
+        page: Int = 0,
+        size: Int = 20,
+        sortOrder: String,
+    ): BasicResponse<FavoritePhotoResponse> {
+        return client.get("/api/photos/favorite") {
+            parameter("page", page)
+            parameter("size", size)
+            parameter("sortOrder", sortOrder)
+        }.body()
+    }
+
+    // 즐겨찾기 요약 조회
+    suspend fun getFavoriteSummary(): BasicResponse<FavoriteSummaryResponse> {
+        return client.get("/api/photos/favorite/summary").body()
     }
 }

core/data/src/main/java/com/neki/android/core/data/remote/api/UploadService.kt

@@ -2,7 +2,7 @@ package com.neki.android.core.data.remote.api
 
 import com.neki.android.core.data.remote.model.request.MediaUploadTicketRequest
 import com.neki.android.core.data.remote.model.response.BasicResponse
-import com.neki.android.core.data.remote.model.response.MediaUploadTicketResponse
+import com.neki.android.core.data.remote.model.response.MediaUploadTicketDataResponse
 import com.neki.android.core.data.remote.qualifier.UploadHttpClient
 import io.ktor.client.HttpClient
 import io.ktor.client.call.body
@@ -18,7 +18,7 @@ class UploadService @Inject constructor(
     @UploadHttpClient private val uploadClient: HttpClient,
 ) {
     // Media Upload Ticket 받기
-    suspend fun getUploadTicket(requestBody: MediaUploadTicketRequest): BasicResponse<MediaUploadTicketResponse> {
+    suspend fun getUploadTicket(requestBody: MediaUploadTicketRequest): BasicResponse<MediaUploadTicketDataResponse> {
         return client.post("/api/media/upload") { setBody(requestBody) }.body()
     }
 

core/data/src/main/java/com/neki/android/core/data/remote/model/request/DeletePhotoRequest.kt

@@ -0,0 +1,9 @@
+package com.neki.android.core.data.remote.model.request
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class DeletePhotoRequest(
+    @SerialName("photoIds") val photoIds: List<Long>,
+)

core/data/src/main/java/com/neki/android/core/data/remote/model/request/MediaUploadTicketRequest.kt

@@ -5,7 +5,12 @@ import kotlinx.serialization.Serializable
 
 @Serializable
 data class MediaUploadTicketRequest(
-    @SerialName("contentType") val contentType: String,
-    @SerialName("filename") val filename: String = "",
-    @SerialName("mediaType") val mediaType: String,
-)
+    @SerialName("items") val items: List<Item>,
+) {
+    @Serializable
+    data class Item(
+        @SerialName("contentType") val contentType: String,
+        @SerialName("filename") val filename: String = "",
+        @SerialName("mediaType") val mediaType: String,
+    )
+}

core/data/src/main/java/com/neki/android/core/data/remote/model/request/RegisterPhotoRequest.kt

@@ -5,7 +5,12 @@ import kotlinx.serialization.Serializable
 
 @Serializable
 data class RegisterPhotoRequest(
-    @SerialName("folderId") val folderId: Long?,
-    @SerialName("mediaId") val mediaId: Long,
-    @SerialName("memo") val memo: String = "",
-)
+    @SerialName("folderId") val folderId: Long? = null,
+    @SerialName("uploads") val uploads: List<Upload>,
+) {
+    @Serializable
+    data class Upload(
+        @SerialName("mediaId") val mediaId: Long,
+        @SerialName("memo") val memo: String? = null,
+    )
+}

core/data/src/main/java/com/neki/android/core/data/remote/model/request/UpdateFavoriteRequest.kt

@@ -0,0 +1,9 @@
+package com.neki.android.core.data.remote.model.request
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class UpdateFavoriteRequest(
+    @SerialName("favorite") val favorite: Boolean,
+)

core/data/src/main/java/com/neki/android/core/data/remote/model/response/FavoritePhotoResponse.kt

@@ -0,0 +1,31 @@
+package com.neki.android.core.data.remote.model.response
+
+import com.neki.android.core.common.util.toFormattedDate
+import com.neki.android.core.model.Photo
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class FavoritePhotoResponse(
+    @SerialName("hasNext") val hasNext: Boolean,
+    @SerialName("items") val items: List<Item>,
+) {
+    @Serializable
+    data class Item(
+        @SerialName("contentType") val contentType: String,
+        @SerialName("createdAt") val createdAt: String,
+        @SerialName("favorite") val favorite: Boolean,
+        @SerialName("folderId") val folderId: Long?,
+        @SerialName("imageUrl") val imageUrl: String,
+        @SerialName("photoId") val photoId: Long,
+    ) {
+        internal fun toModel() = Photo(
+            id = photoId,
+            imageUrl = imageUrl,
+            isFavorite = favorite,
+            date = createdAt.toFormattedDate(),
+        )
+    }
+
+    fun toModels() = items.map { it.toModel() }
+}

core/data/src/main/java/com/neki/android/core/data/remote/model/response/FavoriteSummaryResponse.kt

@@ -0,0 +1,18 @@
+package com.neki.android.core.data.remote.model.response
+
+import com.neki.android.core.model.AlbumPreview
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class FavoriteSummaryResponse(
+    @SerialName("latestImageUrl") val latestImageUrl: String?,
+    @SerialName("totalCount") val totalCount: Int,
+) {
+    fun toModel() = AlbumPreview(
+        id = -1L,
+        title = "즐겨찾는사진",
+        thumbnailUrl = latestImageUrl,
+        photoCount = totalCount,
+    )
+}

core/data/src/main/java/com/neki/android/core/data/remote/model/response/MediaUploadTicketResponse.kt

@@ -5,15 +5,22 @@ import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class MediaUploadTicketResponse(
-    @SerialName("contentType") val contentType: String,
-    @SerialName("expiresIn") val expiresIn: String,
-    @SerialName("mediaId") val mediaId: Long,
+data class MediaUploadTicketDataResponse(
     @SerialName("method") val method: String,
-    @SerialName("uploadUrl") val uploadUrl: String,
+    @SerialName("expiresIn") val expiresIn: String,
+    @SerialName("items") val items: List<MediaUploadTicketItemResponse>,
 ) {
-    fun toModel() = MediaUploadTicket(
-        mediaId = this.mediaId,
-        uploadUrl = this.uploadUrl,
-    )
+    fun toModels() = items.map { it.toModel() }
+
+    @Serializable
+    data class MediaUploadTicketItemResponse(
+        @SerialName("mediaId") val mediaId: Long,
+        @SerialName("uploadTicket") val uploadTicket: String,
+        @SerialName("contentType") val contentType: String,
+    ) {
+        fun toModel() = MediaUploadTicket(
+            mediaId = mediaId,
+            uploadUrl = uploadTicket,
+        )
+    }
 }

core/data/src/main/java/com/neki/android/core/data/remote/model/response/PhotoResponse.kt

@@ -14,13 +14,15 @@ data class PhotoResponse(
     data class Item(
         @SerialName("contentType") val contentType: String,
         @SerialName("createdAt") val createdAt: String,
+        @SerialName("favorite") val isFavorite: Boolean,
         @SerialName("folderId") val folderId: Long?,
         @SerialName("imageUrl") val imageUrl: String,
         @SerialName("photoId") val photoId: Long,
     ) {
         internal fun toModel() = Photo(
             id = photoId,
             imageUrl = imageUrl,
+            isFavorite = isFavorite,
             date = createdAt.toFormattedDate(),
         )
     }

core/data/src/main/java/com/neki/android/core/data/repository/impl/MediaUploadRepositoryImpl.kt

@@ -11,17 +11,22 @@ class MediaUploadRepositoryImpl @Inject constructor(
     private val uploadService: UploadService,
 ) : MediaUploadRepository {
     override suspend fun getUploadTicket(
+        uploadCount: Int,
         fileName: String,
         contentType: String,
         mediaType: String,
     ) = runSuspendCatching {
         uploadService.getUploadTicket(
             requestBody = MediaUploadTicketRequest(
-                filename = fileName,
-                contentType = contentType,
-                mediaType = mediaType,
+                items = List(uploadCount) {
+                    MediaUploadTicketRequest.Item(
+                        filename = fileName,
+                        contentType = contentType,
+                        mediaType = mediaType,
+                    )
+                },
             ),
-        ).data.toModel()
+        ).data.toModels()
     }
 
     override suspend fun uploadImage(