[FIX] 공지 누락된 기능 수정

presentation/src/main/java/com/kusitms/presentation/ui/notice/NoticeScreen.kt

@@ -95,13 +95,19 @@ fun NoticeScreen(
                     onClickUnreadNoticeFilter = {
                         viewModel.updateVisibleOnlyUnreadNotice(it)
                     },
-                    onNoticeClick = onNoticeClick
+                    onNoticeClick = {
+                        onNoticeClick(it)
+                        viewModel.updateNoticeAsViewedInList(it.noticeId)
+                    }
                 )
             }
             NoticeTab.CURRICULUM-> {
                 CurriculumListScreen(
                     curriculumList = curriculumList,
-                    onNoticeClick = onNoticeClick
+                    onNoticeClick = {
+                        onNoticeClick(it)
+                        viewModel.updateNoticeAsViewedInList(it.noticeId)
+                    }
                 )
             }
         }

presentation/src/main/java/com/kusitms/presentation/ui/notice/NoticeViewModel.kt

@@ -2,6 +2,7 @@ package com.kusitms.presentation.ui.notice
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import com.kusitms.domain.model.notice.NoticeModel
 import com.kusitms.domain.usecase.notice.GetCurriculumListUseCase
 import com.kusitms.domain.usecase.notice.GetNoticeListUseCase
 import dagger.hilt.android.lifecycle.HiltViewModel
@@ -10,23 +11,30 @@ import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.catch
+import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 @HiltViewModel
 class NoticeViewModel @Inject constructor(
-    getNoticeListUseCase: GetNoticeListUseCase,
+    private val getNoticeListUseCase: GetNoticeListUseCase,
     getCurriculumListUseCase: GetCurriculumListUseCase
 ) : ViewModel() {
 
-    val noticeList = getNoticeListUseCase().catch {
+    private val _noticeList = MutableStateFlow<List<NoticeModel>>(emptyList())
+    val noticeList : StateFlow<List<NoticeModel>> = _noticeList.asStateFlow()
 
-    }.stateIn(
-        viewModelScope,
-        started = SharingStarted.Eagerly,
-        initialValue = emptyList()
-    )
+   init {
+       viewModelScope.launch {
+           getNoticeListUseCase().catch {
+
+           }.collect {
+               _noticeList.emit(it)
+           }
+       }
+
+   }
 
     val curriculumList = getCurriculumListUseCase().catch {
 
@@ -44,4 +52,15 @@ class NoticeViewModel @Inject constructor(
             _visibleOnlyUnreadNotice.emit(isVisible)
         }
     }
+
+    fun updateNoticeAsViewedInList(noticeId : Int){
+        viewModelScope.launch {
+            _noticeList.emit(
+                noticeList.value.map {
+                    if(it.noticeId == noticeId && !it.viewYn) it.copy(viewYn = true)
+                    else it
+                }
+            )
+        }
+    }
 }

presentation/src/main/java/com/kusitms/presentation/ui/notice/detail/NoticeDetailBottomSheet.kt

@@ -68,7 +68,8 @@ fun NoticeCommentBottom(
     noticeDetailViewModel: NoticeDetailViewModel = hiltViewModel(),
     targetComment : CommentModel,
     onClickChildReport : (NoticeDetailModalState.Report) -> Unit,
-    onClickChildDelete : (NoticeDetailDialogState.CommentDelete) -> Unit
+    onClickChildDelete : (NoticeDetailDialogState.CommentDelete) -> Unit,
+    onDismiss: () -> Unit = {}
 ){
     val childCommentList by noticeDetailViewModel.childCommentList.collectAsStateWithLifecycle()
 
@@ -95,7 +96,20 @@ fun NoticeCommentBottom(
         NoticeComment(
             comment = targetComment,
             commentCount = childCommentList.size,
-            isParentCommentAsReply = true
+            isParentCommentAsReply = true,
+            onClickReport = {
+                onClickChildReport(
+                    NoticeDetailModalState.Report(targetComment, targetComment.writerId)
+                )
+            },
+            onClickDelete = {
+                onClickChildDelete(
+                    NoticeDetailDialogState.CommentDelete(
+                        comment = targetComment
+                    )
+                )
+                onDismiss()
+            }
         )
         KusitmsMarginVerticalSpacer(size = 20)
 

presentation/src/main/java/com/kusitms/presentation/ui/notice/detail/NoticeDetailScreen.kt

@@ -282,6 +282,9 @@ fun NoticeDetailScreen(
                         },
                         onClickChildDelete = {
                             openDialogState = it
+                        },
+                        onDismiss = {
+                            openBottomSheet = null
                         }
                     )
                 }

presentation/src/main/java/com/kusitms/presentation/ui/notice/detail/NoticeDetailViewModel.kt

@@ -155,6 +155,7 @@ class NoticeDetailViewModel @Inject constructor(
             ).catch {
                 _snackbarEvent.emit(NoticeDetailSnackbarEvent.NETWORK_ERROR)
             }.collectLatest {
+                fetchCommentList()
                 fetchChildCommentList(commentId)
             }
         }