[TOP-106] FetchToHotStateUseCase에서 UserCard/TopicSelectCard를 TopicAvailableState를 판단해서 내려주도록 변경

cwj-c · cwj-c · commit a928d2e928d2 · 2025-01-05T15:17:43.000+09:00
- ToHotViewModel에서 다음 Card를 조회할 때 FetchToHotStateUseCase를 사용하도록 변경(TopicExpiredCheck를 위함)
diff --git a/data/src/main/java/com/tht/tht/data/di/RepositoryModule.kt b/data/src/main/java/com/tht/tht/data/di/RepositoryModule.kt
@@ -13,7 +13,7 @@ import com.tht.tht.data.repository.SignupRepositoryImpl
 import com.tht.tht.data.repository.TokenRepositoryImpl
 import com.tht.tht.data.repository.UserSettingRepositoryImpl
 import com.tht.tht.domain.chat.repository.ChatRepository
-import com.tht.tht.domain.dailyusercard.DailyUserCardRepository
+import com.tht.tht.domain.tohot.DailyUserCardRepository
 import com.tht.tht.domain.email.repository.EmailRepository
 import com.tht.tht.domain.image.ImageRepository
 import com.tht.tht.domain.login.repository.LoginRepository
diff --git a/data/src/main/java/com/tht/tht/data/di/UseCaseModule.kt b/data/src/main/java/com/tht/tht/data/di/UseCaseModule.kt
@@ -2,8 +2,6 @@ package com.tht.tht.data.di
 
 import com.tht.tht.domain.chat.repository.ChatRepository
 import com.tht.tht.domain.chat.usecase.GetChatListUseCase
-import com.tht.tht.domain.dailyusercard.DailyUserCardRepository
-import com.tht.tht.domain.dailyusercard.FetchDailyUserCardUseCase
 import com.tht.tht.domain.email.repository.EmailRepository
 import com.tht.tht.domain.email.usecase.SendInquiryEmailUseCase
 import com.tht.tht.domain.image.ImageRepository
@@ -19,7 +17,24 @@ import com.tht.tht.domain.setting.usecase.FetchSettingManageItemsUseCase
 import com.tht.tht.domain.signup.repository.LocationRepository
 import com.tht.tht.domain.signup.repository.RegionCodeRepository
 import com.tht.tht.domain.signup.repository.SignupRepository
-import com.tht.tht.domain.signup.usecase.*
+import com.tht.tht.domain.signup.usecase.CheckLoginEnableUseCase
+import com.tht.tht.domain.signup.usecase.CheckNicknameDuplicateUseCase
+import com.tht.tht.domain.signup.usecase.CreateSignupUserUseCase
+import com.tht.tht.domain.signup.usecase.FetchCurrentLocationUseCase
+import com.tht.tht.domain.signup.usecase.FetchIdealTypeUseCase
+import com.tht.tht.domain.signup.usecase.FetchInterestUseCase
+import com.tht.tht.domain.signup.usecase.FetchLocationByAddressUseCase
+import com.tht.tht.domain.signup.usecase.FetchRegionCodeUseCase
+import com.tht.tht.domain.signup.usecase.FetchSignupUserUseCase
+import com.tht.tht.domain.signup.usecase.FetchTermsUseCase
+import com.tht.tht.domain.signup.usecase.PatchLocationUseCase
+import com.tht.tht.domain.signup.usecase.PatchSignupDataUseCase
+import com.tht.tht.domain.signup.usecase.RemoveSignupUserUseCase
+import com.tht.tht.domain.signup.usecase.RequestAuthenticationUseCase
+import com.tht.tht.domain.signup.usecase.RequestPhoneVerifyUseCase
+import com.tht.tht.domain.signup.usecase.RequestSignupUseCase
+import com.tht.tht.domain.tohot.DailyUserCardRepository
+import com.tht.tht.domain.tohot.FetchDailyUserCardUseCase
 import com.tht.tht.domain.tohot.FetchToHotStateUseCase
 import com.tht.tht.domain.token.repository.TokenRepository
 import com.tht.tht.domain.token.token.CheckAndRefreshThtAccessTokenUseCase
@@ -272,10 +287,10 @@ object UseCaseModule {
     @Provides
     fun provideFetchToHotStateUseCase(
         topicRepository: DailyTopicRepository,
-        userCardRepository: DailyUserCardRepository,
+        fetchDailyUserCardUseCase: FetchDailyUserCardUseCase,
         fetchDailyTopicListUseCase: FetchDailyTopicListUseCase
     ): FetchToHotStateUseCase =
-        FetchToHotStateUseCase(topicRepository, userCardRepository, fetchDailyTopicListUseCase)
+        FetchToHotStateUseCase(topicRepository, fetchDailyUserCardUseCase, fetchDailyTopicListUseCase)
 
     @Provides
     fun provideReportUserUseCase(
diff --git a/data/src/main/java/com/tht/tht/data/remote/mapper/DailyTopicMapper.kt b/data/src/main/java/com/tht/tht/data/remote/mapper/DailyTopicMapper.kt
@@ -1,7 +1,7 @@
 package com.tht.tht.data.remote.mapper
 
 import com.tht.tht.data.remote.response.topic.DailyTopicResponse
-import com.tht.tht.domain.topic.DailyTopicListModel
+import com.tht.tht.domain.tohot.DailyTopicListModel
 import com.tht.tht.domain.topic.DailyTopicModel
 
 fun DailyTopicResponse.toModel(): DailyTopicListModel {
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
@@ -1,8 +1,8 @@
 package com.tht.tht.data.remote.mapper
 
 import com.tht.tht.data.remote.response.dailyusercard.DailyUserCardResponse
-import com.tht.tht.domain.dailyusercard.DailyUserCardListModel
-import com.tht.tht.domain.dailyusercard.DailyUserCardModel
+import com.tht.tht.domain.tohot.DailyUserCardListModel
+import com.tht.tht.domain.tohot.DailyUserCardModel
 import com.tht.tht.domain.signup.model.IdealTypeModel
 import com.tht.tht.domain.signup.model.InterestModel
 
diff --git a/data/src/main/java/com/tht/tht/data/repository/DailyTopicRepositoryImpl.kt b/data/src/main/java/com/tht/tht/data/repository/DailyTopicRepositoryImpl.kt
@@ -3,7 +3,7 @@ package com.tht.tht.data.repository
 import com.tht.tht.data.remote.datasource.topic.DailyTopicDataSource
 import com.tht.tht.data.remote.mapper.toEntity
 import com.tht.tht.data.remote.mapper.toModel
-import com.tht.tht.domain.topic.DailyTopicListModel
+import com.tht.tht.domain.tohot.DailyTopicListModel
 import com.tht.tht.domain.topic.DailyTopicRepository
 import javax.inject.Inject
 
diff --git a/data/src/main/java/com/tht/tht/data/repository/DailyUserCardRepositoryImpl.kt b/data/src/main/java/com/tht/tht/data/repository/DailyUserCardRepositoryImpl.kt
@@ -3,8 +3,8 @@ package com.tht.tht.data.repository
 import com.tht.tht.data.remote.datasource.dailyusercard.DailyUserCardDataSource
 import com.tht.tht.data.remote.mapper.toModel
 import com.tht.tht.data.remote.request.dailyusercard.DailyUserCardRequest
-import com.tht.tht.domain.dailyusercard.DailyUserCardListModel
-import com.tht.tht.domain.dailyusercard.DailyUserCardRepository
+import com.tht.tht.domain.tohot.DailyUserCardListModel
+import com.tht.tht.domain.tohot.DailyUserCardRepository
 import javax.inject.Inject
 
 class DailyUserCardRepositoryImpl @Inject constructor(
diff --git a/domain/src/main/java/com/tht/tht/domain/tohot/DailyUserCardListModel.kt b/domain/src/main/java/com/tht/tht/domain/tohot/DailyUserCardListModel.kt
@@ -1,4 +1,4 @@
-package com.tht.tht.domain.dailyusercard
+package com.tht.tht.domain.tohot
 
 data class DailyUserCardListModel(
     val selectTopicIdx: Int,
diff --git a/domain/src/main/java/com/tht/tht/domain/tohot/DailyUserCardRepository.kt b/domain/src/main/java/com/tht/tht/domain/tohot/DailyUserCardRepository.kt
@@ -1,4 +1,4 @@
-package com.tht.tht.domain.dailyusercard
+package com.tht.tht.domain.tohot
 
 interface DailyUserCardRepository {
     suspend fun fetchDailyUserCard(
diff --git a/domain/src/main/java/com/tht/tht/domain/tohot/FetchDailyUserCardUseCase.kt b/domain/src/main/java/com/tht/tht/domain/tohot/FetchDailyUserCardUseCase.kt
@@ -1,6 +1,5 @@
-package com.tht.tht.domain.dailyusercard
+package com.tht.tht.domain.tohot
 
-//TODO: Topic Expire Check? 그리고 알잘딱깔센 List 내려주기? -> FetchToHotStateUseCase랑 차이점은?
 class FetchDailyUserCardUseCase(
     private val repository: DailyUserCardRepository
 ) {
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
@@ -1,51 +1,57 @@
 package com.tht.tht.domain.tohot
 
-import com.tht.tht.domain.dailyusercard.DailyUserCardRepository
 import com.tht.tht.domain.topic.DailyTopicRepository
 import com.tht.tht.domain.topic.FetchDailyTopicListUseCase
 
 /**
- *  1. DailyUserCardRepository 조회
- *   - 금일 동일 토픽을 선택한 User 목록 조회
- *   - 금일 내가 선택한 주제어 idx 조회 -> 주제어 목록에서 selectTopicIdx로 금일 내가 선택한 주제어 정보 확인 가능
+ * 1. Topic 정보 조회 + 오늘 선택한 Topic 상태 확인
+ *  - FetchDailyUserCardUseCase 에서 selectTopicIdx 를 확인 가능
+ *  - FetchDailyTopicListUseCase 에서 DailyTopic 정보 확인 가능
  *
- *  2. Local에 캐싱한 주제어 목록 정보 조회
- *   - 만료되었다면 Remote에서 새로 불러옴
- *   - selectTopicIdx가 음수면 Remote에서 새로 불러옴
- *  3.
+ * 2. SelectTopicState 에 따라서 다음 Card 데이터 리턴
+ * - 유효 하다면 UserListCard
+ * - 유효 하지 않다면 TopicSelectCard
  */
 class FetchToHotStateUseCase(
     private val topicRepository: DailyTopicRepository,
-    private val userCardRepository: DailyUserCardRepository,
+    private val fetchDailyUserCardUseCase: FetchDailyUserCardUseCase,
     private val fetchDailyTopicListUseCase: FetchDailyTopicListUseCase
 ) {
     suspend operator fun invoke(
-        currentTimeMill: Long,
+        passedUserIdList: List<String>,
+        lastUserDailyFallingCourserIdx: Int?,
+        now: Long = System.currentTimeMillis(),
         size: Int = 10
     ): Result<ToHotStateModel> {
         return kotlin.runCatching {
-            val userCards = userCardRepository.fetchDailyUserCard(
-                passedUserIdList = emptyList(),
-                lastUserDailyFallingCourserIdx = null,
-                size = size
-            ).copy(
-                selectTopicIdx = -1 //TODO: Remove -> TestCode
-            )
-            val topic = kotlin.runCatching {
-                val localTopic = topicRepository.fetchDailyTopicFromLocal()
-                when {
-                    currentTimeMill > localTopic.topicResetTimeMill -> throw Exception("Topic Expired")
-                    userCards.selectTopicIdx < 0 -> throw Exception("None Select Topic")
-                }
-                localTopic
-            }.getOrNull() ?: kotlin.run {
+            val topicCachedFromLocal = topicRepository.fetchDailyTopicFromLocal()
+            val topic = if (now > topicCachedFromLocal.topicResetTimeMill) {
                 fetchDailyTopicListUseCase().getOrThrow()
+            } else {
+                topicCachedFromLocal
             }
-            ToHotStateModel(
-                topic = topic,
+
+            val userCards = fetchDailyUserCardUseCase.invoke(
+                passedUserIdList = passedUserIdList,
+                lastUserDailyFallingCourserIdx = lastUserDailyFallingCourserIdx,
+                size = size
+            ).getOrThrow()
+//                .copy(selectTopicIdx = -1) //TODO: Remove -> TestCode
+
+            val topicInfo = ToHotStateModel.TopicInfo(
                 selectTopic = topic.topics.firstOrNull { it.idx == userCards.selectTopicIdx },
                 topicResetTimeMill = userCards.topicResetTimeMill,
-                cards = userCards.cards
+            )
+
+            val cards: List<ToHotCardModel> = if (topicInfo.isAvailableTopic(now)) {
+                userCards.cards
+            } else {
+                listOf(topic)
+            }
+
+            ToHotStateModel(
+                topicInfo = topicInfo,
+                cards = cards
             )
         }
     }
diff --git a/domain/src/main/java/com/tht/tht/domain/tohot/ToHotCardModel.kt b/domain/src/main/java/com/tht/tht/domain/tohot/ToHotCardModel.kt
@@ -1,7 +1,10 @@
-package com.tht.tht.domain.dailyusercard
+package com.tht.tht.domain.tohot
 
 import com.tht.tht.domain.signup.model.IdealTypeModel
 import com.tht.tht.domain.signup.model.InterestModel
+import com.tht.tht.domain.topic.DailyTopicModel
+
+sealed interface ToHotCardModel
 
 data class DailyUserCardModel(
     val id: String,
@@ -14,4 +17,17 @@ data class DailyUserCardModel(
     val profileImgUrl: List<String>,
     val introduce: String,
     val userDailyFallingCourserIdx: Int
-)
+) : ToHotCardModel
+
+data class DailyTopicListModel(
+    val topicResetTimeMill: Long,
+    val introduction: String,
+    val topicSelectType: TopicSelectType,
+    val topics: List<DailyTopicModel>
+) : ToHotCardModel {
+    enum class TopicSelectType {
+        ONE_CHOICE,
+        TWO_CHOICE,
+        FOUR_CHOICE
+    }
+}
diff --git a/domain/src/main/java/com/tht/tht/domain/tohot/ToHotStateModel.kt b/domain/src/main/java/com/tht/tht/domain/tohot/ToHotStateModel.kt
@@ -1,16 +1,17 @@
 package com.tht.tht.domain.tohot
 
-import com.tht.tht.domain.dailyusercard.DailyUserCardModel
-import com.tht.tht.domain.topic.DailyTopicListModel
 import com.tht.tht.domain.topic.DailyTopicModel
 
 data class ToHotStateModel(
-    val topic: DailyTopicListModel,
-    val selectTopic: DailyTopicModel?,
-    val topicResetTimeMill: Long,
-    val cards: List<DailyUserCardModel>,
+    val topicInfo: TopicInfo,
+    val cards: List<ToHotCardModel>,
 ) {
-    fun isAvailableTopic(now: Long = System.currentTimeMillis()): Boolean {
-        return selectTopic != null && now <= topicResetTimeMill
+    data class TopicInfo(
+        val selectTopic: DailyTopicModel?,
+        val topicResetTimeMill: Long,
+    ) {
+        fun isAvailableTopic(now: Long = System.currentTimeMillis()): Boolean {
+            return selectTopic != null && now <= topicResetTimeMill
+        }
     }
 }
diff --git a/domain/src/main/java/com/tht/tht/domain/topic/DailyTopicListModel.kt b/domain/src/main/java/com/tht/tht/domain/topic/DailyTopicListModel.kt
diff --git a/domain/src/main/java/com/tht/tht/domain/topic/DailyTopicRepository.kt b/domain/src/main/java/com/tht/tht/domain/topic/DailyTopicRepository.kt
@@ -1,5 +1,7 @@
 package com.tht.tht.domain.topic
 
+import com.tht.tht.domain.tohot.DailyTopicListModel
+
 interface DailyTopicRepository {
     suspend fun fetchDailyTopic(): DailyTopicListModel
 
diff --git a/domain/src/main/java/com/tht/tht/domain/topic/FetchDailyTopicListUseCase.kt b/domain/src/main/java/com/tht/tht/domain/topic/FetchDailyTopicListUseCase.kt
@@ -1,5 +1,7 @@
 package com.tht.tht.domain.topic
 
+import com.tht.tht.domain.tohot.DailyTopicListModel
+
 class FetchDailyTopicListUseCase(
     private val repository: DailyTopicRepository
 ) {
diff --git a/feature/tohot/src/main/java/tht/feature/tohot/mapper/ToHotUserMapper.kt b/feature/tohot/src/main/java/tht/feature/tohot/mapper/ToHotUserMapper.kt
@@ -1,11 +1,24 @@
 package tht.feature.tohot.mapper
 
-import com.tht.tht.domain.dailyusercard.DailyUserCardListModel
-import com.tht.tht.domain.dailyusercard.DailyUserCardModel
+import com.tht.tht.domain.tohot.DailyTopicListModel
+import com.tht.tht.domain.tohot.DailyUserCardListModel
+import com.tht.tht.domain.tohot.DailyUserCardModel
+import com.tht.tht.domain.tohot.ToHotCardModel
 import tht.feature.tohot.model.ImmutableListWrapper
 import tht.feature.tohot.model.ToHotCardUiModel
 import tht.feature.tohot.model.ToHotUserUiModel
 
+fun ToHotCardModel.toUiModel(): ToHotCardUiModel {
+    return when (this) {
+        is DailyUserCardModel -> {
+            ToHotCardUiModel.User(this.toUiModel())
+        }
+        is DailyTopicListModel -> {
+            ToHotCardUiModel.Topic(this.toUiModel())
+        }
+    }
+}
+
 fun DailyUserCardModel.toUiModel(): ToHotUserUiModel {
     return ToHotUserUiModel(
         id = id,
diff --git a/feature/tohot/src/main/java/tht/feature/tohot/mapper/TopicUiModelMapper.kt b/feature/tohot/src/main/java/tht/feature/tohot/mapper/TopicUiModelMapper.kt
@@ -1,6 +1,6 @@
 package tht.feature.tohot.mapper
 
-import com.tht.tht.domain.topic.DailyTopicListModel
+import com.tht.tht.domain.tohot.DailyTopicListModel
 import com.tht.tht.domain.topic.DailyTopicModel
 import kotlinx.collections.immutable.toImmutableList
 import tht.feature.tohot.R
@@ -19,7 +19,6 @@ fun DailyTopicModel.toUiModel(): TopicUiModel {
     )
 }
 
-// TODO: 적용
 fun DailyTopicListModel.toUiModel(): TopicSelectUiModel {
     val topicExpiredDuration = (topicResetTimeMill - System.currentTimeMillis()).toDuration(DurationUnit.MILLISECONDS)
     return when(topicSelectType) {
diff --git a/feature/tohot/src/main/java/tht/feature/tohot/tohot/viewmodel/ToHotViewModel.kt b/feature/tohot/src/main/java/tht/feature/tohot/tohot/viewmodel/ToHotViewModel.kt

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.tht.tht.domain.dailyusercard`
	`1`	`+package com.tht.tht.domain.tohot`
`2`	`2`
`3`	`3`	`data class DailyUserCardListModel(`
`4`	`4`	`val selectTopicIdx: Int,`