From 929b39c9f74e6602d1d034ab6acb417363aa6827 Mon Sep 17 00:00:00 2001 From: wjchoi96 Date: Sun, 5 Jan 2025 15:19:17 +0900 Subject: [PATCH] =?UTF-8?q?feat:TOP-106=20domain:topic=20=ED=8C=A8?= =?UTF-8?q?=ED=82=A4=EC=A7=80=20=ED=8C=8C=EC=9D=BC=EC=9D=84=20domain:tohot?= =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EB=AA=A8=EB=91=90=20=EC=9D=B4=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/src/main/java/com/tht/tht/data/di/RepositoryModule.kt | 2 +- data/src/main/java/com/tht/tht/data/di/UseCaseModule.kt | 6 +++--- .../java/com/tht/tht/data/remote/mapper/DailyTopicMapper.kt | 2 +- .../com/tht/tht/data/repository/DailyTopicRepositoryImpl.kt | 2 +- .../com/tht/tht/domain/{topic => tohot}/DailyTopicModel.kt | 2 +- .../tht/tht/domain/{topic => tohot}/DailyTopicRepository.kt | 4 +--- .../domain/{topic => tohot}/FetchDailyTopicListUseCase.kt | 4 +--- .../java/com/tht/tht/domain/tohot/FetchToHotStateUseCase.kt | 3 --- .../tht/tht/domain/{topic => tohot}/SelectTopicUseCase.kt | 2 +- .../main/java/com/tht/tht/domain/tohot/ToHotCardModel.kt | 1 - .../main/java/com/tht/tht/domain/tohot/ToHotStateModel.kt | 2 -- .../src/main/java/com/tht/tht/domain/user/LogoutUseCase.kt | 2 +- .../java/tht/feature/tohot/mapper/TopicUiModelMapper.kt | 2 +- .../tht/feature/tohot/tohot/viewmodel/ToHotViewModel.kt | 2 +- 14 files changed, 13 insertions(+), 23 deletions(-) rename domain/src/main/java/com/tht/tht/domain/{topic => tohot}/DailyTopicModel.kt (80%) rename domain/src/main/java/com/tht/tht/domain/{topic => tohot}/DailyTopicRepository.kt (78%) rename domain/src/main/java/com/tht/tht/domain/{topic => tohot}/FetchDailyTopicListUseCase.kt (78%) rename domain/src/main/java/com/tht/tht/domain/{topic => tohot}/SelectTopicUseCase.kt (90%) 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 index bdeb14a2..e8c25d55 100644 --- a/data/src/main/java/com/tht/tht/data/di/RepositoryModule.kt +++ b/data/src/main/java/com/tht/tht/data/di/RepositoryModule.kt @@ -23,7 +23,7 @@ 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.token.repository.TokenRepository -import com.tht.tht.domain.topic.DailyTopicRepository +import com.tht.tht.domain.tohot.DailyTopicRepository import dagger.Binds import dagger.Module import dagger.hilt.InstallIn 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 index 830ef4df..648672f7 100644 --- a/data/src/main/java/com/tht/tht/data/di/UseCaseModule.kt +++ b/data/src/main/java/com/tht/tht/data/di/UseCaseModule.kt @@ -42,9 +42,9 @@ import com.tht.tht.domain.token.token.CheckThtAccessTokenExpiredUseCase import com.tht.tht.domain.token.token.FetchThtAccessTokenUseCase import com.tht.tht.domain.token.token.RefreshFcmTokenUseCase import com.tht.tht.domain.token.token.RefreshThtAccessTokenUseCase -import com.tht.tht.domain.topic.DailyTopicRepository -import com.tht.tht.domain.topic.FetchDailyTopicListUseCase -import com.tht.tht.domain.topic.SelectTopicUseCase +import com.tht.tht.domain.tohot.DailyTopicRepository +import com.tht.tht.domain.tohot.FetchDailyTopicListUseCase +import com.tht.tht.domain.tohot.SelectTopicUseCase import com.tht.tht.domain.user.BlockUserUseCase import com.tht.tht.domain.user.LogoutUseCase import com.tht.tht.domain.user.ReportUserUseCase 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 index 2b12b377..384a2926 100644 --- 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 @@ -2,7 +2,7 @@ package com.tht.tht.data.remote.mapper import com.tht.tht.data.remote.response.topic.DailyTopicResponse import com.tht.tht.domain.tohot.DailyTopicListModel -import com.tht.tht.domain.topic.DailyTopicModel +import com.tht.tht.domain.tohot.DailyTopicModel fun DailyTopicResponse.toModel(): DailyTopicListModel { return DailyTopicListModel( 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 index 2ff416aa..da03dea3 100644 --- a/data/src/main/java/com/tht/tht/data/repository/DailyTopicRepositoryImpl.kt +++ b/data/src/main/java/com/tht/tht/data/repository/DailyTopicRepositoryImpl.kt @@ -4,7 +4,7 @@ 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.tohot.DailyTopicListModel -import com.tht.tht.domain.topic.DailyTopicRepository +import com.tht.tht.domain.tohot.DailyTopicRepository import javax.inject.Inject class DailyTopicRepositoryImpl @Inject constructor( diff --git a/domain/src/main/java/com/tht/tht/domain/topic/DailyTopicModel.kt b/domain/src/main/java/com/tht/tht/domain/tohot/DailyTopicModel.kt similarity index 80% rename from domain/src/main/java/com/tht/tht/domain/topic/DailyTopicModel.kt rename to domain/src/main/java/com/tht/tht/domain/tohot/DailyTopicModel.kt index c5e310ab..4c8993f0 100644 --- a/domain/src/main/java/com/tht/tht/domain/topic/DailyTopicModel.kt +++ b/domain/src/main/java/com/tht/tht/domain/tohot/DailyTopicModel.kt @@ -1,4 +1,4 @@ -package com.tht.tht.domain.topic +package com.tht.tht.domain.tohot data class DailyTopicModel( val idx: Int, diff --git a/domain/src/main/java/com/tht/tht/domain/topic/DailyTopicRepository.kt b/domain/src/main/java/com/tht/tht/domain/tohot/DailyTopicRepository.kt similarity index 78% rename from domain/src/main/java/com/tht/tht/domain/topic/DailyTopicRepository.kt rename to domain/src/main/java/com/tht/tht/domain/tohot/DailyTopicRepository.kt index 89838665..e4645393 100644 --- a/domain/src/main/java/com/tht/tht/domain/topic/DailyTopicRepository.kt +++ b/domain/src/main/java/com/tht/tht/domain/tohot/DailyTopicRepository.kt @@ -1,6 +1,4 @@ -package com.tht.tht.domain.topic - -import com.tht.tht.domain.tohot.DailyTopicListModel +package com.tht.tht.domain.tohot 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/tohot/FetchDailyTopicListUseCase.kt similarity index 78% rename from domain/src/main/java/com/tht/tht/domain/topic/FetchDailyTopicListUseCase.kt rename to domain/src/main/java/com/tht/tht/domain/tohot/FetchDailyTopicListUseCase.kt index 257aac8d..7cc37042 100644 --- a/domain/src/main/java/com/tht/tht/domain/topic/FetchDailyTopicListUseCase.kt +++ b/domain/src/main/java/com/tht/tht/domain/tohot/FetchDailyTopicListUseCase.kt @@ -1,6 +1,4 @@ -package com.tht.tht.domain.topic - -import com.tht.tht.domain.tohot.DailyTopicListModel +package com.tht.tht.domain.tohot class FetchDailyTopicListUseCase( private val repository: DailyTopicRepository 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 index 6bf2f405..83d6bc9b 100644 --- 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,8 +1,5 @@ package com.tht.tht.domain.tohot -import com.tht.tht.domain.topic.DailyTopicRepository -import com.tht.tht.domain.topic.FetchDailyTopicListUseCase - /** * 1. Topic 정보 조회 + 오늘 선택한 Topic 상태 확인 * - FetchDailyUserCardUseCase 에서 selectTopicIdx 를 확인 가능 diff --git a/domain/src/main/java/com/tht/tht/domain/topic/SelectTopicUseCase.kt b/domain/src/main/java/com/tht/tht/domain/tohot/SelectTopicUseCase.kt similarity index 90% rename from domain/src/main/java/com/tht/tht/domain/topic/SelectTopicUseCase.kt rename to domain/src/main/java/com/tht/tht/domain/tohot/SelectTopicUseCase.kt index 41c88fcd..6bd74bf1 100644 --- a/domain/src/main/java/com/tht/tht/domain/topic/SelectTopicUseCase.kt +++ b/domain/src/main/java/com/tht/tht/domain/tohot/SelectTopicUseCase.kt @@ -1,4 +1,4 @@ -package com.tht.tht.domain.topic +package com.tht.tht.domain.tohot /** * Topic 의 idx 값을 보내야 함(keywordIdx 가 아닌 그냥 idx) 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 index f6881e0a..1a1b0dda 100644 --- a/domain/src/main/java/com/tht/tht/domain/tohot/ToHotCardModel.kt +++ b/domain/src/main/java/com/tht/tht/domain/tohot/ToHotCardModel.kt @@ -2,7 +2,6 @@ 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 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 index c62e2524..4d232f9e 100644 --- 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,7 +1,5 @@ package com.tht.tht.domain.tohot -import com.tht.tht.domain.topic.DailyTopicModel - data class ToHotStateModel( val topicInfo: TopicInfo, val cards: List, diff --git a/domain/src/main/java/com/tht/tht/domain/user/LogoutUseCase.kt b/domain/src/main/java/com/tht/tht/domain/user/LogoutUseCase.kt index 434b1684..eacfc519 100644 --- a/domain/src/main/java/com/tht/tht/domain/user/LogoutUseCase.kt +++ b/domain/src/main/java/com/tht/tht/domain/user/LogoutUseCase.kt @@ -1,7 +1,7 @@ package com.tht.tht.domain.user import com.tht.tht.domain.token.repository.TokenRepository -import com.tht.tht.domain.topic.DailyTopicRepository +import com.tht.tht.domain.tohot.DailyTopicRepository /** * SP.Editor().clear() 로 한번에 싹 clear? 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 index f7c34f23..14dd20cd 100644 --- 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,7 +1,7 @@ package tht.feature.tohot.mapper import com.tht.tht.domain.tohot.DailyTopicListModel -import com.tht.tht.domain.topic.DailyTopicModel +import com.tht.tht.domain.tohot.DailyTopicModel import kotlinx.collections.immutable.toImmutableList import tht.feature.tohot.R import tht.feature.tohot.model.TopicSelectUiModel 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 index 347292aa..7c720293 100644 --- 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 @@ -10,7 +10,7 @@ import com.example.compose_ui.common.viewmodel.store import com.tht.tht.domain.tohot.FetchToHotStateUseCase import com.tht.tht.domain.tohot.ToHotStateModel import com.tht.tht.domain.token.model.NeedLogoutException -import com.tht.tht.domain.topic.SelectTopicUseCase +import com.tht.tht.domain.tohot.SelectTopicUseCase import com.tht.tht.domain.user.BlockUserUseCase import com.tht.tht.domain.user.ReportUserUseCase import com.tht.tht.domain.user.SendDislikeUseCase