Merge pull request #129 from YAPP-Github/feature/MZ-137-received-enve…

…lope-filter-api Feature/mz 137 received envelope filter api
YAPP-Github · Feb 6, 2024 · d946bfd · d946bfd
2 parents b097853 + ca81de9
commit d946bfd
Show file tree

Hide file tree

Showing 30 changed files with 634 additions and 101 deletions.
diff --git a/...esignsystem/src/main/java/com/susu/core/designsystem/component/searchbar/SusuSearchBar.kt b/...esignsystem/src/main/java/com/susu/core/designsystem/component/searchbar/SusuSearchBar.kt
@@ -68,12 +68,12 @@ fun SusuSearchBar(
         decorationBox = { innerText ->
             Row(
                 modifier = Modifier
+                    .clip(RoundedCornerShape(4.dp))
                     .background(Gray20)
                     .padding(
                         horizontal = SusuTheme.spacing.spacing_m,
                         vertical = SusuTheme.spacing.spacing_xxs,
-                    )
-                    .clip(RoundedCornerShape(4.dp)),
+                    ),
                 verticalAlignment = Alignment.CenterVertically,
             ) {
                 Image(

diff --git a/core/model/src/main/java/com/susu/core/model/EnvelopeFilterConfig.kt b/core/model/src/main/java/com/susu/core/model/EnvelopeFilterConfig.kt
@@ -0,0 +1,8 @@
+package com.susu.core.model
+
+data class EnvelopeFilterConfig(
+    val minReceivedAmount: Long,
+    val maxReceivedAmount: Long,
+    val minSentAmount: Long,
+    val maxSentAmount: Long,
+)
diff --git a/core/ui/build.gradle.kts b/core/ui/build.gradle.kts
@@ -10,6 +10,7 @@ android {
 }
 
 dependencies {
+    implementation(projects.core.model)
     implementation(libs.kotlinx.serialization.json)
     implementation(libs.kotlinx.immutable)
 }
diff --git a/core/ui/src/main/java/com/susu/core/ui/argument/EnvelopeFilterArgument.kt b/core/ui/src/main/java/com/susu/core/ui/argument/EnvelopeFilterArgument.kt
@@ -0,0 +1,12 @@
+package com.susu.core.ui.argument
+
+import com.susu.core.model.Friend
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class EnvelopeFilterArgument(
+    val selectedFriendList: List<Friend> = emptyList(),
+    val fromAmount: Long? = null,
+    val toAmount: Long? = null,
+    val isSent: Boolean = false,
+)
diff --git a/core/ui/src/main/java/com/susu/core/ui/extension/Long.kt b/core/ui/src/main/java/com/susu/core/ui/extension/Long.kt
@@ -6,3 +6,8 @@ fun Long.toMoneyFormat(): String {
     // DecimalFormat은 Thread Safe하지 않으므로 지역 변수로 사용함.
     return DecimalFormat("#,###").format(this)
 }
+
+fun Float.toMoneyFormat(): String {
+    // DecimalFormat은 Thread Safe하지 않으므로 지역 변수로 사용함.
+    return DecimalFormat("#,###").format(this)
+}
diff --git a/data/src/main/java/com/susu/data/data/repository/EnvelopesRepositoryImpl.kt b/data/src/main/java/com/susu/data/data/repository/EnvelopesRepositoryImpl.kt
@@ -2,6 +2,7 @@ package com.susu.data.data.repository
 
 import com.susu.core.model.Envelope
 import com.susu.core.model.EnvelopeDetail
+import com.susu.core.model.EnvelopeFilterConfig
 import com.susu.core.model.EnvelopeSearch
 import com.susu.core.model.FriendStatistics
 import com.susu.core.model.Relationship
@@ -150,6 +151,12 @@ class EnvelopesRepositoryImpl @Inject constructor(
         ),
     ).getOrThrow().toModel()
 
+    override suspend fun getEnvelopeFilterConfig(): EnvelopeFilterConfig =
+        envelopesService
+            .getEnvelopeFilterConfig()
+            .getOrThrow()
+            .toModel()
+
     override suspend fun getEnvelopeDetail(
         id: Long,
     ): EnvelopeDetail = envelopesService.getEnvelopeDetail(

diff --git a/data/src/main/java/com/susu/data/remote/api/EnvelopesService.kt b/data/src/main/java/com/susu/data/remote/api/EnvelopesService.kt
@@ -2,6 +2,7 @@ package com.susu.data.remote.api
 
 import com.susu.data.remote.model.request.EnvelopeRequest
 import com.susu.data.remote.model.response.EnvelopeDetailResponse
+import com.susu.data.remote.model.response.EnvelopeFilterConfigResponse
 import com.susu.data.remote.model.response.EnvelopeResponse
 import com.susu.data.remote.model.response.EnvelopesHistoryListResponse
 import com.susu.data.remote.model.response.EnvelopesListResponse
@@ -81,4 +82,7 @@ interface EnvelopesService {
         @Query("size") size: Int?,
         @Query("sort") sort: String?,
     ): ApiResult<SearchEnvelopeResponse>
+
+    @GET("envelopes/configs/search-filter")
+    suspend fun getEnvelopeFilterConfig(): ApiResult<EnvelopeFilterConfigResponse>
 }
diff --git a/data/src/main/java/com/susu/data/remote/model/response/EnvelopeFilterConfigResponse.kt b/data/src/main/java/com/susu/data/remote/model/response/EnvelopeFilterConfigResponse.kt
@@ -0,0 +1,19 @@
+package com.susu.data.remote.model.response
+
+import com.susu.core.model.EnvelopeFilterConfig
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class EnvelopeFilterConfigResponse(
+    val minReceivedAmount: Long,
+    val maxReceivedAmount: Long,
+    val minSentAmount: Long,
+    val maxSentAmount: Long,
+)
+
+internal fun EnvelopeFilterConfigResponse.toModel() = EnvelopeFilterConfig(
+    minReceivedAmount = minReceivedAmount,
+    maxReceivedAmount = maxReceivedAmount,
+    minSentAmount = minSentAmount,
+    maxSentAmount = maxSentAmount,
+)
diff --git a/domain/src/main/java/com/susu/domain/repository/EnvelopesRepository.kt b/domain/src/main/java/com/susu/domain/repository/EnvelopesRepository.kt
@@ -2,6 +2,7 @@ package com.susu.domain.repository
 
 import com.susu.core.model.Envelope
 import com.susu.core.model.EnvelopeDetail
+import com.susu.core.model.EnvelopeFilterConfig
 import com.susu.core.model.EnvelopeSearch
 import com.susu.core.model.FriendStatistics
 import com.susu.core.model.Relationship
@@ -81,4 +82,6 @@ interface EnvelopesRepository {
         categoryId: Long? = null,
         customCategory: String? = null,
     ): Envelope
+
+    suspend fun getEnvelopeFilterConfig(): EnvelopeFilterConfig
 }
diff --git a/domain/src/main/java/com/susu/domain/usecase/envelope/GetEnvelopeFilterConfigUseCase.kt b/domain/src/main/java/com/susu/domain/usecase/envelope/GetEnvelopeFilterConfigUseCase.kt
@@ -0,0 +1,13 @@
+package com.susu.domain.usecase.envelope
+
+import com.susu.core.common.runCatchingIgnoreCancelled
+import com.susu.domain.repository.EnvelopesRepository
+import javax.inject.Inject
+
+class GetEnvelopeFilterConfigUseCase @Inject constructor(
+    private val envelopesRepository: EnvelopesRepository,
+) {
+    suspend operator fun invoke() = runCatchingIgnoreCancelled {
+        envelopesRepository.getEnvelopeFilterConfig()
+    }
+}
diff --git a/feature/navigator/src/main/java/com/susu/feature/navigator/MainNavigator.kt b/feature/navigator/src/main/java/com/susu/feature/navigator/MainNavigator.kt
@@ -25,7 +25,7 @@ import com.susu.feature.mypage.navigation.navigateMyPageInfo
 import com.susu.feature.mypage.navigation.navigateMyPagePrivacyPolicy
 import com.susu.feature.mypage.navigation.navigateMyPageSocial
 import com.susu.feature.received.navigation.ReceivedRoute
-import com.susu.feature.received.navigation.argument.FilterArgument
+import com.susu.feature.received.navigation.argument.LedgerFilterArgument
 import com.susu.feature.received.navigation.navigateLedgerAdd
 import com.susu.feature.received.navigation.navigateLedgerDetail
 import com.susu.feature.received.navigation.navigateLedgerEdit
@@ -36,6 +36,7 @@ import com.susu.feature.received.navigation.navigateReceivedEnvelopeAdd
 import com.susu.feature.received.navigation.navigateReceivedEnvelopeDetail
 import com.susu.feature.received.navigation.navigateReceivedEnvelopeEdit
 import com.susu.feature.sent.navigation.SentRoute
+import com.susu.feature.sent.navigation.navigateEnvelopeFilter
 import com.susu.feature.sent.navigation.navigateSent
 import com.susu.feature.sent.navigation.navigateSentEnvelope
 import com.susu.feature.sent.navigation.navigateSentEnvelopeAdd
@@ -62,9 +63,10 @@ internal class MainNavigator(
         get() = when (currentDestination?.route) {
             in listOf(
                 ReceivedRoute.ledgerSearchRoute,
-                ReceivedRoute.ledgerFilterRoute("{${ReceivedRoute.FILTER_ARGUMENT_NAME}}"),
+                ReceivedRoute.ledgerFilterRoute("{${ReceivedRoute.FILTER_LEDGER_ARGUMENT_NAME}}"),
                 ReceivedRoute.envelopeDetailRoute("{${ReceivedRoute.ENVELOPE_ARGUMENT_NAME}}", "{${ReceivedRoute.LEDGER_ID_ARGUMENT_NAME}}"),
                 ReceivedRoute.envelopeEditRoute("{${ReceivedRoute.ENVELOPE_ARGUMENT_NAME}}", "{${ReceivedRoute.LEDGER_ID_ARGUMENT_NAME}}"),
+                SentRoute.envelopeFilterRoute("{${SentRoute.FILTER_ENVELOPE_ARGUMENT}}"),
                 SentRoute.sentEnvelopeRoute("{${SentRoute.FRIEND_ID_ARGUMENT_NAME}}"),
                 SentRoute.sentEnvelopeDetailRoute("{${SentRoute.ENVELOPE_ID_ARGUMENT_NAME}}"),
                 SentRoute.sentEnvelopeEditRoute("{${SentRoute.ENVELOPE_DETAIL_ARGUMENT_NAME}}"),
@@ -153,7 +155,7 @@ internal class MainNavigator(
         navController.navigateLedgerEdit(ledger)
     }
 
-    fun navigateLedgerFilter(filter: FilterArgument) {
+    fun navigateLedgerFilter(filter: LedgerFilterArgument) {
         navController.navigateLedgerFilter(filter)
     }
 
@@ -197,6 +199,10 @@ internal class MainNavigator(
         navController.navigateVoteDetail(voteId)
     }
 
+    fun navigateEnvelopeFilter(filter: String) {
+        navController.navigateEnvelopeFilter(filter)
+    }
+
     fun navigateVoteEdit(vote: Vote) {
         navController.navigateVoteEdit(vote)
     }

diff --git a/feature/navigator/src/main/java/com/susu/feature/navigator/MainScreen.kt b/feature/navigator/src/main/java/com/susu/feature/navigator/MainScreen.kt
@@ -28,6 +28,7 @@ import com.susu.feature.loginsignup.navigation.loginSignupNavGraph
 import com.susu.feature.mypage.navigation.myPageNavGraph
 import com.susu.feature.received.navigation.ReceivedRoute
 import com.susu.feature.received.navigation.receivedNavGraph
+import com.susu.feature.sent.navigation.SentRoute
 import com.susu.feature.sent.navigation.sentNavGraph
 import com.susu.feature.statistics.navigation.statisticsNavGraph
 import kotlinx.collections.immutable.ImmutableList
@@ -84,6 +85,13 @@ internal fun MainScreen(
                     navigateSentEnvelopeDetail = navigator::navigateSentEnvelopeDetail,
                     navigateSentEnvelopeEdit = navigator::navigateSentEnvelopeEdit,
                     navigateSentEnvelopeAdd = navigator::navigateSentEnvelopeAdd,
+                    popBackStackWithFilter = { filter ->
+                        navigator.navController.previousBackStackEntry?.savedStateHandle?.set(
+                            SentRoute.FILTER_ENVELOPE_ARGUMENT,
+                            filter,
+                        )
+                        navigator.popBackStackIfNotHome()
+                    },
                     navigateSentEnvelopeSearch = navigator::navigateSentEnvelopeSearch,
                     handleException = viewModel::handleException,
                     onShowSnackbar = viewModel::onShowSnackbar,
@@ -92,6 +100,7 @@ internal fun MainScreen(
 
                 receivedNavGraph(
                     padding = innerPadding,
+                    envelopeFilterArgumentName = SentRoute.FILTER_ENVELOPE_ARGUMENT,
                     popBackStack = navigator::popBackStackIfNotHome,
                     popBackStackWithLedger = { ledger ->
                         navigator.navController.previousBackStackEntry?.savedStateHandle?.set(
@@ -109,7 +118,7 @@ internal fun MainScreen(
                     },
                     popBackStackWithFilter = { filter ->
                         navigator.navController.previousBackStackEntry?.savedStateHandle?.set(
-                            ReceivedRoute.FILTER_ARGUMENT_NAME,
+                            ReceivedRoute.FILTER_LEDGER_ARGUMENT_NAME,
                             filter,
                         )
                         navigator.popBackStackIfNotHome()
@@ -136,6 +145,7 @@ internal fun MainScreen(
                     navigateEnvelopAdd = navigator::navigateReceivedEnvelopeAdd,
                     navigateEnvelopeDetail = navigator::navigateReceivedEnvelopeDetail,
                     navigateEnvelopeEdit = navigator::navigateReceivedEnvelopeEdit,
+                    navigateEnvelopeFilter = navigator::navigateEnvelopeFilter,
                     onShowSnackbar = viewModel::onShowSnackbar,
                     onShowDialog = viewModel::onShowDialog,
                     handleException = viewModel::handleException,

diff --git a/...ure/received/src/main/java/com/susu/feature/received/ledgerdetail/LedgerDetailContract.kt b/...ure/received/src/main/java/com/susu/feature/received/ledgerdetail/LedgerDetailContract.kt
@@ -1,8 +1,11 @@
 package com.susu.feature.received.ledgerdetail
 
+import androidx.annotation.StringRes
 import com.susu.core.model.Envelope
+import com.susu.core.model.Friend
 import com.susu.core.model.Ledger
 import com.susu.core.model.SearchEnvelope
+import com.susu.core.ui.R
 import com.susu.core.ui.base.SideEffect
 import com.susu.core.ui.base.UiState
 import kotlinx.collections.immutable.PersistentList
@@ -16,7 +19,36 @@ data class LedgerDetailState(
     val startDate: String = "",
     val endDate: String = "",
     val envelopeList: PersistentList<SearchEnvelope> = persistentListOf(),
-) : UiState
+    val selectedFriendList: PersistentList<Friend> = persistentListOf(),
+    val fromAmount: Long? = null,
+    val toAmount: Long? = null,
+    val showAlignBottomSheet: Boolean = false,
+    val selectedAlignPosition: Int = EnvelopeAlign.RECENT.ordinal,
+) : UiState {
+    val isFiltered = fromAmount != null || toAmount != null || selectedFriendList.isNotEmpty()
+}
+
+enum class EnvelopeAlign(
+    @StringRes val stringResId: Int,
+    val query: String,
+) {
+    RECENT(
+        stringResId = R.string.word_align_recently,
+        query = "createdAt,desc",
+    ),
+    OUTDATED(
+        stringResId = R.string.word_align_outdated,
+        query = "createdAt,asc",
+    ),
+    HIGH_AMOUNT(
+        stringResId = R.string.word_align_high_amount,
+        query = "totalReceivedAmounts,desc",
+    ),
+    LOW_AMOUNT(
+        stringResId = R.string.word_align_low_amount,
+        query = "totalReceivedAmounts,asc",
+    ),
+}
 
 sealed interface LedgerDetailSideEffect : SideEffect {
     data class NavigateEnvelopeAdd(val ledger: Ledger) : LedgerDetailSideEffect
@@ -28,4 +60,5 @@ sealed interface LedgerDetailSideEffect : SideEffect {
     data object ShowDeleteSuccessSnackbar : LedgerDetailSideEffect
     data class ShowSnackbar(val msg: String) : LedgerDetailSideEffect
     data class HandleException(val throwable: Throwable, val retry: () -> Unit) : LedgerDetailSideEffect
+    data class NavigateEnvelopeFilter(val filter: String) : LedgerDetailSideEffect
 }