Skip to content

Commit 3966167

Browse files
committed
refactor: 振替先が新規なのか既存なのかを保存結果から判定するのではなく、作成した Destination オブジェクトで判定するように変更した。
1 parent cab8347 commit 3966167

2 files changed

Lines changed: 13 additions & 19 deletions

File tree

app/src/main/java/com/kurodai0715/directdebitmanager/domain/usecase/SourcesCommandUseCase.kt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ import com.kurodai0715.directdebitmanager.domain.model.Destination
1010
import javax.inject.Inject
1111

1212
sealed interface SaveResult {
13-
data object Created : SaveResult
14-
data object Updated : SaveResult
13+
data object Succeeded : SaveResult
1514
data object Failed : SaveResult
1615
}
1716

@@ -30,7 +29,7 @@ class SourcesCommandUseCase @Inject constructor(
3029
parentId = destination.parentId,
3130
)
3231
when (result) {
33-
true -> SaveResult.Created
32+
true -> SaveResult.Succeeded
3433
false -> SaveResult.Failed
3534
}
3635
}
@@ -43,7 +42,7 @@ class SourcesCommandUseCase @Inject constructor(
4342
parentId = destination.parentId,
4443
)
4544
when (result) {
46-
true -> SaveResult.Updated
45+
true -> SaveResult.Succeeded
4746
false -> SaveResult.Failed
4847
}
4948
}

app/src/main/java/com/kurodai0715/directdebitmanager/ui/screen/destination_edit/DestinationEditViewModel.kt

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -422,23 +422,18 @@ class DestinationEditViewModel @Inject constructor(
422422

423423
val result = saveDestination(dest)
424424

425-
handleResult(result)
426-
}
427-
}
425+
when (result) {
426+
SaveResult.Succeeded -> {
427+
if (dest is Destination.New) {
428+
// 新規作成の場合は、入力フォームを初期化
429+
_formInputState.update { FormInputState() }
430+
}
431+
_eventChannel.send(UiEvent.ShowSnackbar(R.string.common_save_successfully))
432+
}
428433

429-
private suspend fun handleResult(result: SaveResult) {
430-
when (result) {
431-
SaveResult.Created -> {
432-
// 入力フォームを初期化
433-
_formInputState.update { FormInputState() }
434-
_eventChannel.send(UiEvent.ShowSnackbar(R.string.common_save_successfully))
434+
SaveResult.Failed ->
435+
_eventChannel.send(UiEvent.ShowSnackbar(R.string.common_save_failed))
435436
}
436-
437-
SaveResult.Updated ->
438-
_eventChannel.send(UiEvent.ShowSnackbar(R.string.common_save_successfully))
439-
440-
SaveResult.Failed ->
441-
_eventChannel.send(UiEvent.ShowSnackbar(R.string.common_save_failed))
442437
}
443438
}
444439

0 commit comments

Comments
 (0)