refactor(core): app·core·afternote·receiver·setting 의 runCatchingCancellable 을 core:domain 경로로 바꾼다 (#2267)

app/src/main/java/com/afternote/afternote_fe/messaging/FirebaseDevicePushTargetProvider.kt

@@ -1,8 +1,8 @@
 package com.afternote.afternote_fe.messaging
 
 import com.afternote.core.common.reporting.ErrorReporter
-import com.afternote.core.common.result.runCatchingCancellable
 import com.afternote.core.domain.push.DevicePushTargetProvider
+import com.afternote.core.domain.result.runCatchingCancellable
 import com.google.android.gms.tasks.Task
 import com.google.firebase.installations.FirebaseInstallations
 import com.google.firebase.messaging.FirebaseMessaging

app/src/main/java/com/afternote/afternote_fe/messaging/PushTargetSynchronizer.kt

@@ -1,10 +1,10 @@
 package com.afternote.afternote_fe.messaging
 
 import com.afternote.core.common.reporting.ErrorReporter
-import com.afternote.core.common.result.runCatchingCancellable
 import com.afternote.core.domain.push.DevicePushTargetProvider
 import com.afternote.core.domain.repository.auth.AuthRepository
 import com.afternote.core.domain.repository.push.PushTargetRepository
+import com.afternote.core.domain.result.runCatchingCancellable
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock

app/src/main/java/com/afternote/afternote_fe/notification/DailyNotificationScheduleSynchronizer.kt

@@ -3,8 +3,8 @@ package com.afternote.afternote_fe.notification
 import android.content.Context
 import com.afternote.core.common.notification.NotificationScheduler
 import com.afternote.core.common.reporting.ErrorReporter
-import com.afternote.core.common.result.runCatchingCancellable
 import com.afternote.core.domain.repository.auth.AuthRepository
+import com.afternote.core.domain.result.runCatchingCancellable
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.flow.distinctUntilChanged
 import javax.inject.Inject

app/src/main/java/com/afternote/afternote_fe/notification/NotificationPermissionViewModel.kt

@@ -1,8 +1,8 @@
 package com.afternote.afternote_fe.notification
 
 import androidx.lifecycle.viewModelScope
-import com.afternote.core.common.result.runCatchingCancellable
 import com.afternote.core.domain.repository.auth.AuthRepository
+import com.afternote.core.domain.result.runCatchingCancellable
 import com.afternote.core.ui.mvi.MviViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Job

core/data/src/main/java/com/afternote/core/data/repoimpl/PhotoUploadRepositoryImpl.kt

@@ -4,9 +4,9 @@ import android.content.Context
 import android.webkit.MimeTypeMap
 import androidx.core.net.toUri
 import com.afternote.core.common.di.IoDispatcher
-import com.afternote.core.common.result.runCatchingCancellable
 import com.afternote.core.domain.model.UploadedFile
 import com.afternote.core.domain.repository.PhotoUploadRepository
+import com.afternote.core.domain.result.runCatchingCancellable
 import com.afternote.core.network.dto.PresignedUrlRequestDto
 import com.afternote.core.network.model.requireData
 import com.afternote.core.network.service.ImageApiService

core/data/src/main/java/com/afternote/core/data/repoimpl/UserReceiverRepositoryImpl.kt

@@ -1,13 +1,13 @@
 package com.afternote.core.data.repoimpl
 
 import com.afternote.core.common.reporting.ErrorReporter
-import com.afternote.core.common.result.runCatchingCancellable
 import com.afternote.core.data.mapper.delivery.toRequestDto
 import com.afternote.core.data.mapper.user.toDomain
 import com.afternote.core.datastore.TokenDataSource
 import com.afternote.core.domain.error.ReceiverRequestRejectedException
 import com.afternote.core.domain.model.ReceiverListState
 import com.afternote.core.domain.repository.UserReceiverRepository
+import com.afternote.core.domain.result.runCatchingCancellable
 import com.afternote.core.model.delivery.DeliveryConditionItem
 import com.afternote.core.model.delivery.ReceiverDeliveryConditions
 import com.afternote.core.model.user.Receiver

core/data/src/main/java/com/afternote/core/data/repoimpl/VideoUploadRepositoryImpl.kt

@@ -4,9 +4,9 @@ import android.content.Context
 import android.net.Uri
 import androidx.core.net.toUri
 import com.afternote.core.common.di.IoDispatcher
-import com.afternote.core.common.result.runCatchingCancellable
 import com.afternote.core.domain.model.UploadedFile
 import com.afternote.core.domain.repository.VideoUploadRepository
+import com.afternote.core.domain.result.runCatchingCancellable
 import com.afternote.core.network.dto.PresignedUrlRequestDto
 import com.afternote.core.network.model.requireData
 import com.afternote.core.network.service.ImageApiService

core/data/src/main/java/com/afternote/core/data/repoimpl/account/AccountRepositoryImpl.kt

@@ -1,8 +1,8 @@
 package com.afternote.core.data.repoimpl.account
 
-import com.afternote.core.common.result.runCatchingCancellable
 import com.afternote.core.data.mapper.auth.toDomain
 import com.afternote.core.domain.repository.account.AccountRepository
+import com.afternote.core.domain.result.runCatchingCancellable
 import com.afternote.core.model.AccountRegistration
 import com.afternote.core.model.FoundAccount
 import com.afternote.core.network.dto.EmailFindRequestDto

core/data/src/main/java/com/afternote/core/data/repoimpl/appversion/AppVersionRepositoryImpl.kt

@@ -1,7 +1,7 @@
 package com.afternote.core.data.repoimpl.appversion
 
-import com.afternote.core.common.result.runCatchingCancellable
 import com.afternote.core.domain.repository.appversion.AppVersionRepository
+import com.afternote.core.domain.result.runCatchingCancellable
 import com.afternote.core.model.appversion.AppVersionCheck
 import com.afternote.core.network.dto.AppPlatformDto
 import com.afternote.core.network.model.requireData

core/data/src/main/java/com/afternote/core/data/repoimpl/auth/AuthRepositoryImpl.kt

@@ -1,6 +1,5 @@
 package com.afternote.core.data.repoimpl.auth
 
-import com.afternote.core.common.result.runCatchingCancellable
 import com.afternote.core.data.mapper.auth.toDomain
 import com.afternote.core.datastore.LocalStoreRegistry
 import com.afternote.core.datastore.StoreScope
@@ -9,6 +8,7 @@ import com.afternote.core.domain.error.SessionChangedException
 import com.afternote.core.domain.push.DevicePushTargetProvider
 import com.afternote.core.domain.repository.auth.AuthRepository
 import com.afternote.core.domain.repository.push.PushTargetRepository
+import com.afternote.core.domain.result.runCatchingCancellable
 import com.afternote.core.model.Session
 import com.afternote.core.model.TokenBundle
 import com.afternote.core.network.dto.LoginRequestDto

core/data/src/main/java/com/afternote/core/data/repoimpl/auth/LoginFailureTranslation.kt

@@ -1,7 +1,7 @@
 package com.afternote.core.data.repoimpl.auth
 
-import com.afternote.core.common.result.runCatchingCancellable
 import com.afternote.core.domain.error.CoreAuthFailure
+import com.afternote.core.domain.result.runCatchingCancellable
 import com.afternote.core.network.model.ApiException
 import java.io.IOException
 

core/data/src/main/java/com/afternote/core/data/repoimpl/push/PushTargetRepositoryImpl.kt

@@ -1,7 +1,7 @@
 package com.afternote.core.data.repoimpl.push
 
-import com.afternote.core.common.result.runCatchingCancellable
 import com.afternote.core.domain.repository.push.PushTargetRepository
+import com.afternote.core.domain.result.runCatchingCancellable
 import com.afternote.core.network.dto.DeletePushTokenRequestDto
 import com.afternote.core.network.dto.RegisterPushTokenRequestDto
 import com.afternote.core.network.model.requireStatus

core/data/src/test/java/com/afternote/core/data/repoimpl/UploadFailureTranslationTest.kt

@@ -1,7 +1,7 @@
 package com.afternote.core.data.repoimpl
 
-import com.afternote.core.common.result.runCatchingCancellable
 import com.afternote.core.domain.error.FileUploadFailure
+import com.afternote.core.domain.result.runCatchingCancellable
 import com.afternote.core.network.model.ApiException
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertSame

feature/afternote/data/src/main/kotlin/com/afternote/feature/afternote/data/paging/AfternotePagingSource.kt

@@ -2,7 +2,7 @@ package com.afternote.feature.afternote.data.paging
 
 import androidx.paging.PagingSource
 import androidx.paging.PagingState
-import com.afternote.core.common.result.runCatchingCancellable
+import com.afternote.core.domain.result.runCatchingCancellable
 import com.afternote.core.network.model.requireData
 import com.afternote.feature.afternote.data.mapper.toDomainList
 import com.afternote.feature.afternote.data.service.AfternoteApiService

feature/afternote/data/src/main/kotlin/com/afternote/feature/afternote/data/repositoryimpl/author/AfternoteRepositoryImpl.kt

@@ -3,7 +3,7 @@ package com.afternote.feature.afternote.data.repositoryimpl.author
 import androidx.paging.Pager
 import androidx.paging.PagingConfig
 import androidx.paging.PagingData
-import com.afternote.core.common.result.runCatchingCancellable
+import com.afternote.core.domain.result.runCatchingCancellable
 import com.afternote.core.network.model.requireData
 import com.afternote.core.network.model.requireStatus
 import com.afternote.feature.afternote.data.mapper.toBusinessRequest

feature/afternote/data/src/main/kotlin/com/afternote/feature/afternote/data/repositoryimpl/author/MemorialThumbnailUploadRepositoryImpl.kt

@@ -1,7 +1,7 @@
 package com.afternote.feature.afternote.data.repositoryimpl.author
 
 import com.afternote.core.common.di.IoDispatcher
-import com.afternote.core.common.result.runCatchingCancellable
+import com.afternote.core.domain.result.runCatchingCancellable
 import com.afternote.core.network.dto.PresignedUrlRequestDto
 import com.afternote.core.network.model.requireData
 import com.afternote.core.network.service.ImageApiService

feature/afternote/data/src/main/kotlin/com/afternote/feature/afternote/data/repositoryimpl/author/MusicSearchRepositoryImpl.kt

@@ -1,6 +1,6 @@
 package com.afternote.feature.afternote.data.repositoryimpl.author
 
-import com.afternote.core.common.result.runCatchingCancellable
+import com.afternote.core.domain.result.runCatchingCancellable
 import com.afternote.feature.afternote.data.dto.MusicTrackDto
 import com.afternote.feature.afternote.data.service.MusicApiService
 import com.afternote.feature.afternote.domain.model.author.playlist.SearchedSong

feature/afternote/presentation/src/main/kotlin/com/afternote/feature/afternote/presentation/detail/AfternoteDetailViewModel.kt

@@ -3,9 +3,9 @@ package com.afternote.feature.afternote.presentation.detail
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.afternote.core.common.reporting.ErrorReporter
-import com.afternote.core.common.result.runCatchingCancellable
 import com.afternote.core.domain.repository.MyProfileRepository
 import com.afternote.core.domain.repository.UserProfileCacheRepository
+import com.afternote.core.domain.result.runCatchingCancellable
 import com.afternote.feature.afternote.domain.repository.author.AfternoteRepository
 import com.afternote.feature.afternote.presentation.R
 import com.afternote.feature.afternote.presentation.navigation.model.AfternoteRoute

feature/afternote/presentation/src/main/kotlin/com/afternote/feature/afternote/presentation/editor/AfternoteEditorViewModel.kt

@@ -5,8 +5,8 @@ import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.afternote.core.common.reporting.ErrorReporter
-import com.afternote.core.common.result.runCatchingCancellable
 import com.afternote.core.domain.repository.UserReceiverRepository
+import com.afternote.core.domain.result.runCatchingCancellable
 import com.afternote.feature.afternote.domain.AfternoteType
 import com.afternote.feature.afternote.domain.error.AfternoteFailure
 import com.afternote.feature.afternote.domain.model.author.CreateAfternoteInput

feature/afternote/presentation/src/main/kotlin/com/afternote/feature/afternote/presentation/editor/receiver/SelectReceiverViewModel.kt

@@ -4,8 +4,8 @@ import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.afternote.core.common.reporting.ErrorReporter
-import com.afternote.core.common.result.runCatchingCancellable
 import com.afternote.core.domain.repository.UserReceiverRepository
+import com.afternote.core.domain.result.runCatchingCancellable
 import com.afternote.feature.afternote.presentation.editor.mapper.toAfternoteEditorReceivers
 import com.afternote.feature.afternote.presentation.reporting.AfternoteFailureStage
 import com.afternote.feature.afternote.presentation.reporting.recordAfternoteFailure

feature/receiver/data/src/main/kotlin/com/afternote/feature/receiver/data/paging/ReceiverAfternotePagingSource.kt

@@ -3,7 +3,7 @@ package com.afternote.feature.receiver.data.paging
 import androidx.paging.PagingSource
 import androidx.paging.PagingState
 import com.afternote.core.common.reporting.ErrorReporter
-import com.afternote.core.common.result.runCatchingCancellable
+import com.afternote.core.domain.result.runCatchingCancellable
 import com.afternote.core.network.model.requireData
 import com.afternote.feature.receiver.data.error.toReceiverFailure
 import com.afternote.feature.receiver.data.mapper.toReceiverDomainList

feature/receiver/data/src/main/kotlin/com/afternote/feature/receiver/data/repositoryimpl/ReceiverAuthRepositoryImpl.kt

@@ -1,7 +1,7 @@
 package com.afternote.feature.receiver.data.repositoryimpl
 
 import com.afternote.core.common.reporting.ErrorReporter
-import com.afternote.core.common.result.runCatchingCancellable
+import com.afternote.core.domain.result.runCatchingCancellable
 import com.afternote.core.network.model.requireData
 import com.afternote.core.network.model.requireStatus
 import com.afternote.feature.receiver.data.dto.DeliveryVerificationRequestDto

feature/receiver/data/src/main/kotlin/com/afternote/feature/receiver/data/repositoryimpl/ReceiverDeliveryDocumentUploadRepositoryImpl.kt

@@ -1,7 +1,7 @@
 package com.afternote.feature.receiver.data.repositoryimpl
 
 import com.afternote.core.common.di.IoDispatcher
-import com.afternote.core.common.result.runCatchingCancellable
+import com.afternote.core.domain.result.runCatchingCancellable
 import com.afternote.feature.receiver.data.error.mapReceiverFailure
 import com.afternote.feature.receiver.domain.repository.ReceiverAuthRepository
 import com.afternote.feature.receiver.domain.repository.ReceiverDeliveryDocumentUploadRepository

feature/receiver/data/src/main/kotlin/com/afternote/feature/receiver/data/repositoryimpl/ReceiverRepositoryImpl.kt

@@ -4,7 +4,7 @@ import androidx.paging.Pager
 import androidx.paging.PagingConfig
 import androidx.paging.PagingData
 import com.afternote.core.common.reporting.ErrorReporter
-import com.afternote.core.common.result.runCatchingCancellable
+import com.afternote.core.domain.result.runCatchingCancellable
 import com.afternote.core.network.model.requireData
 import com.afternote.feature.receiver.data.error.mapReceiverFailure
 import com.afternote.feature.receiver.data.local.ReceiverMasterKeyDataSource

feature/setting/domain/src/main/java/com/afternote/feature/setting/domain/UpdateReceiverInfoUseCase.kt

@@ -1,7 +1,7 @@
 package com.afternote.feature.setting.domain
 
 import com.afternote.core.domain.repository.UserReceiverRepository
-import kotlinx.coroutines.CancellationException
+import com.afternote.core.domain.result.runCatchingCancellable
 import kotlinx.coroutines.currentCoroutineContext
 import kotlinx.coroutines.ensureActive
 import javax.inject.Inject
@@ -48,21 +48,13 @@ public class UpdateReceiverInfoUseCase
             email: String,
             message: String,
         ): UpdateReceiverInfoResult {
-            try {
-                repository.updateReceiver(receiverId, name, phone, relation, email)
-            } catch (cancelled: CancellationException) {
-                throw cancelled
-            } catch (failure: Throwable) {
-                return UpdateReceiverInfoResult.BasicInfoFailed(failure)
-            }
+            runCatchingCancellable { repository.updateReceiver(receiverId, name, phone, relation, email) }
+                .onFailure { return UpdateReceiverInfoResult.BasicInfoFailed(it) }
             currentCoroutineContext().ensureActive()
-            return try {
-                repository.updateReceiverMessage(receiverId, message)
-                UpdateReceiverInfoResult.Success
-            } catch (cancelled: CancellationException) {
-                throw cancelled
-            } catch (_: Throwable) {
-                UpdateReceiverInfoResult.MessageFailedAfterBasicInfoUpdated
-            }
+            return runCatchingCancellable { repository.updateReceiverMessage(receiverId, message) }
+                .fold(
+                    onSuccess = { UpdateReceiverInfoResult.Success },
+                    onFailure = { UpdateReceiverInfoResult.MessageFailedAfterBasicInfoUpdated },
+                )
         }
     }

feature/setting/presentation/src/main/kotlin/com/afternote/feature/setting/presentation/account/ConnectedAccountsViewModel.kt

@@ -2,7 +2,7 @@ package com.afternote.feature.setting.presentation.account
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.afternote.core.common.result.runCatchingCancellable
+import com.afternote.core.domain.result.runCatchingCancellable
 import com.afternote.core.model.user.UserConnectedAccount
 import com.afternote.feature.setting.domain.SettingAccountRepository
 import com.afternote.feature.setting.presentation.R

feature/setting/presentation/src/main/kotlin/com/afternote/feature/setting/presentation/delivery/DeliveryConditionViewModel.kt

@@ -1,8 +1,8 @@
 package com.afternote.feature.setting.presentation.delivery
 
 import androidx.lifecycle.viewModelScope
-import com.afternote.core.common.result.runCatchingCancellable
 import com.afternote.core.domain.repository.UserReceiverRepository
+import com.afternote.core.domain.result.runCatchingCancellable
 import com.afternote.core.model.delivery.DeliveryConditionType
 import com.afternote.core.model.delivery.DeliveryContentType
 import com.afternote.core.model.delivery.InactivityPeriod

feature/setting/presentation/src/main/kotlin/com/afternote/feature/setting/presentation/home/SettingViewModel.kt

@@ -2,9 +2,9 @@ package com.afternote.feature.setting.presentation.home
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.afternote.core.common.result.runCatchingCancellable
 import com.afternote.core.domain.repository.MyProfileRepository
 import com.afternote.core.domain.repository.auth.AuthRepository
+import com.afternote.core.domain.result.runCatchingCancellable
 import com.afternote.feature.setting.domain.SettingAccountRepository
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.CancellationException

feature/setting/presentation/src/main/kotlin/com/afternote/feature/setting/presentation/notification/PushNotificationViewModel.kt

@@ -6,8 +6,8 @@ import androidx.core.app.NotificationManagerCompat
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.afternote.core.common.reporting.ErrorReporter
-import com.afternote.core.common.result.runCatchingCancellable
 import com.afternote.core.domain.error.PushSettingFailure
+import com.afternote.core.domain.result.runCatchingCancellable
 import com.afternote.feature.setting.domain.SettingNotificationRepository
 import dagger.hilt.android.lifecycle.HiltViewModel
 import dagger.hilt.android.qualifiers.ApplicationContext

feature/setting/presentation/src/main/kotlin/com/afternote/feature/setting/presentation/profile/ProfileEditViewModel.kt

@@ -1,8 +1,8 @@
 package com.afternote.feature.setting.presentation.profile
 
 import androidx.lifecycle.viewModelScope
-import com.afternote.core.common.result.runCatchingCancellable
 import com.afternote.core.domain.repository.MyProfileRepository
+import com.afternote.core.domain.result.runCatchingCancellable
 import com.afternote.core.ui.mvi.MviViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.launch

feature/setting/presentation/src/main/kotlin/com/afternote/feature/setting/presentation/receiver/ReceiverEditViewModel.kt

@@ -1,8 +1,8 @@
 package com.afternote.feature.setting.presentation.receiver
 
 import androidx.lifecycle.viewModelScope
-import com.afternote.core.common.result.runCatchingCancellable
 import com.afternote.core.domain.repository.UserReceiverRepository
+import com.afternote.core.domain.result.runCatchingCancellable
 import com.afternote.core.ui.UiText
 import com.afternote.core.ui.mvi.MviViewModel
 import com.afternote.feature.setting.domain.UpdateReceiverInfoResult

feature/setting/presentation/src/main/kotlin/com/afternote/feature/setting/presentation/receiver/ReceiverRegisterViewModel.kt

@@ -2,8 +2,8 @@ package com.afternote.feature.setting.presentation.receiver
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.afternote.core.common.result.runCatchingCancellable
 import com.afternote.core.domain.repository.UserReceiverRepository
+import com.afternote.core.domain.result.runCatchingCancellable
 import com.afternote.core.ui.UiText
 import com.afternote.feature.setting.presentation.R
 import dagger.hilt.android.lifecycle.HiltViewModel