Merge pull request #713 from Daily-DAYO/bug/issue-706

yuni-ju · web-flow · commit 7916501ba3ed · 2025-12-11T21:33:07.000+09:00
Prevent duplicate reply submissions
diff --git a/presentation/src/main/java/daily/dayo/presentation/screen/main/MainScreen.kt b/presentation/src/main/java/daily/dayo/presentation/screen/main/MainScreen.kt
@@ -112,10 +112,9 @@ internal fun MainScreen(
         SharedTransitionLayout {
             Scaffold(
                 snackbarHost = {
-                    SnackbarHost(
-                        hostState = snackBarHostState,
-                        modifier = Modifier.navigationBarsPadding()
-                    )
+                    if (!bottomSheetController.isVisible) {
+                        SnackbarHost(hostState = snackBarHostState)
+                    }
                 }
             ) {
                 Box {
@@ -295,7 +294,13 @@ internal fun MainScreen(
                             sheetState = bottomSheetState,
                             dragHandle = null
                         ) {
-                            bottomSheetController.sheetContent()
+                            Box {
+                                bottomSheetController.sheetContent()
+                                SnackbarHost(
+                                    hostState = snackBarHostState,
+                                    modifier = Modifier.align(Alignment.BottomCenter)
+                                )
+                            }
                         }
                     }
                 }
diff --git a/presentation/src/main/java/daily/dayo/presentation/screen/post/PostScreen.kt b/presentation/src/main/java/daily/dayo/presentation/screen/post/PostScreen.kt
@@ -99,7 +99,7 @@ fun PostScreen(
     val commentState = postViewModel.postComments.observeAsState()
     val commentText = remember { mutableStateOf(TextFieldValue("")) }
     val showMentionSearchView = remember { mutableStateOf(false) }
-    val commentFocusRequester = FocusRequester()
+    val commentFocusRequester = remember { FocusRequester() }
 
     // comment option
     val onClickCommentDelete: (Long) -> Unit = { commentId ->
@@ -180,11 +180,30 @@ fun PostScreen(
     val onClickCancelReply: () -> Unit = {
         clearComment()
     }
-    val postCommentCreateSuccess by postViewModel.postCommentCreateSuccess.observeAsState(Event(false))
-    if (postCommentCreateSuccess.getContentIfNotHandled() == true) {
-        clearComment()
-        keyboardController?.hide()
-        postViewModel.requestPostComment(postId)
+
+    val postCommentCreateState by postViewModel.postCommentCreateState.observeAsState()
+    LaunchedEffect(postCommentCreateState) {
+        postCommentCreateState?.status?.let { state ->
+            when (state) {
+                Status.LOADING -> {
+                    coroutineScope.launch {
+                        snackBarHostState.showSnackbar(context.getString(R.string.loading_default_message))
+                    }
+                }
+
+                Status.SUCCESS -> {
+                    clearComment()
+                    keyboardController?.hide()
+                    postViewModel.requestPostComment(postId)
+                }
+
+                Status.ERROR -> {
+                    coroutineScope.launch {
+                        snackBarHostState.showSnackbar(context.getString(R.string.network_error_dialog_default_message))
+                    }
+                }
+            }
+        }
     }
 
     BackHandler(enabled = loadingVisible) {}
@@ -454,7 +473,7 @@ private fun PreviewPostScreen() {
             userSearchKeyword = userSearchKeyword,
             showMentionSearchView = showMentionSearchView,
             userResults = userResults,
-            commentFocusRequester = FocusRequester(),
+            commentFocusRequester = remember { FocusRequester() },
             onClickPostComment = { },
             onClickProfile = { },
             onClickPost = { },
diff --git a/presentation/src/main/java/daily/dayo/presentation/view/dialog/CommentBottomSheetDialog.kt b/presentation/src/main/java/daily/dayo/presentation/view/dialog/CommentBottomSheetDialog.kt
@@ -168,11 +168,30 @@ fun CommentBottomSheetDialog(
     val onClickCancelReply: () -> Unit = {
         clearComment()
     }
-    val postCommentCreateSuccess by postViewModel.postCommentCreateSuccess.observeAsState(Event(false))
-    if (postCommentCreateSuccess.getContentIfNotHandled() == true) {
-        clearComment()
-        keyboardController?.hide()
-        postViewModel.requestPostComment(postId)
+
+    val postCommentCreateState by postViewModel.postCommentCreateState.observeAsState()
+    LaunchedEffect(postCommentCreateState) {
+        postCommentCreateState?.status?.let { state ->
+            when (state) {
+                Status.LOADING -> {
+                    coroutineScope.launch {
+                        snackBarHostState.showSnackbar(context.getString(R.string.loading_default_message))
+                    }
+                }
+
+                Status.SUCCESS -> {
+                    clearComment()
+                    keyboardController?.hide()
+                    postViewModel.requestPostComment(postId)
+                }
+
+                Status.ERROR -> {
+                    coroutineScope.launch {
+                        snackBarHostState.showSnackbar(context.getString(R.string.network_error_dialog_default_message))
+                    }
+                }
+            }
+        }
     }
 
     Surface(
diff --git a/presentation/src/main/java/daily/dayo/presentation/viewmodel/PostViewModel.kt b/presentation/src/main/java/daily/dayo/presentation/viewmodel/PostViewModel.kt
@@ -66,8 +66,8 @@ class PostViewModel @Inject constructor(
     private val _postDeleteSuccess = MutableSharedFlow<Status>()
     val postDeleteSuccess = _postDeleteSuccess.asSharedFlow()
 
-    private val _postCommentCreateSuccess = MutableLiveData<Event<Boolean>>()
-    val postCommentCreateSuccess get() = _postCommentCreateSuccess
+    private val _postCommentCreateState = MutableLiveData<Resource<Boolean>>()
+    val postCommentCreateState: LiveData<Resource<Boolean>> get() = _postCommentCreateState
 
     private val _postCommentDeleteSuccess = MutableLiveData<Event<Boolean>>()
     val postCommentDeleteSuccess get() = _postCommentDeleteSuccess
@@ -241,37 +241,41 @@ class PostViewModel @Inject constructor(
     }
 
     fun requestCreatePostComment(contents: String, postId: Long, mentionedUser: List<SearchUser>) {
-        if (contents.isEmpty()) return
+        if (contents.isEmpty() || _postCommentCreateState.value?.status == Status.LOADING) return
+
         viewModelScope.launch {
+            _postCommentCreateState.postValue(Resource.loading(null))
             val mentionList = getMentionList(contents, mentionedUser)
             requestCreatePostCommentUseCase(contents = contents, postId = postId, mentionList = mentionList).let { response ->
                 when (response) {
                     is NetworkResponse.Success -> {
-                        _postCommentCreateSuccess.postValue(Event(true))
+                        _postCommentCreateState.postValue(Resource.success(true))
                     }
 
                     else -> {
-                        _postCommentCreateSuccess.postValue(Event(false))
+                        _postCommentCreateState.postValue(Resource.error("댓글 작성 실패", false))
                     }
                 }
             }
         }
     }
 
     fun requestCreatePostCommentReply(reply: Pair<Long, Comment>, contents: String, postId: Long, mentionedUser: List<SearchUser>) {
-        if (contents.isEmpty()) return
+        if (contents.isEmpty() || _postCommentCreateState.value?.status == Status.LOADING) return
+
         viewModelScope.launch {
+            _postCommentCreateState.postValue(Resource.loading(null))
             val mentionList = getMentionList(contents, mentionedUser).toMutableList()
             val (parentCommentId, comment) = reply
             mentionList.add(MentionUser(comment.memberId, comment.nickname)) // 언급된 유저 리스트에 원본 댓글 유저 추가 (팔로우하지 않아도 답글 가능하므로 따로 추가)
             requestCreatePostCommentReplyUseCase(commentId = parentCommentId, contents = contents, postId = postId, mentionList = mentionList).let { response ->
                 when (response) {
                     is NetworkResponse.Success -> {
-                        _postCommentCreateSuccess.postValue(Event(true))
+                        _postCommentCreateState.postValue(Resource.success(true))
                     }
 
                     else -> {
-                        _postCommentCreateSuccess.postValue(Event(false))
+                        _postCommentCreateState.postValue(Resource.error("답글 작성 실패", false))
                     }
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -66,8 +66,8 @@ class PostViewModel @Inject constructor(`
`66`	`66`	`private val _postDeleteSuccess = MutableSharedFlow<Status>()`
`67`	`67`	`val postDeleteSuccess = _postDeleteSuccess.asSharedFlow()`
`68`	`68`
`69`		`- private val _postCommentCreateSuccess = MutableLiveData<Event<Boolean>>()`
`70`		`- val postCommentCreateSuccess get() = _postCommentCreateSuccess`
	`69`	`+ private val _postCommentCreateState = MutableLiveData<Resource<Boolean>>()`
	`70`	`+ val postCommentCreateState: LiveData<Resource<Boolean>> get() = _postCommentCreateState`
`71`	`71`
`72`	`72`	`private val _postCommentDeleteSuccess = MutableLiveData<Event<Boolean>>()`
`73`	`73`	`val postCommentDeleteSuccess get() = _postCommentDeleteSuccess`
`@@ -241,37 +241,41 @@ class PostViewModel @Inject constructor(`
`241`	`241`	`}`
`242`	`242`
`243`	`243`	`fun requestCreatePostComment(contents: String, postId: Long, mentionedUser: List<SearchUser>) {`
`244`		`- if (contents.isEmpty()) return`
	`244`	`+ if (contents.isEmpty() \|\| _postCommentCreateState.value?.status == Status.LOADING) return`
	`245`	`+`
`245`	`246`	`viewModelScope.launch {`
	`247`	`+ _postCommentCreateState.postValue(Resource.loading(null))`
`246`	`248`	`val mentionList = getMentionList(contents, mentionedUser)`
`247`	`249`	`requestCreatePostCommentUseCase(contents = contents, postId = postId, mentionList = mentionList).let { response ->`
`248`	`250`	`when (response) {`
`249`	`251`	`is NetworkResponse.Success -> {`
`250`		`- _postCommentCreateSuccess.postValue(Event(true))`
	`252`	`+ _postCommentCreateState.postValue(Resource.success(true))`
`251`	`253`	`}`
`252`	`254`
`253`	`255`	`else -> {`
`254`		`- _postCommentCreateSuccess.postValue(Event(false))`
	`256`	`+ _postCommentCreateState.postValue(Resource.error("댓글 작성 실패", false))`
`255`	`257`	`}`
`256`	`258`	`}`
`257`	`259`	`}`
`258`	`260`	`}`
`259`	`261`	`}`
`260`	`262`
`261`	`263`	`fun requestCreatePostCommentReply(reply: Pair<Long, Comment>, contents: String, postId: Long, mentionedUser: List<SearchUser>) {`
`262`		`- if (contents.isEmpty()) return`
	`264`	`+ if (contents.isEmpty() \|\| _postCommentCreateState.value?.status == Status.LOADING) return`
	`265`	`+`
`263`	`266`	`viewModelScope.launch {`
	`267`	`+ _postCommentCreateState.postValue(Resource.loading(null))`
`264`	`268`	`val mentionList = getMentionList(contents, mentionedUser).toMutableList()`
`265`	`269`	`val (parentCommentId, comment) = reply`
`266`	`270`	`mentionList.add(MentionUser(comment.memberId, comment.nickname)) // 언급된 유저 리스트에 원본 댓글 유저 추가 (팔로우하지 않아도 답글 가능하므로 따로 추가)`
`267`	`271`	`requestCreatePostCommentReplyUseCase(commentId = parentCommentId, contents = contents, postId = postId, mentionList = mentionList).let { response ->`
`268`	`272`	`when (response) {`
`269`	`273`	`is NetworkResponse.Success -> {`
`270`		`- _postCommentCreateSuccess.postValue(Event(true))`
	`274`	`+ _postCommentCreateState.postValue(Resource.success(true))`
`271`	`275`	`}`
`272`	`276`
`273`	`277`	`else -> {`
`274`		`- _postCommentCreateSuccess.postValue(Event(false))`
	`278`	`+ _postCommentCreateState.postValue(Resource.error("답글 작성 실패", false))`
`275`	`279`	`}`
`276`	`280`	`}`
`277`	`281`	`}`