From 6c25372d8c031e4e987a4d4ebb75f1288f72cc07 Mon Sep 17 00:00:00 2001 From: Jong Date: Tue, 3 Nov 2026 22:42:24 +0900 Subject: [PATCH 1/2] =?UTF-8?q?[FIX/#216]=20=ED=9A=8C=EC=9B=90=20=EB=B0=8F?= =?UTF-8?q?=20=EC=9B=94=EA=B0=84=20=EC=9A=94=EC=95=BD=20=EC=BA=90=EC=8B=9C?= =?UTF-8?q?=EC=99=80=20=EC=82=AD=EC=A0=9C=20=EC=B2=98=EB=A6=AC=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../archive/repository/ArchiveRepository.kt | 6 +++ .../repository/ArchiveRepositoryImpl.kt | 23 ++++++++++- .../repository/ConnectivityRepository.kt | 7 +++- .../repository/ConnectivityRepositoryImpl.kt | 39 +++++++++++++++++++ .../member/repository/MemberRepository.kt | 6 +++ .../member/repository/MemberRepositoryImpl.kt | 23 ++++++++++- .../repository/ArchiveRepositoryImplTest.kt | 31 +++++++++++++++ .../domain/auth/ClearDeviceDataUseCase.kt | 6 +++ .../domain/auth/ClearDeviceDataUseCaseTest.kt | 36 ++++++++++++++++- .../recordedit/FakeConnectivityRepository.kt | 3 ++ .../main/RecordEditMainViewModelTest.kt | 5 +++ .../setting/FakeDeviceDataRepositories.kt | 20 ++++++++++ 12 files changed, 199 insertions(+), 6 deletions(-) diff --git a/core/data/src/main/java/com/routee/android/core/data/archive/repository/ArchiveRepository.kt b/core/data/src/main/java/com/routee/android/core/data/archive/repository/ArchiveRepository.kt index 2d2126fc..b994d23e 100644 --- a/core/data/src/main/java/com/routee/android/core/data/archive/repository/ArchiveRepository.kt +++ b/core/data/src/main/java/com/routee/android/core/data/archive/repository/ArchiveRepository.kt @@ -7,6 +7,12 @@ import java.time.YearMonth /** 선택한 월의 일별 운동 요약 조회 */ interface ArchiveRepository { + /** 마지막 조회 월과 일치하는 월간 요약 캐시, 없으면 null */ + fun getCachedMonthlySummary(month: YearMonth): List? + + /** 월간 요약 캐시 삭제 */ + fun clearCache() + suspend fun getDailyRecords(date: LocalDate): Result> suspend fun getMonthlySummary(month: YearMonth): Result> diff --git a/core/data/src/main/java/com/routee/android/core/data/archive/repository/ArchiveRepositoryImpl.kt b/core/data/src/main/java/com/routee/android/core/data/archive/repository/ArchiveRepositoryImpl.kt index 01e332ca..582fcb55 100644 --- a/core/data/src/main/java/com/routee/android/core/data/archive/repository/ArchiveRepositoryImpl.kt +++ b/core/data/src/main/java/com/routee/android/core/data/archive/repository/ArchiveRepositoryImpl.kt @@ -12,12 +12,26 @@ internal class ArchiveRepositoryImpl @Inject constructor( private val service: ArchiveService, private val apiResponseHandler: ApiResponseHandler, ) : ArchiveRepository { + private val cacheLock = Any() + private var cacheVersion = 0 + private var cachedMonth: Pair>? = null + + override fun getCachedMonthlySummary(month: YearMonth): List? = synchronized(cacheLock) { + cachedMonth?.takeIf { it.first == month }?.second + } + + override fun clearCache() = synchronized(cacheLock) { + cacheVersion++ + cachedMonth = null + } + override suspend fun getDailyRecords(date: LocalDate): Result> = apiResponseHandler.safeApiCall { service.getDailyRecords(date.toString()) } .map { response -> response.activities.map { ArchiveRecord(it.activityId, it.title, it.thumbnailUrl) } } - override suspend fun getMonthlySummary(month: YearMonth): Result> = - apiResponseHandler.safeApiCall { service.getMonthlySummary(month.year, month.monthValue) } + override suspend fun getMonthlySummary(month: YearMonth): Result> { + val version = synchronized(cacheLock) { cacheVersion } + return apiResponseHandler.safeApiCall { service.getMonthlySummary(month.year, month.monthValue) } .mapCatching { response -> response.result.map { day -> DailyActivitySummary( @@ -27,5 +41,10 @@ internal class ArchiveRepositoryImpl @Inject constructor( coverImageUrl = day.coverImageUrl, ) } + }.onSuccess { summaries -> + synchronized(cacheLock) { + if (version == cacheVersion) cachedMonth = month to summaries + } } + } } diff --git a/core/data/src/main/java/com/routee/android/core/data/connectivity/repository/ConnectivityRepository.kt b/core/data/src/main/java/com/routee/android/core/data/connectivity/repository/ConnectivityRepository.kt index 664faf88..fcdbeeee 100644 --- a/core/data/src/main/java/com/routee/android/core/data/connectivity/repository/ConnectivityRepository.kt +++ b/core/data/src/main/java/com/routee/android/core/data/connectivity/repository/ConnectivityRepository.kt @@ -1,7 +1,12 @@ package com.routee.android.core.data.connectivity.repository -/** 기기 네트워크 연결 상태. API를 부르지 않는 동작 전에 오프라인인지 확인할 때 사용 */ +import kotlinx.coroutines.flow.Flow + +/** 기기 인터넷 연결 상태 조회 및 변경 감지 */ interface ConnectivityRepository { /** 인터넷이 되는 네트워크에 연결되어 있는지. 네트워크를 검증하는 중이면 잠시 기다린 뒤 결과를 반환 */ suspend fun isConnected(): Boolean + + /** 현재 인터넷 연결 상태와 이후 변경 감지, 화면이 보이는 동안 수집 */ + fun observeConnection(): Flow } diff --git a/core/data/src/main/java/com/routee/android/core/data/connectivity/repository/ConnectivityRepositoryImpl.kt b/core/data/src/main/java/com/routee/android/core/data/connectivity/repository/ConnectivityRepositoryImpl.kt index 538b52b6..982bbc11 100644 --- a/core/data/src/main/java/com/routee/android/core/data/connectivity/repository/ConnectivityRepositoryImpl.kt +++ b/core/data/src/main/java/com/routee/android/core/data/connectivity/repository/ConnectivityRepositoryImpl.kt @@ -2,10 +2,14 @@ package com.routee.android.core.data.connectivity.repository import android.content.Context import android.net.ConnectivityManager +import android.net.Network import android.net.NetworkCapabilities import dagger.hilt.android.qualifiers.ApplicationContext import javax.inject.Inject +import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.delay +import kotlinx.coroutines.flow.callbackFlow +import kotlinx.coroutines.flow.distinctUntilChanged private const val VALIDATION_CHECK_COUNT = 10 private const val VALIDATION_CHECK_INTERVAL_MILLIS = 200L @@ -15,6 +19,41 @@ internal class ConnectivityRepositoryImpl @Inject constructor( ) : ConnectivityRepository { override suspend fun isConnected(): Boolean = awaitNetworkValidation(::currentNetworkState) + override fun observeConnection() = callbackFlow { + val manager = context.getSystemService(ConnectivityManager::class.java) + if (manager == null) { + trySend(false) + close() + return@callbackFlow + } + val callback = object : ConnectivityManager.NetworkCallback() { + private var currentNetwork: Network? = null + + override fun onAvailable(network: Network) { + currentNetwork = network + } + + override fun onLost(network: Network) { + if (network == currentNetwork) { + currentNetwork = null + trySend(false) + } + } + + override fun onCapabilitiesChanged(network: Network, capabilities: NetworkCapabilities) { + if (network == currentNetwork) { + trySend( + capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) && + capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED), + ) + } + } + } + manager.registerDefaultNetworkCallback(callback) + trySend(currentNetworkState() == NetworkState.VALIDATED) + awaitClose { manager.unregisterNetworkCallback(callback) } + }.distinctUntilChanged() + private fun currentNetworkState(): NetworkState { val connectivityManager = context.getSystemService(ConnectivityManager::class.java) ?: return NetworkState.DISCONNECTED diff --git a/core/data/src/main/java/com/routee/android/core/data/member/repository/MemberRepository.kt b/core/data/src/main/java/com/routee/android/core/data/member/repository/MemberRepository.kt index 9bbf93d8..6167e0ea 100644 --- a/core/data/src/main/java/com/routee/android/core/data/member/repository/MemberRepository.kt +++ b/core/data/src/main/java/com/routee/android/core/data/member/repository/MemberRepository.kt @@ -3,5 +3,11 @@ package com.routee.android.core.data.member.repository import com.routee.android.core.data.member.model.MemberSummary interface MemberRepository { + /** 마지막으로 조회한 회원 요약, 로그아웃 전까지만 사용 */ + val cachedSummary: MemberSummary? + + /** 회원 요약 캐시 삭제 */ + fun clearCache() + suspend fun getMemberSummary(): Result } diff --git a/core/data/src/main/java/com/routee/android/core/data/member/repository/MemberRepositoryImpl.kt b/core/data/src/main/java/com/routee/android/core/data/member/repository/MemberRepositoryImpl.kt index 5bc72348..9a547e07 100644 --- a/core/data/src/main/java/com/routee/android/core/data/member/repository/MemberRepositoryImpl.kt +++ b/core/data/src/main/java/com/routee/android/core/data/member/repository/MemberRepositoryImpl.kt @@ -12,9 +12,28 @@ internal class MemberRepositoryImpl @Inject constructor( private val apiResponseHandler: ApiResponseHandler, ) : MemberRepository { - override suspend fun getMemberSummary(): Result = - apiResponseHandler.safeApiCall { memberService.getMemberSummary() } + private val cacheLock = Any() + private var cacheVersion = 0 + + @Volatile + override var cachedSummary: MemberSummary? = null + private set + + override fun clearCache() = synchronized(cacheLock) { + cacheVersion++ + cachedSummary = null + } + + override suspend fun getMemberSummary(): Result { + val version = synchronized(cacheLock) { cacheVersion } + return apiResponseHandler.safeApiCall { memberService.getMemberSummary() } .mapCatching { it.toMemberSummary() } + .onSuccess { summary -> + synchronized(cacheLock) { + if (version == cacheVersion) cachedSummary = summary + } + } + } private fun MemberSummaryResponse.toMemberSummary() = MemberSummary( nickname = nickname, diff --git a/core/data/src/test/java/com/routee/android/core/data/archive/repository/ArchiveRepositoryImplTest.kt b/core/data/src/test/java/com/routee/android/core/data/archive/repository/ArchiveRepositoryImplTest.kt index 4ebea96d..a290ef46 100644 --- a/core/data/src/test/java/com/routee/android/core/data/archive/repository/ArchiveRepositoryImplTest.kt +++ b/core/data/src/test/java/com/routee/android/core/data/archive/repository/ArchiveRepositoryImplTest.kt @@ -10,12 +10,17 @@ import java.io.IOException import java.time.LocalDate import java.time.YearMonth import kotlinx.coroutines.CancellationException +import kotlinx.coroutines.CompletableDeferred +import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.async +import kotlinx.coroutines.test.runCurrent import kotlinx.coroutines.test.runTest import kotlinx.serialization.json.Json import org.junit.Assert.assertEquals import org.junit.Assert.assertTrue import org.junit.Test +@OptIn(ExperimentalCoroutinesApi::class) class ArchiveRepositoryImplTest { @Test fun dailyRecordsUseIsoDateAndKeepServerOrderAndMissingThumbnail() = runTest { @@ -56,6 +61,30 @@ class ArchiveRepositoryImplTest { .getMonthlySummary(YearMonth.of(2026, 3)) } + @Test + fun cacheOnlyRestoresMatchingMonthAndClearRemovesIt() = runTest { + val month = YearMonth.of(2026, 3) + val repository = ArchiveRepositoryImpl(FakeService(), ApiResponseHandler(Json)) + val summary = repository.getMonthlySummary(month).getOrThrow() + assertEquals(summary, repository.getCachedMonthlySummary(month)) + assertEquals(null, repository.getCachedMonthlySummary(month.minusMonths(1))) + repository.clearCache() + assertEquals(null, repository.getCachedMonthlySummary(month)) + } + + @Test + fun clearingWhileRequestIsRunningDoesNotRestoreOldCache() = runTest { + val service = FakeService().apply { pending = CompletableDeferred() } + val month = YearMonth.of(2026, 3) + val repository = ArchiveRepositoryImpl(service, ApiResponseHandler(Json)) + val request = async { repository.getMonthlySummary(month) } + runCurrent() + repository.clearCache() + service.pending!!.complete(Unit) + assertTrue(request.await().isSuccess) + assertEquals(null, repository.getCachedMonthlySummary(month)) + } + private class FakeService(private val error: Exception? = null) : ArchiveService { override suspend fun deleteActivity(activityId: Long) = error("Unused") @@ -74,9 +103,11 @@ class ArchiveRepositoryImplTest { override suspend fun getRoutes(activityId: Long) = error("Unused") var requestedMonth: YearMonth? = null + var pending: CompletableDeferred? = null override suspend fun getMonthlySummary(year: Int, month: Int): BaseResponse { error?.let { throw it } + pending?.await() requestedMonth = YearMonth.of(year, month) val response = Json.decodeFromString( """{"result":[{"activityDate":"2026-03-12","totalDurationMinutes":61, diff --git a/core/domain/src/main/java/com/routee/android/core/domain/auth/ClearDeviceDataUseCase.kt b/core/domain/src/main/java/com/routee/android/core/domain/auth/ClearDeviceDataUseCase.kt index 3be86088..8a7440bc 100644 --- a/core/domain/src/main/java/com/routee/android/core/domain/auth/ClearDeviceDataUseCase.kt +++ b/core/domain/src/main/java/com/routee/android/core/domain/auth/ClearDeviceDataUseCase.kt @@ -1,6 +1,8 @@ package com.routee.android.core.domain.auth +import com.routee.android.core.data.archive.repository.ArchiveRepository import com.routee.android.core.data.image.repository.ImageCacheRepository +import com.routee.android.core.data.member.repository.MemberRepository import com.routee.android.core.domain.workout.DiscardWorkoutUseCase import javax.inject.Inject @@ -8,9 +10,13 @@ import javax.inject.Inject class ClearDeviceDataUseCase @Inject constructor( private val discardWorkout: DiscardWorkoutUseCase, private val imageCacheRepository: ImageCacheRepository, + private val memberRepository: MemberRepository, + private val archiveRepository: ArchiveRepository, ) { /** 하나가 실패해도 나머지는 지우고, 첫 실패를 돌려줌 */ suspend operator fun invoke(): Result { + memberRepository.clearCache() + archiveRepository.clearCache() val results = listOf(discardWorkout(), imageCacheRepository.clear()) return results.firstOrNull { it.isFailure } ?: Result.success(Unit) } diff --git a/core/domain/src/test/java/com/routee/android/core/domain/auth/ClearDeviceDataUseCaseTest.kt b/core/domain/src/test/java/com/routee/android/core/domain/auth/ClearDeviceDataUseCaseTest.kt index a1eaa5c6..3782ff26 100644 --- a/core/domain/src/test/java/com/routee/android/core/domain/auth/ClearDeviceDataUseCaseTest.kt +++ b/core/domain/src/test/java/com/routee/android/core/domain/auth/ClearDeviceDataUseCaseTest.kt @@ -1,7 +1,12 @@ package com.routee.android.core.domain.auth +import com.routee.android.core.data.archive.model.ArchiveRecord +import com.routee.android.core.data.archive.model.DailyActivitySummary +import com.routee.android.core.data.archive.repository.ArchiveRepository import com.routee.android.core.data.image.repository.ImageCacheRepository import com.routee.android.core.data.location.model.DeviceLocation +import com.routee.android.core.data.member.model.MemberSummary +import com.routee.android.core.data.member.repository.MemberRepository import com.routee.android.core.data.workout.model.StartedWorkout import com.routee.android.core.data.workout.model.TrackPoint import com.routee.android.core.data.workout.model.WorkoutRecord @@ -13,6 +18,8 @@ import com.routee.android.core.domain.workout.DiscardWorkoutUseCase import com.routee.android.core.domain.workout.FakeWorkoutPhotoRepository import java.io.IOException import java.time.Instant +import java.time.LocalDate +import java.time.YearMonth import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.test.runTest @@ -24,7 +31,30 @@ class ClearDeviceDataUseCaseTest { private val records = FakeRecordRepository() private val photos = FakeWorkoutPhotoRepository() private val imageCache = FakeImageCacheRepository() - private val clearDeviceData = ClearDeviceDataUseCase(DiscardWorkoutUseCase(tracking, records, photos), imageCache) + private var memberCacheCleared = false + private var archiveCacheCleared = false + private val clearDeviceData = + ClearDeviceDataUseCase( + DiscardWorkoutUseCase(tracking, records, photos), + imageCache, + object : MemberRepository { + override val cachedSummary: MemberSummary? = null + override fun clearCache() { + memberCacheCleared = true + } + override suspend fun getMemberSummary(): Result = error("Unused") + }, + object : ArchiveRepository { + override fun getCachedMonthlySummary(month: YearMonth): List? = null + override fun clearCache() { + archiveCacheCleared = true + } + override suspend fun getDailyRecords(date: LocalDate): Result> = error("Unused") + override suspend fun getMonthlySummary( + month: YearMonth, + ): Result> = error("Unused") + }, + ) /** * GIVEN: 기기에 운동 기록, 사진, 이미지 캐시가 있을 때 @@ -40,6 +70,8 @@ class ClearDeviceDataUseCaseTest { assertTrue(records.isCleared) assertTrue(photos.isCleared) assertTrue(imageCache.isCleared) + assertTrue(memberCacheCleared) + assertTrue(archiveCacheCleared) } /** @@ -56,6 +88,8 @@ class ClearDeviceDataUseCaseTest { assertTrue(result.isFailure) assertTrue(photos.isCleared) assertTrue(imageCache.isCleared) + assertTrue(memberCacheCleared) + assertTrue(archiveCacheCleared) } private class FakeTrackingRepository : WorkoutTrackingRepository { diff --git a/feature/record-edit/impl/src/test/java/com/routee/android/feature/recordedit/FakeConnectivityRepository.kt b/feature/record-edit/impl/src/test/java/com/routee/android/feature/recordedit/FakeConnectivityRepository.kt index a4036875..11ea2354 100644 --- a/feature/record-edit/impl/src/test/java/com/routee/android/feature/recordedit/FakeConnectivityRepository.kt +++ b/feature/record-edit/impl/src/test/java/com/routee/android/feature/recordedit/FakeConnectivityRepository.kt @@ -1,9 +1,12 @@ package com.routee.android.feature.recordedit import com.routee.android.core.data.connectivity.repository.ConnectivityRepository +import kotlinx.coroutines.flow.flowOf internal class FakeConnectivityRepository : ConnectivityRepository { var connected = true + override fun observeConnection() = flowOf(connected) + override suspend fun isConnected(): Boolean = connected } diff --git a/feature/record-edit/impl/src/test/java/com/routee/android/feature/recordedit/main/RecordEditMainViewModelTest.kt b/feature/record-edit/impl/src/test/java/com/routee/android/feature/recordedit/main/RecordEditMainViewModelTest.kt index 01c098f9..397fcc67 100644 --- a/feature/record-edit/impl/src/test/java/com/routee/android/feature/recordedit/main/RecordEditMainViewModelTest.kt +++ b/feature/record-edit/impl/src/test/java/com/routee/android/feature/recordedit/main/RecordEditMainViewModelTest.kt @@ -265,6 +265,11 @@ class RecordEditMainViewModelTest { } private class FakeMemberRepository : MemberRepository { + override var cachedSummary: MemberSummary? = null + override fun clearCache() { + cachedSummary = null + } + var joinDate: LocalDate = LocalDate.of(2026, 1, 1) var error: Throwable? = null diff --git a/feature/setting/impl/src/test/java/com/routee/android/feature/setting/FakeDeviceDataRepositories.kt b/feature/setting/impl/src/test/java/com/routee/android/feature/setting/FakeDeviceDataRepositories.kt index 0b3b6da7..5481192e 100644 --- a/feature/setting/impl/src/test/java/com/routee/android/feature/setting/FakeDeviceDataRepositories.kt +++ b/feature/setting/impl/src/test/java/com/routee/android/feature/setting/FakeDeviceDataRepositories.kt @@ -1,7 +1,12 @@ package com.routee.android.feature.setting +import com.routee.android.core.data.archive.model.ArchiveRecord +import com.routee.android.core.data.archive.model.DailyActivitySummary +import com.routee.android.core.data.archive.repository.ArchiveRepository import com.routee.android.core.data.image.repository.ImageCacheRepository import com.routee.android.core.data.location.model.DeviceLocation +import com.routee.android.core.data.member.model.MemberSummary +import com.routee.android.core.data.member.repository.MemberRepository import com.routee.android.core.data.workout.model.StartedWorkout import com.routee.android.core.data.workout.model.TrackPoint import com.routee.android.core.data.workout.model.WorkoutPhoto @@ -15,6 +20,8 @@ import com.routee.android.core.domain.auth.ClearDeviceDataUseCase import com.routee.android.core.domain.workout.DiscardWorkoutUseCase import java.io.File import java.time.Instant +import java.time.LocalDate +import java.time.YearMonth import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow @@ -22,6 +29,19 @@ internal fun clearDeviceData(records: FakeWorkoutRecordRepository = FakeWorkoutR ClearDeviceDataUseCase( discardWorkout = DiscardWorkoutUseCase(FakeWorkoutTrackingRepository(), records, FakeWorkoutPhotoRepository()), imageCacheRepository = FakeImageCacheRepository(), + memberRepository = object : MemberRepository { + override val cachedSummary: MemberSummary? = null + override fun clearCache() = Unit + override suspend fun getMemberSummary(): Result = error("Unused") + }, + archiveRepository = object : ArchiveRepository { + override fun getCachedMonthlySummary(month: YearMonth): List? = null + override fun clearCache() = Unit + override suspend fun getDailyRecords(date: LocalDate): Result> = error("Unused") + override suspend fun getMonthlySummary( + month: YearMonth, + ): Result> = error("Unused") + }, ) internal class FakeWorkoutTrackingRepository : WorkoutTrackingRepository { From 35a4b24726a43a4d71b879f1c0f3f46cc027005a Mon Sep 17 00:00:00 2001 From: Jong Date: Tue, 3 Nov 2026 22:42:25 +0900 Subject: [PATCH 2/2] =?UTF-8?q?[FIX/#216]=20=EC=98=A4=ED=94=84=EB=9D=BC?= =?UTF-8?q?=EC=9D=B8=20=EC=95=84=EC=B9=B4=EC=9D=B4=EB=B8=8C=20=EA=B8=B0?= =?UTF-8?q?=EB=B3=B8=20=ED=99=94=EB=A9=B4=20=EB=B0=8F=20=EC=A1=B0=ED=9A=8C?= =?UTF-8?q?=20=EA=B2=B0=EA=B3=BC=20=EC=9C=A0=EC=A7=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/ConnectivityRepositoryImpl.kt | 37 +++-- .../ObserveConnectionValidationTest.kt | 67 +++++++++ .../android/feature/archive/ArchiveScreen.kt | 81 +++++------ .../feature/archive/ArchiveViewModel.kt | 31 +++- .../component/TotalWorkoutCountChip.kt | 4 +- .../feature/archive/component/UserProfile.kt | 11 +- .../model/ArchiveMonthlySummaryMapper.kt | 2 +- .../feature/archive/model/ArchiveUiState.kt | 2 +- .../ArchiveDailyRecordsViewModelTest.kt | 13 +- .../archive/ArchiveViewModelFixture.kt | 21 +++ .../feature/archive/ArchiveViewModelTest.kt | 137 +++++++++++++++--- 11 files changed, 316 insertions(+), 90 deletions(-) create mode 100644 core/data/src/test/java/com/routee/android/core/data/connectivity/repository/ObserveConnectionValidationTest.kt create mode 100644 feature/archive/impl/src/test/java/com/routee/android/feature/archive/ArchiveViewModelFixture.kt diff --git a/core/data/src/main/java/com/routee/android/core/data/connectivity/repository/ConnectivityRepositoryImpl.kt b/core/data/src/main/java/com/routee/android/core/data/connectivity/repository/ConnectivityRepositoryImpl.kt index 982bbc11..2553fe57 100644 --- a/core/data/src/main/java/com/routee/android/core/data/connectivity/repository/ConnectivityRepositoryImpl.kt +++ b/core/data/src/main/java/com/routee/android/core/data/connectivity/repository/ConnectivityRepositoryImpl.kt @@ -6,10 +6,13 @@ import android.net.Network import android.net.NetworkCapabilities import dagger.hilt.android.qualifiers.ApplicationContext import javax.inject.Inject +import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.delay +import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.callbackFlow import kotlinx.coroutines.flow.distinctUntilChanged +import kotlinx.coroutines.flow.transformLatest private const val VALIDATION_CHECK_COUNT = 10 private const val VALIDATION_CHECK_INTERVAL_MILLIS = 200L @@ -22,7 +25,7 @@ internal class ConnectivityRepositoryImpl @Inject constructor( override fun observeConnection() = callbackFlow { val manager = context.getSystemService(ConnectivityManager::class.java) if (manager == null) { - trySend(false) + trySend(NetworkState.DISCONNECTED) close() return@callbackFlow } @@ -31,39 +34,33 @@ internal class ConnectivityRepositoryImpl @Inject constructor( override fun onAvailable(network: Network) { currentNetwork = network + trySend(NetworkState.VALIDATING) } override fun onLost(network: Network) { if (network == currentNetwork) { currentNetwork = null - trySend(false) + trySend(NetworkState.DISCONNECTED) } } override fun onCapabilitiesChanged(network: Network, capabilities: NetworkCapabilities) { if (network == currentNetwork) { - trySend( - capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) && - capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED), - ) + trySend(capabilities.networkState()) } } } manager.registerDefaultNetworkCallback(callback) - trySend(currentNetworkState() == NetworkState.VALIDATED) + trySend(currentNetworkState()) awaitClose { manager.unregisterNetworkCallback(callback) } - }.distinctUntilChanged() + }.validatedConnection() private fun currentNetworkState(): NetworkState { val connectivityManager = context.getSystemService(ConnectivityManager::class.java) ?: return NetworkState.DISCONNECTED val capabilities = connectivityManager.getNetworkCapabilities(connectivityManager.activeNetwork) ?: return NetworkState.DISCONNECTED - return when { - !capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) -> NetworkState.DISCONNECTED - capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED) -> NetworkState.VALIDATED - else -> NetworkState.VALIDATING - } + return capabilities.networkState() } } @@ -79,3 +76,17 @@ internal suspend fun awaitNetworkValidation(currentState: () -> NetworkState): B } return currentState() == NetworkState.VALIDATED } + +private fun NetworkCapabilities.networkState(): NetworkState = when { + !hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) -> NetworkState.DISCONNECTED + hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED) -> NetworkState.VALIDATED + else -> NetworkState.VALIDATING +} + +@OptIn(ExperimentalCoroutinesApi::class) +internal fun Flow.validatedConnection(): Flow = distinctUntilChanged().transformLatest { state -> + if (state == NetworkState.VALIDATING) { + delay(VALIDATION_CHECK_COUNT * VALIDATION_CHECK_INTERVAL_MILLIS) + } + emit(state == NetworkState.VALIDATED) +}.distinctUntilChanged() diff --git a/core/data/src/test/java/com/routee/android/core/data/connectivity/repository/ObserveConnectionValidationTest.kt b/core/data/src/test/java/com/routee/android/core/data/connectivity/repository/ObserveConnectionValidationTest.kt new file mode 100644 index 00000000..a50c4273 --- /dev/null +++ b/core/data/src/test/java/com/routee/android/core/data/connectivity/repository/ObserveConnectionValidationTest.kt @@ -0,0 +1,67 @@ +package com.routee.android.core.data.connectivity.repository + +import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.flow.MutableSharedFlow +import kotlinx.coroutines.launch +import kotlinx.coroutines.test.advanceTimeBy +import kotlinx.coroutines.test.runCurrent +import kotlinx.coroutines.test.runTest +import org.junit.Assert.assertEquals +import org.junit.Test + +@OptIn(ExperimentalCoroutinesApi::class) +class ObserveConnectionValidationTest { + @Test + fun validatingThenValidatedDoesNotEmitOffline() = runTest { + val states = MutableSharedFlow() + val connections = mutableListOf() + backgroundScope.launch { states.validatedConnection().collect { connections.add(it) } } + runCurrent() + + states.emit(NetworkState.VALIDATING) + advanceTimeBy(1_000) + assertEquals(emptyList(), connections) + states.emit(NetworkState.VALIDATED) + runCurrent() + advanceTimeBy(2_000) + runCurrent() + + assertEquals(listOf(true), connections) + } + + @Test + fun validationTimeoutEmitsOfflineAndCanRecover() = runTest { + val states = MutableSharedFlow() + val connections = mutableListOf() + backgroundScope.launch { states.validatedConnection().collect { connections.add(it) } } + runCurrent() + + states.emit(NetworkState.VALIDATED) + runCurrent() + states.emit(NetworkState.VALIDATING) + advanceTimeBy(1_999) + assertEquals(listOf(true), connections) + advanceTimeBy(1) + runCurrent() + assertEquals(listOf(true, false), connections) + states.emit(NetworkState.VALIDATED) + runCurrent() + + assertEquals(listOf(true, false, true), connections) + } + + @Test + fun disconnectionCancelsValidationWaitImmediately() = runTest { + val states = MutableSharedFlow() + val connections = mutableListOf() + backgroundScope.launch { states.validatedConnection().collect { connections.add(it) } } + runCurrent() + + states.emit(NetworkState.VALIDATING) + advanceTimeBy(100) + states.emit(NetworkState.DISCONNECTED) + runCurrent() + + assertEquals(listOf(false), connections) + } +} diff --git a/feature/archive/impl/src/main/java/com/routee/android/feature/archive/ArchiveScreen.kt b/feature/archive/impl/src/main/java/com/routee/android/feature/archive/ArchiveScreen.kt index f237b3aa..898b04ff 100644 --- a/feature/archive/impl/src/main/java/com/routee/android/feature/archive/ArchiveScreen.kt +++ b/feature/archive/impl/src/main/java/com/routee/android/feature/archive/ArchiveScreen.kt @@ -61,6 +61,7 @@ internal fun ArchiveRoute( viewModel: ArchiveViewModel = hiltViewModel(), ) { val uiState by viewModel.uiState.collectAsStateWithLifecycle() + viewModel.connection.CollectSideEffect(viewModel::onConnectionChanged) ResultEffect { viewModel.onRecordChanged() } val messages = LocalRouteeMessageState.current val sheetMessages = rememberRouteeMessageState() @@ -120,56 +121,50 @@ private fun ArchiveScreen( } } - UiState.Empty -> RouteeBgEllipse(modifier = modifier.fillMaxSize()) { + UiState.Empty, is UiState.Success -> RouteeBgEllipse(modifier = modifier.fillMaxSize()) { + val data = (content as? UiState.Success)?.data ?: archiveContent(null, uiState.selectedMonth, emptyList()) PullToRefreshBox( isRefreshing = uiState.isRefreshing, onRefresh = onRetryClick, - modifier = Modifier.fillMaxSize().statusBarsPadding(), + modifier = Modifier.fillMaxSize(), ) { - Column(Modifier.fillMaxSize().verticalScroll(rememberScrollState())) { + Column( + modifier = Modifier.fillMaxSize().statusBarsPadding().verticalScroll(rememberScrollState()), + horizontalAlignment = Alignment.CenterHorizontally, + ) { RouteePageHeader(title = stringResource(R.string.archive_title)) + UserProfile( + nickname = data.profile?.nickname, + daysTogether = data.profile?.daysTogether, + workoutCount = data.profile?.workoutCount, + profileImageUrl = data.profile?.imageUrl, + modifier = Modifier.padding(horizontal = RouteeTheme.spacing.Spacing16), + ) + Spacer(Modifier.height(22.dp)) + RouteeMonthControl( + yearMonth = uiState.selectedMonth, + onPreviousClick = onPreviousMonthClick, + onNextClick = onNextMonthClick, + isPreviousEnabled = uiState.isPreviousMonthEnabled, + isNextEnabled = uiState.isNextMonthEnabled, + size = RouteeMonthControlSize.SM, + ) + Spacer(Modifier.height(RouteeTheme.spacing.Spacing6)) + MountainMap( + activityLevels = data.activityLevels, + modifier = Modifier.fillMaxWidth().padding(horizontal = RouteeTheme.spacing.Spacing16), + ) + Spacer(Modifier.height(RouteeTheme.spacing.Spacing32)) + ArchiveCalendarSection( + month = data.month, + days = data.calendarDays, + onDateClick = onDateClick, + modifier = Modifier.padding(horizontal = RouteeTheme.spacing.Spacing16), + ) + Spacer(Modifier.height(routeeNavBarPadding(RouteeTheme.spacing.Spacing16))) } } - } - - is UiState.Success -> RouteeBgEllipse(modifier = modifier.fillMaxSize()) { - val data = content.data - Column( - modifier = Modifier.fillMaxSize().statusBarsPadding().verticalScroll(rememberScrollState()), - horizontalAlignment = Alignment.CenterHorizontally, - ) { - RouteePageHeader(title = stringResource(R.string.archive_title)) - UserProfile( - nickname = data.profile.nickname, - daysTogether = data.profile.daysTogether, - workoutCount = data.profile.workoutCount, - profileImageUrl = data.profile.imageUrl, - modifier = Modifier.padding(horizontal = RouteeTheme.spacing.Spacing16), - ) - Spacer(Modifier.height(22.dp)) - RouteeMonthControl( - yearMonth = uiState.selectedMonth, - onPreviousClick = onPreviousMonthClick, - onNextClick = onNextMonthClick, - isPreviousEnabled = uiState.isPreviousMonthEnabled, - isNextEnabled = uiState.isNextMonthEnabled, - size = RouteeMonthControlSize.SM, - ) - Spacer(Modifier.height(RouteeTheme.spacing.Spacing6)) - MountainMap( - activityLevels = data.activityLevels, - modifier = Modifier.fillMaxWidth().padding(horizontal = RouteeTheme.spacing.Spacing16), - ) - Spacer(Modifier.height(RouteeTheme.spacing.Spacing32)) - ArchiveCalendarSection( - month = data.month, - days = data.calendarDays, - onDateClick = onDateClick, - modifier = Modifier.padding(horizontal = RouteeTheme.spacing.Spacing16), - ) - Spacer(Modifier.height(routeeNavBarPadding(RouteeTheme.spacing.Spacing16))) - } - if (uiState.isRefreshing || uiState.isLoadingRecords) RouteeLoadingOverlay() + if (uiState.isLoadingRecords) RouteeLoadingOverlay() val date = uiState.selectedDate if (date != null && uiState.records.size > 1) { RecordBottomSheet( diff --git a/feature/archive/impl/src/main/java/com/routee/android/feature/archive/ArchiveViewModel.kt b/feature/archive/impl/src/main/java/com/routee/android/feature/archive/ArchiveViewModel.kt index b3967ea5..1e5219ee 100644 --- a/feature/archive/impl/src/main/java/com/routee/android/feature/archive/ArchiveViewModel.kt +++ b/feature/archive/impl/src/main/java/com/routee/android/feature/archive/ArchiveViewModel.kt @@ -5,6 +5,7 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.routee.android.core.common.util.suspendRunCatching import com.routee.android.core.data.archive.repository.ArchiveRepository +import com.routee.android.core.data.connectivity.repository.ConnectivityRepository import com.routee.android.core.data.member.model.MemberSummary import com.routee.android.core.data.member.repository.MemberRepository import com.routee.android.core.network.exception.ApiException @@ -38,6 +39,7 @@ internal class ArchiveViewModel @Inject constructor( private val archiveRepository: ArchiveRepository, private val memberRepository: MemberRepository, private val savedStateHandle: SavedStateHandle, + connectivityRepository: ConnectivityRepository, ) : ViewModel() { private val _uiState = MutableStateFlow( ArchiveUiState().let { initial -> @@ -48,6 +50,7 @@ internal class ArchiveViewModel @Inject constructor( val uiState = _uiState.asStateFlow() private val _sideEffect = Channel(Channel.BUFFERED) val sideEffect = _sideEffect.receiveAsFlow() + val connection = connectivityRepository.observeConnection() private var member: MemberSummary? = null private var loadJob: Job? = null private var recordsJob: Job? = null @@ -56,6 +59,14 @@ internal class ArchiveViewModel @Inject constructor( loadSummary() } + fun onConnectionChanged(connected: Boolean) { + val previous = _uiState.value + _uiState.update { it.copy(isOffline = !connected) } + if (!connected && !previous.isOffline && previous.content is UiState.Success) { + viewModelScope.launch { _sideEffect.send(ArchiveSideEffect.NetworkUnavailable) } + } + } + fun onPreviousMonthClick() { if (_uiState.value.isPreviousMonthEnabled) moveMonth(_uiState.value.selectedMonth.minusMonths(1)) } @@ -68,7 +79,12 @@ internal class ArchiveViewModel @Inject constructor( fun onRecordChanged() { member = null - _uiState.update { it.copy(content = UiState.Loading) } + memberRepository.clearCache() + archiveRepository.clearCache() + _uiState.update { + val profile = (it.content as? UiState.Success)?.data?.profile + it.copy(content = UiState.Success(archiveContent(profile, it.selectedMonth, emptyList()))) + } loadSummary() } @@ -160,9 +176,16 @@ internal class ArchiveViewModel @Inject constructor( it.copy( content = when { !isOffline -> UiState.Failure(error) - it.content !is UiState.Success -> UiState.Empty - it.content.data.month == month -> it.content - else -> UiState.Success(archiveContent(it.content.data.profile, month, emptyList())) + + it.content is UiState.Success && it.content.data.month == month -> it.content + + else -> UiState.Success( + archiveContent( + (member ?: memberRepository.cachedSummary)?.toArchiveProfile(), + month, + archiveRepository.getCachedMonthlySummary(month).orEmpty(), + ), + ) }, isRefreshing = false, isOffline = isOffline, diff --git a/feature/archive/impl/src/main/java/com/routee/android/feature/archive/component/TotalWorkoutCountChip.kt b/feature/archive/impl/src/main/java/com/routee/android/feature/archive/component/TotalWorkoutCountChip.kt index a98c8aeb..3881dd3b 100644 --- a/feature/archive/impl/src/main/java/com/routee/android/feature/archive/component/TotalWorkoutCountChip.kt +++ b/feature/archive/impl/src/main/java/com/routee/android/feature/archive/component/TotalWorkoutCountChip.kt @@ -20,7 +20,7 @@ import com.routee.android.core.designsystem.theme.RouteeTheme @Composable internal fun TotalWorkoutCountChip( - workoutCount: Int, + workoutCount: Int?, modifier: Modifier = Modifier, ) { val shape = RoundedCornerShape(RouteeTheme.radius.Radius14) @@ -50,7 +50,7 @@ internal fun TotalWorkoutCountChip( contentDescription = null, ) Text( - text = workoutCount.toString(), + text = workoutCount?.toString().orEmpty(), color = RouteeTheme.colors.white, style = RouteeTheme.typography.labelR12, maxLines = 1, diff --git a/feature/archive/impl/src/main/java/com/routee/android/feature/archive/component/UserProfile.kt b/feature/archive/impl/src/main/java/com/routee/android/feature/archive/component/UserProfile.kt index 9f966bbe..c1cde2ff 100644 --- a/feature/archive/impl/src/main/java/com/routee/android/feature/archive/component/UserProfile.kt +++ b/feature/archive/impl/src/main/java/com/routee/android/feature/archive/component/UserProfile.kt @@ -28,9 +28,9 @@ import com.routee.android.feature.archive.R @Composable internal fun UserProfile( - nickname: String, - daysTogether: Int, - workoutCount: Int, + nickname: String?, + daysTogether: Int?, + workoutCount: Int?, modifier: Modifier = Modifier, profileImageUrl: String? = null, ) { @@ -69,7 +69,7 @@ internal fun UserProfile( verticalArrangement = Arrangement.spacedBy(RouteeTheme.spacing.Spacing8), ) { Text( - text = nickname, + text = nickname.orEmpty(), color = RouteeTheme.colors.white, style = RouteeTheme.typography.labelSb18, maxLines = 1, @@ -84,7 +84,8 @@ internal fun UserProfile( contentDescription = null, ) Text( - text = stringResource(R.string.user_profile_days_together, daysTogether), + text = daysTogether?.let { stringResource(R.string.user_profile_days_together, it) } + ?: "", color = RouteeTheme.colors.mint300, style = RouteeTheme.typography.labelM14, maxLines = 1, diff --git a/feature/archive/impl/src/main/java/com/routee/android/feature/archive/model/ArchiveMonthlySummaryMapper.kt b/feature/archive/impl/src/main/java/com/routee/android/feature/archive/model/ArchiveMonthlySummaryMapper.kt index fb82ab18..053e650f 100644 --- a/feature/archive/impl/src/main/java/com/routee/android/feature/archive/model/ArchiveMonthlySummaryMapper.kt +++ b/feature/archive/impl/src/main/java/com/routee/android/feature/archive/model/ArchiveMonthlySummaryMapper.kt @@ -8,7 +8,7 @@ import java.time.YearMonth import kotlinx.collections.immutable.toImmutableList internal fun archiveContent( - profile: ArchiveProfile, + profile: ArchiveProfile?, month: YearMonth, summaries: List, ): ArchiveContent { diff --git a/feature/archive/impl/src/main/java/com/routee/android/feature/archive/model/ArchiveUiState.kt b/feature/archive/impl/src/main/java/com/routee/android/feature/archive/model/ArchiveUiState.kt index 335c2b24..3b701539 100644 --- a/feature/archive/impl/src/main/java/com/routee/android/feature/archive/model/ArchiveUiState.kt +++ b/feature/archive/impl/src/main/java/com/routee/android/feature/archive/model/ArchiveUiState.kt @@ -39,7 +39,7 @@ internal data class ArchiveProfile( @Immutable internal data class ArchiveContent( - val profile: ArchiveProfile, + val profile: ArchiveProfile?, val month: YearMonth, val calendarDays: ImmutableList, val activityLevels: ImmutableList, diff --git a/feature/archive/impl/src/test/java/com/routee/android/feature/archive/ArchiveDailyRecordsViewModelTest.kt b/feature/archive/impl/src/test/java/com/routee/android/feature/archive/ArchiveDailyRecordsViewModelTest.kt index 0bbc501d..6e27b714 100644 --- a/feature/archive/impl/src/test/java/com/routee/android/feature/archive/ArchiveDailyRecordsViewModelTest.kt +++ b/feature/archive/impl/src/test/java/com/routee/android/feature/archive/ArchiveDailyRecordsViewModelTest.kt @@ -103,9 +103,14 @@ class ArchiveDailyRecordsViewModelTest { assertFalse(viewModel.uiState.value.isLoadingRecords) } - private fun viewModel(repository: ArchiveRepository) = ArchiveViewModel( + private fun viewModel(repository: ArchiveRepository) = archiveViewModel( repository, object : MemberRepository { + override var cachedSummary: MemberSummary? = null + override fun clearCache() { + cachedSummary = null + } + override suspend fun getMemberSummary() = Result.success( MemberSummary("이름", null, LocalDate.now().minusMonths(2), 60, 2), ) @@ -114,6 +119,12 @@ class ArchiveDailyRecordsViewModelTest { ) private class FakeRepository : ArchiveRepository { + private var cachedMonth: Pair>? = null + override fun getCachedMonthlySummary(month: YearMonth) = cachedMonth?.takeIf { it.first == month }?.second + override fun clearCache() { + cachedMonth = null + } + var records = emptyList() var summaries = emptyList() var summaryCalls = 0 diff --git a/feature/archive/impl/src/test/java/com/routee/android/feature/archive/ArchiveViewModelFixture.kt b/feature/archive/impl/src/test/java/com/routee/android/feature/archive/ArchiveViewModelFixture.kt new file mode 100644 index 00000000..686db865 --- /dev/null +++ b/feature/archive/impl/src/test/java/com/routee/android/feature/archive/ArchiveViewModelFixture.kt @@ -0,0 +1,21 @@ +package com.routee.android.feature.archive + +import androidx.lifecycle.SavedStateHandle +import com.routee.android.core.data.archive.repository.ArchiveRepository +import com.routee.android.core.data.connectivity.repository.ConnectivityRepository +import com.routee.android.core.data.member.repository.MemberRepository +import kotlinx.coroutines.flow.flowOf + +internal fun archiveViewModel( + repository: ArchiveRepository, + members: MemberRepository, + savedStateHandle: SavedStateHandle, +) = ArchiveViewModel( + repository, + members, + savedStateHandle, + object : ConnectivityRepository { + override suspend fun isConnected() = true + override fun observeConnection() = flowOf(true) + }, +) diff --git a/feature/archive/impl/src/test/java/com/routee/android/feature/archive/ArchiveViewModelTest.kt b/feature/archive/impl/src/test/java/com/routee/android/feature/archive/ArchiveViewModelTest.kt index 7cdb4d4b..374d4c1d 100644 --- a/feature/archive/impl/src/test/java/com/routee/android/feature/archive/ArchiveViewModelTest.kt +++ b/feature/archive/impl/src/test/java/com/routee/android/feature/archive/ArchiveViewModelTest.kt @@ -34,14 +34,14 @@ class ArchiveViewModelTest { fun changedRecordRefreshesMemberSummaryWithoutChangingSelectedMonth() = runTest { val repository = FakeArchiveRepository() val members = FakeMemberRepository() - val viewModel = ArchiveViewModel(repository, members, SavedStateHandle()) + val viewModel = archiveViewModel(repository, members, SavedStateHandle()) viewModel.onPreviousMonthClick() val month = viewModel.uiState.value.selectedMonth members.totalCount = 4 viewModel.onRecordChanged() - assertEquals(4, viewModel.content().profile.workoutCount) + assertEquals(4, viewModel.content().profile?.workoutCount) assertEquals(2, members.callCount) assertEquals(month, viewModel.content().month) assertEquals(3, repository.months.size) @@ -62,8 +62,8 @@ class ArchiveViewModelTest { ) } val members = FakeMemberRepository().apply { totalCount = 2 } - val viewModel = ArchiveViewModel(repository, members, SavedStateHandle()) - assertEquals(2, viewModel.content().profile.workoutCount) + val viewModel = archiveViewModel(repository, members, SavedStateHandle()) + assertEquals(2, viewModel.content().profile?.workoutCount) assertEquals(2, viewModel.content().calendarDays.single().recordCount) for (remaining in 1 downTo 0) { @@ -71,7 +71,7 @@ class ArchiveViewModelTest { members.totalCount = remaining viewModel.onRecordChanged() - assertEquals(remaining, viewModel.content().profile.workoutCount) + assertEquals(remaining, viewModel.content().profile?.workoutCount) assertEquals(remaining, viewModel.content().calendarDays.sumOf { it.recordCount }) } @@ -87,30 +87,61 @@ class ArchiveViewModelTest { Result.success(listOf(DailyActivitySummary(month.atDay(12), recordCount * 45, recordCount, null))) } val members = FakeMemberRepository().apply { totalCount = 2 } - val viewModel = ArchiveViewModel(repository, members, SavedStateHandle()) - assertEquals(2, viewModel.content().profile.workoutCount) + val viewModel = archiveViewModel(repository, members, SavedStateHandle()) + assertEquals(2, viewModel.content().profile?.workoutCount) recordCount = 1 members.totalCount = 1 repository.error = ApiException.NetworkConnection() viewModel.onRecordChanged() - assertEquals(UiState.Empty, viewModel.uiState.value.content) + assertTrue(viewModel.content().calendarDays.isEmpty()) assertTrue(viewModel.uiState.value.isOffline) repository.error = null viewModel.onRetryClick() - assertEquals(1, viewModel.content().profile.workoutCount) + assertEquals(1, viewModel.content().profile?.workoutCount) assertEquals(1, viewModel.content().calendarDays.single().recordCount) assertFalse(viewModel.uiState.value.isOffline) } + @Test + fun failedProfileRefreshAfterDeletionPreservesProfileButInvalidatesRecords() = runTest { + val repository = FakeArchiveRepository { month -> + Result.success(listOf(DailyActivitySummary(month.atDay(12), 90, 2, null))) + } + val members = FakeMemberRepository().apply { totalCount = 2 } + val viewModel = archiveViewModel(repository, members, SavedStateHandle()) + val profile = viewModel.content().profile + val month = viewModel.content().month + + members.error = ApiException.NetworkConnection() + repository.error = ApiException.NetworkConnection() + viewModel.onRecordChanged() + + assertEquals(profile, viewModel.content().profile) + assertTrue(viewModel.content().calendarDays.isEmpty()) + assertTrue(viewModel.content().activityLevels.all { it == MountainActivityLevel.NONE }) + assertEquals(null, members.cachedSummary) + assertEquals(null, repository.getCachedMonthlySummary(month)) + assertTrue(viewModel.uiState.value.isOffline) + + members.error = null + members.totalCount = 1 + repository.error = null + viewModel.onRetryClick() + + assertEquals(1, viewModel.content().profile?.workoutCount) + assertEquals(3, members.callCount) + assertFalse(viewModel.uiState.value.isOffline) + } + @Test fun monthMovementHonorsJoinAndCurrentMonthsWithoutReloadingMember() = runTest { val repository = FakeArchiveRepository() val members = FakeMemberRepository() - val viewModel = ArchiveViewModel(repository, members, SavedStateHandle()) + val viewModel = archiveViewModel(repository, members, SavedStateHandle()) val current = viewModel.uiState.value.currentMonth repeat(3) { viewModel.onPreviousMonthClick() } @@ -128,7 +159,7 @@ class ArchiveViewModelTest { val repository = FakeArchiveRepository { month -> Result.success(listOf(DailyActivitySummary(month.atDay(12), 90, 2, "photo"))) } - val viewModel = ArchiveViewModel(repository, FakeMemberRepository(), SavedStateHandle()) + val viewModel = archiveViewModel(repository, FakeMemberRepository(), SavedStateHandle()) val previousContent = viewModel.content() assertTrue(previousContent.calendarDays.isNotEmpty()) repository.error = ApiException.NetworkConnection() @@ -155,7 +186,7 @@ class ArchiveViewModelTest { val repository = FakeArchiveRepository { month -> Result.success(listOf(DailyActivitySummary(month.atDay(12), 90, 2, "photo"))) } - val viewModel = ArchiveViewModel(repository, FakeMemberRepository(), SavedStateHandle()) + val viewModel = archiveViewModel(repository, FakeMemberRepository(), SavedStateHandle()) val previousContent = viewModel.uiState.value.content repository.error = ApiException.NetworkConnection() @@ -166,6 +197,56 @@ class ArchiveViewModelTest { assertFalse(viewModel.uiState.value.isRefreshing) } + @Test + fun offlineTabReentryRestoresLastSuccessfulProfileAndMonth() = runTest { + val repository = FakeArchiveRepository { month -> + Result.success(listOf(DailyActivitySummary(month.atDay(12), 90, 2, "photo"))) + } + val members = FakeMemberRepository() + val original = archiveViewModel(repository, members, SavedStateHandle()).content() + repository.error = ApiException.NetworkConnection() + members.error = ApiException.NetworkConnection() + val recreated = archiveViewModel(repository, members, SavedStateHandle()) + assertEquals(original, recreated.content()) + assertTrue(recreated.uiState.value.isOffline) + } + + @Test + fun initialOfflineWithoutProfileShowsCalendarWithoutInventingMemberData() = runTest { + val repository = FakeArchiveRepository().apply { error = ApiException.NetworkConnection() } + val members = FakeMemberRepository().apply { error = ApiException.NetworkConnection() } + val viewModel = archiveViewModel(repository, members, SavedStateHandle()) + assertEquals(null, viewModel.content().profile) + assertEquals(YearMonth.now(), viewModel.content().month) + assertTrue(viewModel.content().calendarDays.isEmpty()) + assertTrue(viewModel.content().activityLevels.all { it == MountainActivityLevel.NONE }) + } + + @Test + fun offlineFirstThenOnlineTabReentryThenDisconnectPreservesLoadedData() = runTest { + val repository = FakeArchiveRepository { month -> + Result.success(listOf(DailyActivitySummary(month.atDay(12), 90, 2, "photo"))) + }.apply { error = ApiException.NetworkConnection() } + val members = FakeMemberRepository().apply { error = ApiException.NetworkConnection() } + val offline = archiveViewModel(repository, members, SavedStateHandle()) + assertEquals(null, offline.content().profile) + assertTrue(offline.content().calendarDays.isEmpty()) + assertEquals(ArchiveSideEffect.NetworkUnavailable, offline.sideEffect.first()) + + repository.error = null + members.error = null + val online = archiveViewModel(repository, members, SavedStateHandle()) + val loaded = online.content() + assertEquals(5, loaded.profile?.workoutCount) + assertTrue(loaded.calendarDays.isNotEmpty()) + assertFalse(online.uiState.value.isOffline) + + online.onConnectionChanged(false) + assertEquals(loaded, online.content()) + assertTrue(online.uiState.value.isOffline) + assertEquals(ArchiveSideEffect.NetworkUnavailable, online.sideEffect.first()) + } + @Test fun slowerCancelledMonthDoesNotOverwriteNewSelection() = runTest { val current = YearMonth.now() @@ -173,7 +254,7 @@ class ArchiveViewModelTest { if (month == current.minusMonths(1)) withContext(NonCancellable) { delay(100) } Result.success(emptyList()) } - val viewModel = ArchiveViewModel(repository, FakeMemberRepository(), SavedStateHandle()) + val viewModel = archiveViewModel(repository, FakeMemberRepository(), SavedStateHandle()) viewModel.onPreviousMonthClick() runCurrent() @@ -187,12 +268,12 @@ class ArchiveViewModelTest { fun initialOfflineEntryShowsEmptyContentAndCanBeRetried() = runTest { val repository = FakeArchiveRepository().apply { error = ApiException.NetworkConnection() } val restored = YearMonth.now().minusMonths(1) - val viewModel = ArchiveViewModel( + val viewModel = archiveViewModel( repository, FakeMemberRepository(), SavedStateHandle(mapOf("selectedMonth" to restored.toString())), ) - assertEquals(UiState.Empty, viewModel.uiState.value.content) + assertTrue(viewModel.content().calendarDays.isEmpty()) assertTrue(viewModel.uiState.value.isOffline) assertFalse(viewModel.uiState.value.isRefreshing) assertEquals(ArchiveSideEffect.NetworkUnavailable, viewModel.sideEffect.first()) @@ -207,9 +288,9 @@ class ArchiveViewModelTest { @Test fun initialMemberNetworkFailureAlsoShowsOfflineContent() = runTest { val members = FakeMemberRepository().apply { error = ApiException.NetworkConnection() } - val viewModel = ArchiveViewModel(FakeArchiveRepository(), members, SavedStateHandle()) + val viewModel = archiveViewModel(FakeArchiveRepository(), members, SavedStateHandle()) - assertEquals(UiState.Empty, viewModel.uiState.value.content) + assertTrue(viewModel.content().calendarDays.isEmpty()) assertTrue(viewModel.uiState.value.isOffline) assertFalse(viewModel.uiState.value.isRefreshing) assertEquals(ArchiveSideEffect.NetworkUnavailable, viewModel.sideEffect.first()) @@ -224,7 +305,7 @@ class ArchiveViewModelTest { @Test fun nonNetworkFailureStillShowsErrorScreen() = runTest { val repository = FakeArchiveRepository().apply { error = IllegalStateException() } - val viewModel = ArchiveViewModel(repository, FakeMemberRepository(), SavedStateHandle()) + val viewModel = archiveViewModel(repository, FakeMemberRepository(), SavedStateHandle()) assertTrue(viewModel.uiState.value.content is UiState.Failure) assertFalse(viewModel.uiState.value.isOffline) @@ -234,6 +315,11 @@ class ArchiveViewModelTest { private fun ArchiveViewModel.content() = (uiState.value.content as UiState.Success).data private class FakeMemberRepository : MemberRepository { + override var cachedSummary: MemberSummary? = null + override fun clearCache() { + cachedSummary = null + } + var callCount = 0 var totalCount = 5 var error: Exception? = null @@ -241,13 +327,24 @@ class ArchiveViewModelTest { override suspend fun getMemberSummary(): Result { callCount++ error?.let { return Result.failure(it) } - return Result.success(MemberSummary("이름", null, YearMonth.now().minusMonths(2).atDay(1), 70, totalCount)) + return Result.success( + MemberSummary("이름", null, YearMonth.now().minusMonths(2).atDay(1), 70, totalCount), + ).onSuccess { + cachedSummary = + it + } } } private class FakeArchiveRepository( private val load: suspend (YearMonth) -> Result> = { Result.success(emptyList()) }, ) : ArchiveRepository { + private var cachedMonth: Pair>? = null + override fun getCachedMonthlySummary(month: YearMonth) = cachedMonth?.takeIf { it.first == month }?.second + override fun clearCache() { + cachedMonth = null + } + override suspend fun getDailyRecords(date: java.time.LocalDate) = error("Unused") var error: Exception? = null val months = mutableListOf() @@ -255,7 +352,7 @@ class ArchiveViewModelTest { override suspend fun getMonthlySummary(month: YearMonth): Result> { months += month error?.let { return Result.failure(it) } - return load(month) + return load(month).onSuccess { cachedMonth = month to it } } } }