From 78f8154d6c687d668b161f0c4ba566bba3b68578 Mon Sep 17 00:00:00 2001 From: Hyobeen-Park Date: Thu, 22 Aug 2024 00:21:00 +0900 Subject: [PATCH] =?UTF-8?q?[CHORE/#177]=20feature=EB=B3=84=20=ED=8C=A8?= =?UTF-8?q?=ED=82=A4=EC=A7=80=20=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/dto/response/HomeTodayInternResponseDto.kt | 1 - .../mapper/{ => home}/HomeFilteringInfoMapper.kt | 4 ++-- .../mapper/{ => home}/HomeRecommendInternMapper.kt | 4 ++-- .../data/mapper/{ => home}/HomeTodayInternMapper.kt | 4 ++-- .../data/repositoryimpl/HomeRepositoryImpl.kt | 12 ++++++------ .../domain/entity/{ => home}/HomeFilteringInfo.kt | 2 +- .../domain/entity/{ => home}/HomeRecommendIntern.kt | 2 +- .../domain/entity/{ => home}/HomeTodayIntern.kt | 2 +- .../com/terning/domain/repository/HomeRepository.kt | 6 +++--- .../feature/home/changefilter/ChangeFilterRoute.kt | 2 +- .../java/com/terning/feature/home/home/HomeRoute.kt | 6 +++--- .../com/terning/feature/home/home/HomeViewModel.kt | 6 +++--- .../home/home/component/HomeRecommendInternDialog.kt | 2 +- .../feature/home/home/component/HomeTodayIntern.kt | 2 +- .../home/home/component/HomeTodayInternDialog.kt | 2 +- .../search/searchprocess/SearchProcessRoute.kt | 2 +- 16 files changed, 29 insertions(+), 30 deletions(-) rename data/src/main/java/com/terning/data/mapper/{ => home}/HomeFilteringInfoMapper.kt (77%) rename data/src/main/java/com/terning/data/mapper/{ => home}/HomeRecommendInternMapper.kt (84%) rename data/src/main/java/com/terning/data/mapper/{ => home}/HomeTodayInternMapper.kt (84%) rename domain/src/main/java/com/terning/domain/entity/{ => home}/HomeFilteringInfo.kt (77%) rename domain/src/main/java/com/terning/domain/entity/{ => home}/HomeRecommendIntern.kt (88%) rename domain/src/main/java/com/terning/domain/entity/{ => home}/HomeTodayIntern.kt (87%) diff --git a/data/src/main/java/com/terning/data/dto/response/HomeTodayInternResponseDto.kt b/data/src/main/java/com/terning/data/dto/response/HomeTodayInternResponseDto.kt index 8f4654c13..33283ae00 100644 --- a/data/src/main/java/com/terning/data/dto/response/HomeTodayInternResponseDto.kt +++ b/data/src/main/java/com/terning/data/dto/response/HomeTodayInternResponseDto.kt @@ -1,6 +1,5 @@ package com.terning.data.dto.response -import com.terning.domain.entity.HomeTodayIntern import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/data/src/main/java/com/terning/data/mapper/HomeFilteringInfoMapper.kt b/data/src/main/java/com/terning/data/mapper/home/HomeFilteringInfoMapper.kt similarity index 77% rename from data/src/main/java/com/terning/data/mapper/HomeFilteringInfoMapper.kt rename to data/src/main/java/com/terning/data/mapper/home/HomeFilteringInfoMapper.kt index 11cce14b3..afdb5f7bb 100644 --- a/data/src/main/java/com/terning/data/mapper/HomeFilteringInfoMapper.kt +++ b/data/src/main/java/com/terning/data/mapper/home/HomeFilteringInfoMapper.kt @@ -1,7 +1,7 @@ -package com.terning.data.mapper +package com.terning.data.mapper.home import com.terning.data.dto.response.HomeFilteringInfoResponseDto -import com.terning.domain.entity.HomeFilteringInfo +import com.terning.domain.entity.home.HomeFilteringInfo fun HomeFilteringInfoResponseDto.toHomeFilteringInfo(): HomeFilteringInfo = HomeFilteringInfo( diff --git a/data/src/main/java/com/terning/data/mapper/HomeRecommendInternMapper.kt b/data/src/main/java/com/terning/data/mapper/home/HomeRecommendInternMapper.kt similarity index 84% rename from data/src/main/java/com/terning/data/mapper/HomeRecommendInternMapper.kt rename to data/src/main/java/com/terning/data/mapper/home/HomeRecommendInternMapper.kt index 353b2ded2..84e93aebd 100644 --- a/data/src/main/java/com/terning/data/mapper/HomeRecommendInternMapper.kt +++ b/data/src/main/java/com/terning/data/mapper/home/HomeRecommendInternMapper.kt @@ -1,7 +1,7 @@ -package com.terning.data.mapper +package com.terning.data.mapper.home import com.terning.data.dto.response.HomeRecommendInternResponseDto -import com.terning.domain.entity.HomeRecommendIntern +import com.terning.domain.entity.home.HomeRecommendIntern fun HomeRecommendInternResponseDto.toHomeRecommendIntern(): HomeRecommendIntern = HomeRecommendIntern( diff --git a/data/src/main/java/com/terning/data/mapper/HomeTodayInternMapper.kt b/data/src/main/java/com/terning/data/mapper/home/HomeTodayInternMapper.kt similarity index 84% rename from data/src/main/java/com/terning/data/mapper/HomeTodayInternMapper.kt rename to data/src/main/java/com/terning/data/mapper/home/HomeTodayInternMapper.kt index c61bfc6aa..762354301 100644 --- a/data/src/main/java/com/terning/data/mapper/HomeTodayInternMapper.kt +++ b/data/src/main/java/com/terning/data/mapper/home/HomeTodayInternMapper.kt @@ -1,7 +1,7 @@ -package com.terning.data.mapper +package com.terning.data.mapper.home import com.terning.data.dto.response.HomeTodayInternResponseDto -import com.terning.domain.entity.HomeTodayIntern +import com.terning.domain.entity.home.HomeTodayIntern fun HomeTodayInternResponseDto.toHomeTodayInternList(): HomeTodayIntern = HomeTodayIntern( diff --git a/data/src/main/java/com/terning/data/repositoryimpl/HomeRepositoryImpl.kt b/data/src/main/java/com/terning/data/repositoryimpl/HomeRepositoryImpl.kt index 16c2f7a2f..d33c19c9e 100644 --- a/data/src/main/java/com/terning/data/repositoryimpl/HomeRepositoryImpl.kt +++ b/data/src/main/java/com/terning/data/repositoryimpl/HomeRepositoryImpl.kt @@ -2,12 +2,12 @@ package com.terning.data.repositoryimpl import com.terning.data.datasource.HomeDataSource import com.terning.data.dto.request.toChangeFilterRequestDto -import com.terning.data.mapper.toHomeFilteringInfo -import com.terning.data.mapper.toHomeRecommendIntern -import com.terning.data.mapper.toHomeTodayInternList -import com.terning.domain.entity.HomeFilteringInfo -import com.terning.domain.entity.HomeRecommendIntern -import com.terning.domain.entity.HomeTodayIntern +import com.terning.data.mapper.home.toHomeFilteringInfo +import com.terning.data.mapper.home.toHomeRecommendIntern +import com.terning.data.mapper.home.toHomeTodayInternList +import com.terning.domain.entity.home.HomeFilteringInfo +import com.terning.domain.entity.home.HomeRecommendIntern +import com.terning.domain.entity.home.HomeTodayIntern import com.terning.domain.entity.request.ChangeFilteringRequestModel import com.terning.domain.repository.HomeRepository import javax.inject.Inject diff --git a/domain/src/main/java/com/terning/domain/entity/HomeFilteringInfo.kt b/domain/src/main/java/com/terning/domain/entity/home/HomeFilteringInfo.kt similarity index 77% rename from domain/src/main/java/com/terning/domain/entity/HomeFilteringInfo.kt rename to domain/src/main/java/com/terning/domain/entity/home/HomeFilteringInfo.kt index 9bade722c..657fce14d 100644 --- a/domain/src/main/java/com/terning/domain/entity/HomeFilteringInfo.kt +++ b/domain/src/main/java/com/terning/domain/entity/home/HomeFilteringInfo.kt @@ -1,4 +1,4 @@ -package com.terning.domain.entity +package com.terning.domain.entity.home data class HomeFilteringInfo( val grade: Int?, diff --git a/domain/src/main/java/com/terning/domain/entity/HomeRecommendIntern.kt b/domain/src/main/java/com/terning/domain/entity/home/HomeRecommendIntern.kt similarity index 88% rename from domain/src/main/java/com/terning/domain/entity/HomeRecommendIntern.kt rename to domain/src/main/java/com/terning/domain/entity/home/HomeRecommendIntern.kt index 89a183259..e8e4150d9 100644 --- a/domain/src/main/java/com/terning/domain/entity/HomeRecommendIntern.kt +++ b/domain/src/main/java/com/terning/domain/entity/home/HomeRecommendIntern.kt @@ -1,4 +1,4 @@ -package com.terning.domain.entity +package com.terning.domain.entity.home data class HomeRecommendIntern( val scrapId: Long?, diff --git a/domain/src/main/java/com/terning/domain/entity/HomeTodayIntern.kt b/domain/src/main/java/com/terning/domain/entity/home/HomeTodayIntern.kt similarity index 87% rename from domain/src/main/java/com/terning/domain/entity/HomeTodayIntern.kt rename to domain/src/main/java/com/terning/domain/entity/home/HomeTodayIntern.kt index 5035161d3..742773035 100644 --- a/domain/src/main/java/com/terning/domain/entity/HomeTodayIntern.kt +++ b/domain/src/main/java/com/terning/domain/entity/home/HomeTodayIntern.kt @@ -1,4 +1,4 @@ -package com.terning.domain.entity +package com.terning.domain.entity.home data class HomeTodayIntern( val scrapId: Long, diff --git a/domain/src/main/java/com/terning/domain/repository/HomeRepository.kt b/domain/src/main/java/com/terning/domain/repository/HomeRepository.kt index fc0bcfda0..c21daa27a 100644 --- a/domain/src/main/java/com/terning/domain/repository/HomeRepository.kt +++ b/domain/src/main/java/com/terning/domain/repository/HomeRepository.kt @@ -1,8 +1,8 @@ package com.terning.domain.repository -import com.terning.domain.entity.HomeFilteringInfo -import com.terning.domain.entity.HomeRecommendIntern -import com.terning.domain.entity.HomeTodayIntern +import com.terning.domain.entity.home.HomeFilteringInfo +import com.terning.domain.entity.home.HomeRecommendIntern +import com.terning.domain.entity.home.HomeTodayIntern import com.terning.domain.entity.request.ChangeFilteringRequestModel interface HomeRepository { diff --git a/feature/src/main/java/com/terning/feature/home/changefilter/ChangeFilterRoute.kt b/feature/src/main/java/com/terning/feature/home/changefilter/ChangeFilterRoute.kt index 5c28ab07a..649df5d59 100644 --- a/feature/src/main/java/com/terning/feature/home/changefilter/ChangeFilterRoute.kt +++ b/feature/src/main/java/com/terning/feature/home/changefilter/ChangeFilterRoute.kt @@ -26,7 +26,7 @@ import com.terning.core.designsystem.component.topappbar.BackButtonTopAppBar import com.terning.core.designsystem.theme.TerningTheme import com.terning.core.extension.toast import com.terning.core.state.UiState -import com.terning.domain.entity.HomeFilteringInfo +import com.terning.domain.entity.home.HomeFilteringInfo import com.terning.domain.entity.request.ChangeFilteringRequestModel import com.terning.feature.R import com.terning.feature.home.changefilter.component.ChangeFilteringRadioGroup diff --git a/feature/src/main/java/com/terning/feature/home/home/HomeRoute.kt b/feature/src/main/java/com/terning/feature/home/home/HomeRoute.kt index 621a66f57..732f51cb5 100644 --- a/feature/src/main/java/com/terning/feature/home/home/HomeRoute.kt +++ b/feature/src/main/java/com/terning/feature/home/home/HomeRoute.kt @@ -56,9 +56,9 @@ import com.terning.core.designsystem.theme.White import com.terning.core.extension.noRippleClickable import com.terning.core.extension.toast import com.terning.core.state.UiState -import com.terning.domain.entity.HomeFilteringInfo -import com.terning.domain.entity.HomeRecommendIntern -import com.terning.domain.entity.HomeTodayIntern +import com.terning.domain.entity.home.HomeFilteringInfo +import com.terning.domain.entity.home.HomeRecommendIntern +import com.terning.domain.entity.home.HomeTodayIntern import com.terning.feature.R import com.terning.feature.home.changefilter.navigation.navigateChangeFilter import com.terning.feature.home.home.component.HomeFilteringEmptyIntern diff --git a/feature/src/main/java/com/terning/feature/home/home/HomeViewModel.kt b/feature/src/main/java/com/terning/feature/home/home/HomeViewModel.kt index 20599510e..5cca99d71 100644 --- a/feature/src/main/java/com/terning/feature/home/home/HomeViewModel.kt +++ b/feature/src/main/java/com/terning/feature/home/home/HomeViewModel.kt @@ -6,9 +6,9 @@ import androidx.lifecycle.viewModelScope import com.terning.core.designsystem.theme.CalRed import com.terning.core.state.UiState import com.terning.domain.entity.CalendarScrapRequest -import com.terning.domain.entity.HomeFilteringInfo -import com.terning.domain.entity.HomeRecommendIntern -import com.terning.domain.entity.HomeTodayIntern +import com.terning.domain.entity.home.HomeFilteringInfo +import com.terning.domain.entity.home.HomeRecommendIntern +import com.terning.domain.entity.home.HomeTodayIntern import com.terning.domain.entity.request.ChangeFilteringRequestModel import com.terning.domain.repository.HomeRepository import com.terning.domain.repository.MyPageRepository diff --git a/feature/src/main/java/com/terning/feature/home/home/component/HomeRecommendInternDialog.kt b/feature/src/main/java/com/terning/feature/home/home/component/HomeRecommendInternDialog.kt index 947f20600..776cf9081 100644 --- a/feature/src/main/java/com/terning/feature/home/home/component/HomeRecommendInternDialog.kt +++ b/feature/src/main/java/com/terning/feature/home/home/component/HomeRecommendInternDialog.kt @@ -44,7 +44,7 @@ import com.terning.core.designsystem.theme.TerningMain import com.terning.core.designsystem.theme.TerningTheme import com.terning.core.designsystem.theme.White import com.terning.core.extension.noRippleClickable -import com.terning.domain.entity.HomeRecommendIntern +import com.terning.domain.entity.home.HomeRecommendIntern import com.terning.feature.home.home.HomeViewModel import com.terning.feature.intern.component.InternInfoRow diff --git a/feature/src/main/java/com/terning/feature/home/home/component/HomeTodayIntern.kt b/feature/src/main/java/com/terning/feature/home/home/component/HomeTodayIntern.kt index 4f44576a8..0e0e2cc6f 100644 --- a/feature/src/main/java/com/terning/feature/home/home/component/HomeTodayIntern.kt +++ b/feature/src/main/java/com/terning/feature/home/home/component/HomeTodayIntern.kt @@ -16,7 +16,7 @@ import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel import com.terning.core.designsystem.component.dialog.TerningBasicDialog import com.terning.core.extension.noRippleClickable -import com.terning.domain.entity.HomeTodayIntern +import com.terning.domain.entity.home.HomeTodayIntern import com.terning.feature.R import com.terning.feature.home.home.HomeViewModel import com.terning.feature.home.home.model.HomeDialogState diff --git a/feature/src/main/java/com/terning/feature/home/home/component/HomeTodayInternDialog.kt b/feature/src/main/java/com/terning/feature/home/home/component/HomeTodayInternDialog.kt index 1b928744a..cb6808de1 100644 --- a/feature/src/main/java/com/terning/feature/home/home/component/HomeTodayInternDialog.kt +++ b/feature/src/main/java/com/terning/feature/home/home/component/HomeTodayInternDialog.kt @@ -53,7 +53,7 @@ import com.terning.core.designsystem.theme.TerningMain import com.terning.core.designsystem.theme.TerningTheme import com.terning.core.designsystem.theme.White import com.terning.core.extension.noRippleClickable -import com.terning.domain.entity.HomeTodayIntern +import com.terning.domain.entity.home.HomeTodayIntern import com.terning.feature.home.home.HomeViewModel import com.terning.feature.intern.component.InternInfoRow diff --git a/feature/src/main/java/com/terning/feature/search/searchprocess/SearchProcessRoute.kt b/feature/src/main/java/com/terning/feature/search/searchprocess/SearchProcessRoute.kt index cc380b237..9d6e7f446 100644 --- a/feature/src/main/java/com/terning/feature/search/searchprocess/SearchProcessRoute.kt +++ b/feature/src/main/java/com/terning/feature/search/searchprocess/SearchProcessRoute.kt @@ -61,7 +61,7 @@ import com.terning.core.designsystem.theme.TerningTheme import com.terning.core.extension.addFocusCleaner import com.terning.core.extension.noRippleClickable import com.terning.core.extension.toast -import com.terning.domain.entity.HomeRecommendIntern +import com.terning.domain.entity.home.HomeRecommendIntern import com.terning.feature.R import com.terning.feature.home.home.component.HomeRecommendInternDialog import com.terning.feature.intern.navigation.navigateIntern