[feat] #59, #64, #69 아카이브 API 연동 및 페이징 구현

core/data-api/build.gradle.kts

@@ -1,9 +1,14 @@
 plugins {
-    alias(libs.plugins.neki.kotlin.library)
+    alias(libs.plugins.neki.android.library)
+}
+
+android {
+    namespace = "com.neki.android.core.dataapi"
 }
 
 dependencies {
     implementation(projects.core.model)
     implementation(libs.kotlinx.coroutines.core)
     api(libs.androidx.datastore.preferences)
+    api(libs.androidx.paging.runtime)
 }

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

@@ -0,0 +1,10 @@
+package com.neki.android.core.dataapi.repository
+
+import com.neki.android.core.model.AlbumPreview
+
+interface FolderRepository {
+    suspend fun getFolders(): Result<List<AlbumPreview>>
+    suspend fun createFolder(name: String): Result<Unit>
+    suspend fun deleteFolder(id: List<Long>, deletePhotos: Boolean): Result<Unit>
+    suspend fun removePhotosFromFolder(folderId: Long, photoIds: List<Long>): Result<Unit>
+}

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

@@ -1,11 +1,18 @@
 package com.neki.android.core.dataapi.repository
 
+import android.net.Uri
 import com.neki.android.core.model.ContentType
 import com.neki.android.core.model.MediaUploadTicket
 
 interface MediaUploadRepository {
-    suspend fun getUploadTicket(
-        uploadCount: Int = 1,
+    suspend fun getSingleUploadTicket(
+        fileName: String,
+        contentType: String,
+        mediaType: String,
+    ): Result<MediaUploadTicket>
+
+    suspend fun getMultipleUploadTicket(
+        uploadCount: Int,
         fileName: String,
         contentType: String,
         mediaType: String,
@@ -16,4 +23,16 @@ interface MediaUploadRepository {
         imageBytes: ByteArray,
         contentType: ContentType,
     ): Result<Unit>
+
+    suspend fun uploadImageFromUri(
+        uploadUrl: String,
+        uri: Uri,
+        contentType: ContentType,
+    ): Result<Unit>
+
+    suspend fun uploadImageFromUrl(
+        uploadUrl: String,
+        imageUrl: String,
+        contentType: ContentType,
+    ): Result<Unit>
 }

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

@@ -1,8 +1,10 @@
 package com.neki.android.core.dataapi.repository
 
+import androidx.paging.PagingData
 import com.neki.android.core.model.AlbumPreview
 import com.neki.android.core.model.Photo
 import com.neki.android.core.model.SortOrder
+import kotlinx.coroutines.flow.Flow
 
 interface PhotoRepository {
     suspend fun getPhotos(
@@ -28,4 +30,13 @@ interface PhotoRepository {
     ): Result<List<Photo>>
 
     suspend fun getFavoriteSummary(): Result<AlbumPreview>
+
+    fun getPhotosFlow(
+        folderId: Long? = null,
+        sortOrder: SortOrder = SortOrder.DESC,
+    ): Flow<PagingData<Photo>>
+
+    fun getFavoritePhotosFlow(
+        sortOrder: SortOrder = SortOrder.DESC,
+    ): Flow<PagingData<Photo>>
 }

core/data/build.gradle.kts

@@ -42,4 +42,5 @@ dependencies {
 
     implementation(libs.androidx.datastore.core)
     implementation(libs.androidx.datastore.preferences)
+    implementation(libs.androidx.paging.runtime)
 }

core/data/src/main/java/com/neki/android/core/data/paging/FavoritePhotoPagingSource.kt

@@ -0,0 +1,41 @@
+package com.neki.android.core.data.paging
+
+import androidx.paging.PagingSource
+import androidx.paging.PagingState
+import com.neki.android.core.data.remote.api.PhotoService
+import com.neki.android.core.model.Photo
+import com.neki.android.core.model.SortOrder
+
+class FavoritePhotoPagingSource(
+    private val photoService: PhotoService,
+    private val sortOrder: SortOrder,
+) : PagingSource<Int, Photo>() {
+
+    override fun getRefreshKey(state: PagingState<Int, Photo>): Int? {
+        return state.anchorPosition?.let { anchorPosition ->
+            state.closestPageToPosition(anchorPosition)?.prevKey?.plus(1)
+                ?: state.closestPageToPosition(anchorPosition)?.nextKey?.minus(1)
+        }
+    }
+
+    override suspend fun load(params: LoadParams<Int>): LoadResult<Int, Photo> {
+        return try {
+            val page = params.key ?: 0
+            val response = photoService.getFavoritePhotos(
+                page = page,
+                size = params.loadSize,
+                sortOrder = sortOrder.name,
+            )
+            val photos = response.data.toModels()
+            val hasNext = response.data.hasNext
+
+            LoadResult.Page(
+                data = photos,
+                prevKey = if (page == 0) null else page - 1,
+                nextKey = if (hasNext) page + 1 else null,
+            )
+        } catch (e: Exception) {
+            LoadResult.Error(e)
+        }
+    }
+}

core/data/src/main/java/com/neki/android/core/data/paging/PhotoPagingSource.kt

@@ -0,0 +1,42 @@
+package com.neki.android.core.data.paging
+
+import androidx.paging.PagingSource
+import androidx.paging.PagingState
+import com.neki.android.core.data.remote.api.PhotoService
+import com.neki.android.core.model.Photo
+
+class PhotoPagingSource(
+    private val photoService: PhotoService,
+    private val folderId: Long?,
+    private val sortOrder: String,
+) : PagingSource<Int, Photo>() {
+
+    override fun getRefreshKey(state: PagingState<Int, Photo>): Int? {
+        return state.anchorPosition?.let { anchorPosition ->
+            state.closestPageToPosition(anchorPosition)?.prevKey?.plus(1)
+                ?: state.closestPageToPosition(anchorPosition)?.nextKey?.minus(1)
+        }
+    }
+
+    override suspend fun load(params: LoadParams<Int>): LoadResult<Int, Photo> {
+        return try {
+            val page = params.key ?: 0
+            val response = photoService.getPhotos(
+                folderId = folderId,
+                page = page,
+                size = params.loadSize,
+                sortOrder = sortOrder,
+            )
+            val photos = response.data.toModels()
+            val hasNext = response.data.hasNext
+
+            LoadResult.Page(
+                data = photos,
+                prevKey = if (page == 0) null else page - 1,
+                nextKey = if (hasNext) page + 1 else null,
+            )
+        } catch (e: Exception) {
+            LoadResult.Error(e)
+        }
+    }
+}

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

@@ -0,0 +1,46 @@
+package com.neki.android.core.data.remote.api
+
+import com.neki.android.core.data.remote.model.request.CreateFolderRequest
+import com.neki.android.core.data.remote.model.request.DeleteFolderRequest
+import com.neki.android.core.data.remote.model.request.DeletePhotoRequest
+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.CreateFolderResponse
+import com.neki.android.core.data.remote.model.response.FolderResponse
+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.post
+import io.ktor.client.request.setBody
+import javax.inject.Inject
+
+class FolderService @Inject constructor(
+    private val client: HttpClient,
+) {
+    // 폴더 목록 조회
+    suspend fun getFolders(): BasicResponse<FolderResponse> {
+        return client.get("/api/folders").body()
+    }
+
+    // 폴더 생성
+    suspend fun createFolder(requestBody: CreateFolderRequest): BasicNullableResponse<CreateFolderResponse> {
+        return client.post("/api/folders") { setBody(requestBody) }.body()
+    }
+
+    // 폴더 삭제
+    suspend fun deleteFolder(requestBody: DeleteFolderRequest, deletePhotos: Boolean): BasicNullableResponse<Unit> {
+        return client.delete("/api/folders") {
+            setBody(requestBody)
+            parameter("deletePhotos", deletePhotos)
+        }.body()
+    }
+
+    // 폴더에서 사진 제거 (사진 자체는 삭제되지 않음)
+    suspend fun removePhotosFromFolder(folderId: Long, requestBody: DeletePhotoRequest): BasicNullableResponse<Unit> {
+        return client.delete("/api/folders/$folderId/photos") {
+            setBody(requestBody)
+        }.body()
+    }
+}

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

@@ -27,11 +27,13 @@ class PhotoService @Inject constructor(
         folderId: Long? = null,
         page: Int = 0,
         size: Int = 20,
+        sortOrder: String = "DESC",
     ): BasicResponse<PhotoResponse> {
         return client.get("/api/photos") {
             parameter("folderId", folderId)
             parameter("page", page)
             parameter("size", size)
+            parameter("sortOrder", sortOrder)
         }.body()
     }
 

core/data/src/main/java/com/neki/android/core/data/remote/model/request/CreateFolderRequest.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 CreateFolderRequest(
+    @SerialName("name") val name: String,
+)

core/data/src/main/java/com/neki/android/core/data/remote/model/request/DeleteFolderRequest.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 DeleteFolderRequest(
+    @SerialName("folderIds") val folderIds: List<Long>,
+)

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

@@ -0,0 +1,10 @@
+package com.neki.android.core.data.remote.model.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+// TODO: 추후 API 스펙 업데이트 시 제거
+@Serializable
+data class CreateFolderResponse(
+    @SerialName("folderId") val folderId: Long,
+)

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

@@ -0,0 +1,27 @@
+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 FolderResponse(
+    @SerialName("items") val items: List<Item>,
+) {
+    @Serializable
+    data class Item(
+        @SerialName("folderId") val folderId: Long,
+        @SerialName("name") val name: String,
+        @SerialName("latestImageUrl") val latestImageUrl: String?,
+        @SerialName("totalCount") val totalCount: Int,
+    ) {
+        internal fun toModel() = AlbumPreview(
+            id = folderId,
+            title = name,
+            thumbnailUrl = latestImageUrl,
+            photoCount = totalCount,
+        )
+    }
+
+    fun toModels() = items.map { it.toModel() }
+}

core/data/src/main/java/com/neki/android/core/data/repository/di/RepositoryModule.kt

@@ -4,10 +4,12 @@ import com.neki.android.core.data.auth.AuthEventManagerImpl
 import com.neki.android.core.data.repository.impl.AuthRepositoryImpl
 import com.neki.android.core.data.repository.impl.DataStoreRepositoryImpl
 import com.neki.android.core.data.repository.impl.MediaUploadRepositoryImpl
+import com.neki.android.core.data.repository.impl.FolderRepositoryImpl
 import com.neki.android.core.data.repository.impl.MapRepositoryImpl
 import com.neki.android.core.data.repository.impl.PhotoRepositoryImpl
 import com.neki.android.core.data.repository.impl.TokenRepositoryImpl
 import com.neki.android.core.dataapi.auth.AuthEventManager
+import com.neki.android.core.dataapi.repository.FolderRepository
 import com.neki.android.core.dataapi.repository.AuthRepository
 import com.neki.android.core.dataapi.repository.DataStoreRepository
 import com.neki.android.core.dataapi.repository.MediaUploadRepository
@@ -60,6 +62,12 @@ internal interface RepositoryModule {
         photoRepositoryImpl: PhotoRepositoryImpl,
     ): PhotoRepository
 
+    @Binds
+    @Singleton
+    fun bindFolderRepositoryImpl(
+        folderRepositoryImpl: FolderRepositoryImpl,
+    ): FolderRepository
+
     @Binds
     @Singleton
     fun bindMapRepositoryImpl(

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

@@ -0,0 +1,38 @@
+package com.neki.android.core.data.repository.impl
+
+import com.neki.android.core.data.remote.api.FolderService
+import com.neki.android.core.data.remote.model.request.CreateFolderRequest
+import com.neki.android.core.data.remote.model.request.DeleteFolderRequest
+import com.neki.android.core.data.remote.model.request.DeletePhotoRequest
+import com.neki.android.core.data.util.runSuspendCatching
+import com.neki.android.core.dataapi.repository.FolderRepository
+import com.neki.android.core.model.AlbumPreview
+import javax.inject.Inject
+
+class FolderRepositoryImpl @Inject constructor(
+    private val folderService: FolderService,
+) : FolderRepository {
+    override suspend fun getFolders(): Result<List<AlbumPreview>> = runSuspendCatching {
+        folderService.getFolders().data.toModels()
+    }
+
+    override suspend fun createFolder(name: String): Result<Unit> = runSuspendCatching {
+        folderService.createFolder(
+            requestBody = CreateFolderRequest(name = name),
+        ).data
+    }
+
+    override suspend fun deleteFolder(id: List<Long>, deletePhotos: Boolean): Result<Unit> = runSuspendCatching {
+        folderService.deleteFolder(
+            requestBody = DeleteFolderRequest(folderIds = id),
+            deletePhotos = deletePhotos,
+        ).data
+    }
+
+    override suspend fun removePhotosFromFolder(folderId: Long, photoIds: List<Long>): Result<Unit> = runSuspendCatching {
+        folderService.removePhotosFromFolder(
+            folderId = folderId,
+            requestBody = DeletePhotoRequest(photoIds = photoIds),
+        ).data
+    }
+}