[FEAT][#97] MyPage Album 이미지 삭제 API 연결

core/data/src/main/kotlin/com/nexters/ilab/android/core/data/datasource/DeleteMyAlbumDataSource.kt

@@ -0,0 +1,7 @@
+package com.nexters.ilab.android.core.data.datasource
+
+import com.nexters.ilab.android.core.data.response.UserInfoResponse
+
+interface DeleteMyAlbumDataSource {
+    suspend fun deleteMyAlbum(uuid: Long, thumbnailId: Int): UserInfoResponse
+}

core/data/src/main/kotlin/com/nexters/ilab/android/core/data/datasource/DeleteMyAlbumDataSourceImpl.kt

@@ -0,0 +1,13 @@
+package com.nexters.ilab.android.core.data.datasource
+
+import com.nexters.ilab.android.core.data.response.UserInfoResponse
+import com.nexters.ilab.android.core.data.service.ILabService
+import javax.inject.Inject
+
+class DeleteMyAlbumDataSourceImpl @Inject constructor(
+    private val service: ILabService,
+) : DeleteMyAlbumDataSource {
+    override suspend fun deleteMyAlbum(uuid: Long, thumbnailId: Int): UserInfoResponse {
+        return service.deleteMyAlbumImage(uuid, thumbnailId)
+    }
+}

core/data/src/main/kotlin/com/nexters/ilab/android/core/data/di/DataSourceModule.kt

@@ -4,6 +4,8 @@ import com.nexters.ilab.android.core.data.datasource.FileDataSource
 import com.nexters.ilab.android.core.data.datasource.FileDataSourceImpl
 import com.nexters.ilab.android.core.data.datasource.AuthDataSource
 import com.nexters.ilab.android.core.data.datasource.AuthDataSourceImpl
+import com.nexters.ilab.android.core.data.datasource.DeleteMyAlbumDataSource
+import com.nexters.ilab.android.core.data.datasource.DeleteMyAlbumDataSourceImpl
 import com.nexters.ilab.android.core.data.datasource.ProfileDataSource
 import com.nexters.ilab.android.core.data.datasource.ProfileDataSourceImpl
 import com.nexters.ilab.android.core.data.datasource.StyleDataSource
@@ -45,4 +47,8 @@ abstract class DataSourceModule {
     @Singleton
     @Binds
     abstract fun bindProfileDataSource(profileDataSourceImpl: ProfileDataSourceImpl): ProfileDataSource
+
+    @Binds
+    @Singleton
+    abstract fun bindDeleteMyAlbumDataSource(deleteMyAlbumDataSourceImpl: DeleteMyAlbumDataSourceImpl): DeleteMyAlbumDataSource
 }

core/data/src/main/kotlin/com/nexters/ilab/android/core/data/di/RepositoryModule.kt

@@ -2,12 +2,14 @@ package com.nexters.ilab.android.core.data.di
 
 import com.nexters.ilab.android.core.data.repository.FileRepositoryImpl
 import com.nexters.ilab.android.core.data.repository.AuthRepositoryImpl
+import com.nexters.ilab.android.core.data.repository.DeleteMyAlbumRepositoryImpl
 import com.nexters.ilab.android.core.data.repository.PrivacyPolicyRepositoryImpl
 import com.nexters.ilab.android.core.data.repository.ProfileRepositoryImpl
 import com.nexters.ilab.android.core.data.repository.StyleRepositoryImpl
 import com.nexters.ilab.android.core.data.repository.TokenRepositoryImpl
 import com.nexters.ilab.android.core.domain.repository.FileRepository
 import com.nexters.ilab.android.core.domain.repository.AuthRepository
+import com.nexters.ilab.android.core.domain.repository.DeleteMyAlbumRepository
 import com.nexters.ilab.android.core.domain.repository.PrivacyPolicyRepository
 import com.nexters.ilab.android.core.domain.repository.ProfileRepository
 import com.nexters.ilab.android.core.domain.repository.StyleRepository
@@ -45,4 +47,8 @@ abstract class RepositoryModule {
     @Binds
     @Singleton
     abstract fun bindProfileRepository(profileRepositoryImpl: ProfileRepositoryImpl): ProfileRepository
+
+    @Binds
+    @Singleton
+    abstract fun bindDeleteMyAlbumRepository(deleteMyAlbumRepositoryImpl: DeleteMyAlbumRepositoryImpl): DeleteMyAlbumRepository
 }

core/data/src/main/kotlin/com/nexters/ilab/android/core/data/repository/DeleteMyAlbumRepositoryImpl.kt

@@ -0,0 +1,18 @@
+package com.nexters.ilab.android.core.data.repository
+
+import com.nexters.ilab.android.core.data.datasource.DeleteMyAlbumDataSource
+import com.nexters.ilab.android.core.data.mapper.toEntity
+import com.nexters.ilab.android.core.data.util.runSuspendCatching
+import com.nexters.ilab.android.core.datastore.TokenDataSource
+import com.nexters.ilab.android.core.domain.repository.DeleteMyAlbumRepository
+import javax.inject.Inject
+
+class DeleteMyAlbumRepositoryImpl @Inject constructor(
+    private val tokenDataSource: TokenDataSource,
+    private val myAlbumDataSource: DeleteMyAlbumDataSource,
+) : DeleteMyAlbumRepository {
+    override suspend fun deleteMyAlbum(thumbnailId: Int) = runSuspendCatching {
+        val uuid = tokenDataSource.getUUID()
+        myAlbumDataSource.deleteMyAlbum(uuid, thumbnailId).toEntity()
+    }
+}

core/data/src/main/kotlin/com/nexters/ilab/android/core/data/service/ILabService.kt

@@ -3,11 +3,13 @@ package com.nexters.ilab.android.core.data.service
 import com.nexters.ilab.android.core.data.response.CreatedProfileResponse
 import com.nexters.ilab.android.core.data.response.ProfileResponse
 import com.nexters.ilab.android.core.data.response.StyleResponse
+import com.nexters.ilab.android.core.data.response.UserInfoResponse
 import okhttp3.MultipartBody
 import retrofit2.http.GET
 import retrofit2.http.Multipart
 import retrofit2.http.POST
 import retrofit2.http.Part
+import retrofit2.http.Path
 
 interface ILabService {
     @GET("style")
@@ -23,4 +25,10 @@ interface ILabService {
         @Part("styleId") styleId: Int,
         @Part("uuid") uuid: Long,
     ): List<CreatedProfileResponse>
+
+    @POST("thumbnails/delete/{uuid}/{thumbnailId}")
+    suspend fun deleteMyAlbumImage(
+        @Path("uuid") uuid: Long,
+        @Path("uuid") thumbnailId: Int,
+    ): UserInfoResponse
 }

core/domain/src/main/kotlin/com/nexters/ilab/android/core/domain/repository/DeleteMyAlbumRepository.kt

@@ -0,0 +1,7 @@
+package com.nexters.ilab.android.core.domain.repository
+
+import com.nexters.ilab.android.core.domain.entity.UserInfoEntity
+
+interface DeleteMyAlbumRepository {
+    suspend fun deleteMyAlbum(thumbnailId: Int): Result<UserInfoEntity>
+}

feature/home/src/main/kotlin/com/nexters/ilab/android/feature/home/HomeScreen.kt

@@ -84,11 +84,11 @@ internal fun HomeRoute(
     LaunchedEffect(viewModel) {
         viewModel.container.sideEffectFlow.collect { sideEffect ->
             when (sideEffect) {
-                is HomeSideEffect.OnCreateImageButtonClickFromStyle -> {
+                is HomeSideEffect.OnCreateImageBtnClickFromStyle -> {
                     onNavigateToUploadPhoto(sideEffect.selectedStyle)
                 }
 
-                is HomeSideEffect.OnCreateImageButtonClickFromProfile -> {
+                is HomeSideEffect.OnCreateImageBtnClickFromProfile -> {
                     onNavigateToUploadPhoto(sideEffect.selectedProfile)
                 }
             }
@@ -99,8 +99,8 @@ internal fun HomeRoute(
         uiState = uiState,
         padding = padding,
         onSettingClick = onSettingClick,
-        onCreateImageButtonClickFromStyle = viewModel::onCreateImageButtonClickFromStyle,
-        onCreateImageButtonClickFromProfile = viewModel::onCreateImageButtonClickFromProfile,
+        onCreateImageBtnClickFromStyle = viewModel::onCreateImageBtnClickFromStyle,
+        onCreateImageBtnClickFromProfile = viewModel::onCreateImageBtnClickFromProfile,
         openProfileImageDialog = viewModel::openProfileImageDialog,
         dismissProfileImageDialog = viewModel::dismissProfileImageDialog,
         getStyleProfileList = viewModel::getStyleProfileList,
@@ -115,8 +115,8 @@ internal fun HomeScreen(
     uiState: HomeState,
     padding: PaddingValues,
     onSettingClick: () -> Unit,
-    onCreateImageButtonClickFromStyle: () -> Unit,
-    onCreateImageButtonClickFromProfile: () -> Unit,
+    onCreateImageBtnClickFromStyle: () -> Unit,
+    onCreateImageBtnClickFromProfile: () -> Unit,
     openProfileImageDialog: (Int) -> Unit,
     dismissProfileImageDialog: () -> Unit,
     getStyleProfileList: () -> Unit,
@@ -153,17 +153,17 @@ internal fun HomeScreen(
             ProfileImageDialog(
                 profileImage = uiState.selectedProfileImage,
                 onCloseClick = dismissProfileImageDialog,
-                onCreateImageButtonClickFromProfile = {
+                onCreateImageBtnClickFromProfile = {
                     dismissProfileImageDialog()
-                    onCreateImageButtonClickFromProfile()
+                    onCreateImageBtnClickFromProfile()
                 },
             )
         }
         HomeTopAppBar(onSettingClick)
         HomeContent(
             styleImageList = uiState.styleImageList,
             profileImageList = uiState.profileImageList,
-            onCreateImageButtonClickFromStyle = onCreateImageButtonClickFromStyle,
+            onCreateImageBtnClickFromStyle = onCreateImageBtnClickFromStyle,
             openProfileImageDialog = openProfileImageDialog,
             setSelectedStyleImage = setSelectedStyleImage,
         )
@@ -189,7 +189,7 @@ internal fun HomeTopAppBar(onSettingClick: () -> Unit) {
 internal fun HomeContent(
     styleImageList: List<StyleEntity>,
     profileImageList: List<ProfileEntity>,
-    onCreateImageButtonClickFromStyle: () -> Unit,
+    onCreateImageBtnClickFromStyle: () -> Unit,
     openProfileImageDialog: (Int) -> Unit,
     setSelectedStyleImage: (Int) -> Unit,
 ) {
@@ -205,7 +205,7 @@ internal fun HomeContent(
         item(span = StaggeredGridItemSpan.FullLine) {
             HomeKeywordView(
                 styleImageList = styleImageList,
-                onCreateImageButtonClickFromStyle = onCreateImageButtonClickFromStyle,
+                onCreateImageBtnClickFromStyle = onCreateImageBtnClickFromStyle,
                 setSelectedStyleImage = setSelectedStyleImage,
             )
         }
@@ -236,7 +236,7 @@ internal fun HomeContent(
 @Composable
 internal fun HomeKeywordView(
     styleImageList: List<StyleEntity>,
-    onCreateImageButtonClickFromStyle: () -> Unit,
+    onCreateImageBtnClickFromStyle: () -> Unit,
     setSelectedStyleImage: (Int) -> Unit,
 ) {
     val pageCount = styleImageList.size
@@ -296,7 +296,7 @@ internal fun HomeKeywordView(
             )
             Spacer(modifier = Modifier.height(32.dp))
             ILabButton(
-                onClick = onCreateImageButtonClickFromStyle,
+                onClick = onCreateImageBtnClickFromStyle,
                 modifier = Modifier
                     .fillMaxWidth()
                     .padding(start = 20.dp, end = 20.dp)
@@ -364,7 +364,7 @@ internal fun ProfileImageItem(
 internal fun ProfileImageDialog(
     profileImage: ProfileEntity,
     onCloseClick: () -> Unit,
-    onCreateImageButtonClickFromProfile: () -> Unit,
+    onCreateImageBtnClickFromProfile: () -> Unit,
 ) {
     BasicAlertDialog(
         onDismissRequest = onCloseClick,
@@ -409,7 +409,7 @@ internal fun ProfileImageDialog(
                 )
                 Spacer(modifier = Modifier.height(24.dp))
                 ILabButton(
-                    onClick = onCreateImageButtonClickFromProfile,
+                    onClick = onCreateImageBtnClickFromProfile,
                     modifier = Modifier
                         .fillMaxWidth()
                         .padding(start = 20.dp, end = 20.dp, bottom = 16.dp)
@@ -435,8 +435,8 @@ internal fun HomeScreenPreview() {
         uiState = HomeState(),
         padding = PaddingValues(0.dp),
         onSettingClick = {},
-        onCreateImageButtonClickFromStyle = {},
-        onCreateImageButtonClickFromProfile = {},
+        onCreateImageBtnClickFromStyle = {},
+        onCreateImageBtnClickFromProfile = {},
         openProfileImageDialog = {},
         dismissProfileImageDialog = {},
         getStyleProfileList = {},
@@ -452,6 +452,6 @@ fun ProfileImageDialogPreview() {
     ProfileImageDialog(
         profileImage = ProfileEntity("", "", ""),
         onCloseClick = {},
-        onCreateImageButtonClickFromProfile = {},
+        onCreateImageBtnClickFromProfile = {},
     )
 }

feature/home/src/main/kotlin/com/nexters/ilab/android/feature/home/viewmodel/HomeSideEffect.kt

@@ -1,6 +1,6 @@
 package com.nexters.ilab.android.feature.home.viewmodel
 
 sealed interface HomeSideEffect {
-    data class OnCreateImageButtonClickFromStyle(val selectedStyle: String) : HomeSideEffect
-    data class OnCreateImageButtonClickFromProfile(val selectedProfile: String) : HomeSideEffect
+    data class OnCreateImageBtnClickFromStyle(val selectedStyle: String) : HomeSideEffect
+    data class OnCreateImageBtnClickFromProfile(val selectedProfile: String) : HomeSideEffect
 }

feature/home/src/main/kotlin/com/nexters/ilab/android/feature/home/viewmodel/HomeViewModel.kt

@@ -73,9 +73,9 @@ class HomeViewModel @Inject constructor(
         }
     }
 
-    fun onCreateImageButtonClickFromStyle() = intent {
+    fun onCreateImageBtnClickFromStyle() = intent {
         postSideEffect(
-            HomeSideEffect.OnCreateImageButtonClickFromStyle(
+            HomeSideEffect.OnCreateImageBtnClickFromStyle(
                 if (state.selectedStyle.name.isEmpty()) {
                     state.styleImageList[0].name
                 } else {
@@ -85,9 +85,9 @@ class HomeViewModel @Inject constructor(
         )
     }
 
-    fun onCreateImageButtonClickFromProfile() = intent {
+    fun onCreateImageBtnClickFromProfile() = intent {
         postSideEffect(
-            HomeSideEffect.OnCreateImageButtonClickFromProfile(state.selectedProfileImage.name),
+            HomeSideEffect.OnCreateImageBtnClickFromProfile(state.selectedProfileImage.name),
         )
     }
 

feature/login/src/main/kotlin/com/nexters/ilab/android/feature/login/LoginScreen.kt

@@ -129,7 +129,7 @@ internal fun LoginRoute(
 
     LoginScreen(
         uiState = uiState,
-        onLoginClick = viewModel::onLoginButtonClick,
+        onLoginClick = viewModel::onLoginBtnClick,
     )
 }
 

feature/login/src/main/kotlin/com/nexters/ilab/android/feature/login/viewmodel/LoginViewModel.kt

@@ -23,7 +23,7 @@ class LoginViewModel @Inject constructor(
 
     override val container = container<LoginState, LoginSideEffect>(LoginState())
 
-    fun onLoginButtonClick() = intent {
+    fun onLoginBtnClick() = intent {
         postSideEffect(LoginSideEffect.KakaoLogin)
     }
 

feature/mypage/src/main/kotlin/com/nexters/ilab/android/feature/mypage/MyPageScreen.kt

@@ -129,7 +129,7 @@ internal fun MyPageRoute(
         onSettingClick = onSettingClick,
         getUserInfo = viewModel::getUserInfo,
         onShareBtnClick = viewModel::shareMyAlbum,
-        onDeleteBtnClick = {},
+        onDeleteBtnClick = viewModel::deleteMyAlbum,
         onAlbumClick = viewModel::onAlbumClick,
         dismissServerErrorDialog = viewModel::dismissServerErrorDialog,
         dismissNetworkErrorDialog = viewModel::dismissNetworkErrorDialog,
@@ -143,7 +143,7 @@ internal fun MyPageScreen(
     onSettingClick: () -> Unit,
     getUserInfo: () -> Unit,
     onShareBtnClick: () -> Unit,
-    onDeleteBtnClick: () -> Unit,
+    onDeleteBtnClick: (Int) -> Unit,
     onAlbumClick: (Int) -> Unit,
     dismissServerErrorDialog: () -> Unit,
     dismissNetworkErrorDialog: () -> Unit,
@@ -203,7 +203,7 @@ internal fun MyPageContent(
     userInfo: UserInfoEntity,
     myAlbumImageList: ImmutableList<UserThumbnailEntity>,
     onShareBtnClick: () -> Unit,
-    onDeleteBtnClick: () -> Unit,
+    onDeleteBtnClick: (Int) -> Unit,
     onAlbumClick: (Int) -> Unit,
 ) {
     val span: (LazyGridItemSpanScope) -> GridItemSpan = { GridItemSpan(2) }
@@ -240,7 +240,7 @@ internal fun MyPageContent(
                 MyAlbumImage(
                     myAlbum = myAlbumImageList[iter],
                     onShareBtnClick = onShareBtnClick,
-                    onDeleteBtnClick = onDeleteBtnClick,
+                    onDeleteBtnClick = { onDeleteBtnClick(iter) },
                     onAlbumClick = onAlbumClick,
                     index = iter,
                 )

feature/mypage/src/main/kotlin/com/nexters/ilab/android/feature/mypage/viewmodel/MyPageViewModel.kt

@@ -5,6 +5,7 @@ import androidx.lifecycle.viewModelScope
 import com.nexters.ilab.android.core.common.ErrorHandlerActions
 import com.nexters.ilab.android.core.common.handleException
 import com.nexters.ilab.android.core.domain.repository.AuthRepository
+import com.nexters.ilab.android.core.domain.repository.DeleteMyAlbumRepository
 import com.nexters.ilab.android.core.domain.repository.FileRepository
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.collections.immutable.toImmutableList
@@ -20,6 +21,7 @@ import javax.inject.Inject
 class MyPageViewModel @Inject constructor(
     private val authRepository: AuthRepository,
     private val fileRepository: FileRepository,
+    private val deleteMyAlbumRepository: DeleteMyAlbumRepository,
 ) : ViewModel(), ContainerHost<MyPageState, MyPageSideEffect>, ErrorHandlerActions {
     override val container = container<MyPageState, MyPageSideEffect>(MyPageState())
 
@@ -51,6 +53,29 @@ class MyPageViewModel @Inject constructor(
         }
     }
 
+    fun deleteMyAlbum(index: Int) = intent {
+        viewModelScope.launch {
+            reduce {
+                state.copy(isLoading = true)
+            }
+            deleteMyAlbumRepository.deleteMyAlbum(index)
+                .onSuccess { userInfo ->
+                    reduce {
+                        state.copy(
+                            myAlbumFullImageList = userInfo.thumbnails.toImmutableList(),
+                        )
+                    }
+                }.onFailure { exception ->
+                    handleException(exception, this@MyPageViewModel)
+                }
+            reduce {
+                state.copy(
+                    isLoading = false,
+                )
+            }
+        }
+    }
+
     private fun setSelectedMyAlbum(index: Int) = intent {
         reduce {
             state.copy(selectedMyAlbum = index)