feat : 채팅방 목록, 채팅방 상세 화면에서만 웹소켓을 연결하는 것으로 변경

tgyuuAn · tgyuuAn · commit 00e51d180064 · 2025-05-10T17:52:50.000+09:00
diff --git a/feature/center-chatting/src/main/java/com/idle/center/chatting/CenterChattingFragment.kt b/feature/center-chatting/src/main/java/com/idle/center/chatting/CenterChattingFragment.kt
@@ -35,6 +35,7 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.fragment.app.viewModels
+import androidx.lifecycle.compose.LifecycleStartEffect
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import coil.compose.AsyncImage
 import com.idle.compose.base.BaseComposeFragment
@@ -65,7 +66,11 @@ internal class CenterChattingFragment : BaseComposeFragment() {
                 initCenterChatting()
                 retrieveChatRoomList()
                 loadChatRoomList()
-                subscribeChatMessage()
+            }
+
+            LifecycleStartEffect(fragmentViewModel) {
+                connectWebsocket()
+                onStopOrDispose { disconnectWebsocket() }
             }
 
             CenterChattingScreen(
diff --git a/feature/center-chatting/src/main/java/com/idle/center/chatting/CenterChattingViewModel.kt b/feature/center-chatting/src/main/java/com/idle/center/chatting/CenterChattingViewModel.kt
@@ -43,7 +43,17 @@ class CenterChattingViewModel @Inject constructor(
         }.onFailure { errorHelper.sendError(it) }
     }
 
-    internal fun subscribeChatMessage() = viewModelScope.launch {
+    internal fun connectWebsocket() = viewModelScope.launch {
+        chatRepository.connectWebSocket().onSuccess {
+            subscribeChatMessage()
+        }
+    }
+
+    internal fun disconnectWebsocket() = viewModelScope.launch {
+        chatRepository.disconnectWebSocket()
+    }
+
+    private fun subscribeChatMessage() = viewModelScope.launch {
         chatRepository.subscribeChatMessage(_myProfile.value?.centerId ?: return@launch)
             .collect { message ->
                 when (message) {
diff --git a/feature/chatting-detail/src/main/java/com/idle/chatting_detail/ChattingDetailFragment.kt b/feature/chatting-detail/src/main/java/com/idle/chatting_detail/ChattingDetailFragment.kt
@@ -5,6 +5,7 @@ import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.fragment.app.viewModels
+import androidx.lifecycle.compose.LifecycleStartEffect
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.fragment.findNavController
 import com.idle.chatting_detail.ui.ChattingDetailLoadingScreen
@@ -34,10 +35,15 @@ internal class ChattingDetailFragment : BaseComposeFragment() {
             LaunchedEffect(Unit) {
                 getUserProfile()
                 getChatMessages()
-                subscribeChatMessage()
                 readMessage()
             }
 
+            LifecycleStartEffect(fragmentViewModel) {
+                connectWebsocket()
+                onStopOrDispose { disconnectWebsocket() }
+            }
+
+
             if (chatMessages != null && workerProfile != null && centerProfile != null) {
                 ChattingDetailScreen(
                     receiverId = receiverId,
diff --git a/feature/chatting-detail/src/main/java/com/idle/chatting_detail/ChattingDetailViewModel.kt b/feature/chatting-detail/src/main/java/com/idle/chatting_detail/ChattingDetailViewModel.kt
@@ -134,7 +134,17 @@ class ChattingDetailViewModel @Inject constructor(
         }
     }
 
-    internal suspend fun subscribeChatMessage() {
+    internal fun connectWebsocket() = viewModelScope.launch {
+        chatRepository.connectWebSocket().onSuccess {
+            subscribeChatMessage()
+        }
+    }
+
+    internal fun disconnectWebsocket() = viewModelScope.launch {
+        chatRepository.disconnectWebSocket()
+    }
+
+    private suspend fun subscribeChatMessage() {
         chatRepository.subscribeChatMessage(myId)
             .catch {
                 errorHelper.sendError(it)
diff --git a/feature/setting/src/main/java/com/idle/setting/center/CenterSettingViewModel.kt b/feature/setting/src/main/java/com/idle/setting/center/CenterSettingViewModel.kt
@@ -6,7 +6,6 @@ import com.idle.analytics.AnalyticsHelper
 import com.idle.domain.model.error.ErrorHelper
 import com.idle.domain.model.profile.CenterProfile
 import com.idle.domain.repositorry.AuthRepository
-import com.idle.domain.repositorry.ChatRepository
 import com.idle.domain.usecase.profile.GetMyCenterProfileUseCase
 import com.idle.setting.SettingEvent
 import dagger.hilt.android.lifecycle.HiltViewModel
@@ -21,15 +20,13 @@ import javax.inject.Inject
 class CenterSettingViewModel @Inject constructor(
     private val getMyCenterProfileUseCase: GetMyCenterProfileUseCase,
     private val authRepository: AuthRepository,
-    private val chatRepository: ChatRepository,
     private val analyticsHelper: AnalyticsHelper,
     private val errorHelper: ErrorHelper,
     val navigationHelper: com.idle.navigation.NavigationHelper,
 ) : ViewModel() {
-    private val _centerProfile =
-        MutableStateFlow<CenterProfile>(
-            CenterProfile("", "", "", "", "", "", 0.0, 0.0, "", "")
-        )
+    private val _centerProfile = MutableStateFlow<CenterProfile>(
+        CenterProfile("", "", "", "", "", "", 0.0, 0.0, "", "")
+    )
     val centerProfile = _centerProfile.asStateFlow()
 
     private val _centerSettingEvent = MutableSharedFlow<SettingEvent>()
@@ -48,7 +45,6 @@ class CenterSettingViewModel @Inject constructor(
     fun logout() = viewModelScope.launch {
         authRepository.logoutCenter().onSuccess {
             analyticsHelper.setUserId(null)
-            chatRepository.disconnectWebSocket()
             navigationHelper.navigateTo(
                 com.idle.navigation.NavigationEvent.ToAuthWithClearBackStack(
                     toastMsg = "로그아웃이 완료되었습니다.",
diff --git a/feature/setting/src/main/java/com/idle/setting/worker/WorkerSettingViewModel.kt b/feature/setting/src/main/java/com/idle/setting/worker/WorkerSettingViewModel.kt
@@ -6,7 +6,6 @@ import com.idle.analytics.AnalyticsHelper
 import com.idle.domain.model.error.ErrorHelper
 import com.idle.domain.model.profile.WorkerProfile
 import com.idle.domain.repositorry.AuthRepository
-import com.idle.domain.repositorry.ChatRepository
 import com.idle.domain.usecase.profile.GetMyWorkerProfileUseCase
 import com.idle.setting.SettingEvent
 import dagger.hilt.android.lifecycle.HiltViewModel
@@ -20,7 +19,6 @@ import javax.inject.Inject
 class WorkerSettingViewModel @Inject constructor(
     private val getMyWorkerProfileUseCase: GetMyWorkerProfileUseCase,
     private val authRepository: AuthRepository,
-    private val chatRepository: ChatRepository,
     private val analyticsHelper: AnalyticsHelper,
     private val errorHelper: ErrorHelper,
     val navigationHelper: com.idle.navigation.NavigationHelper,
@@ -43,7 +41,6 @@ class WorkerSettingViewModel @Inject constructor(
     fun logout() = viewModelScope.launch {
         authRepository.logoutWorker().onSuccess {
             analyticsHelper.setUserId(null)
-            chatRepository.disconnectWebSocket()
             navigationHelper.navigateTo(
                 com.idle.navigation.NavigationEvent.ToAuthWithClearBackStack(
                     toastMsg = "로그아웃이 완료되었습니다.",
diff --git a/feature/signin/src/main/java/com/idle/signin/center/CenterSignInViewModel.kt b/feature/signin/src/main/java/com/idle/signin/center/CenterSignInViewModel.kt
@@ -13,7 +13,6 @@ import com.idle.domain.model.error.HttpResponseException
 import com.idle.domain.model.error.HttpResponseStatus
 import com.idle.domain.model.profile.CenterManagerAccountStatus
 import com.idle.domain.repositorry.AuthRepository
-import com.idle.domain.repositorry.ChatRepository
 import com.idle.domain.repositorry.ProfileRepository
 import com.idle.navigation.DeepLinkDestination.CenterHome
 import com.idle.navigation.DeepLinkDestination.CenterPending
@@ -29,7 +28,6 @@ import javax.inject.Inject
 @HiltViewModel
 class CenterSignInViewModel @Inject constructor(
     private val authRepository: AuthRepository,
-    private val chatRepository: ChatRepository,
     private val profileRepository: ProfileRepository,
     private val analyticsHelper: AnalyticsHelper,
     private val errorHelper: ErrorHelper,
@@ -109,7 +107,6 @@ class CenterSignInViewModel @Inject constructor(
 
     private fun fetchAndNavigateToProfile() = viewModelScope.launch {
         profileRepository.getMyCenterProfile().onSuccess {
-            chatRepository.connectWebSocket()
             navigationHelper.navigateTo(To(CenterHome, R.id.centerSignInFragment))
         }.onFailure {
             val error = it as HttpResponseException
diff --git a/feature/signup/src/main/java/com/idle/signup/worker/WorkerSignUpViewModel.kt b/feature/signup/src/main/java/com/idle/signup/worker/WorkerSignUpViewModel.kt
@@ -13,7 +13,6 @@ import com.idle.domain.model.error.ErrorHelper
 import com.idle.domain.model.error.HttpResponseException
 import com.idle.domain.model.error.HttpResponseStatus
 import com.idle.domain.repositorry.AuthRepository
-import com.idle.domain.repositorry.ChatRepository
 import com.idle.domain.repositorry.ProfileRepository
 import com.idle.domain.util.formatPhoneNumber
 import com.idle.navigation.DeepLinkDestination.SignUpComplete
@@ -32,7 +31,6 @@ import javax.inject.Inject
 class WorkerSignUpViewModel @Inject constructor(
     private val profileRepository: ProfileRepository,
     private val authRepository: AuthRepository,
-    private val chatRepository: ChatRepository,
     private val countDownTimer: CountDownTimer,
     private val analyticsHelper: AnalyticsHelper,
     private val errorHelper: ErrorHelper,
@@ -153,7 +151,6 @@ class WorkerSignUpViewModel @Inject constructor(
             authCode = _workerAuthCode.value,
         ).onSuccess {
             profileRepository.getWorkerId().onSuccess { analyticsHelper.setUserId(it) }
-            chatRepository.connectWebSocket()
             navigationHelper.navigateTo(
                 com.idle.navigation.NavigationEvent.To(
                     WorkerHome,
@@ -189,7 +186,6 @@ class WorkerSignUpViewModel @Inject constructor(
             lotNumberAddress = _lotNumberAddress.value,
         ).onSuccess {
             profileRepository.getWorkerId().onSuccess { analyticsHelper.setUserId(it) }
-            chatRepository.connectWebSocket()
             navigationHelper.navigateTo(
                 com.idle.navigation.NavigationEvent.To(
                     SignUpComplete,
diff --git a/feature/withdrawal/src/main/java/com/idle/withdrawal/WithdrawalViewModel.kt b/feature/withdrawal/src/main/java/com/idle/withdrawal/WithdrawalViewModel.kt
@@ -13,7 +13,6 @@ import com.idle.domain.model.error.ApiErrorCode
 import com.idle.domain.model.error.ErrorHelper
 import com.idle.domain.model.error.HttpResponseException
 import com.idle.domain.repositorry.AuthRepository
-import com.idle.domain.repositorry.ChatRepository
 import com.idle.domain.util.formatPhoneNumber
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Job
@@ -25,7 +24,6 @@ import javax.inject.Inject
 @HiltViewModel
 class WithdrawalViewModel @Inject constructor(
     private val authRepository: AuthRepository,
-    private val chatRepository: ChatRepository,
     private val countDownTimer: CountDownTimer,
     private val analyticsHelper: AnalyticsHelper,
     private val errorHelper: ErrorHelper,
@@ -167,7 +165,6 @@ class WithdrawalViewModel @Inject constructor(
             password = password.value
         ).onSuccess {
             analyticsHelper.setUserId(null)
-            chatRepository.disconnectWebSocket()
             navigationHelper.navigateTo(
                 com.idle.navigation.NavigationEvent.ToAuthWithClearBackStack(
                     "회원탈퇴가 완료되었어요."
@@ -190,7 +187,6 @@ class WithdrawalViewModel @Inject constructor(
                 .joinToString("|"),
         ).onSuccess {
             analyticsHelper.setUserId(null)
-            chatRepository.disconnectWebSocket()
             navigationHelper.navigateTo(
                 com.idle.navigation.NavigationEvent.ToAuthWithClearBackStack(
                     "회원탈퇴가 완료되었어요."
diff --git a/feature/worker-chatting/src/main/java/com/idle/worker/chatting/WorkerChattingFragment.kt b/feature/worker-chatting/src/main/java/com/idle/worker/chatting/WorkerChattingFragment.kt
@@ -35,6 +35,7 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.fragment.app.viewModels
+import androidx.lifecycle.compose.LifecycleStartEffect
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import coil.compose.AsyncImage
 import com.idle.compose.base.BaseComposeFragment
@@ -50,7 +51,6 @@ import com.idle.domain.util.formatUnReadNumber
 import com.idle.navigation.DeepLinkDestination
 import com.idle.navigation.NavigationEvent
 import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.launch
 
 @AndroidEntryPoint
 internal class WorkerChattingFragment : BaseComposeFragment() {
@@ -64,11 +64,13 @@ internal class WorkerChattingFragment : BaseComposeFragment() {
 
             LaunchedEffect(Unit) {
                 initWorkerChatting()
-                launch {
-                    retrieveChatRoomList()
-                    loadChatRoomList()
-                }
-                launch { subscribeChatMessage() }
+                retrieveChatRoomList()
+                loadChatRoomList()
+            }
+
+            LifecycleStartEffect(fragmentViewModel) {
+                connectWebsocket()
+                onStopOrDispose { disconnectWebsocket() }
             }
 
             if (chatRoomList != null) {
diff --git a/feature/worker-chatting/src/main/java/com/idle/worker/chatting/WorkerChattingViewModel.kt b/feature/worker-chatting/src/main/java/com/idle/worker/chatting/WorkerChattingViewModel.kt
@@ -19,6 +19,7 @@ import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 @HiltViewModel
@@ -71,7 +72,17 @@ class WorkerChattingViewModel @Inject constructor(
         }
     }
 
-    internal suspend fun subscribeChatMessage() {
+    internal fun connectWebsocket() = viewModelScope.launch {
+        chatRepository.connectWebSocket().onSuccess {
+            subscribeChatMessage()
+        }
+    }
+
+    internal fun disconnectWebsocket() = viewModelScope.launch {
+        chatRepository.disconnectWebSocket()
+    }
+
+    private suspend fun subscribeChatMessage() {
         chatRepository.subscribeChatMessage(_myProfile.value?.workerId ?: return)
             .collect { message ->
                 when (message) {
diff --git a/presentation/src/main/java/com/idle/presentation/MainActivity.kt b/presentation/src/main/java/com/idle/presentation/MainActivity.kt
@@ -129,18 +129,6 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
-    override fun onStart() {
-        super.onStart()
-        if (networkMonitor.networkState.value != NetworkState.NotConnected) {
-            viewModel.connectWebSocket()
-        }
-    }
-
-    override fun onStop() {
-        super.onStop()
-        viewModel.disconnectWebSocket()
-    }
-
     override fun onNewIntent(intent: Intent?) {
         super.onNewIntent(intent)
 
diff --git a/presentation/src/main/java/com/idle/presentation/MainViewModel.kt b/presentation/src/main/java/com/idle/presentation/MainViewModel.kt
@@ -12,7 +12,6 @@ import com.idle.domain.model.error.ErrorHelper
 import com.idle.domain.model.error.HttpResponseException
 import com.idle.domain.model.jobposting.SharedJobPostingInfo
 import com.idle.domain.model.profile.CenterManagerAccountStatus
-import com.idle.domain.repositorry.ChatRepository
 import com.idle.domain.repositorry.ConfigRepository
 import com.idle.domain.repositorry.JobPostingRepository
 import com.idle.domain.repositorry.NotificationRepository
@@ -41,7 +40,6 @@ class MainViewModel @Inject constructor(
     private val profileRepository: ProfileRepository,
     private val notificationRepository: NotificationRepository,
     private val jobPostingRepository: JobPostingRepository,
-    private val chatRepository: ChatRepository,
     private val errorHelper: ErrorHelper,
     internal val eventHelper: EventHelper,
     internal val navigationHelper: NavigationHelper,
@@ -56,20 +54,6 @@ class MainViewModel @Inject constructor(
         handleError()
     }
 
-    internal fun connectWebSocket() = viewModelScope.launch {
-        val (accessToken, userRole) = getAccessTokenAndUserRole()
-
-        if (accessToken.isBlank() || userRole.isBlank()) {
-            return@launch
-        }
-
-        chatRepository.connectWebSocket()
-    }
-
-    internal fun disconnectWebSocket() = viewModelScope.launch {
-        chatRepository.connectWebSocket()
-    }
-
     internal fun setNavigationMenuType(navigationMenuType: NavigationMenuType) {
         _navigationMenuType.value = navigationMenuType
     }
@@ -113,7 +97,12 @@ class MainViewModel @Inject constructor(
 
     private suspend fun navigateToDestination(userRole: String) {
         when (userRole) {
-            UserType.WORKER.apiValue -> navigationHelper.navigateTo(NavigationEvent.To(WorkerHome, R.id.authFragment))
+            UserType.WORKER.apiValue -> navigationHelper.navigateTo(
+                NavigationEvent.To(
+                    WorkerHome,
+                    R.id.authFragment
+                )
+            )
 
             UserType.CENTER.apiValue -> getCenterStatus()
             else -> Unit
@@ -163,8 +152,6 @@ class MainViewModel @Inject constructor(
                         ApiErrorCode.TokenExpiredException,
                         ApiErrorCode.TokenNotFound,
                         ApiErrorCode.NotSupportUserTokenType -> {
-                            disconnectWebSocket()
-
                             navigationHelper.navigateTo(
                                 NavigationEvent.ToAuthWithClearBackStack(
                                     exception.print()
