[feat] #70: 폴더 삭제 API deletePhotos 쿼리 추가 및 앨범 사진 삭제 옵션별 분기 구현

- DELETE /api/folders에 deletePhotos 쿼리 파라미터 추가
- DELETE /api/folders/{folderId}/photos 폴더에서 사진 제거 API 추가
- AlbumDeleteOption에 따라 사진 포함/미포함 삭제 분기
- PhotoDeleteOption에 따라 앨범에서만 제거/완전 삭제 분기

Author: ikseong00

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

@@ -5,5 +5,6 @@ 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>): Result<Unit>
+    suspend fun deleteFolder(id: List<Long>, deletePhotos: Boolean): Result<Unit>
+    suspend fun removePhotosFromFolder(folderId: Long, photoIds: List<Long>): Result<Unit>
 }

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

@@ -2,13 +2,16 @@ 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
@@ -27,7 +30,17 @@ class FolderService @Inject constructor(
     }
 
     // 폴더 삭제
-    suspend fun deleteFolder(requestBody: DeleteFolderRequest): BasicNullableResponse<Unit> {
-        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/repository/impl/FolderRepositoryImpl.kt

@@ -3,6 +3,7 @@ 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
@@ -21,9 +22,17 @@ class FolderRepositoryImpl @Inject constructor(
         ).data
     }
 
-    override suspend fun deleteFolder(id: List<Long>): Result<Unit> = runSuspendCatching {
+    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
     }
 }

feature/archive/impl/src/main/kotlin/com/neki/android/feature/archive/impl/album/AllAlbumViewModel.kt

@@ -191,11 +191,11 @@ class AllAlbumViewModel @Inject constructor(
         reduce: (AllAlbumState.() -> AllAlbumState) -> Unit,
         postSideEffect: (AllAlbumSideEffect) -> Unit,
     ) {
-        // TODO: 삭제 타입에 따라 핸들링
         viewModelScope.launch {
             val selectedAlbumIds = state.selectedAlbums.map { it.id }
+            val deletePhotos = state.selectedDeleteOption == AlbumDeleteOption.DELETE_WITH_PHOTOS
 
-            folderRepository.deleteFolder(selectedAlbumIds)
+            folderRepository.deleteFolder(selectedAlbumIds, deletePhotos)
                 .onSuccess {
                     fetchFolders(reduce)
                     postSideEffect(AllAlbumSideEffect.ShowToastMessage("앨범을 삭제했어요"))

feature/archive/impl/src/main/kotlin/com/neki/android/feature/archive/impl/album_detail/AlbumDetailViewModel.kt

@@ -6,6 +6,7 @@ import androidx.paging.PagingData
 import androidx.paging.cachedIn
 import androidx.paging.filter
 import androidx.paging.map
+import com.neki.android.core.dataapi.repository.FolderRepository
 import com.neki.android.core.dataapi.repository.PhotoRepository
 import com.neki.android.core.model.Photo
 import com.neki.android.core.ui.MviIntentStore
@@ -30,6 +31,7 @@ class AlbumDetailViewModel @AssistedInject constructor(
     @Assisted private val title: String,
     @Assisted private val isFavoriteAlbum: Boolean,
     private val photoRepository: PhotoRepository,
+    private val folderRepository: FolderRepository,
 ) : ViewModel() {
 
     @AssistedFactory
@@ -232,7 +234,12 @@ class AlbumDetailViewModel @AssistedInject constructor(
         viewModelScope.launch {
             reduce { copy(isLoading = true) }
 
-            photoRepository.deletePhoto(photoIds = selectedPhotoIds)
+            val result = when (state.selectedDeleteOption) {
+                PhotoDeleteOption.REMOVE_FROM_ALBUM -> folderRepository.removePhotosFromFolder(id, selectedPhotoIds)
+                PhotoDeleteOption.REMOVE_FROM_ALL -> photoRepository.deletePhoto(photoIds = selectedPhotoIds)
+            }
+
+            result
                 .onSuccess {
                     Timber.d("삭제 성공")
                     deletedPhotoIds.update { it + selectedPhotoIds.toSet() }