diff --git a/Near/app/build.gradle.kts b/Near/app/build.gradle.kts index 02684d70..047d1968 100644 --- a/Near/app/build.gradle.kts +++ b/Near/app/build.gradle.kts @@ -18,7 +18,7 @@ android { applicationId = "com.alarmy.near" minSdk = 27 targetSdk = 35 - versionCode = 2 + versionCode = 3 versionName = "1.0" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" diff --git a/Near/app/src/main/java/com/alarmy/near/data/entity/MemberInfoEntity.kt b/Near/app/src/main/java/com/alarmy/near/data/entity/MemberInfoEntity.kt index fe1e9f25..4231658f 100644 --- a/Near/app/src/main/java/com/alarmy/near/data/entity/MemberInfoEntity.kt +++ b/Near/app/src/main/java/com/alarmy/near/data/entity/MemberInfoEntity.kt @@ -12,6 +12,6 @@ data class MemberInfoEntity( val username: String, val nickname: String, val imageUrl: String?, - val notificationAgreedAt: String?, + val notificationAgreedAt: String? = "", // TODO #Issue: 52 Default 값 추후 제거 필요 val providerType: String, ) diff --git a/Near/app/src/main/java/com/alarmy/near/network/response/FriendSummaryEntity.kt b/Near/app/src/main/java/com/alarmy/near/network/response/FriendSummaryEntity.kt index f6a6c55b..2a81ac71 100644 --- a/Near/app/src/main/java/com/alarmy/near/network/response/FriendSummaryEntity.kt +++ b/Near/app/src/main/java/com/alarmy/near/network/response/FriendSummaryEntity.kt @@ -10,6 +10,6 @@ data class FriendSummaryEntity( val name: String, val imageUrl: String? = null, val fileName: String? = null, - val checkRate: Int, + val checkRate: Int = 0, // TODO #Issue: 52 Default 값 추후 제거 필요 val lastContactAt: String? = null, ) diff --git a/Near/app/src/main/java/com/alarmy/near/presentation/feature/home/HomeViewModel.kt b/Near/app/src/main/java/com/alarmy/near/presentation/feature/home/HomeViewModel.kt index 11301eec..d8681d00 100644 --- a/Near/app/src/main/java/com/alarmy/near/presentation/feature/home/HomeViewModel.kt +++ b/Near/app/src/main/java/com/alarmy/near/presentation/feature/home/HomeViewModel.kt @@ -1,5 +1,6 @@ package com.alarmy.near.presentation.feature.home +import android.util.Log import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.alarmy.near.data.repository.FriendRepository @@ -32,11 +33,15 @@ class HomeViewModel val errorEvent = _errorEvent.receiveAsFlow() val memberInfoFlow: StateFlow = - memberRepository.getMyInfo().stateIn( - viewModelScope, - SharingStarted.WhileSubscribed(5_000), - null, - ) + memberRepository + .getMyInfo() + .catch { + _errorEvent.send(it) + }.stateIn( + viewModelScope, + SharingStarted.WhileSubscribed(5_000), + null, + ) val friendsFlow: StateFlow> = combine( @@ -45,14 +50,13 @@ class HomeViewModel deletedFriendIdsFlow, ) { friends, deletedIds -> friends.filter { it.id !in deletedIds } - } - .catch { - _errorEvent.send(it) - }.stateIn( - scope = viewModelScope, - started = SharingStarted.WhileSubscribed(5_000), - initialValue = emptyList(), - ) + }.catch { + _errorEvent.send(it) + }.stateIn( + scope = viewModelScope, + started = SharingStarted.WhileSubscribed(5_000), + initialValue = emptyList(), + ) val monthlyFriendFlow: StateFlow> = @@ -70,5 +74,5 @@ class HomeViewModel viewModelScope.launch { deletedFriendIdsFlow.emit(deletedFriendIdsFlow.value + friendId) } + } } -}