장부, 봉투 생성 시 상세 화면 이동 / 받은 장부 목록 쿼리 수정

data/src/main/java/com/susu/data/data/repository/LedgerRepositoryImpl.kt

@@ -16,14 +16,14 @@ class LedgerRepositoryImpl @Inject constructor(
         title: String?,
         categoryIdList: List<Int>?,
         fromStartAt: LocalDateTime,
-        toEndAt: LocalDateTime,
+        toStartAt: LocalDateTime,
         page: Int?,
         sort: String?,
     ): List<Ledger> = ledgerService.getLedgerList(
         title = title,
         categoryIdList = categoryIdList,
         fromStartAt = fromStartAt.toKotlinLocalDateTime(),
-        toEndAt = toEndAt.toKotlinLocalDateTime(),
+        toStartAt = toStartAt.toKotlinLocalDateTime(),
         page = page,
         sort = sort,
     ).getOrThrow().toModel()

data/src/main/java/com/susu/data/remote/api/LedgerService.kt

@@ -20,7 +20,7 @@ interface LedgerService {
         @Query("title") title: String?,
         @Query("categoryIds") categoryIdList: List<Int>?,
         @Query("fromStartAt") fromStartAt: LocalDateTime,
-        @Query("toEndAt") toEndAt: LocalDateTime,
+        @Query("toStartAt") toStartAt: LocalDateTime,
         @Query("page") page: Int?,
         @Query("sort") sort: String?,
     ): ApiResult<LedgerListResponse>

domain/src/main/java/com/susu/domain/repository/LedgerRepository.kt

@@ -8,7 +8,7 @@ interface LedgerRepository {
         title: String?,
         categoryIdList: List<Int>?,
         fromStartAt: LocalDateTime,
-        toEndAt: LocalDateTime,
+        toStartAt: LocalDateTime,
         page: Int?,
         sort: String?,
     ): List<Ledger>

domain/src/main/java/com/susu/domain/usecase/ledger/GetLedgerListUseCase.kt

@@ -14,7 +14,7 @@ class GetLedgerListUseCase @Inject constructor(
                 title = title,
                 categoryIdList = categoryIdList,
                 fromStartAt = fromStartAt ?: LocalDateTime.now().minusYears(100),
-                toEndAt = toEndAt ?: LocalDateTime.now().plusYears(100),
+                toStartAt = toStartAt ?: LocalDateTime.now().plusYears(100),
                 page = page,
                 sort = sort,
             )
@@ -25,7 +25,7 @@ class GetLedgerListUseCase @Inject constructor(
         val title: String? = null,
         val categoryIdList: List<Int>? = null,
         val fromStartAt: LocalDateTime? = null,
-        val toEndAt: LocalDateTime? = null,
+        val toStartAt: LocalDateTime? = null,
         val page: Int? = null,
         val sort: String? = null,
     )

feature/received/src/main/java/com/susu/feature/received/envelopeadd/ReceivedEnvelopeAddContract.kt

@@ -1,6 +1,8 @@
 package com.susu.feature.received.envelopeadd
 
 import androidx.annotation.StringRes
+import com.susu.core.model.Envelope
+import com.susu.core.model.Ledger
 import com.susu.core.ui.base.SideEffect
 import com.susu.core.ui.base.UiState
 import com.susu.feature.received.R
@@ -37,7 +39,7 @@ enum class EnvelopeAddStep(
 sealed interface ReceivedEnvelopeAddSideEffect : SideEffect {
     data class ShowSnackbar(val message: String) : ReceivedEnvelopeAddSideEffect
     data object PopBackStack : ReceivedEnvelopeAddSideEffect
-    data class PopBackStackWithEnvelope(val envelope: String) : ReceivedEnvelopeAddSideEffect
+    data class NavigateEnvelopeDetail(val envelope: Envelope, val ledger: Ledger) : ReceivedEnvelopeAddSideEffect
     data class HandleException(val throwable: Throwable, val retry: () -> Unit) : ReceivedEnvelopeAddSideEffect
     data class LogClickNextButton(val step: EnvelopeAddStep) : ReceivedEnvelopeAddSideEffect
     data class LogClickBackButton(val step: EnvelopeAddStep) : ReceivedEnvelopeAddSideEffect

feature/received/src/main/java/com/susu/feature/received/envelopeadd/ReceivedEnvelopeAddScreen.kt

@@ -29,6 +29,8 @@ import com.susu.core.designsystem.component.button.MediumButtonStyle
 import com.susu.core.designsystem.component.button.SusuFilledButton
 import com.susu.core.designsystem.component.screen.LoadingScreen
 import com.susu.core.designsystem.theme.SusuTheme
+import com.susu.core.model.Envelope
+import com.susu.core.model.Ledger
 import com.susu.core.model.Relationship
 import com.susu.core.ui.SnackbarToken
 import com.susu.core.ui.extension.collectWithLifecycle
@@ -50,7 +52,7 @@ import java.time.LocalDateTime
 fun ReceivedEnvelopeAddRoute(
     viewModel: ReceivedEnvelopeAddViewModel = hiltViewModel(),
     popBackStack: () -> Unit,
-    popBackStackWithEnvelope: (String) -> Unit,
+    navigateEnvelopeDetail: (Envelope, Ledger) -> Unit,
     onShowSnackbar: (SnackbarToken) -> Unit,
     handleException: (Throwable, () -> Unit) -> Unit,
 ) {
@@ -64,7 +66,7 @@ fun ReceivedEnvelopeAddRoute(
             is ReceivedEnvelopeAddSideEffect.HandleException -> handleException(sideEffect.throwable, sideEffect.retry)
             ReceivedEnvelopeAddSideEffect.PopBackStack -> popBackStack()
             is ReceivedEnvelopeAddSideEffect.ShowSnackbar -> onShowSnackbar(SnackbarToken(message = sideEffect.message))
-            is ReceivedEnvelopeAddSideEffect.PopBackStackWithEnvelope -> popBackStackWithEnvelope(sideEffect.envelope)
+            is ReceivedEnvelopeAddSideEffect.NavigateEnvelopeDetail -> navigateEnvelopeDetail(sideEffect.envelope, sideEffect.ledger)
             is ReceivedEnvelopeAddSideEffect.LogClickBackButton -> scope.launch {
                 FirebaseAnalytics.getInstance(context).logEvent(
                     FirebaseAnalytics.Event.SELECT_CONTENT,

feature/received/src/main/java/com/susu/feature/received/envelopeadd/ReceivedEnvelopeAddViewModel.kt

@@ -7,7 +7,6 @@ import com.susu.core.model.Relationship
 import com.susu.core.model.exception.AlreadyRegisteredFriendPhoneNumberException
 import com.susu.core.ui.base.BaseViewModel
 import com.susu.core.ui.extension.decodeFromUri
-import com.susu.core.ui.extension.encodeToUri
 import com.susu.domain.usecase.envelope.CreateReceivedEnvelopeUseCase
 import com.susu.feature.received.navigation.ReceivedRoute
 import dagger.hilt.android.lifecycle.HiltViewModel
@@ -66,8 +65,8 @@ class ReceivedEnvelopeAddViewModel @Inject constructor(
                 handedOverAt = date!!.toKotlinLocalDateTime(),
                 hasVisited = hasVisited,
             ),
-        ).onSuccess {
-            postSideEffect(ReceivedEnvelopeAddSideEffect.PopBackStackWithEnvelope(Json.encodeToUri(it)))
+        ).onSuccess { envelope ->
+            postSideEffect(ReceivedEnvelopeAddSideEffect.NavigateEnvelopeDetail(envelope, ledger))
         }.onFailure { throwable ->
             when (throwable) {
                 is AlreadyRegisteredFriendPhoneNumberException -> postSideEffect(ReceivedEnvelopeAddSideEffect.ShowSnackbar(throwable.message))

feature/received/src/main/java/com/susu/feature/received/ledgeradd/LedgerAddContract.kt

@@ -1,5 +1,6 @@
 package com.susu.feature.received.ledgeradd
 
+import com.susu.core.model.Ledger
 import com.susu.core.ui.base.SideEffect
 import com.susu.core.ui.base.UiState
 
@@ -18,6 +19,6 @@ enum class LedgerAddStep {
 sealed interface LedgerAddSideEffect : SideEffect {
     data object HideKeyboard : LedgerAddSideEffect
     data object PopBackStack : LedgerAddSideEffect
-    data class PopBackStackWithLedger(val ledger: String) : LedgerAddSideEffect
+    data class NavigateLedgerDetail(val ledger: Ledger) : LedgerAddSideEffect
     data class HandleException(val throwable: Throwable, val retry: () -> Unit) : LedgerAddSideEffect
 }

feature/received/src/main/java/com/susu/feature/received/ledgeradd/LedgerAddScreen.kt

@@ -27,6 +27,7 @@ import com.susu.core.designsystem.component.button.SusuFilledButton
 import com.susu.core.designsystem.component.screen.LoadingScreen
 import com.susu.core.designsystem.theme.SusuTheme
 import com.susu.core.model.Category
+import com.susu.core.model.Ledger
 import com.susu.core.ui.R
 import com.susu.core.ui.SnackbarToken
 import com.susu.core.ui.extension.collectWithLifecycle
@@ -40,7 +41,7 @@ import java.time.LocalDateTime
 fun LedgerAddRoute(
     viewModel: LedgerAddViewModel = hiltViewModel(),
     popBackStack: () -> Unit,
-    popBackStackWithLedger: (String) -> Unit,
+    navigateLedgerDetail: (Ledger) -> Unit,
     onShowSnackbar: (SnackbarToken) -> Unit,
     handleException: (Throwable, () -> Unit) -> Unit,
 ) {
@@ -50,7 +51,7 @@ fun LedgerAddRoute(
         when (sideEffect) {
             LedgerAddSideEffect.PopBackStack -> popBackStack()
             is LedgerAddSideEffect.HandleException -> handleException(sideEffect.throwable, sideEffect.retry)
-            is LedgerAddSideEffect.PopBackStackWithLedger -> popBackStackWithLedger(sideEffect.ledger)
+            is LedgerAddSideEffect.NavigateLedgerDetail -> navigateLedgerDetail(sideEffect.ledger)
             LedgerAddSideEffect.HideKeyboard -> keyboardController?.hide()
         }
     }

feature/received/src/main/java/com/susu/feature/received/ledgeradd/LedgerAddViewModel.kt

@@ -4,13 +4,11 @@ import androidx.lifecycle.viewModelScope
 import com.susu.core.model.Category
 import com.susu.core.model.Ledger
 import com.susu.core.ui.base.BaseViewModel
-import com.susu.core.ui.extension.encodeToUri
 import com.susu.domain.usecase.ledger.CreateLedgerUseCase
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.datetime.toKotlinLocalDateTime
-import kotlinx.serialization.json.Json
 import java.time.LocalDateTime
 import javax.inject.Inject
 
@@ -80,7 +78,7 @@ class LedgerAddViewModel @Inject constructor(
                 category = selectedCategory!!,
             ),
         ).onSuccess { ledger ->
-            postSideEffect(LedgerAddSideEffect.PopBackStackWithLedger(Json.encodeToUri(ledger)))
+            postSideEffect(LedgerAddSideEffect.NavigateLedgerDetail(ledger))
         }.onFailure {
             postSideEffect(LedgerAddSideEffect.HandleException(it, ::createLedger))
         }

feature/received/src/main/java/com/susu/feature/received/navigation/ReceivedNavigation.kt

@@ -158,7 +158,10 @@ fun NavGraphBuilder.receivedNavGraph(
     ) {
         LedgerAddRoute(
             popBackStack = popBackStack,
-            popBackStackWithLedger = popBackStackWithLedger,
+            navigateLedgerDetail = { ledger ->
+                popBackStackWithLedger(Json.encodeToUri(ledger))
+                navigateLedgerDetail(ledger)
+            },
             handleException = handleException,
             onShowSnackbar = onShowSnackbar,
         )
@@ -172,7 +175,10 @@ fun NavGraphBuilder.receivedNavGraph(
         ReceivedEnvelopeAddRoute(
             popBackStack = popBackStack,
             onShowSnackbar = onShowSnackbar,
-            popBackStackWithEnvelope = popBackStackWithEnvelope,
+            navigateEnvelopeDetail = { envelope, ledger ->
+                popBackStackWithEnvelope(Json.encodeToUri(envelope))
+                navigateEnvelopeDetail(envelope, ledger)
+            },
             handleException = handleException,
         )
     }

feature/received/src/main/java/com/susu/feature/received/received/ReceivedViewModel.kt

@@ -104,7 +104,7 @@ class ReceivedViewModel @Inject constructor(
                     page = page,
                     categoryIdList = filter.selectedCategoryList.map { it.id },
                     fromStartAt = currentState.startAt,
-                    toEndAt = currentState.endAt,
+                    toStartAt = currentState.endAt,
                     sort = LedgerAlign.entries[currentState.selectedAlignPosition].query,
                 ),
             ).onSuccess { ledgerList ->

feature/sent/src/main/java/com/susu/feature/envelopeadd/EnvelopeAddContract.kt

@@ -5,7 +5,7 @@ import com.susu.core.ui.base.UiState
 
 sealed interface EnvelopeAddEffect : SideEffect {
     data object PopBackStack : EnvelopeAddEffect
-    data object PopBackStackWithRefresh : EnvelopeAddEffect
+    data class NavigateSentEnvelopeDetail(val id: Long) : EnvelopeAddEffect
     data class HandleException(val throwable: Throwable, val retry: () -> Unit) : EnvelopeAddEffect
     data class LogClickNextButton(val step: EnvelopeAddStep) : EnvelopeAddEffect
     data class LogClickBackButton(val step: EnvelopeAddStep) : EnvelopeAddEffect

feature/sent/src/main/java/com/susu/feature/envelopeadd/EnvelopeAddViewModel.kt

@@ -67,7 +67,7 @@ class EnvelopeAddViewModel @Inject constructor(
                     category = category!!,
                 ),
             ).onSuccess {
-                postSideEffect(EnvelopeAddEffect.PopBackStackWithRefresh)
+                postSideEffect(EnvelopeAddEffect.NavigateSentEnvelopeDetail(it.id))
             }.onFailure {
                 postSideEffect(EnvelopeAddEffect.HandleException(it, ::createEnvelope))
             }

feature/sent/src/main/java/com/susu/feature/envelopeadd/SentEnvelopeAddScreen.kt

@@ -52,7 +52,7 @@ import java.time.LocalDateTime
 fun SentEnvelopeAddRoute(
     viewModel: EnvelopeAddViewModel = hiltViewModel(),
     popBackStack: () -> Unit,
-    popBackStackWithRefresh: () -> Unit,
+    navigateSentEnvelopeDetail: (Long) -> Unit,
     onShowSnackbar: (SnackbarToken) -> Unit,
     handleException: (Throwable, () -> Unit) -> Unit,
 ) {
@@ -64,7 +64,7 @@ fun SentEnvelopeAddRoute(
         when (sideEffect) {
             is EnvelopeAddEffect.HandleException -> handleException(sideEffect.throwable, sideEffect.retry)
             EnvelopeAddEffect.PopBackStack -> popBackStack()
-            EnvelopeAddEffect.PopBackStackWithRefresh -> popBackStackWithRefresh()
+            is EnvelopeAddEffect.NavigateSentEnvelopeDetail -> navigateSentEnvelopeDetail(sideEffect.id)
             is EnvelopeAddEffect.LogClickBackButton -> scope.launch {
                 FirebaseAnalytics.getInstance(context).logEvent(
                     FirebaseAnalytics.Event.SELECT_CONTENT,

feature/sent/src/main/java/com/susu/feature/sent/navigation/SentNavigation.kt

@@ -139,7 +139,10 @@ fun NavGraphBuilder.sentNavGraph(
     composable(route = SentRoute.sentEnvelopeAddRoute("{${SentRoute.FRIEND_ARGUMENT_NAME}}")) {
         SentEnvelopeAddRoute(
             popBackStack = popBackStack,
-            popBackStackWithRefresh = popBackStackWithRefresh,
+            navigateSentEnvelopeDetail = {
+                popBackStackWithRefresh()
+                navigateSentEnvelopeDetail(it)
+            },
             handleException = handleException,
             onShowSnackbar = onShowSnackbar,
         )