-
Notifications
You must be signed in to change notification settings - Fork 1
[BUGFIX] 운세 생성 상태에 만료 기한 추가하여 유령 Creating 문제 해결 #257
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
Merged
Merged
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
1d8b5c3
[REFACTOR/#256] FortunePreferences 분리
DongChyeon 5b25d71
[FEAT/#256] 유령 Creating 상태를 방지하기 위해 attemptId와 leaseTime 도입
DongChyeon 3347a95
[FEAT/#256] 만료 시간 또는 attemptId가 없는 레거시의 경우 실패로 처리
DongChyeon 7653038
[FEAT/#256] 운세 생성 성공이나 실패 시 시도 메타데이터 제거
DongChyeon c87bad1
[FIX/#256] CoroutineCancellationException 발생 시 WorkManager로 에러 전파
DongChyeon d2c4881
[TEST/#256] 운세 생성 및 상태 관리 로직 테스트 코드 추가
DongChyeon a19c919
[FEAT/#256] 운세 생성 성공 처리 시 만료 상태 확인 로직 추가
DongChyeon 3108e6f
[TEST/#256] 운세 생성 상태 만료 후 Success 처리 시 미반영 되는 로직 검증
DongChyeon File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
212 changes: 212 additions & 0 deletions
212
core/datastore/src/main/java/com/yapp/datastore/FortunePreferences.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,212 @@ | ||
| package com.yapp.datastore | ||
|
|
||
| import androidx.datastore.core.DataStore | ||
| import androidx.datastore.preferences.core.Preferences | ||
| import androidx.datastore.preferences.core.booleanPreferencesKey | ||
| import androidx.datastore.preferences.core.edit | ||
| import androidx.datastore.preferences.core.emptyPreferences | ||
| import androidx.datastore.preferences.core.intPreferencesKey | ||
| import androidx.datastore.preferences.core.longPreferencesKey | ||
| import androidx.datastore.preferences.core.stringPreferencesKey | ||
| import kotlinx.coroutines.ExperimentalCoroutinesApi | ||
| import kotlinx.coroutines.flow.Flow | ||
| import kotlinx.coroutines.flow.catch | ||
| import kotlinx.coroutines.flow.distinctUntilChanged | ||
| import kotlinx.coroutines.flow.map | ||
| import kotlinx.coroutines.flow.transformLatest | ||
| import java.time.Clock | ||
| import java.time.Instant | ||
| import java.time.LocalDate | ||
| import javax.inject.Inject | ||
| import javax.inject.Singleton | ||
|
|
||
| @Singleton | ||
| class FortunePreferences @Inject constructor( | ||
| private val dataStore: DataStore<Preferences>, | ||
| private val clock: Clock, | ||
| ) { | ||
| private object Keys { | ||
| val ID = longPreferencesKey("fortune_id") | ||
| val DATE = longPreferencesKey("fortune_date_epoch") | ||
| val IMAGE_ID = intPreferencesKey("fortune_image_id") | ||
| val SCORE = intPreferencesKey("fortune_score") | ||
| val SEEN = booleanPreferencesKey("fortune_seen") | ||
| val TOOLTIP_SHOWN = booleanPreferencesKey("fortune_tooltip_shown") | ||
|
|
||
| val CREATING = booleanPreferencesKey("fortune_creating") | ||
| val FAILED = booleanPreferencesKey("fortune_failed") | ||
|
|
||
| val ATTEMPT_ID = stringPreferencesKey("fortune_attempt_id") | ||
| val STARTED_AT = longPreferencesKey("fortune_started_at") | ||
| val EXPIRES_AT = longPreferencesKey("fortune_expires_at") | ||
|
|
||
| val FIRST_ALARM_DISMISSED_TODAY = booleanPreferencesKey("first_alarm_dismissed_today") | ||
| val FIRST_ALARM_DISMISSED_DATE_EPOCH = longPreferencesKey("first_alarm_dismissed_date_epoch") | ||
| } | ||
|
|
||
| private fun todayEpoch(): Long = LocalDate.now(clock).toEpochDay() | ||
| private fun nowMillis(): Long = Instant.now(clock).toEpochMilli() | ||
|
|
||
| val fortuneIdFlow: Flow<Long?> = dataStore.data | ||
| .catch { emit(emptyPreferences()) } | ||
| .map { it[Keys.ID] } | ||
| .distinctUntilChanged() | ||
|
|
||
| val fortuneDateEpochFlow: Flow<Long?> = dataStore.data | ||
| .catch { emit(emptyPreferences()) } | ||
| .map { it[Keys.DATE] } | ||
| .distinctUntilChanged() | ||
|
|
||
| val fortuneImageIdFlow: Flow<Int?> = dataStore.data | ||
| .catch { emit(emptyPreferences()) } | ||
| .map { it[Keys.IMAGE_ID] } | ||
| .distinctUntilChanged() | ||
|
|
||
| val fortuneScoreFlow: Flow<Int?> = dataStore.data | ||
| .catch { emit(emptyPreferences()) } | ||
| .map { it[Keys.SCORE] } | ||
| .distinctUntilChanged() | ||
|
|
||
| val hasUnseenFortuneFlow: Flow<Boolean> = dataStore.data | ||
| .catch { emit(emptyPreferences()) } | ||
| .map { pref -> | ||
| val isToday = pref[Keys.DATE] == todayEpoch() | ||
| isToday && (pref[Keys.ID] != null) && (pref[Keys.SEEN] != true) | ||
| } | ||
| .distinctUntilChanged() | ||
|
|
||
| val shouldShowFortuneToolTipFlow: Flow<Boolean> = dataStore.data | ||
| .catch { emit(emptyPreferences()) } | ||
| .map { pref -> | ||
| val hasTodayFortune = (pref[Keys.DATE] == todayEpoch()) && (pref[Keys.ID] != null) | ||
| val tooltipShown = pref[Keys.TOOLTIP_SHOWN] ?: false | ||
| hasTodayFortune && !tooltipShown | ||
| } | ||
| .distinctUntilChanged() | ||
|
|
||
| @OptIn(ExperimentalCoroutinesApi::class) | ||
| val isFortuneCreatingFlow: Flow<Boolean> = dataStore.data | ||
| .catch { emit(emptyPreferences()) } | ||
| .map { pref -> | ||
| Triple( | ||
| pref[Keys.CREATING] ?: false, | ||
| pref[Keys.EXPIRES_AT] ?: 0L, | ||
| pref[Keys.ATTEMPT_ID], | ||
| ) | ||
| } | ||
| .transformLatest { (creating, expiresAt, attemptId) -> | ||
| if (creating) { | ||
| val legacy = (expiresAt <= 0L) || attemptId.isNullOrEmpty() | ||
| val expired = (!legacy && nowMillis() > expiresAt) | ||
|
|
||
| if (legacy || expired) { | ||
| // 레거시(만료정보 없음) 또는 만료 → 실패로 교정 | ||
| dataStore.edit { pref -> | ||
| pref[Keys.CREATING] = false | ||
| pref[Keys.FAILED] = true | ||
| } | ||
| emit(false) | ||
| return@transformLatest | ||
| } | ||
| } | ||
| emit(creating) | ||
| } | ||
| .distinctUntilChanged() | ||
|
|
||
| val isFortuneFailedFlow: Flow<Boolean> = dataStore.data | ||
| .catch { emit(emptyPreferences()) } | ||
| .map { it[Keys.FAILED] ?: false } | ||
| .distinctUntilChanged() | ||
|
|
||
| val isFirstAlarmDismissedTodayFlow: Flow<Boolean> = dataStore.data | ||
| .catch { emit(emptyPreferences()) } | ||
| .map { pref -> | ||
| val flag = pref[Keys.FIRST_ALARM_DISMISSED_TODAY] ?: false | ||
| val isToday = pref[Keys.FIRST_ALARM_DISMISSED_DATE_EPOCH] == todayEpoch() | ||
| flag && isToday | ||
| } | ||
| .distinctUntilChanged() | ||
|
|
||
| suspend fun markFortuneCreating( | ||
| attemptId: String, | ||
| lease: Long, | ||
| ) { | ||
| val now = nowMillis() | ||
| dataStore.edit { pref -> | ||
| pref[Keys.CREATING] = true | ||
| pref[Keys.FAILED] = false | ||
| pref[Keys.ATTEMPT_ID] = attemptId | ||
| pref[Keys.STARTED_AT] = now | ||
| pref[Keys.EXPIRES_AT] = now + lease | ||
| } | ||
| } | ||
|
|
||
| suspend fun markFortuneCreatedIfAttemptMatches( | ||
| attemptId: String, | ||
| fortuneId: Long, | ||
| ) { | ||
| dataStore.edit { pref -> | ||
| val currentAttempt = pref[Keys.ATTEMPT_ID] | ||
| if (currentAttempt == attemptId) { | ||
| val today = todayEpoch() | ||
| val prevDate = pref[Keys.DATE] | ||
| val isNewForToday = (pref[Keys.ID] != fortuneId) || (prevDate != today) | ||
|
|
||
| pref[Keys.ID] = fortuneId | ||
| pref[Keys.DATE] = today | ||
| pref[Keys.CREATING] = false | ||
| pref[Keys.FAILED] = false | ||
|
|
||
| if (isNewForToday) { | ||
| pref[Keys.SEEN] = false | ||
| pref[Keys.TOOLTIP_SHOWN] = false | ||
| } | ||
| } | ||
DongChyeon marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
| } | ||
|
|
||
| suspend fun markFortuneFailedIfAttemptMatches(attemptId: String) { | ||
| dataStore.edit { pref -> | ||
| if (pref[Keys.ATTEMPT_ID] == attemptId) { | ||
| pref[Keys.CREATING] = false | ||
| pref[Keys.FAILED] = true | ||
| } | ||
| } | ||
| } | ||
DongChyeon marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| suspend fun markFortuneSeen() { | ||
| dataStore.edit { it[Keys.SEEN] = true } | ||
| } | ||
|
|
||
| suspend fun markFortuneTooltipShown() { | ||
| dataStore.edit { it[Keys.TOOLTIP_SHOWN] = true } | ||
| } | ||
|
|
||
| suspend fun saveFortuneImageId(imageResId: Int) { | ||
| dataStore.edit { it[Keys.IMAGE_ID] = imageResId } | ||
| } | ||
|
|
||
| suspend fun saveFortuneScore(score: Int) { | ||
| dataStore.edit { it[Keys.SCORE] = score } | ||
| } | ||
|
|
||
| suspend fun markFirstAlarmDismissedToday() { | ||
| dataStore.edit { pref -> | ||
| pref[Keys.FIRST_ALARM_DISMISSED_TODAY] = true | ||
| pref[Keys.FIRST_ALARM_DISMISSED_DATE_EPOCH] = todayEpoch() | ||
| } | ||
| } | ||
|
|
||
| suspend fun clearFortuneData() { | ||
| dataStore.edit { pref -> | ||
| pref.remove(Keys.ID) | ||
| pref.remove(Keys.DATE) | ||
| pref.remove(Keys.IMAGE_ID) | ||
| pref.remove(Keys.SCORE) | ||
| pref.remove(Keys.SEEN) | ||
| pref.remove(Keys.TOOLTIP_SHOWN) | ||
| pref.remove(Keys.CREATING) | ||
| pref.remove(Keys.FAILED) | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.