Skip to content
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 16 commits into from
Jan 25, 2024
Merged
Show file tree
Hide file tree
Changes from 11 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions core/model/src/main/java/com/susu/core/model/MyStatistics.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package com.susu.core.model

data class MyStatistics(
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

요놈 Contract에서도 사용하는 것 같은데 @Stable 마크 붙여주세유~! (StatisticsElement 도 붙여주세요)

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,
)
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,
)
1 change: 1 addition & 0 deletions core/ui/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,5 @@
<string name="word_no">아니요</string>
<string name="word_phone_number">연락처</string>
<string name="word_memo">메모</string>
<string name="word_close">닫기</string>
</resources>
7 changes: 7 additions & 0 deletions data/src/main/java/com/susu/data/data/di/RepositoryModule.kt
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import com.susu.data.data.repository.LedgerRecentSearchRepositoryImpl
import com.susu.data.data.repository.LedgerRepositoryImpl
import com.susu.data.data.repository.LoginRepositoryImpl
import com.susu.data.data.repository.SignUpRepositoryImpl
import com.susu.data.data.repository.StatisticsRepositoryImpl
import com.susu.data.data.repository.TermRepositoryImpl
import com.susu.data.data.repository.TokenRepositoryImpl
import com.susu.data.data.repository.UserRepositoryImpl
Expand All @@ -15,6 +16,7 @@ import com.susu.domain.repository.LedgerRecentSearchRepository
import com.susu.domain.repository.LedgerRepository
import com.susu.domain.repository.LoginRepository
import com.susu.domain.repository.SignUpRepository
import com.susu.domain.repository.StatisticsRepository
import com.susu.domain.repository.TermRepository
import com.susu.domain.repository.TokenRepository
import com.susu.domain.repository.UserRepository
Expand Down Expand Up @@ -71,4 +73,9 @@ abstract class RepositoryModule {
abstract fun bindExcelRepository(
excelRepositoryImpl: ExcelRepositoryImpl,
): ExcelRepository

@Binds
abstract fun bindStatisticsRepository(
statisticsRepositoryImpl: StatisticsRepositoryImpl,
): StatisticsRepository
}
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,
)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,11 @@ class UserRepositoryImpl @Inject constructor(
}.firstOrNull() ?: throw UserNotFoundException()

val uid = json.decodeFromString<UserResponse>(localUserInfo).id
return userService.patchUserInfo(uid = uid, UserPatchRequest(name, gender, birth)).getOrThrow().toModel()
val patchedUserInfo = userService.patchUserInfo(uid = uid, UserPatchRequest(name, gender, birth)).getOrThrow()
dataStore.edit { preferences ->
preferences[userKey] = json.encodeToString(patchedUserInfo)
}
return patchedUserInfo.toModel()
}

override suspend fun logout() {
Expand Down
10 changes: 10 additions & 0 deletions data/src/main/java/com/susu/data/remote/api/StatisticsService.kt
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>
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import com.susu.data.remote.api.AuthService
import com.susu.data.remote.api.CategoryService
import com.susu.data.remote.api.LedgerService
import com.susu.data.remote.api.SignUpService
import com.susu.data.remote.api.StatisticsService
import com.susu.data.remote.api.TermService
import com.susu.data.remote.api.TokenService
import com.susu.data.remote.api.UserService
Expand Down Expand Up @@ -59,4 +60,10 @@ object ApiServiceModule {
fun providesUserService(retrofit: Retrofit): UserService {
return retrofit.create(UserService::class.java)
}

@Singleton
@Provides
fun providesStatisticsService(retrofit: Retrofit): StatisticsService {
return retrofit.create(StatisticsService::class.java)
}
}
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,
)
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
}
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")
}
}
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()
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ import androidx.compose.foundation.shape.CircleShape
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.getValue
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
Expand Down Expand Up @@ -63,6 +63,10 @@ fun MyPageInfoRoute(

val uiState by viewModel.uiState.collectAsStateWithLifecycle()

LaunchedEffect(key1 = Unit) {
viewModel.getUserInfo()
}

BackHandler {
if (uiState.isEditing) {
viewModel.cancelEdit()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,7 @@ class MyPageInfoViewModel @Inject constructor(
private val patchUserUseCase: PatchUserUseCase,
) : BaseViewModel<MyPageInfoState, MyPageInfoEffect>(MyPageInfoState()) {

init {
getUserInfo()
}

private fun getUserInfo() {
fun getUserInfo() {
viewModelScope.launch {
intent { copy(isLoading = true) }
getUserUseCase().onSuccess {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,9 @@ internal fun MainScreen(
)

statisticsNavGraph(
padding = innerPadding,
navigateToMyInfo = navigator::navigateMyPageInfo,
onShowDialog = viewModel::onShowDialog,
handleException = viewModel::handleException,
)

communityNavGraph(
Expand Down
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
}
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()
}
}
Loading