From 50ae0f7e48ca4319ffc255c6aefb7b37132426cd Mon Sep 17 00:00:00 2001 From: Hyobeen-Park Date: Thu, 15 Aug 2024 00:25:43 +0900 Subject: [PATCH 1/8] =?UTF-8?q?[chore/#177]=20domain=20=ED=8C=A8=ED=82=A4?= =?UTF-8?q?=EC=A7=80=20=EA=B5=AC=EC=A1=B0=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/dto/response/HomeFilteringInfoResponseDto.kt | 2 +- .../data/dto/response/HomeRecommendInternResponseDto.kt | 2 +- .../terning/data/dto/response/HomeTodayInternResponseDto.kt | 2 +- .../com/terning/data/repositoryimpl/HomeRepositoryImpl.kt | 6 +++--- .../domain/entity/{response => }/HomeFilteringInfoModel.kt | 2 +- .../entity/{response => }/HomeRecommendInternModel.kt | 2 +- .../domain/entity/{response => }/HomeTodayInternModel.kt | 2 +- .../java/com/terning/domain/repository/HomeRepository.kt | 6 +++--- .../terning/feature/home/changefilter/ChangeFilterRoute.kt | 3 +-- .../main/java/com/terning/feature/home/home/HomeRoute.kt | 6 +++--- .../java/com/terning/feature/home/home/HomeViewModel.kt | 6 +++--- .../home/home/component/HomeRecommendInternDialog.kt | 2 +- .../terning/feature/home/home/component/HomeTodayIntern.kt | 2 +- .../feature/home/home/component/HomeTodayInternDialog.kt | 3 +-- .../feature/search/searchprocess/SearchProcessRoute.kt | 3 +-- 15 files changed, 23 insertions(+), 26 deletions(-) rename domain/src/main/java/com/terning/domain/entity/{response => }/HomeFilteringInfoModel.kt (76%) rename domain/src/main/java/com/terning/domain/entity/{response => }/HomeRecommendInternModel.kt (87%) rename domain/src/main/java/com/terning/domain/entity/{response => }/HomeTodayInternModel.kt (86%) 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 index 6524556bc..fe894de21 100644 --- 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,6 @@ package com.terning.data.dto.response -import com.terning.domain.entity.response.HomeFilteringInfoModel +import com.terning.domain.entity.HomeFilteringInfoModel import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable 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 index 008315cc7..fba08196f 100644 --- 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,6 @@ package com.terning.data.dto.response -import com.terning.domain.entity.response.HomeRecommendInternModel +import com.terning.domain.entity.HomeRecommendInternModel import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable 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 f93a1f21f..ac8dc0c2d 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,6 @@ package com.terning.data.dto.response -import com.terning.domain.entity.response.HomeTodayInternModel +import com.terning.domain.entity.HomeTodayInternModel import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable 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 6e6e50fb0..57fc56e5b 100644 --- a/data/src/main/java/com/terning/data/repositoryimpl/HomeRepositoryImpl.kt +++ b/data/src/main/java/com/terning/data/repositoryimpl/HomeRepositoryImpl.kt @@ -2,10 +2,10 @@ package com.terning.data.repositoryimpl import com.terning.data.datasource.HomeDataSource import com.terning.data.dto.request.toChangeFilterRequestDto +import com.terning.domain.entity.HomeFilteringInfoModel +import com.terning.domain.entity.HomeRecommendInternModel +import com.terning.domain.entity.HomeTodayInternModel 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 diff --git a/domain/src/main/java/com/terning/domain/entity/response/HomeFilteringInfoModel.kt b/domain/src/main/java/com/terning/domain/entity/HomeFilteringInfoModel.kt similarity index 76% rename from domain/src/main/java/com/terning/domain/entity/response/HomeFilteringInfoModel.kt rename to domain/src/main/java/com/terning/domain/entity/HomeFilteringInfoModel.kt index b1c386044..e48344329 100644 --- a/domain/src/main/java/com/terning/domain/entity/response/HomeFilteringInfoModel.kt +++ b/domain/src/main/java/com/terning/domain/entity/HomeFilteringInfoModel.kt @@ -1,4 +1,4 @@ -package com.terning.domain.entity.response +package com.terning.domain.entity data class HomeFilteringInfoModel( val grade: Int?, diff --git a/domain/src/main/java/com/terning/domain/entity/response/HomeRecommendInternModel.kt b/domain/src/main/java/com/terning/domain/entity/HomeRecommendInternModel.kt similarity index 87% rename from domain/src/main/java/com/terning/domain/entity/response/HomeRecommendInternModel.kt rename to domain/src/main/java/com/terning/domain/entity/HomeRecommendInternModel.kt index 5b1b23ce0..b5bb1b42e 100644 --- a/domain/src/main/java/com/terning/domain/entity/response/HomeRecommendInternModel.kt +++ b/domain/src/main/java/com/terning/domain/entity/HomeRecommendInternModel.kt @@ -1,4 +1,4 @@ -package com.terning.domain.entity.response +package com.terning.domain.entity data class HomeRecommendInternModel( val scrapId: Long?, diff --git a/domain/src/main/java/com/terning/domain/entity/response/HomeTodayInternModel.kt b/domain/src/main/java/com/terning/domain/entity/HomeTodayInternModel.kt similarity index 86% rename from domain/src/main/java/com/terning/domain/entity/response/HomeTodayInternModel.kt rename to domain/src/main/java/com/terning/domain/entity/HomeTodayInternModel.kt index abd234bae..279fa1c9b 100644 --- a/domain/src/main/java/com/terning/domain/entity/response/HomeTodayInternModel.kt +++ b/domain/src/main/java/com/terning/domain/entity/HomeTodayInternModel.kt @@ -1,4 +1,4 @@ -package com.terning.domain.entity.response +package com.terning.domain.entity data class HomeTodayInternModel( 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 ecead916b..393a37672 100644 --- a/domain/src/main/java/com/terning/domain/repository/HomeRepository.kt +++ b/domain/src/main/java/com/terning/domain/repository/HomeRepository.kt @@ -1,9 +1,9 @@ package com.terning.domain.repository +import com.terning.domain.entity.HomeFilteringInfoModel +import com.terning.domain.entity.HomeRecommendInternModel +import com.terning.domain.entity.HomeTodayInternModel 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> 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 2551651dd..5abf15cfa 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,8 +26,8 @@ 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.HomeFilteringInfoModel 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 @@ -35,7 +35,6 @@ 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 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 15d0c463a..7546c7325 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.response.HomeFilteringInfoModel -import com.terning.domain.entity.response.HomeRecommendInternModel -import com.terning.domain.entity.response.HomeTodayInternModel +import com.terning.domain.entity.HomeFilteringInfoModel +import com.terning.domain.entity.HomeRecommendInternModel +import com.terning.domain.entity.HomeTodayInternModel 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 3733e3ead..319488714 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 @@ -5,11 +5,11 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.terning.core.designsystem.theme.CalRed import com.terning.core.state.UiState +import com.terning.domain.entity.HomeFilteringInfoModel +import com.terning.domain.entity.HomeRecommendInternModel +import com.terning.domain.entity.HomeTodayInternModel import com.terning.domain.entity.request.ChangeFilteringRequestModel import com.terning.domain.entity.request.ScrapRequestModel -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 com.terning.domain.repository.MyPageRepository import com.terning.domain.repository.ScrapRepository 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 9738753e9..763052d12 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.response.HomeRecommendInternModel +import com.terning.domain.entity.HomeRecommendInternModel 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 83b14f432..531f6eaaf 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.response.HomeTodayInternModel +import com.terning.domain.entity.HomeTodayInternModel 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 44b0e29d5..5b930cb2d 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 @@ -7,7 +7,6 @@ import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer -import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding @@ -54,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.response.HomeTodayInternModel +import com.terning.domain.entity.HomeTodayInternModel 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 cd804faa6..19939e366 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 @@ -1,6 +1,5 @@ package com.terning.feature.search.searchprocess -import android.util.Log import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -62,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.response.HomeRecommendInternModel +import com.terning.domain.entity.HomeRecommendInternModel import com.terning.feature.R import com.terning.feature.home.home.component.HomeRecommendInternDialog import com.terning.feature.intern.navigation.navigateIntern From 43ddd5bdd77098caaaf77aa69b815ef20cfe5a18 Mon Sep 17 00:00:00 2001 From: Hyobeen-Park Date: Mon, 19 Aug 2024 22:34:53 +0900 Subject: [PATCH 2/8] =?UTF-8?q?[CHORE/#177]=20=EC=97=94=ED=8B=B0=ED=8B=B0?= =?UTF-8?q?=20=EC=9D=B4=EB=A6=84=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../response/HomeFilteringInfoResponseDto.kt | 6 ++--- .../HomeRecommendInternResponseDto.kt | 6 ++--- .../data/repositoryimpl/HomeRepositoryImpl.kt | 8 +++---- ...eringInfoModel.kt => HomeFilteringInfo.kt} | 2 +- ...dInternModel.kt => HomeRecommendIntern.kt} | 2 +- ...TodayInternModel.kt => HomeTodayIntern.kt} | 0 .../domain/repository/HomeRepository.kt | 8 +++---- .../home/changefilter/ChangeFilterRoute.kt | 6 ++--- .../terning/feature/home/home/HomeRoute.kt | 22 +++++++++---------- .../feature/home/home/HomeViewModel.kt | 8 +++---- .../component/HomeRecommendInternDialog.kt | 10 ++++----- .../searchprocess/SearchProcessRoute.kt | 4 ++-- 12 files changed, 41 insertions(+), 41 deletions(-) rename domain/src/main/java/com/terning/domain/entity/{HomeFilteringInfoModel.kt => HomeFilteringInfo.kt} (79%) rename domain/src/main/java/com/terning/domain/entity/{HomeRecommendInternModel.kt => HomeRecommendIntern.kt} (88%) rename domain/src/main/java/com/terning/domain/entity/{HomeTodayInternModel.kt => HomeTodayIntern.kt} (100%) 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 index fe894de21..0f686b5b3 100644 --- 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,6 @@ package com.terning.data.dto.response -import com.terning.domain.entity.HomeFilteringInfoModel +import com.terning.domain.entity.HomeFilteringInfo import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable @@ -15,8 +15,8 @@ data class HomeFilteringInfoResponseDto( @SerialName("startMonth") val startMonth: Int?, ) { - fun toHomeFilteringInfoModel(): HomeFilteringInfoModel = - HomeFilteringInfoModel( + fun toHomeFilteringInfoModel(): HomeFilteringInfo = + HomeFilteringInfo( grade = this.grade, workingPeriod = this.workingPeriod, startYear = this.startYear, 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 index fba08196f..d6d1692b7 100644 --- 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,6 @@ package com.terning.data.dto.response -import com.terning.domain.entity.HomeRecommendInternModel +import com.terning.domain.entity.HomeRecommendIntern import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable @@ -25,8 +25,8 @@ data class HomeRecommendInternResponseDto( @SerialName("isScrapped") val isScrapped: Boolean, ) { - fun toRecommendInternEntity(): HomeRecommendInternModel = - HomeRecommendInternModel( + fun toRecommendInternEntity(): HomeRecommendIntern = + HomeRecommendIntern( scrapId = this.scrapId, internshipAnnouncementId = this.internshipAnnouncementId, title = this.title, 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 57fc56e5b..0ef045556 100644 --- a/data/src/main/java/com/terning/data/repositoryimpl/HomeRepositoryImpl.kt +++ b/data/src/main/java/com/terning/data/repositoryimpl/HomeRepositoryImpl.kt @@ -2,8 +2,8 @@ package com.terning.data.repositoryimpl import com.terning.data.datasource.HomeDataSource import com.terning.data.dto.request.toChangeFilterRequestDto -import com.terning.domain.entity.HomeFilteringInfoModel -import com.terning.domain.entity.HomeRecommendInternModel +import com.terning.domain.entity.HomeFilteringInfo +import com.terning.domain.entity.HomeRecommendIntern import com.terning.domain.entity.HomeTodayInternModel import com.terning.domain.entity.request.ChangeFilteringRequestModel import com.terning.domain.repository.HomeRepository @@ -23,7 +23,7 @@ class HomeRepositoryImpl @Inject constructor( sortBy: String, startYear: Int, startMonth: Int - ): Result> = + ): Result> = runCatching { homeDataSource.getRecommendIntern( sortBy = sortBy, @@ -34,7 +34,7 @@ class HomeRepositoryImpl @Inject constructor( } } - override suspend fun getFilteringInfo(): Result = + override suspend fun getFilteringInfo(): Result = runCatching { homeDataSource.getFilteringInfo().result.toHomeFilteringInfoModel() } diff --git a/domain/src/main/java/com/terning/domain/entity/HomeFilteringInfoModel.kt b/domain/src/main/java/com/terning/domain/entity/HomeFilteringInfo.kt similarity index 79% rename from domain/src/main/java/com/terning/domain/entity/HomeFilteringInfoModel.kt rename to domain/src/main/java/com/terning/domain/entity/HomeFilteringInfo.kt index e48344329..9bade722c 100644 --- a/domain/src/main/java/com/terning/domain/entity/HomeFilteringInfoModel.kt +++ b/domain/src/main/java/com/terning/domain/entity/HomeFilteringInfo.kt @@ -1,6 +1,6 @@ package com.terning.domain.entity -data class HomeFilteringInfoModel( +data class HomeFilteringInfo( val grade: Int?, val workingPeriod: Int?, val startYear: Int?, diff --git a/domain/src/main/java/com/terning/domain/entity/HomeRecommendInternModel.kt b/domain/src/main/java/com/terning/domain/entity/HomeRecommendIntern.kt similarity index 88% rename from domain/src/main/java/com/terning/domain/entity/HomeRecommendInternModel.kt rename to domain/src/main/java/com/terning/domain/entity/HomeRecommendIntern.kt index b5bb1b42e..89a183259 100644 --- a/domain/src/main/java/com/terning/domain/entity/HomeRecommendInternModel.kt +++ b/domain/src/main/java/com/terning/domain/entity/HomeRecommendIntern.kt @@ -1,6 +1,6 @@ package com.terning.domain.entity -data class HomeRecommendInternModel( +data class HomeRecommendIntern( val scrapId: Long?, val internshipAnnouncementId: Long, val title: String, diff --git a/domain/src/main/java/com/terning/domain/entity/HomeTodayInternModel.kt b/domain/src/main/java/com/terning/domain/entity/HomeTodayIntern.kt similarity index 100% rename from domain/src/main/java/com/terning/domain/entity/HomeTodayInternModel.kt rename to domain/src/main/java/com/terning/domain/entity/HomeTodayIntern.kt 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 393a37672..0f3c21ba4 100644 --- a/domain/src/main/java/com/terning/domain/repository/HomeRepository.kt +++ b/domain/src/main/java/com/terning/domain/repository/HomeRepository.kt @@ -1,7 +1,7 @@ package com.terning.domain.repository -import com.terning.domain.entity.HomeFilteringInfoModel -import com.terning.domain.entity.HomeRecommendInternModel +import com.terning.domain.entity.HomeFilteringInfo +import com.terning.domain.entity.HomeRecommendIntern import com.terning.domain.entity.HomeTodayInternModel import com.terning.domain.entity.request.ChangeFilteringRequestModel @@ -12,9 +12,9 @@ interface HomeRepository { sortBy: String, startYear: Int, startMonth: Int - ): Result> + ): Result> - suspend fun getFilteringInfo(): Result + suspend fun getFilteringInfo(): Result 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 index 5abf15cfa..5c28ab07a 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.HomeFilteringInfoModel +import com.terning.domain.entity.HomeFilteringInfo import com.terning.domain.entity.request.ChangeFilteringRequestModel import com.terning.feature.R import com.terning.feature.home.changefilter.component.ChangeFilteringRadioGroup @@ -52,7 +52,7 @@ fun ChangeFilterRoute( when (filteringState) { is UiState.Success -> ChangeFilterScreen( - (filteringState as UiState.Success).data, + (filteringState as UiState.Success).data, navController, viewModel, ) @@ -74,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 index 7546c7325..a4a59f7f3 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,8 +56,8 @@ 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.HomeFilteringInfoModel -import com.terning.domain.entity.HomeRecommendInternModel +import com.terning.domain.entity.HomeFilteringInfo +import com.terning.domain.entity.HomeRecommendIntern import com.terning.domain.entity.HomeTodayInternModel import com.terning.feature.R import com.terning.feature.home.changefilter.navigation.navigateChangeFilter @@ -120,7 +120,7 @@ fun HomeRoute( LaunchedEffect(homeFilteringState, currentSortBy.value) { when (homeFilteringState) { is UiState.Success -> - with((homeFilteringState as UiState.Success).data) { + with((homeFilteringState as UiState.Success).data) { viewModel.getRecommendInternsData( currentSortBy.value, startYear ?: viewModel.currentYear, @@ -154,15 +154,15 @@ fun HomeRoute( val homeRecommendInternList = when (homeRecommendInternState) { is UiState.Success -> { - (homeRecommendInternState as UiState.Success>).data + (homeRecommendInternState as UiState.Success>).data } else -> emptyList() } val homeFilteringInfo = when (homeFilteringState) { - is UiState.Success -> (homeFilteringState as UiState.Success).data - else -> HomeFilteringInfoModel(null, null, viewModel.currentYear, viewModel.currentMonth) + is UiState.Success -> (homeFilteringState as UiState.Success).data + else -> HomeFilteringInfo(null, null, viewModel.currentYear, viewModel.currentMonth) } val homeUserName = when (homeUserState) { @@ -187,9 +187,9 @@ fun HomeRoute( fun HomeScreen( currentSortBy: MutableState, homeUserName: String, - homeFilteringInfo: HomeFilteringInfoModel, + homeFilteringInfo: HomeFilteringInfo, homeTodayInternList: List, - recommendInternList: List, + recommendInternList: List, 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( @@ -463,7 +463,7 @@ private fun ShowRecommendTitle() { @Composable private fun ShowInternFilter( - homeFilteringInfo: HomeFilteringInfoModel, + homeFilteringInfo: HomeFilteringInfo, onChangeFilterClick: () -> Unit, ) { if (homeFilteringInfo.grade == null) { 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 4231c6bce..c82e64a58 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,8 +6,8 @@ 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.HomeFilteringInfoModel -import com.terning.domain.entity.HomeRecommendInternModel +import com.terning.domain.entity.HomeFilteringInfo +import com.terning.domain.entity.HomeRecommendIntern import com.terning.domain.entity.HomeTodayInternModel import com.terning.domain.entity.request.ChangeFilteringRequestModel import com.terning.domain.repository.HomeRepository @@ -43,11 +43,11 @@ class HomeViewModel @Inject constructor( val homeTodayState get() = _homeTodayState.asStateFlow() private val _homeRecommendInternState = - MutableStateFlow>>(UiState.Loading) + MutableStateFlow>>(UiState.Loading) val homeRecommendInternState get() = _homeRecommendInternState.asStateFlow() private val _homeFilteringState = - MutableStateFlow>(UiState.Loading) + MutableStateFlow>(UiState.Loading) val homeFilteringState get() = _homeFilteringState.asStateFlow() private val _homeSortByState = MutableStateFlow(0) 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 763052d12..947f20600 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.HomeRecommendInternModel +import com.terning.domain.entity.HomeRecommendIntern import com.terning.feature.home.home.HomeViewModel import com.terning.feature.intern.component.InternInfoRow @@ -54,7 +54,7 @@ fun HomeRecommendInternDialog( internInfoList: List>, clickAction: () -> Unit, onColorSelected:(Color) -> Unit = {}, - homeRecommendInternModel: HomeRecommendInternModel, + homeRecommendIntern: HomeRecommendIntern, viewModel: HomeViewModel = hiltViewModel(), ) { val state by viewModel.homeDialogState.collectAsStateWithLifecycle() @@ -73,7 +73,7 @@ fun HomeRecommendInternDialog( ) { AsyncImage( model = ImageRequest.Builder(LocalContext.current) - .data(homeRecommendInternModel.companyImage) + .data(homeRecommendIntern.companyImage) .build(), contentDescription = stringResource(R.string.image_content_descriptin), modifier = Modifier @@ -89,7 +89,7 @@ fun HomeRecommendInternDialog( ) Text( - text = homeRecommendInternModel.title, + text = homeRecommendIntern.title, textAlign = TextAlign.Center, style = TerningTheme.typography.title4, color = Grey500, @@ -179,7 +179,7 @@ fun HomeRecommendInternDialog( } } else { Text( - text = homeRecommendInternModel.dDay, + text = homeRecommendIntern.dDay, style = TerningTheme.typography.body5, color = TerningMain, modifier = Modifier.padding(bottom = 9.dp) 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 19939e366..cc380b237 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.HomeRecommendInternModel +import com.terning.domain.entity.HomeRecommendIntern import com.terning.feature.R import com.terning.feature.home.home.component.HomeRecommendInternDialog import com.terning.feature.intern.navigation.navigateIntern @@ -360,7 +360,7 @@ fun SearchProcessScreen( onColorSelected = { newColor -> viewModel.updateSelectColor(newColor) }, - homeRecommendInternModel = HomeRecommendInternModel( + homeRecommendIntern = HomeRecommendIntern( scrapId = scrapId, internshipAnnouncementId = internshipAnnouncementId, companyImage = companyImage, From 38c1d511c1d9ac437f3e3039cd97937cf7cacbab Mon Sep 17 00:00:00 2001 From: Hyobeen-Park Date: Mon, 19 Aug 2024 22:45:07 +0900 Subject: [PATCH 3/8] =?UTF-8?q?[FEAT/#177]=20=ED=99=88=20=EA=B4=80?= =?UTF-8?q?=EB=A0=A8=20=EB=A7=A4=ED=8D=BC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../response/HomeFilteringInfoResponseDto.kt | 11 +---------- .../response/HomeRecommendInternResponseDto.kt | 16 +--------------- .../dto/response/HomeTodayInternResponseDto.kt | 17 ++--------------- .../data/mapper/HomeFilteringInfoMapper.kt | 12 ++++++++++++ .../data/mapper/HomeRecommendInternMapper.kt | 17 +++++++++++++++++ .../data/mapper/HomeTodayInternMapper.kt | 17 +++++++++++++++++ .../data/repositoryimpl/HomeRepositoryImpl.kt | 17 ++++++++++------- .../terning/domain/entity/HomeTodayIntern.kt | 2 +- .../terning/domain/repository/HomeRepository.kt | 4 ++-- .../com/terning/feature/home/home/HomeRoute.kt | 10 +++++----- .../terning/feature/home/home/HomeViewModel.kt | 4 ++-- .../home/home/component/HomeTodayIntern.kt | 6 +++--- .../home/component/HomeTodayInternDialog.kt | 16 ++++++++-------- 13 files changed, 81 insertions(+), 68 deletions(-) create mode 100644 data/src/main/java/com/terning/data/mapper/HomeFilteringInfoMapper.kt create mode 100644 data/src/main/java/com/terning/data/mapper/HomeRecommendInternMapper.kt create mode 100644 data/src/main/java/com/terning/data/mapper/HomeTodayInternMapper.kt 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 index 0f686b5b3..0b0a43308 100644 --- 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.HomeFilteringInfo 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(): HomeFilteringInfo = - HomeFilteringInfo( - grade = this.grade, - workingPeriod = this.workingPeriod, - startYear = this.startYear, - startMonth = this.startMonth, - ) -} \ No newline at end of file +) 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 index d6d1692b7..c8f8e8671 100644 --- 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.HomeRecommendIntern 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(): 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/dto/response/HomeTodayInternResponseDto.kt b/data/src/main/java/com/terning/data/dto/response/HomeTodayInternResponseDto.kt index ac8dc0c2d..8f4654c13 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,6 @@ package com.terning.data.dto.response -import com.terning.domain.entity.HomeTodayInternModel +import com.terning.domain.entity.HomeTodayIntern import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable @@ -25,17 +25,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, - ) -} +) \ No newline at end of file diff --git a/data/src/main/java/com/terning/data/mapper/HomeFilteringInfoMapper.kt b/data/src/main/java/com/terning/data/mapper/HomeFilteringInfoMapper.kt new file mode 100644 index 000000000..11cce14b3 --- /dev/null +++ b/data/src/main/java/com/terning/data/mapper/HomeFilteringInfoMapper.kt @@ -0,0 +1,12 @@ +package com.terning.data.mapper + +import com.terning.data.dto.response.HomeFilteringInfoResponseDto +import com.terning.domain.entity.HomeFilteringInfo + +fun HomeFilteringInfoResponseDto.toHomeFilteringInfo(): HomeFilteringInfo = + HomeFilteringInfo( + grade = this.grade, + workingPeriod = this.workingPeriod, + startYear = this.startYear, + startMonth = this.startMonth, + ) \ No newline at end of file diff --git a/data/src/main/java/com/terning/data/mapper/HomeRecommendInternMapper.kt b/data/src/main/java/com/terning/data/mapper/HomeRecommendInternMapper.kt new file mode 100644 index 000000000..353b2ded2 --- /dev/null +++ b/data/src/main/java/com/terning/data/mapper/HomeRecommendInternMapper.kt @@ -0,0 +1,17 @@ +package com.terning.data.mapper + +import com.terning.data.dto.response.HomeRecommendInternResponseDto +import com.terning.domain.entity.HomeRecommendIntern + +fun HomeRecommendInternResponseDto.toHomeRecommendIntern(): 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/HomeTodayInternMapper.kt b/data/src/main/java/com/terning/data/mapper/HomeTodayInternMapper.kt new file mode 100644 index 000000000..c61bfc6aa --- /dev/null +++ b/data/src/main/java/com/terning/data/mapper/HomeTodayInternMapper.kt @@ -0,0 +1,17 @@ +package com.terning.data.mapper + +import com.terning.data.dto.response.HomeTodayInternResponseDto +import com.terning.domain.entity.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, + ) \ No newline at end of file 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 0ef045556..16c2f7a2f 100644 --- a/data/src/main/java/com/terning/data/repositoryimpl/HomeRepositoryImpl.kt +++ b/data/src/main/java/com/terning/data/repositoryimpl/HomeRepositoryImpl.kt @@ -2,9 +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.HomeTodayInternModel +import com.terning.domain.entity.HomeTodayIntern import com.terning.domain.entity.request.ChangeFilteringRequestModel import com.terning.domain.repository.HomeRepository import javax.inject.Inject @@ -12,10 +15,10 @@ import javax.inject.Inject class HomeRepositoryImpl @Inject constructor( private val homeDataSource: HomeDataSource, ) : HomeRepository { - override suspend fun getHomeTodayInternList(): Result> = + override suspend fun getHomeTodayInternList(): Result> = runCatching { - homeDataSource.getTodayIntern().result.map { - it.toHomeTodayInternList() + homeDataSource.getTodayIntern().result.map { homeTodayInternResponseDto -> + homeTodayInternResponseDto.toHomeTodayInternList() } } @@ -29,14 +32,14 @@ class HomeRepositoryImpl @Inject constructor( sortBy = sortBy, startYear = startYear, startMonth = startMonth - ).result.map { - it.toRecommendInternEntity() + ).result.map { homeRecommendInternResponseDto -> + homeRecommendInternResponseDto.toHomeRecommendIntern() } } override suspend fun getFilteringInfo(): Result = runCatching { - homeDataSource.getFilteringInfo().result.toHomeFilteringInfoModel() + homeDataSource.getFilteringInfo().result.toHomeFilteringInfo() } override suspend fun putFilteringInfo(putFilteringRequest: ChangeFilteringRequestModel): Result = diff --git a/domain/src/main/java/com/terning/domain/entity/HomeTodayIntern.kt b/domain/src/main/java/com/terning/domain/entity/HomeTodayIntern.kt index 279fa1c9b..5035161d3 100644 --- a/domain/src/main/java/com/terning/domain/entity/HomeTodayIntern.kt +++ b/domain/src/main/java/com/terning/domain/entity/HomeTodayIntern.kt @@ -1,6 +1,6 @@ package com.terning.domain.entity -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 index 0f3c21ba4..fc0bcfda0 100644 --- a/domain/src/main/java/com/terning/domain/repository/HomeRepository.kt +++ b/domain/src/main/java/com/terning/domain/repository/HomeRepository.kt @@ -2,11 +2,11 @@ package com.terning.domain.repository import com.terning.domain.entity.HomeFilteringInfo import com.terning.domain.entity.HomeRecommendIntern -import com.terning.domain.entity.HomeTodayInternModel +import com.terning.domain.entity.HomeTodayIntern import com.terning.domain.entity.request.ChangeFilteringRequestModel interface HomeRepository { - suspend fun getHomeTodayInternList(): Result> + suspend fun getHomeTodayInternList(): Result> suspend fun getRecommendIntern( sortBy: String, 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 a4a59f7f3..621a66f57 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 @@ -58,7 +58,7 @@ 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.HomeTodayInternModel +import com.terning.domain.entity.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> = remember { + val homeTodayInternList: MutableState> = remember { mutableStateOf(emptyList()) } @@ -143,7 +143,7 @@ fun HomeRoute( when (homeTodayState) { is UiState.Success -> { homeTodayInternList.value = - (homeTodayState as UiState.Success>).data + (homeTodayState as UiState.Success>).data } is UiState.Loading -> {} @@ -188,7 +188,7 @@ fun HomeScreen( currentSortBy: MutableState, homeUserName: String, homeFilteringInfo: HomeFilteringInfo, - homeTodayInternList: List, + homeTodayInternList: List, recommendInternList: List, homeDialogState: HomeDialogState, onChangeFilterClick: () -> Unit, @@ -425,7 +425,7 @@ private fun ShowMainTitleWithName(userName: String) { @Composable private fun ShowTodayIntern( - homeTodayInternList: List, + homeTodayInternList: List, homeDialogState: HomeDialogState, navigateToDetail: (Long) -> Unit, ) { 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 c82e64a58..20599510e 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 @@ -8,7 +8,7 @@ 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.HomeTodayInternModel +import com.terning.domain.entity.HomeTodayIntern import com.terning.domain.entity.request.ChangeFilteringRequestModel import com.terning.domain.repository.HomeRepository import com.terning.domain.repository.MyPageRepository @@ -39,7 +39,7 @@ class HomeViewModel @Inject constructor( val homeSideEffect get() = _homeSideEffect.asSharedFlow() private val _homeTodayState = - MutableStateFlow>>(UiState.Loading) + MutableStateFlow>>(UiState.Loading) val homeTodayState get() = _homeTodayState.asStateFlow() private val _homeRecommendInternState = 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 531f6eaaf..4f44576a8 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,14 +16,14 @@ 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.HomeTodayInternModel +import com.terning.domain.entity.HomeTodayIntern import com.terning.feature.R import com.terning.feature.home.home.HomeViewModel import com.terning.feature.home.home.model.HomeDialogState @Composable fun HomeTodayIntern( - internList: List, + internList: List, homeDialogState: HomeDialogState, navigateToDetail: (Long) -> Unit, homeViewModel: HomeViewModel = hiltViewModel() @@ -76,7 +76,7 @@ fun HomeTodayIntern( navigateToDetail(internshipAnnouncementId) homeViewModel.updateScrapDialogVisible(false) }, - homeTodayInternModel = internList[selectedIndex], + homeTodayIntern = internList[selectedIndex], ) } }, 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 5b930cb2d..1b928744a 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.HomeTodayInternModel +import com.terning.domain.entity.HomeTodayIntern import com.terning.feature.home.home.HomeViewModel import com.terning.feature.intern.component.InternInfoRow @@ -62,7 +62,7 @@ import com.terning.feature.intern.component.InternInfoRow fun HomeTodayInternDialog( internInfoList: List>, navigateTo: () -> Unit, - homeTodayInternModel: HomeTodayInternModel, + homeTodayIntern: HomeTodayIntern, viewModel: HomeViewModel = hiltViewModel(), ) { val state by viewModel.homeDialogState.collectAsStateWithLifecycle() @@ -87,7 +87,7 @@ fun HomeTodayInternDialog( ) { AsyncImage( model = ImageRequest.Builder(LocalContext.current) - .data(homeTodayInternModel.companyImage) + .data(homeTodayIntern.companyImage) .build(), contentDescription = stringResource(R.string.image_content_descriptin), modifier = Modifier @@ -103,7 +103,7 @@ fun HomeTodayInternDialog( ) Text( - text = homeTodayInternModel.title, + text = homeTodayIntern.title, textAlign = TextAlign.Center, style = TerningTheme.typography.title4, color = Grey500, @@ -184,7 +184,7 @@ fun HomeTodayInternDialog( contentAlignment = Alignment.Center ) { ColorPalette( - initialColor = Color(android.graphics.Color.parseColor(homeTodayInternModel.color)), + initialColor = Color(android.graphics.Color.parseColor(homeTodayIntern.color)), onColorSelected = { newColor -> viewModel.updateSelectColor(newColor) } @@ -192,7 +192,7 @@ fun HomeTodayInternDialog( } } else { Text( - text = homeTodayInternModel.dDay, + text = homeTodayIntern.dDay, style = TerningTheme.typography.body5, color = TerningMain, modifier = Modifier.padding(bottom = 9.dp) @@ -227,14 +227,14 @@ fun HomeTodayInternDialog( viewModel.updatePaletteOpen(false) viewModel.updateColorChange(false) viewModel.patchScrap( - scrapId = homeTodayInternModel.scrapId, + scrapId = homeTodayIntern.scrapId, colorIndex = selectedColorIndex, ) } else { if (state.isColorChange) { viewModel.updateColorChange(false) viewModel.patchScrap( - scrapId = homeTodayInternModel.scrapId, + scrapId = homeTodayIntern.scrapId, colorIndex = selectedColorIndex, ) } From 78f8154d6c687d668b161f0c4ba566bba3b68578 Mon Sep 17 00:00:00 2001 From: Hyobeen-Park Date: Thu, 22 Aug 2024 00:21:00 +0900 Subject: [PATCH 4/8] =?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 From e8e48532f74695c4c61e6afffbc5151b0011731f Mon Sep 17 00:00:00 2001 From: Hyobeen-Park Date: Fri, 23 Aug 2024 11:36:16 +0900 Subject: [PATCH 5/8] =?UTF-8?q?[CHORE/#177]=20=EB=A7=A4=ED=8D=BC=20?= =?UTF-8?q?=ED=95=A8=EC=88=98=EB=AA=85=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/terning/data/mapper/home/HomeRecommendInternMapper.kt | 2 +- .../com/terning/data/repositoryimpl/HomeRepositoryImpl.kt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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 index 84e93aebd..6e505189c 100644 --- a/data/src/main/java/com/terning/data/mapper/home/HomeRecommendInternMapper.kt +++ b/data/src/main/java/com/terning/data/mapper/home/HomeRecommendInternMapper.kt @@ -3,7 +3,7 @@ package com.terning.data.mapper.home import com.terning.data.dto.response.HomeRecommendInternResponseDto import com.terning.domain.entity.home.HomeRecommendIntern -fun HomeRecommendInternResponseDto.toHomeRecommendIntern(): HomeRecommendIntern = +fun HomeRecommendInternResponseDto.toHomeRecommendInternList(): HomeRecommendIntern = HomeRecommendIntern( scrapId = this.scrapId, internshipAnnouncementId = this.internshipAnnouncementId, 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 d33c19c9e..25dc6cc11 100644 --- a/data/src/main/java/com/terning/data/repositoryimpl/HomeRepositoryImpl.kt +++ b/data/src/main/java/com/terning/data/repositoryimpl/HomeRepositoryImpl.kt @@ -3,7 +3,7 @@ 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.toHomeRecommendIntern +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 @@ -33,7 +33,7 @@ class HomeRepositoryImpl @Inject constructor( startYear = startYear, startMonth = startMonth ).result.map { homeRecommendInternResponseDto -> - homeRecommendInternResponseDto.toHomeRecommendIntern() + homeRecommendInternResponseDto.toHomeRecommendInternList() } } From dcffbd0a21fd0f66851efbaf6f14e5e67f9f4c3f Mon Sep 17 00:00:00 2001 From: LEE YOU BIN Date: Sun, 25 Aug 2024 20:53:44 +0900 Subject: [PATCH 6/8] =?UTF-8?q?[FIX/#198]=20debugImplementation=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle.kts | 4 ++-- core/build.gradle.kts | 2 +- feature/build.gradle.kts | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 456c1c632..7979f9585 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -116,8 +116,8 @@ dependencies { implementation(libs.ossLicense) implementation(libs.process.phoenix) - debugImplementation(libs.androidx.ui.tooling) - debugImplementation(libs.androidx.ui.test.manifest) + implementation(libs.androidx.ui.tooling) + implementation(libs.androidx.ui.test.manifest) // KakaoDependencies implementation(libs.kakao.user) diff --git a/core/build.gradle.kts b/core/build.gradle.kts index b1e09da7e..0dd3b2d4a 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -69,7 +69,7 @@ dependencies { implementation(libs.androidx.material3.android) // Compose Preview - debugImplementation(libs.compose.ui.tooling) + implementation(libs.compose.ui.tooling) implementation(libs.androidx.ui.tooling.preview) // Test Dependency diff --git a/feature/build.gradle.kts b/feature/build.gradle.kts index 5a7e3c948..6b56a6904 100644 --- a/feature/build.gradle.kts +++ b/feature/build.gradle.kts @@ -96,7 +96,7 @@ dependencies { implementation (libs.androidx.browser) // Compose Preview - debugImplementation(libs.compose.ui.tooling) + implementation(libs.compose.ui.tooling) // KakaoDependencies implementation(libs.kakao.user) From fb49262f8b55d159646e999ceee8dfadeddf62c3 Mon Sep 17 00:00:00 2001 From: LEE YOU BIN Date: Sun, 25 Aug 2024 21:17:00 +0900 Subject: [PATCH 7/8] =?UTF-8?q?[FIX/#198]=20=EB=B6=88=ED=95=84=EC=9A=94?= =?UTF-8?q?=ED=95=9C=20=EC=9E=84=ED=8F=AC=ED=8A=B8=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/build.gradle.kts | 1 - 1 file changed, 1 deletion(-) diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 0dd3b2d4a..6c71ee666 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -70,7 +70,6 @@ dependencies { // Compose Preview implementation(libs.compose.ui.tooling) - implementation(libs.androidx.ui.tooling.preview) // Test Dependency testImplementation(libs.junit) From efdd64930642f9b63d0d6c26ba160ab385544a94 Mon Sep 17 00:00:00 2001 From: LEE YOU BIN Date: Sun, 25 Aug 2024 21:32:49 +0900 Subject: [PATCH 8/8] =?UTF-8?q?[FIX/#198]=20=EB=B6=88=ED=95=84=EC=9A=94?= =?UTF-8?q?=ED=95=9C=20=EC=9E=84=ED=8F=AC=ED=8A=B8=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle.kts | 4 ++-- gradle/libs.versions.toml | 6 +----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 7979f9585..e01b17572 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -116,8 +116,8 @@ dependencies { implementation(libs.ossLicense) implementation(libs.process.phoenix) - implementation(libs.androidx.ui.tooling) - implementation(libs.androidx.ui.test.manifest) + // Compose Preview + implementation(libs.compose.ui.tooling) // KakaoDependencies implementation(libs.kakao.user) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 29d2a6622..63638296d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -66,7 +66,7 @@ lottieVersion = "6.0.0" accompanistSystemuicontroller = "0.28.0" coreSplashscreen = "1.0.1" -# ui +# UI uiTooling = "1.6.8" ## Test @@ -120,9 +120,6 @@ compose-compiler-gradle-plugin = { module = "org.jetbrains.kotlin:compose-compil androidx-ui = { group = "androidx.compose.ui", name = "ui" } androidx-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" } -androidx-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" } -androidx-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" } -androidx-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" } androidx-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" } androidx-foundation-android = { group = "androidx.compose.foundation", name = "foundation-android", version.ref = "foundationAndroid" } androidx-material3-android = { group = "androidx.compose.material3", name = "material3-android", version.ref = "material3Android" } @@ -175,7 +172,6 @@ kakao-user = {group = "com.kakao.sdk", name = "v2-user", version.ref = "kakaoVer process-phoenix = {group = "com.jakewharton", name = "process-phoenix", version.ref = "processPhoenix"} accompanist-systemuicontroller = { module = "com.google.accompanist:accompanist-systemuicontroller", version.ref = "accompanistSystemuicontroller" } - [plugins] android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" } kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }