[MERGE] #177 -> develop

[CHORE/#177] 홈 뷰 패키지 구조 수정
teamterning · Aug 26, 2024 · 6778e36 · 6778e36
2 parents 5762ac1 + a4ddeef
commit 6778e36
Show file tree

Hide file tree

Showing 18 changed files with 119 additions and 110 deletions.
diff --git a/data/src/main/java/com/terning/data/dto/response/HomeFilteringInfoResponseDto.kt b/data/src/main/java/com/terning/data/dto/response/HomeFilteringInfoResponseDto.kt
@@ -1,6 +1,5 @@
 package com.terning.data.dto.response
 
-import com.terning.domain.entity.response.HomeFilteringInfoModel
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
@@ -14,12 +13,4 @@ data class HomeFilteringInfoResponseDto(
     val startYear: Int?,
     @SerialName("startMonth")
     val startMonth: Int?,
-) {
-    fun toHomeFilteringInfoModel(): HomeFilteringInfoModel =
-        HomeFilteringInfoModel(
-            grade = this.grade,
-            workingPeriod = this.workingPeriod,
-            startYear = this.startYear,
-            startMonth = this.startMonth,
-        )
-}
+)
diff --git a/data/src/main/java/com/terning/data/dto/response/HomeRecommendInternResponseDto.kt b/data/src/main/java/com/terning/data/dto/response/HomeRecommendInternResponseDto.kt
@@ -1,6 +1,5 @@
 package com.terning.data.dto.response
 
-import com.terning.domain.entity.response.HomeRecommendInternModel
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
@@ -24,17 +23,4 @@ data class HomeRecommendInternResponseDto(
     val companyImage: String,
     @SerialName("isScrapped")
     val isScrapped: Boolean,
-) {
-    fun toRecommendInternEntity(): HomeRecommendInternModel =
-        HomeRecommendInternModel(
-            scrapId = this.scrapId,
-            internshipAnnouncementId = this.internshipAnnouncementId,
-            title = this.title,
-            dDay = this.dDay,
-            deadline = deadline,
-            workingPeriod = this.workingPeriod,
-            startYearMonth = this.startYearMonth,
-            companyImage = this.companyImage,
-            isScrapped = this.isScrapped,
-        )
-}
+)
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
@@ -1,6 +1,5 @@
 package com.terning.data.dto.response
 
-import com.terning.domain.entity.response.HomeTodayInternModel
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
@@ -25,17 +24,4 @@ data class HomeTodayInternResponseDto(
     @SerialName("startYearMonth")
     val startYearMonth: String,
 
-) {
-    fun toHomeTodayInternList(): HomeTodayInternModel =
-        HomeTodayInternModel(
-            scrapId = this.scrapId,
-            internshipAnnouncementId = this.internshipAnnouncementId,
-            companyImage = this.companyImage,
-            title = this.title,
-            dDay = this.dDay,
-            deadline = this.deadline,
-            workingPeriod = this.workingPeriod,
-            startYearMonth = this.startYearMonth,
-            color = this.color,
-        )
-}
+)
diff --git a/data/src/main/java/com/terning/data/mapper/home/HomeFilteringInfoMapper.kt b/data/src/main/java/com/terning/data/mapper/home/HomeFilteringInfoMapper.kt
@@ -0,0 +1,12 @@
+package com.terning.data.mapper.home
+
+import com.terning.data.dto.response.HomeFilteringInfoResponseDto
+import com.terning.domain.entity.home.HomeFilteringInfo
+
+fun HomeFilteringInfoResponseDto.toHomeFilteringInfo(): HomeFilteringInfo =
+    HomeFilteringInfo(
+        grade = this.grade,
+        workingPeriod = this.workingPeriod,
+        startYear = this.startYear,
+        startMonth = this.startMonth,
+    )
diff --git a/data/src/main/java/com/terning/data/mapper/home/HomeRecommendInternMapper.kt b/data/src/main/java/com/terning/data/mapper/home/HomeRecommendInternMapper.kt
@@ -0,0 +1,17 @@
+package com.terning.data.mapper.home
+
+import com.terning.data.dto.response.HomeRecommendInternResponseDto
+import com.terning.domain.entity.home.HomeRecommendIntern
+
+fun HomeRecommendInternResponseDto.toHomeRecommendInternList(): HomeRecommendIntern =
+    HomeRecommendIntern(
+        scrapId = this.scrapId,
+        internshipAnnouncementId = this.internshipAnnouncementId,
+        title = this.title,
+        dDay = this.dDay,
+        deadline = deadline,
+        workingPeriod = this.workingPeriod,
+        startYearMonth = this.startYearMonth,
+        companyImage = this.companyImage,
+        isScrapped = this.isScrapped,
+    )
diff --git a/data/src/main/java/com/terning/data/mapper/home/HomeTodayInternMapper.kt b/data/src/main/java/com/terning/data/mapper/home/HomeTodayInternMapper.kt
@@ -0,0 +1,17 @@
+package com.terning.data.mapper.home
+
+import com.terning.data.dto.response.HomeTodayInternResponseDto
+import com.terning.domain.entity.home.HomeTodayIntern
+
+fun HomeTodayInternResponseDto.toHomeTodayInternList(): HomeTodayIntern =
+    HomeTodayIntern(
+        scrapId = this.scrapId,
+        internshipAnnouncementId = this.internshipAnnouncementId,
+        companyImage = this.companyImage,
+        title = this.title,
+        dDay = this.dDay,
+        deadline = this.deadline,
+        workingPeriod = this.workingPeriod,
+        startYearMonth = this.startYearMonth,
+        color = this.color,
+    )
diff --git a/data/src/main/java/com/terning/data/repositoryimpl/HomeRepositoryImpl.kt b/data/src/main/java/com/terning/data/repositoryimpl/HomeRepositoryImpl.kt
@@ -2,41 +2,44 @@ package com.terning.data.repositoryimpl
 
 import com.terning.data.datasource.HomeDataSource
 import com.terning.data.dto.request.toChangeFilterRequestDto
+import com.terning.data.mapper.home.toHomeFilteringInfo
+import com.terning.data.mapper.home.toHomeRecommendInternList
+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.entity.response.HomeFilteringInfoModel
-import com.terning.domain.entity.response.HomeRecommendInternModel
-import com.terning.domain.entity.response.HomeTodayInternModel
 import com.terning.domain.repository.HomeRepository
 import javax.inject.Inject
 
 class HomeRepositoryImpl @Inject constructor(
     private val homeDataSource: HomeDataSource,
 ) : HomeRepository {
-    override suspend fun getHomeTodayInternList(): Result<List<HomeTodayInternModel>> =
+    override suspend fun getHomeTodayInternList(): Result<List<HomeTodayIntern>> =
         runCatching {
-            homeDataSource.getTodayIntern().result.map {
-                it.toHomeTodayInternList()
+            homeDataSource.getTodayIntern().result.map { homeTodayInternResponseDto ->
+                homeTodayInternResponseDto.toHomeTodayInternList()
             }
         }
 
     override suspend fun getRecommendIntern(
         sortBy: String,
         startYear: Int,
         startMonth: Int
-    ): Result<List<HomeRecommendInternModel>> =
+    ): Result<List<HomeRecommendIntern>> =
         runCatching {
             homeDataSource.getRecommendIntern(
                 sortBy = sortBy,
                 startYear = startYear,
                 startMonth = startMonth
-            ).result.map {
-                it.toRecommendInternEntity()
+            ).result.map { homeRecommendInternResponseDto ->
+                homeRecommendInternResponseDto.toHomeRecommendInternList()
             }
         }
 
-    override suspend fun getFilteringInfo(): Result<HomeFilteringInfoModel> =
+    override suspend fun getFilteringInfo(): Result<HomeFilteringInfo> =
         runCatching {
-            homeDataSource.getFilteringInfo().result.toHomeFilteringInfoModel()
+            homeDataSource.getFilteringInfo().result.toHomeFilteringInfo()
         }
 
     override suspend fun putFilteringInfo(putFilteringRequest: ChangeFilteringRequestModel): Result<Unit> =

diff --git a/...entity/response/HomeFilteringInfoModel.kt → ...g/domain/entity/home/HomeFilteringInfo.kt b/...entity/response/HomeFilteringInfoModel.kt → ...g/domain/entity/home/HomeFilteringInfo.kt
@@ -1,6 +1,6 @@
-package com.terning.domain.entity.response
+package com.terning.domain.entity.home
 
-data class HomeFilteringInfoModel(
+data class HomeFilteringInfo(
     val grade: Int?,
     val workingPeriod: Int?,
     val startYear: Int?,

diff --git a/...tity/response/HomeRecommendInternModel.kt → ...domain/entity/home/HomeRecommendIntern.kt b/...tity/response/HomeRecommendInternModel.kt → ...domain/entity/home/HomeRecommendIntern.kt
@@ -1,6 +1,6 @@
-package com.terning.domain.entity.response
+package com.terning.domain.entity.home
 
-data class HomeRecommendInternModel(
+data class HomeRecommendIntern(
     val scrapId: Long?,
     val internshipAnnouncementId: Long,
     val title: String,

diff --git a/...n/entity/response/HomeTodayInternModel.kt → ...ing/domain/entity/home/HomeTodayIntern.kt b/...n/entity/response/HomeTodayInternModel.kt → ...ing/domain/entity/home/HomeTodayIntern.kt
@@ -1,6 +1,6 @@
-package com.terning.domain.entity.response
+package com.terning.domain.entity.home
 
-data class HomeTodayInternModel(
+data class HomeTodayIntern(
     val scrapId: Long,
     val internshipAnnouncementId: Long,
     val companyImage: String,

diff --git a/domain/src/main/java/com/terning/domain/repository/HomeRepository.kt b/domain/src/main/java/com/terning/domain/repository/HomeRepository.kt
@@ -1,20 +1,20 @@
 package com.terning.domain.repository
 
+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.entity.response.HomeFilteringInfoModel
-import com.terning.domain.entity.response.HomeRecommendInternModel
-import com.terning.domain.entity.response.HomeTodayInternModel
 
 interface HomeRepository {
-    suspend fun getHomeTodayInternList(): Result<List<HomeTodayInternModel>>
+    suspend fun getHomeTodayInternList(): Result<List<HomeTodayIntern>>
 
     suspend fun getRecommendIntern(
         sortBy: String,
         startYear: Int,
         startMonth: Int
-    ): Result<List<HomeRecommendInternModel>>
+    ): Result<List<HomeRecommendIntern>>
 
-    suspend fun getFilteringInfo(): Result<HomeFilteringInfoModel>
+    suspend fun getFilteringInfo(): Result<HomeFilteringInfo>
 
     suspend fun putFilteringInfo(
         putFilteringRequest: ChangeFilteringRequestModel,

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
@@ -26,16 +26,15 @@ 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.home.HomeFilteringInfo
 import com.terning.domain.entity.request.ChangeFilteringRequestModel
-import com.terning.domain.entity.response.HomeFilteringInfoModel
 import com.terning.feature.R
 import com.terning.feature.home.changefilter.component.ChangeFilteringRadioGroup
 import com.terning.feature.home.changefilter.component.FilteringMainTitleText
 import com.terning.feature.home.changefilter.component.FilteringSubTitleText
 import com.terning.feature.home.changefilter.navigation.navigateChangeFilter
 import com.terning.feature.home.home.HomeSideEffect
 import com.terning.feature.home.home.HomeViewModel
-import com.terning.feature.home.home.navigation.navigateHome
 
 const val MIN_INDEX = 0
 const val MAX_WORKING_INDEX = 2
@@ -53,7 +52,7 @@ fun ChangeFilterRoute(
 
     when (filteringState) {
         is UiState.Success -> ChangeFilterScreen(
-            (filteringState as UiState.Success<HomeFilteringInfoModel>).data,
+            (filteringState as UiState.Success<HomeFilteringInfo>).data,
             navController,
             viewModel,
         )
@@ -75,7 +74,7 @@ fun ChangeFilterRoute(
 
 @Composable
 fun ChangeFilterScreen(
-    filterData: HomeFilteringInfoModel,
+    filterData: HomeFilteringInfo,
     navController: NavController,
     viewModel: HomeViewModel,
 ) {

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
@@ -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.response.HomeFilteringInfoModel
-import com.terning.domain.entity.response.HomeRecommendInternModel
-import com.terning.domain.entity.response.HomeTodayInternModel
+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
@@ -102,7 +102,7 @@ fun HomeRoute(
     val homeUserState by viewModel.homeUserState.collectAsStateWithLifecycle()
     val homeDialogState by viewModel.homeDialogState.collectAsStateWithLifecycle()
 
-    val homeTodayInternList: MutableState<List<HomeTodayInternModel>> = remember {
+    val homeTodayInternList: MutableState<List<HomeTodayIntern>> = remember {
         mutableStateOf(emptyList())
     }
 
@@ -120,7 +120,7 @@ fun HomeRoute(
     LaunchedEffect(homeFilteringState, currentSortBy.value) {
         when (homeFilteringState) {
             is UiState.Success ->
-                with((homeFilteringState as UiState.Success<HomeFilteringInfoModel>).data) {
+                with((homeFilteringState as UiState.Success<HomeFilteringInfo>).data) {
                     viewModel.getRecommendInternsData(
                         currentSortBy.value,
                         startYear ?: viewModel.currentYear,
@@ -143,7 +143,7 @@ fun HomeRoute(
     when (homeTodayState) {
         is UiState.Success -> {
             homeTodayInternList.value =
-                (homeTodayState as UiState.Success<List<HomeTodayInternModel>>).data
+                (homeTodayState as UiState.Success<List<HomeTodayIntern>>).data
         }
 
         is UiState.Loading -> {}
@@ -154,15 +154,15 @@ fun HomeRoute(
 
     val homeRecommendInternList = when (homeRecommendInternState) {
         is UiState.Success -> {
-            (homeRecommendInternState as UiState.Success<List<HomeRecommendInternModel>>).data
+            (homeRecommendInternState as UiState.Success<List<HomeRecommendIntern>>).data
         }
 
         else -> emptyList()
     }
 
     val homeFilteringInfo = when (homeFilteringState) {
-        is UiState.Success -> (homeFilteringState as UiState.Success<HomeFilteringInfoModel>).data
-        else -> HomeFilteringInfoModel(null, null, viewModel.currentYear, viewModel.currentMonth)
+        is UiState.Success -> (homeFilteringState as UiState.Success<HomeFilteringInfo>).data
+        else -> HomeFilteringInfo(null, null, viewModel.currentYear, viewModel.currentMonth)
     }
 
     val homeUserName = when (homeUserState) {
@@ -187,9 +187,9 @@ fun HomeRoute(
 fun HomeScreen(
     currentSortBy: MutableState<Int>,
     homeUserName: String,
-    homeFilteringInfo: HomeFilteringInfoModel,
-    homeTodayInternList: List<HomeTodayInternModel>,
-    recommendInternList: List<HomeRecommendInternModel>,
+    homeFilteringInfo: HomeFilteringInfo,
+    homeTodayInternList: List<HomeTodayIntern>,
+    recommendInternList: List<HomeRecommendIntern>,
     homeDialogState: HomeDialogState,
     onChangeFilterClick: () -> Unit,
     viewModel: HomeViewModel = hiltViewModel(),
@@ -372,7 +372,7 @@ fun HomeScreen(
                                     viewModel.updateScrapped(false)
                                 }
                             },
-                            homeRecommendInternModel = this,
+                            homeRecommendIntern = this,
                         )
                     }
                 }
@@ -385,7 +385,7 @@ fun HomeScreen(
 @Composable
 private fun RecommendInternItem(
     navController: NavHostController,
-    intern: HomeRecommendInternModel,
+    intern: HomeRecommendIntern,
     onScrapButtonClicked: (Long) -> Unit,
 ) {
     InternItemWithShadow(
@@ -425,7 +425,7 @@ private fun ShowMainTitleWithName(userName: String) {
 
 @Composable
 private fun ShowTodayIntern(
-    homeTodayInternList: List<HomeTodayInternModel>,
+    homeTodayInternList: List<HomeTodayIntern>,
     homeDialogState: HomeDialogState,
     navigateToDetail: (Long) -> Unit,
 ) {
@@ -463,7 +463,7 @@ private fun ShowRecommendTitle() {
 
 @Composable
 private fun ShowInternFilter(
-    homeFilteringInfo: HomeFilteringInfoModel,
+    homeFilteringInfo: HomeFilteringInfo,
     onChangeFilterClick: () -> Unit,
 ) {
     if (homeFilteringInfo.grade == null) {