🔗 :: (#402) 디바이스 토큰 삭제 api 추가

Team-return · Oct 26, 2024 · 08d04cc · 08d04cc
2 parents 02ba52d + 7e449d8
commit 08d04cc
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 5 deletions.
diff --git a/core/data/src/main/java/team/retum/data/repository/user/UserRepository.kt b/core/data/src/main/java/team/retum/data/repository/user/UserRepository.kt
@@ -22,7 +22,7 @@ interface UserRepository {
 
     fun getRefreshExpiresAt(): String
 
-    fun signOut()
+    suspend fun signOut()
 
     suspend fun saveDeviceToken(deviceToken: String)
 

diff --git a/core/data/src/main/java/team/retum/data/repository/user/UserRepositoryImpl.kt b/core/data/src/main/java/team/retum/data/repository/user/UserRepositoryImpl.kt
@@ -55,7 +55,8 @@ class UserRepositoryImpl @Inject constructor(
         return localUserDataSource.getRefreshExpiresAt()
     }
 
-    override fun signOut() {
+    override suspend fun signOut() {
+        remoteUserDataSource.deleteDeviceToken()
         localUserDataSource.clearUserInformation()
     }
 

diff --git a/core/domain/src/main/java/team/retum/usecase/usecase/user/SignOutUseCase.kt b/core/domain/src/main/java/team/retum/usecase/usecase/user/SignOutUseCase.kt
@@ -6,7 +6,7 @@ import javax.inject.Inject
 class SignOutUseCase @Inject constructor(
     private val userRepository: UserRepository,
 ) {
-    operator fun invoke() = runCatching {
+    suspend operator fun invoke() = runCatching {
         userRepository.signOut()
     }
 }
diff --git a/core/network/src/main/java/team/retum/network/api/UserApi.kt b/core/network/src/main/java/team/retum/network/api/UserApi.kt
@@ -1,6 +1,7 @@
 package team.retum.network.api
 
 import retrofit2.http.Body
+import retrofit2.http.PATCH
 import retrofit2.http.POST
 import team.retum.network.di.RequestUrls
 import team.retum.network.model.request.user.SignInRequest
@@ -11,4 +12,7 @@ interface UserApi {
     suspend fun signIn(
         @Body signInRequest: SignInRequest,
     ): TokenResponse
+
+    @PATCH(RequestUrls.Users.deviceToken)
+    suspend fun deleteDeviceToken()
 }
diff --git a/core/network/src/main/java/team/retum/network/datasource/user/RemoteUserDataSource.kt b/core/network/src/main/java/team/retum/network/datasource/user/RemoteUserDataSource.kt
@@ -5,4 +5,6 @@ import team.retum.network.model.response.TokenResponse
 
 interface RemoteUserDataSource {
     suspend fun signIn(signInRequest: SignInRequest): TokenResponse
+
+    suspend fun deleteDeviceToken()
 }
diff --git a/core/network/src/main/java/team/retum/network/datasource/user/RemoteUserDataSourceImpl.kt b/core/network/src/main/java/team/retum/network/datasource/user/RemoteUserDataSourceImpl.kt
@@ -14,4 +14,10 @@ class RemoteUserDataSourceImpl @Inject constructor(
             userApi.signIn(signInRequest = signInRequest)
         }
     }
+
+    override suspend fun deleteDeviceToken() {
+        return RequestHandler<Unit>().request {
+            userApi.deleteDeviceToken()
+        }
+    }
 }
diff --git a/core/network/src/main/java/team/retum/network/di/RequestUrls.kt b/core/network/src/main/java/team/retum/network/di/RequestUrls.kt
@@ -15,6 +15,7 @@ internal object RequestUrls {
 
         const val login = "$path/login"
         const val token = "$path/token"
+        const val deviceToken = "$path/device-token"
     }
 
     data object Auth {

diff --git a/feature/mypage/src/main/java/team/retum/jobis/ui/MyPageScreen.kt b/feature/mypage/src/main/java/team/retum/jobis/ui/MyPageScreen.kt
@@ -91,6 +91,14 @@ internal fun MyPage(
                     navigateToLanding()
                 }
 
+                is MyPageSideEffect.FailSignOut -> {
+                    JobisToast.create(
+                        context = context,
+                        message = context.getString(R.string.toast_fail_sign_out),
+                        drawable = JobisIcon.Error,
+                    ).show()
+                }
+
                 is MyPageSideEffect.BadEditProfileImage -> {
                     JobisToast.create(
                         context = context,

diff --git a/feature/mypage/src/main/java/team/retum/jobis/viewmodel/MyPageViewModel.kt b/feature/mypage/src/main/java/team/retum/jobis/viewmodel/MyPageViewModel.kt
@@ -103,8 +103,12 @@ internal class MyPageViewModel @Inject constructor(
     }
 
     internal fun onSignOutClick() {
-        signOutUseCase().onSuccess {
-            postSideEffect(MyPageSideEffect.SuccessSignOut)
+        viewModelScope.launch(Dispatchers.IO) {
+            signOutUseCase().onSuccess {
+                postSideEffect(MyPageSideEffect.SuccessSignOut)
+            }.onFailure {
+                postSideEffect(MyPageSideEffect.FailSignOut)
+            }
         }
     }
 
@@ -137,6 +141,7 @@ internal data class MyPageState(
 
 internal sealed interface MyPageSideEffect {
     data object SuccessSignOut : MyPageSideEffect
+    data object FailSignOut : MyPageSideEffect
     data object SuccessEditProfileImage : MyPageSideEffect
     data object BadEditProfileImage : MyPageSideEffect
 }
diff --git a/feature/mypage/src/main/res/values/strings.xml b/feature/mypage/src/main/res/values/strings.xml
@@ -24,6 +24,7 @@
     <string name="modal_button_withdrawal">회원탈퇴</string>
     <string name="toast_update_later">추후 업데이트 될 예정이에요</string>
 
+    <string name="toast_fail_sign_out">로그아웃 처리 중 문제가 발생했습니다</string>
     <string name="toast_bad_request_edit_image">잘못된 요청이에요</string>
     <string name="toast_success_edit_profile_image">프로필이 성공적으로 업데이트 되었어요</string>
 </resources>