-
Notifications
You must be signed in to change notification settings - Fork 1
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Feature/mz 129 my statistics #94
Merged
Merged
Changes from 11 commits
Commits
Show all changes
16 commits
Select commit
Hold shift + click to select a range
e3168e1
feat: RecentSpendGraph 컴포넌트 추가
yangsooplus ad00c3f
feat: StatisticsItem 컴포넌트 추가
yangsooplus 1ca8b52
chore: string resource 오타 수정
yangsooplus cfb1716
feat: StatisticsItem 비활성화 상태 추가
yangsooplus be2d9a4
feat: 나의 통계 UI
yangsooplus 3e4fc83
feat: 통계 화면 구조 수정
yangsooplus 1ff4ed1
feat: 추가정보 미입력 시 UI와 다이얼로그 출력
yangsooplus a9e9df7
fix: 수정된 유저 정보가 로컬에 저장되지 않는 문제 수정
yangsooplus c8ae674
chore: StatisticsScreen string Resource 분리 및 소소한 UI 수정
yangsooplus 92c49a6
feat: 나의 통계 서버 연동
yangsooplus cd8fea7
refactor: 최근 금액 데이터를 Repository에서 가공하도록 수정
yangsooplus 7f450c1
Merge branch 'develop' into feature/MZ-129-my-statistics
yangsooplus 5c00d78
refactor: @Stable 추가, PersistentList로 변경
yangsooplus eaedf5b
Merge remote-tracking branch 'origin/feature/MZ-129-my-statistics' in…
yangsooplus 4102354
chore: ktlint, detekt check
yangsooplus 120a00f
refactor: 최근 사용 내역 수정된 api 형식에 맞게 데이터 가공하도록 수정
yangsooplus File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
12 changes: 12 additions & 0 deletions
12
core/model/src/main/java/com/susu/core/model/MyStatistics.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
package com.susu.core.model | ||
|
||
data class MyStatistics( | ||
val highestAmountReceived: StatisticsElement = StatisticsElement(), | ||
val highestAmountSent: StatisticsElement = StatisticsElement(), | ||
val mostCategory: StatisticsElement = StatisticsElement(), | ||
val mostRelationship: StatisticsElement = StatisticsElement(), | ||
val mostSpentMonth: Int = 0, | ||
val recentSpent: List<StatisticsElement> = emptyList(), | ||
val recentTotalSpent: Int = 0, | ||
val recentMaximumSpent: Int = 0, | ||
) |
6 changes: 6 additions & 0 deletions
6
core/model/src/main/java/com/susu/core/model/StatisticsElement.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
package com.susu.core.model | ||
|
||
data class StatisticsElement( | ||
val title: String = "", | ||
val value: Int = 0, | ||
) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
29 changes: 29 additions & 0 deletions
29
data/src/main/java/com/susu/data/data/repository/StatisticsRepositoryImpl.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
package com.susu.data.data.repository | ||
|
||
import com.susu.core.model.MyStatistics | ||
import com.susu.core.model.StatisticsElement | ||
import com.susu.data.remote.api.StatisticsService | ||
import com.susu.data.remote.model.response.toModel | ||
import com.susu.domain.repository.StatisticsRepository | ||
import javax.inject.Inject | ||
|
||
class StatisticsRepositoryImpl @Inject constructor( | ||
private val statisticsService: StatisticsService, | ||
) : StatisticsRepository { | ||
override suspend fun getMyStatistics(): MyStatistics { | ||
val originalStatistic = statisticsService.getMyStatistics().getOrThrow().toModel() | ||
val sortedRecentSpent = originalStatistic.recentSpent.sortedBy { it.title.replace(".", "").toInt() } // api 수정 후 replace 제거 | ||
.map { StatisticsElement(title = it.title.removeRange(0 until 5).toInt().toString(), value = it.value) } // api 수정 후 range 수정 | ||
|
||
return MyStatistics( | ||
highestAmountReceived = originalStatistic.highestAmountReceived, | ||
highestAmountSent = originalStatistic.highestAmountSent, | ||
mostCategory = originalStatistic.mostCategory, | ||
mostRelationship = originalStatistic.mostRelationship, | ||
mostSpentMonth = originalStatistic.mostSpentMonth % 100, | ||
recentSpent = sortedRecentSpent, | ||
recentTotalSpent = originalStatistic.recentTotalSpent, | ||
recentMaximumSpent = originalStatistic.recentMaximumSpent, | ||
) | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 10 additions & 0 deletions
10
data/src/main/java/com/susu/data/remote/api/StatisticsService.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
package com.susu.data.remote.api | ||
|
||
import com.susu.data.remote.model.response.MyStatisticsResponse | ||
import com.susu.data.remote.retrofit.ApiResult | ||
import retrofit2.http.GET | ||
|
||
interface StatisticsService { | ||
@GET("statistics/mine") | ||
suspend fun getMyStatistics(): ApiResult<MyStatisticsResponse> | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
36 changes: 36 additions & 0 deletions
36
data/src/main/java/com/susu/data/remote/model/response/MyStatisticsResponse.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
package com.susu.data.remote.model.response | ||
|
||
import com.susu.core.model.MyStatistics | ||
import kotlinx.serialization.Serializable | ||
|
||
@Serializable | ||
data class MyStatisticsResponse( | ||
val highestAmountReceived: StatisticsElement, | ||
val highestAmountSent: StatisticsElement, | ||
val mostCategory: StatisticsElement, | ||
val mostRelationship: StatisticsElement, | ||
val mostSpentMonth: Int, | ||
val recentSpent: List<StatisticsElement>, | ||
) | ||
|
||
@Serializable | ||
data class StatisticsElement( | ||
val title: String, | ||
val value: Int, | ||
) | ||
|
||
fun MyStatisticsResponse.toModel() = MyStatistics( | ||
highestAmountReceived = highestAmountReceived.toModel(), | ||
highestAmountSent = highestAmountSent.toModel(), | ||
mostCategory = mostCategory.toModel(), | ||
mostRelationship = mostRelationship.toModel(), | ||
mostSpentMonth = mostSpentMonth, | ||
recentSpent = recentSpent.map { it.toModel() }, | ||
recentMaximumSpent = recentSpent.maxOfOrNull { it.value } ?: 0, | ||
recentTotalSpent = recentSpent.sumOf { it.value } | ||
) | ||
|
||
fun StatisticsElement.toModel() = com.susu.core.model.StatisticsElement( | ||
title = title, | ||
value = value, | ||
) |
7 changes: 7 additions & 0 deletions
7
domain/src/main/java/com/susu/domain/repository/StatisticsRepository.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
package com.susu.domain.repository | ||
|
||
import com.susu.core.model.MyStatistics | ||
|
||
interface StatisticsRepository { | ||
suspend fun getMyStatistics(): MyStatistics | ||
} |
14 changes: 14 additions & 0 deletions
14
domain/src/main/java/com/susu/domain/usecase/statistics/CheckAdditionalUserInfoUseCase.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
package com.susu.domain.usecase.statistics | ||
|
||
import com.susu.core.common.runCatchingIgnoreCancelled | ||
import com.susu.domain.repository.UserRepository | ||
import javax.inject.Inject | ||
|
||
class CheckAdditionalUserInfoUseCase @Inject constructor( | ||
private val userRepository: UserRepository, | ||
) { | ||
suspend operator fun invoke() = runCatchingIgnoreCancelled { | ||
val userInfo = userRepository.getUserInfo() | ||
userInfo.birth in 1930..2030 && (userInfo.gender == "M" || userInfo.gender == "F") | ||
} | ||
} |
13 changes: 13 additions & 0 deletions
13
domain/src/main/java/com/susu/domain/usecase/statistics/GetMyStatisticsUseCase.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
package com.susu.domain.usecase.statistics | ||
|
||
import com.susu.core.common.runCatchingIgnoreCancelled | ||
import com.susu.domain.repository.StatisticsRepository | ||
import javax.inject.Inject | ||
|
||
class GetMyStatisticsUseCase @Inject constructor( | ||
private val statisticsRepository: StatisticsRepository, | ||
) { | ||
suspend operator fun invoke() = runCatchingIgnoreCancelled { | ||
statisticsRepository.getMyStatistics() | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
21 changes: 21 additions & 0 deletions
21
feature/statistics/src/main/java/com/susu/feature/statistics/StatisticsContract.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
package com.susu.feature.statistics | ||
|
||
import androidx.annotation.StringRes | ||
import com.susu.core.ui.base.SideEffect | ||
import com.susu.core.ui.base.UiState | ||
|
||
enum class StatisticsTab(@StringRes val stringId: Int) { | ||
MY(R.string.statistics_tab_my), | ||
AVERAGE(R.string.statistics_tab_average) | ||
} | ||
|
||
data class StatisticsState( | ||
val isLoading: Boolean = false, | ||
val isBlind: Boolean = true, | ||
val currentTab: StatisticsTab = StatisticsTab.MY, | ||
) : UiState | ||
|
||
sealed interface StatisticsEffect : SideEffect { | ||
data object ShowAdditionalInfoDialog : StatisticsEffect | ||
data class HandleException(val throwable: Throwable, val retry: () -> Unit) : StatisticsEffect | ||
} |
105 changes: 96 additions & 9 deletions
105
feature/statistics/src/main/java/com/susu/feature/statistics/StatisticsScreen.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,28 +1,115 @@ | ||
package com.susu.feature.statistics | ||
|
||
import androidx.compose.foundation.layout.PaddingValues | ||
import androidx.compose.foundation.layout.Arrangement | ||
import androidx.compose.foundation.layout.Box | ||
import androidx.compose.foundation.layout.Column | ||
import androidx.compose.foundation.layout.fillMaxSize | ||
import androidx.compose.foundation.layout.height | ||
import androidx.compose.foundation.layout.padding | ||
import androidx.compose.material3.Text | ||
import androidx.compose.foundation.rememberScrollState | ||
import androidx.compose.foundation.verticalScroll | ||
import androidx.compose.runtime.Composable | ||
import androidx.compose.runtime.LaunchedEffect | ||
import androidx.compose.runtime.getValue | ||
import androidx.compose.ui.Alignment | ||
import androidx.compose.ui.Modifier | ||
import androidx.compose.ui.platform.LocalContext | ||
import androidx.compose.ui.res.stringResource | ||
import androidx.compose.ui.tooling.preview.Preview | ||
import androidx.compose.ui.unit.dp | ||
import androidx.hilt.navigation.compose.hiltViewModel | ||
import androidx.lifecycle.compose.collectAsStateWithLifecycle | ||
import com.susu.core.designsystem.component.appbar.SusuDefaultAppBar | ||
import com.susu.core.designsystem.component.appbar.icon.LogoIcon | ||
import com.susu.core.designsystem.component.screen.LoadingScreen | ||
import com.susu.core.designsystem.theme.SusuTheme | ||
import com.susu.core.ui.DialogToken | ||
import com.susu.core.ui.extension.collectWithLifecycle | ||
import com.susu.feature.statistics.component.StatisticsTab | ||
import com.susu.feature.statistics.content.MyStatisticsRoute | ||
|
||
@Composable | ||
fun StatisticsScreen( | ||
padding: PaddingValues, | ||
fun StatisticsRoute( | ||
viewModel: StatisticsViewModel = hiltViewModel(), | ||
navigateToMyInfo: () -> Unit, | ||
onShowDialog: (DialogToken) -> Unit, | ||
handleException: (Throwable, () -> Unit) -> Unit, | ||
) { | ||
Text( | ||
modifier = Modifier.padding(padding), | ||
text = "통계", | ||
val uiState by viewModel.uiState.collectAsStateWithLifecycle() | ||
val context = LocalContext.current | ||
|
||
viewModel.sideEffect.collectWithLifecycle { sideEffect -> | ||
when (sideEffect) { | ||
is StatisticsEffect.HandleException -> handleException(sideEffect.throwable, sideEffect.retry) | ||
StatisticsEffect.ShowAdditionalInfoDialog -> onShowDialog( | ||
DialogToken( | ||
title = context.getString(R.string.statistics_dialog_title), | ||
text = context.getString(R.string.statistics_dialog_description), | ||
dismissText = context.getString(com.susu.core.ui.R.string.word_close), | ||
confirmText = context.getString(R.string.statistics_dialog_confirm), | ||
onConfirmRequest = navigateToMyInfo, | ||
), | ||
) | ||
} | ||
} | ||
|
||
LaunchedEffect(key1 = Unit) { | ||
viewModel.checkAdditionalInfo() | ||
} | ||
|
||
StatisticsScreen( | ||
uiState = uiState, | ||
onTabSelected = viewModel::selectStatisticsTab, | ||
handleException = handleException, | ||
) | ||
} | ||
|
||
@Preview | ||
@Composable | ||
fun StatisticsScreen( | ||
uiState: StatisticsState = StatisticsState(), | ||
onTabSelected: (StatisticsTab) -> Unit = {}, | ||
handleException: (Throwable, () -> Unit) -> Unit = { _, _ -> }, | ||
) { | ||
Box( | ||
modifier = Modifier.fillMaxSize() | ||
.verticalScroll(rememberScrollState()), | ||
) { | ||
Column( | ||
modifier = Modifier.fillMaxSize().padding(horizontal = SusuTheme.spacing.spacing_m), | ||
verticalArrangement = Arrangement.spacedBy(SusuTheme.spacing.spacing_xxs), | ||
) { | ||
SusuDefaultAppBar( | ||
leftIcon = { LogoIcon() }, | ||
title = stringResource(R.string.statistics_word), | ||
) | ||
StatisticsTab( | ||
modifier = Modifier | ||
.height(52.dp) | ||
.padding(vertical = SusuTheme.spacing.spacing_xxs), | ||
selectedTab = uiState.currentTab, | ||
onTabSelect = onTabSelected, | ||
) | ||
when (uiState.currentTab) { | ||
StatisticsTab.MY -> MyStatisticsRoute( | ||
isBlind = uiState.isBlind, | ||
modifier = Modifier.fillMaxSize(), | ||
handleException = handleException, | ||
) | ||
|
||
StatisticsTab.AVERAGE -> {} | ||
} | ||
} | ||
|
||
if (uiState.isLoading) { | ||
LoadingScreen(modifier = Modifier.fillMaxSize().align(Alignment.Center)) | ||
} | ||
} | ||
} | ||
|
||
@Preview(showBackground = true) | ||
@Composable | ||
fun SentScreenPreview() { | ||
SusuTheme { | ||
StatisticsScreen(padding = PaddingValues(0.dp)) | ||
StatisticsScreen() | ||
} | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
요놈 Contract에서도 사용하는 것 같은데
@Stable
마크 붙여주세유~! (StatisticsElement 도 붙여주세요)