Fix/182 messaging token

app/src/main/java/com/easyhz/noffice/navigation/my_page/MyPageNavigation.kt

@@ -84,7 +84,8 @@ internal fun NavGraphBuilder.myPageGraph(
     composable<Withdrawal> {
         WithdrawalScreen(
             navigateToUp = navigateToUp,
-            navigateToLogin = navigateToLogin
+            navigateToLogin = navigateToLogin,
+            snackBarHostState = snackBarHostState
         )
     }
 }

core/network/src/main/java/com/easyhz/noffice/core/network/api/auth/AuthService.kt

@@ -1,10 +1,12 @@
 package com.easyhz.noffice.core.network.api.auth
 
 import com.easyhz.noffice.core.network.model.request.sign.LoginRequest
+import com.easyhz.noffice.core.network.model.request.token.MessagingToken
 import com.easyhz.noffice.core.network.model.response.auth.UserResponse
 import com.easyhz.noffice.core.network.util.NofficeResult
 import retrofit2.http.Body
 import retrofit2.http.DELETE
+import retrofit2.http.HTTP
 import retrofit2.http.Header
 import retrofit2.http.POST
 
@@ -25,7 +27,13 @@ interface AuthService {
     /* fcm 토큰 저장 */
     @POST("/api/v1/notifications/fcm-token")
     suspend fun registerMessagingToken(
-        @Body fcmToken: String
+        @Body messagingToken: MessagingToken
+    ): NofficeResult<Unit>
+
+    /* fcm 토큰 삭제 */
+    @HTTP(method = "DELETE", path = "/api/v1/notifications/fcm-token", hasBody = true)
+    suspend fun deleteMessagingToken(
+        @Body messagingToken: MessagingToken
     ): NofficeResult<Unit>
 
     /* 회원 탈퇴 */

core/network/src/main/java/com/easyhz/noffice/core/network/model/request/token/MessagingToken.kt

@@ -0,0 +1,5 @@
+package com.easyhz.noffice.core.network.model.request.token
+
+data class MessagingToken(
+    val token: String
+)

data/notification/build.gradle.kts

@@ -12,4 +12,6 @@ android {
 dependencies {
     implementation(projects.core.common)
     implementation(projects.core.network)
+
+    implementation(projects.core.datastore)
 }

data/notification/src/main/java/com/easyhz/noffice/data/notification/repository/messaging/CloudMessagingRepository.kt

@@ -2,5 +2,6 @@ package com.easyhz.noffice.data.notification.repository.messaging
 
 interface CloudMessagingRepository {
     suspend fun getToken(): Result<String>
-    suspend fun registerToken(token: String): Result<Unit>
+    suspend fun registerMessagingToken(token: String): Result<Unit>
+    suspend fun deleteMessagingToken(token: String): Result<Unit>
 }

data/notification/src/main/java/com/easyhz/noffice/data/notification/repository/messaging/CloudMessagingRepositoryImpl.kt

@@ -3,6 +3,7 @@ package com.easyhz.noffice.data.notification.repository.messaging
 import com.easyhz.noffice.core.common.di.Dispatcher
 import com.easyhz.noffice.core.common.di.NofficeDispatchers
 import com.easyhz.noffice.core.network.api.auth.AuthService
+import com.easyhz.noffice.core.network.model.request.token.MessagingToken
 import com.easyhz.noffice.core.network.util.toResult
 import com.google.firebase.messaging.FirebaseMessaging
 import kotlinx.coroutines.CoroutineDispatcher
@@ -21,7 +22,11 @@ class CloudMessagingRepositoryImpl @Inject constructor(
         }
     }
 
-    override suspend fun registerToken(token: String): Result<Unit> = withContext(dispatcher) {
-        return@withContext authService.registerMessagingToken(token).toResult()
+    override suspend fun registerMessagingToken(token: String): Result<Unit> = withContext(dispatcher) {
+        return@withContext authService.registerMessagingToken(MessagingToken(token)).toResult()
+    }
+
+    override suspend fun deleteMessagingToken(token: String): Result<Unit> = withContext(dispatcher) {
+        return@withContext authService.deleteMessagingToken(MessagingToken(token)).toResult()
     }
 }

data/notification/src/main/java/com/easyhz/noffice/data/notification/service/CloudMessagingService.kt

@@ -1,7 +1,10 @@
 package com.easyhz.noffice.data.notification.service
 
 import android.util.Log
+import com.easyhz.noffice.core.common.util.errorLogging
+import com.easyhz.noffice.core.datastore.datasource.user.UserLocalDataSource
 import com.easyhz.noffice.core.network.api.auth.AuthService
+import com.easyhz.noffice.core.network.model.request.token.MessagingToken
 import com.google.firebase.messaging.FirebaseMessagingService
 import com.google.firebase.messaging.RemoteMessage
 import dagger.hilt.android.AndroidEntryPoint
@@ -15,6 +18,9 @@ class CloudMessagingService: FirebaseMessagingService() {
     @Inject
     lateinit var authService: AuthService
 
+    @Inject
+    lateinit var userLocalDataSource: UserLocalDataSource
+
     @Inject
     lateinit var notificationService: NotificationService
 
@@ -32,13 +38,17 @@ class CloudMessagingService: FirebaseMessagingService() {
 
     private fun registerToken(token: String) {
         CoroutineScope(Dispatchers.IO).launch {
-            val response = authService.registerMessagingToken(token)
+            val memberId = userLocalDataSource.getMemberId().getOrNull()
+            if (memberId == null || memberId == -1) {
+                Log.w(this.javaClass.name, "memberId is $memberId")
+                return@launch
+            }
+            val response = authService.registerMessagingToken(MessagingToken(token))
             response.onSuccess {
                 Log.d(this.javaClass.name, "Success registering token")
             }.onFailure { e ->
-                Log.e(this.javaClass.name, "Error registering token", e)
+                errorLogging(this.javaClass.name, "Error registering token", e)
             }
         }
     }
-
 }

domain/my-page/build.gradle.kts

@@ -16,5 +16,6 @@ dependencies {
     implementation(projects.data.notification)
     implementation(projects.data.organization)
 
+    implementation(projects.domain.notification)
     implementation(projects.domain.organization)
 }

domain/my-page/src/main/java/com/easyhz/noffice/domain/my_page/usecase/LogoutUseCase.kt

@@ -2,13 +2,24 @@ package com.easyhz.noffice.domain.my_page.usecase
 
 import android.content.Context
 import com.easyhz.noffice.core.common.base.BaseUseCase
+import com.easyhz.noffice.core.common.util.errorLogging
 import com.easyhz.noffice.data.auth.repository.auth.AuthRepository
+import com.easyhz.noffice.domain.notification.usecase.DeleteMessagingTokenUseCase
 import javax.inject.Inject
 
 class LogoutUseCase @Inject constructor(
-    private val authRepository: AuthRepository
+    private val authRepository: AuthRepository,
+    private val deleteMessagingTokenUseCase: DeleteMessagingTokenUseCase
 ): BaseUseCase<Context, Unit>() {
-    override suspend fun invoke(param: Context): Result<Unit> {
-        return authRepository.logout(param)
+    override suspend fun invoke(param: Context): Result<Unit> = runCatching {
+        deleteMessagingToken()
+        authRepository.logout(param)
+    }
+
+    private suspend fun deleteMessagingToken() {
+        deleteMessagingTokenUseCase(Unit).onFailure { e ->
+            errorLogging(this.javaClass.name, "deleteMessagingToken", e)
+            throw e
+        }
     }
 }

domain/my-page/src/main/java/com/easyhz/noffice/domain/my_page/usecase/WithdrawUseCase.kt

@@ -0,0 +1,25 @@
+package com.easyhz.noffice.domain.my_page.usecase
+
+import android.content.Context
+import com.easyhz.noffice.core.common.base.BaseUseCase
+import com.easyhz.noffice.core.common.util.errorLogging
+import com.easyhz.noffice.data.auth.repository.auth.AuthRepository
+import com.easyhz.noffice.domain.notification.usecase.DeleteMessagingTokenUseCase
+import javax.inject.Inject
+
+class WithdrawUseCase @Inject constructor(
+    private val authRepository: AuthRepository,
+    private val deleteMessagingTokenUseCase: DeleteMessagingTokenUseCase
+): BaseUseCase<Context, Unit>() {
+    override suspend fun invoke(param: Context): Result<Unit> = runCatching {
+        deleteMessagingToken()
+        authRepository.withdraw(param)
+    }
+
+    private suspend fun deleteMessagingToken() {
+        deleteMessagingTokenUseCase(Unit).onFailure { e ->
+            errorLogging(this.javaClass.name, "deleteMessagingToken", e)
+            throw e
+        }
+    }
+}

domain/notification/src/main/java/com/easyhz/noffice/domain/notification/usecase/DeleteMessagingTokenUseCase.kt

@@ -0,0 +1,22 @@
+package com.easyhz.noffice.domain.notification.usecase
+
+import com.easyhz.noffice.core.common.base.BaseUseCase
+import com.easyhz.noffice.data.notification.repository.messaging.CloudMessagingRepository
+import javax.inject.Inject
+
+class DeleteMessagingTokenUseCase @Inject constructor(
+    private val cloudMessagingRepository: CloudMessagingRepository,
+) : BaseUseCase<Unit, Unit>() {
+    override suspend fun invoke(param: Unit): Result<Unit> = runCatching {
+        val token = getMessagingToken().getOrThrow()
+        deleteMessagingToken(token)
+    }
+
+    private suspend fun getMessagingToken(): Result<String> {
+        return cloudMessagingRepository.getToken()
+    }
+
+    private suspend fun deleteMessagingToken(token: String): Result<Unit> {
+        return cloudMessagingRepository.deleteMessagingToken(token)
+    }
+}

domain/notification/src/main/java/com/easyhz/noffice/domain/notification/usecase/RegisterMessagingTokenUseCase.kt

@@ -17,6 +17,6 @@ class RegisterMessagingTokenUseCase @Inject constructor(
     }
 
     private suspend fun registerMessagingToken(token: String): Result<Unit> {
-        return cloudMessagingRepository.registerToken(token)
+        return cloudMessagingRepository.registerMessagingToken(token)
     }
 }

feature/my-page/src/main/java/com/easyhz/noffice/feature/my_page/contract/detail/withdrawal/WithdrawalSideEffect.kt

@@ -1,8 +1,10 @@
 package com.easyhz.noffice.feature.my_page.contract.detail.withdrawal
 
+import androidx.annotation.StringRes
 import com.easyhz.noffice.core.common.base.UiSideEffect
 
 sealed class WithdrawalSideEffect: UiSideEffect() {
     data object NavigateToUp: WithdrawalSideEffect()
     data object NavigateToLogin: WithdrawalSideEffect()
+    data class ShowSnackBar(@StringRes val stringId: Int):  WithdrawalSideEffect()
 }

feature/my-page/src/main/java/com/easyhz/noffice/feature/my_page/contract/menu/MenuSideEffect.kt

@@ -1,6 +1,7 @@
 package com.easyhz.noffice.feature.my_page.contract.menu
 
 import android.net.Uri
+import androidx.annotation.StringRes
 import com.easyhz.noffice.core.common.base.UiSideEffect
 
 sealed class MenuSideEffect: UiSideEffect() {
@@ -11,4 +12,5 @@ sealed class MenuSideEffect: UiSideEffect() {
     data object NavigateToConsentToInformation: MenuSideEffect()
     data object NavigateToWithdrawal: MenuSideEffect()
     data object NavigateToLogin: MenuSideEffect()
+    data class ShowSnackBar(@StringRes val stringId: Int):  MenuSideEffect()
 }

feature/my-page/src/main/java/com/easyhz/noffice/feature/my_page/screen/MyPageMenuViewModel.kt

@@ -4,6 +4,8 @@ import android.content.Context
 import android.net.Uri
 import androidx.lifecycle.viewModelScope
 import com.easyhz.noffice.core.common.base.BaseViewModel
+import com.easyhz.noffice.core.common.error.handleError
+import com.easyhz.noffice.core.common.util.errorLogging
 import com.easyhz.noffice.domain.my_page.usecase.LogoutUseCase
 import com.easyhz.noffice.feature.my_page.contract.menu.MenuIntent
 import com.easyhz.noffice.feature.my_page.contract.menu.MenuSideEffect
@@ -88,6 +90,9 @@ class MyPageMenuViewModel @Inject constructor(
         logoutUseCase.invoke(context)
             .onSuccess {
                 postSideEffect { MenuSideEffect.NavigateToLogin }
+            }.onFailure {
+                errorLogging(this.javaClass.name, "handleLogout", it)
+                showSnackBar(it.handleError())
             }.also {
                 reduce { copy(isLoading = false) }
             }
@@ -96,4 +101,8 @@ class MyPageMenuViewModel @Inject constructor(
     private fun updateLogoutState(isShowLogoutDialog: Boolean = false, isLoading: Boolean) {
         reduce { copy(isShowLogoutDialog = isShowLogoutDialog, isLoading = isLoading) }
     }
+
+    private fun showSnackBar(stringId: Int) {
+        postSideEffect { MenuSideEffect.ShowSnackBar(stringId) }
+    }
 }

feature/my-page/src/main/java/com/easyhz/noffice/feature/my_page/screen/MyPageScreen.kt

@@ -241,6 +241,12 @@ fun MyPageScreen(
             is MenuSideEffect.NavigateToConsentToInformation -> { navigateToConsent() }
             is MenuSideEffect.NavigateToWithdrawal -> { navigateToWithdrawal() }
             is MenuSideEffect.NavigateToLogin -> { navigateToLogin() }
+            is MenuSideEffect.ShowSnackBar -> {
+                snackBarHostState.showSnackbar(
+                    message = context.getString(sideEffect.stringId),
+                    withDismissAction = true
+                )
+            }
         }
     }
 }

feature/my-page/src/main/java/com/easyhz/noffice/feature/my_page/screen/detail/withdrawal/WithdrawalScreen.kt

@@ -13,6 +13,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.Icon
+import androidx.compose.material3.SnackbarHostState
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
@@ -52,6 +53,7 @@ import com.easyhz.noffice.feature.my_page.util.WithdrawalType
 fun WithdrawalScreen(
     modifier: Modifier = Modifier,
     viewModel: WithdrawalViewModel = hiltViewModel(),
+    snackBarHostState: SnackbarHostState,
     navigateToUp: () -> Unit,
     navigateToLogin: () -> Unit
 ) {
@@ -169,6 +171,12 @@ fun WithdrawalScreen(
         when(sideEffect) {
             is WithdrawalSideEffect.NavigateToUp -> { navigateToUp() }
             is WithdrawalSideEffect.NavigateToLogin -> { navigateToLogin() }
+            is WithdrawalSideEffect.ShowSnackBar -> {
+                snackBarHostState.showSnackbar(
+                    message = context.getString(sideEffect.stringId),
+                    withDismissAction = true
+                )
+            }
         }
     }
 }

feature/my-page/src/main/java/com/easyhz/noffice/feature/my_page/screen/detail/withdrawal/WithdrawalViewModel.kt

@@ -4,8 +4,9 @@ import android.content.Context
 import androidx.lifecycle.viewModelScope
 import com.easyhz.noffice.core.common.base.BaseViewModel
 import com.easyhz.noffice.core.common.error.NofficeError
+import com.easyhz.noffice.core.common.error.handleError
 import com.easyhz.noffice.core.common.util.errorLogging
-import com.easyhz.noffice.domain.my_page.usecase.WithdrawUserCase
+import com.easyhz.noffice.domain.my_page.usecase.WithdrawUseCase
 import com.easyhz.noffice.feature.my_page.contract.detail.withdrawal.WithdrawalIntent
 import com.easyhz.noffice.feature.my_page.contract.detail.withdrawal.WithdrawalSideEffect
 import com.easyhz.noffice.feature.my_page.contract.detail.withdrawal.WithdrawalState
@@ -15,7 +16,7 @@ import javax.inject.Inject
 
 @HiltViewModel
 class WithdrawalViewModel @Inject constructor(
-    private val withdrawUserCase: WithdrawUserCase
+    private val withdrawUseCase: WithdrawUseCase
 ): BaseViewModel<WithdrawalState, WithdrawalIntent, WithdrawalSideEffect>(
     initialState = WithdrawalState.init()
 ) {
@@ -33,13 +34,14 @@ class WithdrawalViewModel @Inject constructor(
 
     private fun onClickWithdrawalButton(context: Context) = viewModelScope.launch {
         reduce { copy(isLoading = true) }
-        withdrawUserCase.invoke(context).onSuccess {
+        withdrawUseCase.invoke(context).onSuccess {
             navigateToLogIn()
         }.onFailure {
             if (it is NofficeError.NoContent) {
                 navigateToLogIn()
             } else {
                 errorLogging(this.javaClass.name, "withdraw", it)
+                showSnackBar(it.handleError())
             }
         }.also {
             reduce { copy(isLoading = false) }
@@ -53,4 +55,8 @@ class WithdrawalViewModel @Inject constructor(
     private fun onClickBackButton() {
         postSideEffect { WithdrawalSideEffect.NavigateToUp }
     }
+
+    private fun showSnackBar(stringId: Int) {
+        postSideEffect { WithdrawalSideEffect.ShowSnackBar(stringId) }
+    }
 }