diff --git a/core/data/src/main/java/com/routee/android/core/data/workout/repository/WorkoutTrackingRepository.kt b/core/data/src/main/java/com/routee/android/core/data/workout/repository/WorkoutTrackingRepository.kt index ba8d719e..323054f2 100644 --- a/core/data/src/main/java/com/routee/android/core/data/workout/repository/WorkoutTrackingRepository.kt +++ b/core/data/src/main/java/com/routee/android/core/data/workout/repository/WorkoutTrackingRepository.kt @@ -2,6 +2,7 @@ package com.routee.android.core.data.workout.repository import com.routee.android.core.data.location.model.DeviceLocation 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.WorkoutTrackingState import com.routee.android.core.data.workout.model.WorkoutType import java.time.Instant @@ -45,6 +46,12 @@ interface WorkoutTrackingRepository { */ suspend fun finish(endedAt: Instant? = null): Result - /** 저장을 마쳤거나 저장할 수 없는 기록 삭제, 상태 비움 */ + /** 서버에 저장한 기록 삭제, 경로는 다음 [start]나 [clear] 전까지 메모리에 남김 */ + suspend fun markSaved(): Result + + /** [markSaved]로 남긴 [activityId] 기록의 경로, 없으면 null */ + fun getSavedTrackPoints(activityId: Long): List? + + /** 저장할 수 없거나 버리는 기록 삭제, 남긴 경로도 비움 */ suspend fun clear(): Result } diff --git a/core/data/src/main/java/com/routee/android/core/data/workout/repository/WorkoutTrackingRepositoryImpl.kt b/core/data/src/main/java/com/routee/android/core/data/workout/repository/WorkoutTrackingRepositoryImpl.kt index 67220782..86569982 100644 --- a/core/data/src/main/java/com/routee/android/core/data/workout/repository/WorkoutTrackingRepositoryImpl.kt +++ b/core/data/src/main/java/com/routee/android/core/data/workout/repository/WorkoutTrackingRepositoryImpl.kt @@ -3,6 +3,7 @@ package com.routee.android.core.data.workout.repository import com.routee.android.core.common.util.suspendRunCatching import com.routee.android.core.data.location.model.DeviceLocation 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 import com.routee.android.core.data.workout.model.WorkoutTrackingState import com.routee.android.core.data.workout.model.WorkoutType @@ -25,6 +26,8 @@ internal class WorkoutTrackingRepositoryImpl @Inject constructor( private val _state = MutableStateFlow(WorkoutTrackingState()) override val state: StateFlow = _state.asStateFlow() + @Volatile + private var savedRoute: SavedRoute? = null private val mutex = Mutex() override suspend fun start( @@ -33,7 +36,10 @@ internal class WorkoutTrackingRepositoryImpl @Inject constructor( startedAt: Instant, ): Result = mutex.withLock { val record = WorkoutRecord.started(workout, type, startedAt, clock.instant()) - recordRepository.startRecord(record).onSuccess { _state.value = WorkoutTrackingState(record = record) } + recordRepository.startRecord(record).onSuccess { + _state.value = WorkoutTrackingState(record = record) + savedRoute = null + } } override suspend fun pause(): Result = updateStatus { it.paused(clock.instant()) } @@ -82,7 +88,18 @@ internal class WorkoutTrackingRepositoryImpl @Inject constructor( recordRepository.saveRecord(finished).onSuccess { _state.value = _state.value.copy(record = finished) } } + override suspend fun markSaved(): Result = mutex.withLock { + val current = _state.value + val record = current.record ?: return@withLock Result.success(Unit) + savedRoute = SavedRoute(record.activityId, current.trackPoints) + recordRepository.deleteRecord(record.activityId).onSuccess { _state.value = WorkoutTrackingState() } + } + + override fun getSavedTrackPoints(activityId: Long): List? = + savedRoute?.takeIf { it.activityId == activityId }?.trackPoints + override suspend fun clear(): Result = mutex.withLock { + savedRoute = null val record = _state.value.record ?: return@withLock Result.success(Unit) recordRepository.deleteRecord(record.activityId).onSuccess { _state.value = WorkoutTrackingState() } } @@ -104,3 +121,9 @@ internal class WorkoutTrackingRepositoryImpl @Inject constructor( const val NO_RECORD = "진행 중인 기록이 없음" } } + +// 서버에 저장한 기록의 경로 +private class SavedRoute( + val activityId: Long, + val trackPoints: List, +) diff --git a/core/data/src/test/java/com/routee/android/core/data/workout/repository/WorkoutTrackingRepositoryImplTest.kt b/core/data/src/test/java/com/routee/android/core/data/workout/repository/WorkoutTrackingRepositoryImplTest.kt index a0e8cf57..e3d4b938 100644 --- a/core/data/src/test/java/com/routee/android/core/data/workout/repository/WorkoutTrackingRepositoryImplTest.kt +++ b/core/data/src/test/java/com/routee/android/core/data/workout/repository/WorkoutTrackingRepositoryImplTest.kt @@ -293,6 +293,58 @@ class WorkoutTrackingRepositoryImplTest { assertNull(repository.state.value.record) } + /** + * GIVEN: 경로 좌표를 기록하고 종료한 기록일 때 + * WHEN: 저장을 마쳤다고 표시하면 + * THEN: 기기 기록과 상태는 비우고 경로는 그 기록 ID로만 남긴다 + */ + @Test + fun `저장을 마치면 기기 기록은 지우고 경로는 남긴다`() = runTest { + repository.start(STARTED_WORKOUT, WorkoutType.HIKING, START) + clock.now = START.plusSeconds(1) + repository.addTrackPoint(location(latitude = 37.0, seconds = 1)) + repository.finish() + + repository.markSaved() + + assertNull(recordRepository.getRecord().getOrThrow()) + assertNull(repository.state.value.record) + assertEquals(listOf(1), repository.getSavedTrackPoints(ACTIVITY_ID)?.map { it.pointIndex }) + assertNull(repository.getSavedTrackPoints(ACTIVITY_ID + 1)) + } + + /** + * GIVEN: 저장을 마쳐 경로를 남긴 뒤 + * WHEN: 다음 기록을 시작하면 + * THEN: 남긴 경로를 지운다 + */ + @Test + fun `다음 기록을 시작하면 남긴 경로를 지운다`() = runTest { + repository.start(STARTED_WORKOUT, WorkoutType.HIKING, START) + repository.finish() + repository.markSaved() + + repository.start(STARTED_WORKOUT, WorkoutType.HIKING, START) + + assertNull(repository.getSavedTrackPoints(ACTIVITY_ID)) + } + + /** + * GIVEN: 저장을 마쳐 경로를 남긴 뒤 + * WHEN: 기록을 지우면 + * THEN: 남긴 경로도 지운다 + */ + @Test + fun `기록을 지우면 남긴 경로도 지운다`() = runTest { + repository.start(STARTED_WORKOUT, WorkoutType.HIKING, START) + repository.finish() + repository.markSaved() + + repository.clear() + + assertNull(repository.getSavedTrackPoints(ACTIVITY_ID)) + } + private fun record() = WorkoutRecord( activityId = ACTIVITY_ID, title = "2026.10.22 기록", diff --git a/core/domain/src/main/java/com/routee/android/core/domain/timeline/GetTimelineTrackUseCase.kt b/core/domain/src/main/java/com/routee/android/core/domain/timeline/GetTimelineTrackUseCase.kt new file mode 100644 index 00000000..f5c26ebf --- /dev/null +++ b/core/domain/src/main/java/com/routee/android/core/domain/timeline/GetTimelineTrackUseCase.kt @@ -0,0 +1,36 @@ +package com.routee.android.core.domain.timeline + +import com.routee.android.core.data.recap.model.ActivityTrack +import com.routee.android.core.data.recap.model.TimelineMarker +import com.routee.android.core.data.recap.model.TrackPoint as ActivityTrackPoint +import com.routee.android.core.data.recap.repository.RecapRepository +import com.routee.android.core.data.workout.model.TrackPoint as WorkoutTrackPoint +import com.routee.android.core.data.workout.model.WorkoutPhoto +import com.routee.android.core.data.workout.repository.WorkoutPhotoRepository +import com.routee.android.core.data.workout.repository.WorkoutTrackingRepository +import javax.inject.Inject + +/** 타임라인 지도 경로와 사진 마커, 기기에 남긴 경로가 있으면 서버를 부르지 않음 */ +class GetTimelineTrackUseCase @Inject constructor( + private val trackingRepository: WorkoutTrackingRepository, + private val photoRepository: WorkoutPhotoRepository, + private val recapRepository: RecapRepository, +) { + suspend operator fun invoke(activityId: Long): Result { + val deviceRoute = trackingRepository.getSavedTrackPoints(activityId) + ?: return recapRepository.getActivityTrack(activityId) + val markers = photoRepository.photos.value.toTimelineMarkers(activityId) + return Result.success(ActivityTrack(deviceRoute.map { it.toActivityTrackPoint() }, markers)) + } +} + +private fun WorkoutTrackPoint.toActivityTrackPoint() = ActivityTrackPoint(latitude, longitude, elevation, pointIndex) + +// 서버에 올린 사진만 +private fun List.toTimelineMarkers(activityId: Long): List = + filter { it.activityId == activityId } + .mapNotNull { photo -> + val timelineId = photo.timelineId ?: return@mapNotNull null + val imageUrl = photo.imageUrl() ?: return@mapNotNull null + TimelineMarker(timelineId, imageUrl, photo.point.latitude, photo.point.longitude, photo.point.pointIndex) + } diff --git a/core/domain/src/main/java/com/routee/android/core/domain/workout/SaveFinishedWorkoutUseCase.kt b/core/domain/src/main/java/com/routee/android/core/domain/workout/SaveFinishedWorkoutUseCase.kt index 93663a15..edf46c91 100644 --- a/core/domain/src/main/java/com/routee/android/core/domain/workout/SaveFinishedWorkoutUseCase.kt +++ b/core/domain/src/main/java/com/routee/android/core/domain/workout/SaveFinishedWorkoutUseCase.kt @@ -31,8 +31,8 @@ class SaveFinishedWorkoutUseCase @Inject constructor( val missingPhotoCount = photoRepository.syncPhotos(record.activityId) remoteRepository.completeWorkout(record, state.trackPoints, objectKey) .getOrElse { return failed(it) } - // 타임라인이 서버를 다시 부르지 않게 사진은 남김, 다음 운동 시작이나 로그아웃 때 지움 - trackingRepository.clear() + // 타임라인에 쓰게 경로와 사진은 남김 + trackingRepository.markSaved() return if (missingPhotoCount > 0) WorkoutSaveResult.PhotosMissing else WorkoutSaveResult.Saved } 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 8c3ace82..b0699e11 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 @@ -114,6 +114,10 @@ class ClearDeviceDataUseCaseTest { override suspend fun finish(endedAt: Instant?): Result = Result.success(Unit) + override suspend fun markSaved(): Result = Result.success(Unit) + + override fun getSavedTrackPoints(activityId: Long): List? = null + override suspend fun clear(): Result { isCleared = true return Result.success(Unit) diff --git a/core/domain/src/test/java/com/routee/android/core/domain/timeline/GetTimelineTrackUseCaseTest.kt b/core/domain/src/test/java/com/routee/android/core/domain/timeline/GetTimelineTrackUseCaseTest.kt new file mode 100644 index 00000000..bdf58370 --- /dev/null +++ b/core/domain/src/test/java/com/routee/android/core/domain/timeline/GetTimelineTrackUseCaseTest.kt @@ -0,0 +1,88 @@ +package com.routee.android.core.domain.timeline + +import com.routee.android.core.data.recap.model.ActivityRecap +import com.routee.android.core.data.recap.model.ActivityTrack +import com.routee.android.core.data.recap.model.RecapEditorData +import com.routee.android.core.data.recap.model.RecapResource +import com.routee.android.core.data.recap.model.TimelineMarker +import com.routee.android.core.data.recap.repository.RecapRepository +import com.routee.android.core.domain.workout.FakePhotoTrackingRepository +import com.routee.android.core.domain.workout.FakeWorkoutPhotoRepository +import com.routee.android.core.domain.workout.photoTrackPoint +import com.routee.android.core.domain.workout.workoutPhoto +import java.io.File +import java.time.YearMonth +import kotlinx.coroutines.test.runTest +import org.junit.Assert.assertEquals +import org.junit.Test + +class GetTimelineTrackUseCaseTest { + private val tracking = FakePhotoTrackingRepository(points = 0) + private val photos = FakeWorkoutPhotoRepository() + private val recap = FakeRecapRepository() + private val getTimelineTrack = GetTimelineTrackUseCase(tracking, photos, recap) + + /** + * GIVEN: 저장을 마친 기록의 경로가 기기에 남아 있을 때 + * WHEN: 경로를 조회하면 + * THEN: 서버를 부르지 않고 기기 경로와 이 기록의 올린 사진만 마커로 돌려준다 + */ + @Test + fun `기기에 남긴 경로가 있으면 서버를 부르지 않는다`() = runTest { + tracking.savedRoute = ACTIVITY_ID to listOf(photoTrackPoint(0), photoTrackPoint(1)) + photos.setPhotos( + listOf( + workoutPhoto(1).copy(timelineId = 11), + workoutPhoto(2), + workoutPhoto(3, activityId = 8).copy(timelineId = 13), + ), + ) + + val result = getTimelineTrack(ACTIVITY_ID).getOrThrow() + + assertEquals(listOf(0, 1), result.trackPoints.map { it.pointIndex }) + assertEquals( + listOf(TimelineMarker(11, File("photo-1.jpg").toURI().toString(), 37.0, 127.0, 1)), + result.timelineMarkers, + ) + assertEquals(0, recap.trackRequestCount) + } + + /** + * GIVEN: 앱이 다시 켜져 기기에 경로가 없을 때 + * WHEN: 경로를 조회하면 + * THEN: 서버에서 조회한다 + */ + @Test + fun `기기에 경로가 없으면 서버에서 조회한다`() = runTest { + val result = getTimelineTrack(ACTIVITY_ID).getOrThrow() + + assertEquals(SERVER_TRACK, result) + assertEquals(1, recap.trackRequestCount) + } + + private class FakeRecapRepository : RecapRepository { + var trackRequestCount = 0 + + override suspend fun getMonthlyRecaps(month: YearMonth): Result> = error("Unused") + + override suspend fun updateRecapTitle( + activityId: Long, + title: String, + ): Result = error("Unused") + + override suspend fun getRecapResource(activityId: Long): Result = error("Unused") + + override suspend fun getActivityTrack(activityId: Long): Result { + trackRequestCount++ + return Result.success(SERVER_TRACK) + } + + override suspend fun getRecapEditorData(activityId: Long): Result = error("Unused") + } + + private companion object { + const val ACTIVITY_ID = 7L + val SERVER_TRACK = ActivityTrack(emptyList(), emptyList()) + } +} diff --git a/core/domain/src/test/java/com/routee/android/core/domain/workout/SaveFinishedWorkoutUseCaseTest.kt b/core/domain/src/test/java/com/routee/android/core/domain/workout/SaveFinishedWorkoutUseCaseTest.kt index 3721f85b..a3247a3a 100644 --- a/core/domain/src/test/java/com/routee/android/core/domain/workout/SaveFinishedWorkoutUseCaseTest.kt +++ b/core/domain/src/test/java/com/routee/android/core/domain/workout/SaveFinishedWorkoutUseCaseTest.kt @@ -32,10 +32,10 @@ class SaveFinishedWorkoutUseCaseTest { /** * GIVEN: 경로 좌표가 2개 이상인 종료한 기록일 때 * WHEN: 지도 캡처와 함께 저장하면 - * THEN: 캡처를 올리고, 받은 키로 완료한 뒤 기기 기록을 지운다 + * THEN: 캡처를 올리고, 받은 키로 완료한 뒤 타임라인에 쓸 경로만 남기고 기기 기록을 지운다 */ @Test - fun `저장하면 캡처를 올리고 완료한 뒤 기기 기록을 지운다`() = runTest { + fun `저장하면 캡처를 올리고 완료한 뒤 경로만 남기고 기기 기록을 지운다`() = runTest { tracking.state(points = 2) val result = saveFinishedWorkout(JPEG) @@ -43,7 +43,8 @@ class SaveFinishedWorkoutUseCaseTest { assertEquals(WorkoutSaveResult.Saved, result) assertEquals(JPEG, mapImages.uploadedJpeg) assertEquals("map-key", remote.completedKey) - assertTrue(tracking.isCleared) + assertTrue(tracking.isSaved) + assertFalse(tracking.isCleared) } /** @@ -184,6 +185,7 @@ class SaveFinishedWorkoutUseCaseTest { private val _state = MutableStateFlow(WorkoutTrackingState()) override val state: StateFlow = _state var isCleared = false + var isSaved = false fun state( points: Int, @@ -210,6 +212,14 @@ class SaveFinishedWorkoutUseCaseTest { override suspend fun finish(endedAt: Instant?): Result = Result.success(Unit) + override suspend fun markSaved(): Result { + isSaved = true + _state.value = WorkoutTrackingState() + return Result.success(Unit) + } + + override fun getSavedTrackPoints(activityId: Long): List? = null + override suspend fun clear(): Result { isCleared = true _state.value = WorkoutTrackingState() diff --git a/core/domain/src/test/java/com/routee/android/core/domain/workout/TrackWorkoutUseCaseTest.kt b/core/domain/src/test/java/com/routee/android/core/domain/workout/TrackWorkoutUseCaseTest.kt index e8b5d67a..0d6c6b39 100644 --- a/core/domain/src/test/java/com/routee/android/core/domain/workout/TrackWorkoutUseCaseTest.kt +++ b/core/domain/src/test/java/com/routee/android/core/domain/workout/TrackWorkoutUseCaseTest.kt @@ -3,6 +3,7 @@ package com.routee.android.core.domain.workout import com.routee.android.core.data.location.model.DeviceLocation import com.routee.android.core.data.location.repository.LocationRepository 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 import com.routee.android.core.data.workout.model.WorkoutStatus import com.routee.android.core.data.workout.model.WorkoutTrackingState @@ -180,6 +181,10 @@ class TrackWorkoutUseCaseTest { override suspend fun finish(endedAt: Instant?): Result = Result.success(Unit) + override suspend fun markSaved(): Result = Result.success(Unit) + + override fun getSavedTrackPoints(activityId: Long): List? = null + override suspend fun clear(): Result = Result.success(Unit) private fun record() = WorkoutRecord( diff --git a/core/domain/src/test/java/com/routee/android/core/domain/workout/WorkoutPhotoTestFixtures.kt b/core/domain/src/test/java/com/routee/android/core/domain/workout/WorkoutPhotoTestFixtures.kt index 9b4e79ef..94d5a5f6 100644 --- a/core/domain/src/test/java/com/routee/android/core/domain/workout/WorkoutPhotoTestFixtures.kt +++ b/core/domain/src/test/java/com/routee/android/core/domain/workout/WorkoutPhotoTestFixtures.kt @@ -57,6 +57,7 @@ internal class FakePhotoTrackingRepository( ) override val state: StateFlow = _state val added = mutableListOf() + var savedRoute: Pair>? = null override suspend fun start( workout: StartedWorkout, @@ -80,6 +81,11 @@ internal class FakePhotoTrackingRepository( override suspend fun finish(endedAt: Instant?): Result = Result.success(Unit) + override suspend fun markSaved(): Result = Result.success(Unit) + + override fun getSavedTrackPoints(activityId: Long): List? = + savedRoute?.takeIf { it.first == activityId }?.second + override suspend fun clear(): Result = Result.success(Unit) private companion object { 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 dfab515d..e6fa4750 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 @@ -65,6 +65,10 @@ internal class FakeWorkoutTrackingRepository : WorkoutTrackingRepository { override suspend fun finish(endedAt: Instant?): Result = Result.success(Unit) + override suspend fun markSaved(): Result = Result.success(Unit) + + override fun getSavedTrackPoints(activityId: Long): List? = null + override suspend fun clear(): Result = Result.success(Unit) } diff --git a/feature/timeline/impl/src/main/java/com/routee/android/feature/timeline/main/TimelineViewModel.kt b/feature/timeline/impl/src/main/java/com/routee/android/feature/timeline/main/TimelineViewModel.kt index c043882a..1b6b04d8 100644 --- a/feature/timeline/impl/src/main/java/com/routee/android/feature/timeline/main/TimelineViewModel.kt +++ b/feature/timeline/impl/src/main/java/com/routee/android/feature/timeline/main/TimelineViewModel.kt @@ -8,8 +8,8 @@ import androidx.lifecycle.viewModelScope import com.routee.android.core.data.archive.model.ArchivePhoto import com.routee.android.core.data.archive.repository.ArchiveDetailRepository import com.routee.android.core.data.photo.GalleryImageStore -import com.routee.android.core.data.recap.repository.RecapRepository import com.routee.android.core.domain.timeline.GetTimelinePhotosUseCase +import com.routee.android.core.domain.timeline.GetTimelineTrackUseCase import com.routee.android.core.navigation.util.NavKeyViewModelFactory import com.routee.android.core.ui.UiState import com.routee.android.feature.timeline.api.TimelineNavKey @@ -41,7 +41,7 @@ internal class TimelineViewModel @AssistedInject constructor( private val galleryImageStore: GalleryImageStore, private val recordSaver: TimelineRecordSaver, private val archiveDetailRepository: ArchiveDetailRepository, - private val recapRepository: RecapRepository, + private val getTimelineTrack: GetTimelineTrackUseCase, private val getTimelinePhotos: GetTimelinePhotosUseCase, ) : ViewModel() { val activityId = key.activityId @@ -110,7 +110,7 @@ internal class TimelineViewModel @AssistedInject constructor( private fun loadTrack() { viewModelScope.launch { - recapRepository.getActivityTrack(activityId) + getTimelineTrack(activityId) .onSuccess { track -> _uiState.update { it.copy(track = UiState.Success(track.toTimelineTrack())) } } .onFailure { error -> Timber.e(error, "경로 조회 실패") diff --git a/feature/workout/impl/src/test/java/com/routee/android/feature/workout/FakeWorkoutRepositories.kt b/feature/workout/impl/src/test/java/com/routee/android/feature/workout/FakeWorkoutRepositories.kt index 814d1473..777aa0ce 100644 --- a/feature/workout/impl/src/test/java/com/routee/android/feature/workout/FakeWorkoutRepositories.kt +++ b/feature/workout/impl/src/test/java/com/routee/android/feature/workout/FakeWorkoutRepositories.kt @@ -86,6 +86,11 @@ internal class FakeWorkoutTrackingRepository( return Result.success(Unit) } + // 저장을 마쳐도 기기 기록은 지움 + override suspend fun markSaved(): Result = clear() + + override fun getSavedTrackPoints(activityId: Long): List? = null + override suspend fun clear(): Result { isCleared = true _state.value = WorkoutTrackingState()