feat:TOP-106 Local에 캐싱된 Topic이 없는 경우 에러 처리

THT-Team · Jan 5, 2025 · 3ef14ee · 3ef14ee
1 parent 171d094
commit 3ef14ee
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/data/src/main/java/com/tht/tht/data/remote/mapper/DailyUserCardMapper.kt b/data/src/main/java/com/tht/tht/data/remote/mapper/DailyUserCardMapper.kt
@@ -10,15 +10,23 @@ fun DailyUserCardResponse.UserInfo.IdealTypeResponse.toModel(): IdealTypeModel {
     return IdealTypeModel(
         title = name,
         key = idx,
-        emojiCode = emojiCode
+        emojiCode = if (emojiCode.startsWith("U+")) {
+            emojiCode.removePrefix("U+")
+        } else {
+            emojiCode
+        }
     )
 }
 
 fun DailyUserCardResponse.UserInfo.InterestResponse.toModel(): InterestModel {
     return InterestModel(
         title = name,
         key = idx,
-        emojiCode = emojiCode
+        emojiCode = if (emojiCode.startsWith("U+")) {
+            emojiCode.removePrefix("U+")
+        } else {
+            emojiCode
+        }
     )
 }
 

diff --git a/domain/src/main/java/com/tht/tht/domain/tohot/FetchToHotStateUseCase.kt b/domain/src/main/java/com/tht/tht/domain/tohot/FetchToHotStateUseCase.kt
@@ -21,8 +21,12 @@ class FetchToHotStateUseCase(
         size: Int = 10
     ): Result<ToHotStateModel> {
         return kotlin.runCatching {
-            val topicCachedFromLocal = topicRepository.fetchDailyTopicFromLocal()
-            val topic = if (now > topicCachedFromLocal.topicResetTimeMill) {
+            val topicCachedFromLocal = runCatching {
+                topicRepository.fetchDailyTopicFromLocal()
+            }.getOrNull()
+            val topic = if (
+                topicCachedFromLocal == null || now > topicCachedFromLocal.topicResetTimeMill
+            ) {
                 fetchDailyTopicListUseCase().getOrThrow()
             } else {
                 topicCachedFromLocal