Merge pull request #288 from School-of-Company/feature/#287_delete_pa…

…tch_post 🔀 :: (#287) Delete Feature Patch Post
School-of-Company · Sep 1, 2024 · 51d8dcd · 51d8dcd
2 parents c5bf5aa + f189b00
commit 51d8dcd
Show file tree

Hide file tree

Showing 11 changed files with 2 additions and 96 deletions.
diff --git a/app/src/main/java/com/msg/bitgoeul_android/navigation/BitgoeulNavHost.kt b/app/src/main/java/com/msg/bitgoeul_android/navigation/BitgoeulNavHost.kt
@@ -128,7 +128,6 @@ fun BitgoeulNavHost(
             onItemClick = navController::navigateToPostDetailPage,
         )
         postDetailScreen(
-            // onEditClicked = navController::navigateToPostAddPage,
             onDeleteClicked = navController::navigateUp,
             onBackClicked = navController::navigateUp
         )

diff --git a/core/data/src/main/java/com/msg/data/repository/post/PostRepository.kt b/core/data/src/main/java/com/msg/data/repository/post/PostRepository.kt
@@ -9,6 +9,5 @@ import java.util.UUID
 interface PostRepository {
     fun getPostList(type: FeedType, size: Int, page: Int): Flow<GetPostListEntity>
     fun getDetailPost(id: UUID): Flow<GetDetailPostEntity>
-    // fun editPost(id: UUID, body: WritePostParam): Flow<Unit>
     fun deletePost(id: UUID): Flow<Unit>
 }
diff --git a/core/data/src/main/java/com/msg/data/repository/post/PostRepositoryImpl.kt b/core/data/src/main/java/com/msg/data/repository/post/PostRepositoryImpl.kt
@@ -35,13 +35,6 @@ class PostRepositoryImpl @Inject constructor(
         }
     }
 
-//    override fun editPost(id: UUID, body: WritePostParam): Flow<Unit> {
-//        return postDataSource.editPost(
-//            id = id,
-//            body = body.toRequest()
-//        )
-//    }
-
     override fun deletePost(id: UUID): Flow<Unit> {
         return postDataSource.deletePost(id = id)
     }

diff --git a/core/domain/src/main/java/com/msg/domain/usecase/post/EditPostUseCase.kt b/core/domain/src/main/java/com/msg/domain/usecase/post/EditPostUseCase.kt
diff --git a/core/network/src/main/java/com/msg/network/api/PostAPI.kt b/core/network/src/main/java/com/msg/network/api/PostAPI.kt
@@ -3,11 +3,8 @@ package com.msg.network.api
 import com.msg.model.enumdata.FeedType
 import com.msg.network.response.post.GetDetailPostResponse
 import com.msg.network.response.post.GetPostListResponse
-import retrofit2.http.Body
 import retrofit2.http.DELETE
 import retrofit2.http.GET
-import retrofit2.http.PATCH
-import retrofit2.http.POST
 import retrofit2.http.Path
 import retrofit2.http.Query
 import java.util.UUID
@@ -25,12 +22,6 @@ interface PostAPI {
         @Path("id") id: UUID
     ): GetDetailPostResponse
 
-//    @PATCH("post/{id}")
-//    suspend fun editPost(
-//        @Path("id") id: UUID,
-//        @Body body: WritePostRequest
-//    )
-
     @DELETE("post/{id}")
     suspend fun deletePost(
         @Path("id") id: UUID

diff --git a/core/network/src/main/java/com/msg/network/datasource/post/PostDataSource.kt b/core/network/src/main/java/com/msg/network/datasource/post/PostDataSource.kt
@@ -9,6 +9,5 @@ import java.util.UUID
 interface PostDataSource {
     fun getPostList(type: FeedType, size: Int, page: Int): Flow<GetPostListResponse>
     fun getDetailPost(id: UUID): Flow<GetDetailPostResponse>
-    // fun editPost(id: UUID, body: WritePostRequest): Flow<Unit>
     fun deletePost(id: UUID): Flow<Unit>
 }
diff --git a/core/network/src/main/java/com/msg/network/datasource/post/PostDataSourceImpl.kt b/core/network/src/main/java/com/msg/network/datasource/post/PostDataSourceImpl.kt
@@ -17,9 +17,6 @@ class PostDataSourceImpl @Inject constructor(
     override fun getDetailPost(id: UUID): Flow<GetDetailPostResponse> =
         makeRequest { postAPI.getDetailPost(id = id) }
 
-//    override fun editPost(id: UUID, body: WritePostRequest): Flow<Unit> =
-//        makeRequest { postAPI.editPost(id = id, body = body) }
-
     override fun deletePost(id: UUID): Flow<Unit> =
         makeRequest { postAPI.deletePost(id = id) }
 }
diff --git a/feature/lecture/src/main/java/com/msg/lecture/viewmodel/LectureViewModel.kt b/feature/lecture/src/main/java/com/msg/lecture/viewmodel/LectureViewModel.kt
@@ -56,6 +56,7 @@ class LectureViewModel @Inject constructor(
     private val _getTakingLectureStudentListResponse = MutableStateFlow<Event<GetTakingLectureStudentListEntity>>(Event.Loading)
     val getTakingLectureStudentListResponse = _getTakingLectureStudentListResponse.asStateFlow()
 
+    // 네이밍을 editPostResponse에서 editLectureCourseCompletionStatusResponse로 변경해야함
     private val _editPostResponse = MutableStateFlow<Event<Unit>>(Event.Loading)
     val editPostResponse = _editPostResponse.asStateFlow()
 

diff --git a/feature/post/src/main/java/com/msg/post/PostDetailScreen.kt b/feature/post/src/main/java/com/msg/post/PostDetailScreen.kt
@@ -49,7 +49,6 @@ import java.util.UUID
 @Composable
 internal fun PostDetailScreenRoute(
     viewModel: PostViewModel = hiltViewModel(LocalContext.current as ComponentActivity),
-    // onEditClicked: () -> Unit,
     onDeleteClicked: () -> Unit,
     onBackClicked: () -> Unit
 ) {
@@ -69,10 +68,6 @@ internal fun PostDetailScreenRoute(
             onDeleteClicked()
             viewModel.deletePost(it)
         },
-//        onEditClicked = {
-//             onEditClicked()
-//             viewModel.getFilledEditPage()
-//        },
         onBackClicked = {
             onBackClicked()
             viewModel.selectedId.value = UUID.randomUUID()
@@ -102,7 +97,6 @@ internal fun PostDetailScreen(
     id: UUID,
     role: Authority = Authority.ROLE_USER,
     onDeleteClicked: (UUID) -> Unit,
-    // onEditClicked: () -> Unit,
     onBackClicked: () -> Unit
 ) {
     val (isDialogShow, setIsDialogShow)  = rememberSaveable { mutableStateOf(false) }
@@ -184,16 +178,6 @@ internal fun PostDetailScreen(
                             setIsDialogShow(true)
                         }
                     }
-                    Row(
-                        modifier = modifier.weight(0.45f)
-                    ) {
-                        BitgoeulButton(
-                            modifier = modifier.fillMaxWidth(),
-                            text = "수정하기"
-                        ) {
-                            // onEditClicked()
-                        }
-                    }
                 }
             }
             NegativeActionDialog(
@@ -224,7 +208,6 @@ fun PostDetailScreenPre() {
         ),
         role = Authority.ROLE_ADMIN,
         onDeleteClicked = {},
-        // onEditClicked = {},
         id = UUID.randomUUID()
     ) {}
 }
diff --git a/feature/post/src/main/java/com/msg/post/navigation/PostNavigation.kt b/feature/post/src/main/java/com/msg/post/navigation/PostNavigation.kt
@@ -27,13 +27,11 @@ fun NavController.navigateToPostDetailPage(navOptions: NavOptions? = null) {
 }
 
 fun NavGraphBuilder.postDetailScreen(
-    // onEditClicked: () -> Unit,
     onDeleteClicked: () -> Unit,
     onBackClicked: () -> Unit
 ) {
     composable(route = postDetailRoute) {
         PostDetailScreenRoute(
-            // onEditClicked = onEditClicked,
             onDeleteClicked = onDeleteClicked,
             onBackClicked = onBackClicked
         )

diff --git a/feature/post/src/main/java/com/msg/post/viewmodel/PostViewModel.kt b/feature/post/src/main/java/com/msg/post/viewmodel/PostViewModel.kt
@@ -2,7 +2,6 @@ package com.msg.post.viewmodel
 
 import androidx.compose.runtime.mutableStateListOf
 import androidx.compose.runtime.mutableStateOf
-import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.msg.common.errorhandling.errorHandling
@@ -24,21 +23,16 @@ import javax.inject.Inject
 @HiltViewModel
 class PostViewModel @Inject constructor(
     private val deletePostUseCase: DeletePostUseCase,
-    // private val editPostUseCase: EditPostUseCase,
     private val getDetailPostUseCase: GetDetailPostUseCase,
     private val getPostListUseCase: GetPostListUseCase,
     private val getAuthorityUseCase: GetAuthorityUseCase,
-    private val savedStateHandle: SavedStateHandle
 ) : ViewModel() {
 
     val role = getRole().toString()
 
     private val _deletePostResponse = MutableStateFlow<Event<Unit>>(Event.Loading)
     val deletePostResponse = _deletePostResponse.asStateFlow()
 
-    private val _editPostResponse = MutableStateFlow<Event<Unit>>(Event.Loading)
-    val editPostResponse = _editPostResponse.asStateFlow()
-
     private val _getDetailPostResponse = MutableStateFlow<Event<GetDetailPostEntity>>(Event.Loading)
     val getDetailPostResponse = _getDetailPostResponse.asStateFlow()
 
@@ -74,6 +68,7 @@ class PostViewModel @Inject constructor(
     var isEditPage = mutableStateOf(false)
         private set
 
+    // 아래의 삭제 함수를 저번 PR에서 실수로 삭제 못함 바로 삭제해야함
     internal fun deletePost(
         id: UUID
     ) = viewModelScope.launch {
@@ -88,31 +83,6 @@ class PostViewModel @Inject constructor(
         }
     }
 
-//    internal fun editPost(
-//        id: UUID,
-//        title: String,
-//        content: String,
-//        feedType: FeedType
-//    ) = viewModelScope.launch {
-//        editPostUseCase(
-//            id = id,
-//            body = WritePostParam(
-//                title = title,
-//                content = content,
-//                links = links,
-//                feedType = feedType
-//            )
-//        ).onSuccess {
-//            it.catch { remoteError ->
-//                _editPostResponse.value = remoteError.errorHandling()
-//            }.collect {
-//                _editPostResponse.value = Event.Success()
-//            }
-//        }.onFailure { error ->
-//            _editPostResponse.value = error.errorHandling()
-//        }
-//    }
-
     internal fun getPostList(
         type: FeedType
     ) = viewModelScope.launch {
@@ -147,13 +117,6 @@ class PostViewModel @Inject constructor(
         }
     }
 
-    internal fun getFilledEditPage() {
-        // onTitleChange(detailPost.value.title)
-        // onContentChange(detailPost.value.content)
-        links.addAll(detailPost.value.links)
-        isEditPage.value = true
-    }
-
     private fun getRole() = viewModelScope.launch {
         getAuthorityUseCase()
     }