Skip to content

Commit 604081a

Browse files
l5x5ll5x5l
committed
CHORE: List와 같은 복수형 변수 네이밍을 뒤에 s를 붙이는 방식으로 통일
1 parent a87e993 commit 604081a

15 files changed

Lines changed: 58 additions & 60 deletions

File tree

‎data/src/main/java/com/threegap/bitnagil/data/onboarding/model/dto/OnBoardingAbstractDto.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ data class OnBoardingAbstractDto(
99
fun toOnBoardingAbstract(): OnBoardingAbstract {
1010
return OnBoardingAbstract(
1111
prefix = prefixText,
12-
abstractTextList = detailTextsList.map { detailTexts ->
12+
abstractTexts = detailTextsList.map { detailTexts ->
1313
detailTexts.toOnBoardingAbstractText()
1414
}
1515
)

‎data/src/main/java/com/threegap/bitnagil/data/onboarding/model/dto/OnBoardingAbstractTextDto.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ data class OnBoardingAbstractTextDto(
77
) {
88
fun toOnBoardingAbstractText(): OnBoardingAbstractText {
99
return OnBoardingAbstractText(
10-
textItemList = textItemList.map { textItemDto ->
10+
textItems = textItemList.map { textItemDto ->
1111
textItemDto.toOnBoardingAbstractTextItem()
1212
}
1313
)

‎data/src/main/java/com/threegap/bitnagil/data/onboarding/repositoryImpl/OnBoardingRepositoryImpl.kt‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,22 @@ class OnBoardingRepositoryImpl @Inject constructor(
1414
private val onBoardingDataSource: OnBoardingDataSource
1515
) : OnBoardingRepository {
1616
override suspend fun getOnBoardingList(): List<OnBoarding> {
17-
val onBoardingDtoList = onBoardingDataSource.getOnBoardingList()
18-
return onBoardingDtoList.map { onBoardingDto ->
17+
val onBoardingDtos = onBoardingDataSource.getOnBoardingList()
18+
return onBoardingDtos.map { onBoardingDto ->
1919
onBoardingDto.toOnBoarding()
2020
}
2121
}
2222

23-
override suspend fun getOnBoardingAbstract(selectedOnBoardingItemsList: List<Pair<String, List<String>>>): OnBoardingAbstract {
24-
val onBoardingAbstractDto = onBoardingDataSource.getOnBoardingAbstract(selectedOnBoardingItemsList)
23+
override suspend fun getOnBoardingAbstract(selectedItemIdsWithOnBoardingId: List<Pair<String, List<String>>>): OnBoardingAbstract {
24+
val onBoardingAbstractDto = onBoardingDataSource.getOnBoardingAbstract(selectedItemIdsWithOnBoardingId)
2525
return onBoardingAbstractDto.toOnBoardingAbstract()
2626
}
2727

28-
29-
override suspend fun getRecommendOnBoardingRouteList(selectedOnBoardingItemsList: List<Pair<String, List<String>>>): Result<List<OnBoardingRecommendRoutine>> {
30-
val timeSlot = selectedOnBoardingItemsList.find { it.first == OnBoardingDto.TimeSlot.id }?.second?.first()
31-
val emotionType = selectedOnBoardingItemsList.find { it.first == OnBoardingDto.EmotionType.id }?.second?.first()
32-
val realOutingFrequency = selectedOnBoardingItemsList.find { it.first == OnBoardingDto.RealOutingFrequency.id }?.second?.first()
33-
val targetOutingFrequency = selectedOnBoardingItemsList.find { it.first == OnBoardingDto.TargetOutingFrequency.id }?.second?.first()
28+
override suspend fun getRecommendOnBoardingRouteList(selectedItemIdsWithOnBoardingId: List<Pair<String, List<String>>>): Result<List<OnBoardingRecommendRoutine>> {
29+
val timeSlot = selectedItemIdsWithOnBoardingId.find { it.first == OnBoardingDto.TimeSlot.id }?.second?.first()
30+
val emotionType = selectedItemIdsWithOnBoardingId.find { it.first == OnBoardingDto.EmotionType.id }?.second?.first()
31+
val realOutingFrequency = selectedItemIdsWithOnBoardingId.find { it.first == OnBoardingDto.RealOutingFrequency.id }?.second?.first()
32+
val targetOutingFrequency = selectedItemIdsWithOnBoardingId.find { it.first == OnBoardingDto.TargetOutingFrequency.id }?.second?.first()
3433

3534
val request = GetOnBoardingRecommendRoutinesRequest(
3635
timeSlot = timeSlot ?: "",
@@ -46,8 +45,8 @@ class OnBoardingRepositoryImpl @Inject constructor(
4645
}
4746
}
4847

49-
override suspend fun registerRecommendRoutineList(selectedRecommendRoutineIdList: List<String>): Result<Unit> {
50-
val request = RegisterOnBoardingRecommendRoutinesRequest(recommendedRoutineIds = selectedRecommendRoutineIdList)
48+
override suspend fun registerRecommendRoutineList(selectedRecommendRoutineIds: List<String>): Result<Unit> {
49+
val request = RegisterOnBoardingRecommendRoutinesRequest(recommendedRoutineIds = selectedRecommendRoutineIds)
5150

5251
// todo - 서버측 구현시 연결
5352
return Result.success(Unit)

‎domain/src/main/java/com/threegap/bitnagil/domain/onboarding/model/OnBoardingAbstract.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ package com.threegap.bitnagil.domain.onboarding.model
22

33
data class OnBoardingAbstract(
44
val prefix: String,
5-
val abstractTextList: List<OnBoardingAbstractText>
5+
val abstractTexts: List<OnBoardingAbstractText>
66
)

‎domain/src/main/java/com/threegap/bitnagil/domain/onboarding/model/OnBoardingAbstractText.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
package com.threegap.bitnagil.domain.onboarding.model
22

33
data class OnBoardingAbstractText(
4-
val textItemList: List<OnBoardingAbstractTextItem>
4+
val textItems: List<OnBoardingAbstractTextItem>
55
)

‎domain/src/main/java/com/threegap/bitnagil/domain/onboarding/repository/OnBoardingRepository.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import com.threegap.bitnagil.domain.onboarding.model.OnBoardingRecommendRoutine
66

77
interface OnBoardingRepository {
88
suspend fun getOnBoardingList(): List<OnBoarding>
9-
suspend fun getOnBoardingAbstract(selectedOnBoardingItemsList: List<Pair<String, List<String>>>): OnBoardingAbstract
10-
suspend fun getRecommendOnBoardingRouteList(selectedOnBoardingItemsList: List<Pair<String, List<String>>>): Result<List<OnBoardingRecommendRoutine>>
11-
suspend fun registerRecommendRoutineList(selectedRecommendRoutineIdList: List<String>): Result<Unit>
9+
suspend fun getOnBoardingAbstract(selectedItemIdsWithOnBoardingId: List<Pair<String, List<String>>>): OnBoardingAbstract
10+
suspend fun getRecommendOnBoardingRouteList(selectedItemIdsWithOnBoardingId: List<Pair<String, List<String>>>): Result<List<OnBoardingRecommendRoutine>>
11+
suspend fun registerRecommendRoutineList(selectedRecommendRoutineIds: List<String>): Result<Unit>
1212
}

‎domain/src/main/java/com/threegap/bitnagil/domain/onboarding/usecase/GetOnBoardingAbstractUseCase.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import javax.inject.Inject
77
class GetOnBoardingAbstractUseCase @Inject constructor(
88
private val onBoardingRepository: OnBoardingRepository
99
) {
10-
suspend operator fun invoke(selectedOnBoardingItemIdLists: List<Pair<String, List<String>>>): OnBoardingAbstract {
11-
return onBoardingRepository.getOnBoardingAbstract(selectedOnBoardingItemIdLists)
10+
suspend operator fun invoke(selectedItemIdsWithOnBoardingId: List<Pair<String, List<String>>>): OnBoardingAbstract {
11+
return onBoardingRepository.getOnBoardingAbstract(selectedItemIdsWithOnBoardingId)
1212
}
1313
}

domain/src/main/java/com/threegap/bitnagil/domain/onboarding/usecase/GetOnBoardingListUseCase.kt renamed to domain/src/main/java/com/threegap/bitnagil/domain/onboarding/usecase/GetOnBoardingsUseCase.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import com.threegap.bitnagil.domain.onboarding.model.OnBoarding
44
import com.threegap.bitnagil.domain.onboarding.repository.OnBoardingRepository
55
import javax.inject.Inject
66

7-
class GetOnBoardingListUseCase @Inject constructor(
7+
class GetOnBoardingsUseCase @Inject constructor(
88
private val onBoardingRepository: OnBoardingRepository
99
) {
1010
suspend operator fun invoke(): List<OnBoarding> {

domain/src/main/java/com/threegap/bitnagil/domain/onboarding/usecase/GetRecommendOnBoardingRoutineListUseCase.kt renamed to domain/src/main/java/com/threegap/bitnagil/domain/onboarding/usecase/GetRecommendOnBoardingRoutinesUseCase.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ import com.threegap.bitnagil.domain.onboarding.model.OnBoardingRecommendRoutine
44
import com.threegap.bitnagil.domain.onboarding.repository.OnBoardingRepository
55
import javax.inject.Inject
66

7-
class GetRecommendOnBoardingRoutineListUseCase @Inject constructor(
7+
class GetRecommendOnBoardingRoutinesUseCase @Inject constructor(
88
private val onBoardingRepository: OnBoardingRepository
99
) {
10-
suspend operator fun invoke(selectedOnBoardingItemIdLists: List<Pair<String, List<String>>>) : Result<List<OnBoardingRecommendRoutine>> {
11-
return onBoardingRepository.getRecommendOnBoardingRouteList(selectedOnBoardingItemIdLists)
10+
suspend operator fun invoke(selectedItemIdsWithOnBoardingId: List<Pair<String, List<String>>>) : Result<List<OnBoardingRecommendRoutine>> {
11+
return onBoardingRepository.getRecommendOnBoardingRouteList(selectedItemIdsWithOnBoardingId)
1212
}
1313
}

domain/src/main/java/com/threegap/bitnagil/domain/onboarding/usecase/RegisterRecommendOnBoardingRoutineListUseCase.kt renamed to domain/src/main/java/com/threegap/bitnagil/domain/onboarding/usecase/RegisterRecommendOnBoardingRoutinesUseCase.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ package com.threegap.bitnagil.domain.onboarding.usecase
33
import com.threegap.bitnagil.domain.onboarding.repository.OnBoardingRepository
44
import javax.inject.Inject
55

6-
class RegisterRecommendOnBoardingRoutineListUseCase @Inject constructor(
6+
class RegisterRecommendOnBoardingRoutinesUseCase @Inject constructor(
77
private val repository: OnBoardingRepository,
88
) {
9-
suspend operator fun invoke(selectedRecommendRoutineIdList: List<String>) : Result<Unit> {
10-
return repository.registerRecommendRoutineList(selectedRecommendRoutineIdList = selectedRecommendRoutineIdList)
9+
suspend operator fun invoke(selectedRecommendRoutineIds: List<String>) : Result<Unit> {
10+
return repository.registerRecommendRoutineList(selectedRecommendRoutineIds = selectedRecommendRoutineIds)
1111
}
1212
}

0 commit comments

Comments
 (0)