Skip to content

Commit 490c20c

Browse files
l5x5ll5x5l
committed
CHORE: ktlint 적용
1 parent 604081a commit 490c20c

27 files changed

Lines changed: 77 additions & 85 deletions

‎data/src/main/java/com/threegap/bitnagil/data/onboarding/datasourceImpl/OnBoardingDataSourceImpl.kt‎

Lines changed: 26 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ import com.threegap.bitnagil.data.onboarding.service.OnBoardingService
1313
import javax.inject.Inject
1414

1515
class OnBoardingDataSourceImpl @Inject constructor(
16-
private val onBoardingService: OnBoardingService
16+
private val onBoardingService: OnBoardingService,
1717
) : OnBoardingDataSource {
1818
private val onBoardingDtoList = listOf(
1919
OnBoardingDto.TimeSlot,
2020
OnBoardingDto.RealOutingFrequency,
2121
OnBoardingDto.EmotionType,
22-
OnBoardingDto.TargetOutingFrequency
22+
OnBoardingDto.TargetOutingFrequency,
2323
)
2424

2525
override suspend fun getOnBoardingList(): List<OnBoardingDto> {
@@ -37,14 +37,14 @@ class OnBoardingDataSourceImpl @Inject constructor(
3737

3838
for ((onBoardingId, selectedOnBoardingDetailIdList) in selectedOnBoardingItemIdList) {
3939
val onBoardingAbstractText = getOnBoardingAbstractText(onBoardingId, selectedOnBoardingDetailIdList)
40-
if (onBoardingAbstractText != null){
40+
if (onBoardingAbstractText != null) {
4141
onBoardingAbstractTextList.add(onBoardingAbstractText)
4242
}
4343
}
4444

4545
return OnBoardingAbstractDto(
4646
prefixText = "당신은 지금",
47-
detailTextsList = onBoardingAbstractTextList
47+
detailTextsList = onBoardingAbstractTextList,
4848
)
4949
}
5050

@@ -61,9 +61,9 @@ class OnBoardingDataSourceImpl @Inject constructor(
6161
}
6262

6363
private fun getSingleSelectOnBoardingAbstractText(onBoardingId: String, onBoardingDetailId: String): OnBoardingAbstractTextDto? {
64-
when(onBoardingId) {
64+
when (onBoardingId) {
6565
OnBoardingDto.TimeSlot.id -> {
66-
return when(onBoardingDetailId) {
66+
return when (onBoardingDetailId) {
6767
OnBoardingItemDto.Morning.id -> {
6868
OnBoardingAbstractTextDto(
6969
textItemList = listOf(
@@ -75,7 +75,7 @@ class OnBoardingDataSourceImpl @Inject constructor(
7575
text = "을 만들고 싶고",
7676
isBold = false,
7777
),
78-
)
78+
),
7979
)
8080
}
8181
OnBoardingItemDto.Evening.id -> {
@@ -89,7 +89,7 @@ class OnBoardingDataSourceImpl @Inject constructor(
8989
text = "을 만들고 싶고",
9090
isBold = false,
9191
),
92-
)
92+
),
9393
)
9494
}
9595
OnBoardingItemDto.Nothing.id -> {
@@ -103,7 +103,7 @@ class OnBoardingDataSourceImpl @Inject constructor(
103103
text = "을 회복하고 싶고",
104104
isBold = false,
105105
),
106-
)
106+
),
107107
)
108108
}
109109
else -> {
@@ -112,7 +112,7 @@ class OnBoardingDataSourceImpl @Inject constructor(
112112
}
113113
}
114114
OnBoardingDto.TargetOutingFrequency.id -> {
115-
return when(onBoardingDetailId) {
115+
return when (onBoardingDetailId) {
116116
OnBoardingItemDto.TargetOutingOneToTwoPerWeek.id -> {
117117
OnBoardingAbstractTextDto(
118118
textItemList = listOf(
@@ -124,7 +124,7 @@ class OnBoardingDataSourceImpl @Inject constructor(
124124
text = " 목표로 해볼꼐요!",
125125
isBold = false,
126126
),
127-
)
127+
),
128128
)
129129
}
130130
OnBoardingItemDto.TargetOutingThreeToFourPerWeek.id -> {
@@ -138,7 +138,7 @@ class OnBoardingDataSourceImpl @Inject constructor(
138138
text = " 목표로 해볼께요!",
139139
isBold = false,
140140
),
141-
)
141+
),
142142
)
143143
}
144144
OnBoardingItemDto.TargetOutingMoreThenFivePerWeek.id -> {
@@ -152,7 +152,7 @@ class OnBoardingDataSourceImpl @Inject constructor(
152152
text = " 목표로 해볼께요!",
153153
isBold = false,
154154
),
155-
)
155+
),
156156
)
157157
}
158158
OnBoardingItemDto.TargetOutingUnknown.id -> {
@@ -166,7 +166,7 @@ class OnBoardingDataSourceImpl @Inject constructor(
166166
text = " 목표로 해볼께요!",
167167
isBold = false,
168168
),
169-
)
169+
),
170170
)
171171
}
172172
else -> {
@@ -183,23 +183,23 @@ class OnBoardingDataSourceImpl @Inject constructor(
183183
private fun getMultipleSelectOnBoardingAbstractText(onBoardingId: String, onBoardingDetailIdList: List<String>): OnBoardingAbstractTextDto {
184184
val onBoardingAbstractTextItemList = mutableListOf<OnBoardingAbstractTextItemDto>()
185185

186-
when(onBoardingId) {
186+
when (onBoardingId) {
187187
OnBoardingDto.EmotionType.id -> {
188188
for (onBoardingDetailId in onBoardingDetailIdList) {
189-
when(onBoardingDetailId) {
189+
when (onBoardingDetailId) {
190190
OnBoardingItemDto.Stability.id -> {
191191
onBoardingAbstractTextItemList.apply {
192192
add(
193193
OnBoardingAbstractTextItemDto(
194194
text = "안정감",
195195
isBold = true,
196-
)
196+
),
197197
)
198198
add(
199199
OnBoardingAbstractTextItemDto(
200200
text = ", ",
201201
isBold = false,
202-
)
202+
),
203203
)
204204
}
205205
}
@@ -209,13 +209,13 @@ class OnBoardingDataSourceImpl @Inject constructor(
209209
OnBoardingAbstractTextItemDto(
210210
text = "연결감",
211211
isBold = true,
212-
)
212+
),
213213
)
214214
add(
215215
OnBoardingAbstractTextItemDto(
216216
text = ", ",
217217
isBold = false,
218-
)
218+
),
219219
)
220220
}
221221
}
@@ -225,13 +225,13 @@ class OnBoardingDataSourceImpl @Inject constructor(
225225
OnBoardingAbstractTextItemDto(
226226
text = "성장감",
227227
isBold = true,
228-
)
228+
),
229229
)
230230
add(
231231
OnBoardingAbstractTextItemDto(
232232
text = ", ",
233233
isBold = false,
234-
)
234+
),
235235
)
236236
}
237237
}
@@ -241,30 +241,29 @@ class OnBoardingDataSourceImpl @Inject constructor(
241241
OnBoardingAbstractTextItemDto(
242242
text = "생동감",
243243
isBold = true,
244-
)
244+
),
245245
)
246246
add(
247247
OnBoardingAbstractTextItemDto(
248248
text = ", ",
249249
isBold = false,
250-
)
250+
),
251251
)
252252
}
253253
}
254254
}
255255
}
256256
}
257257
else -> {
258-
259258
}
260259
}
261260

262261
onBoardingAbstractTextItemList.removeLastOrNull()
263262
onBoardingAbstractTextItemList.add(
264263
OnBoardingAbstractTextItemDto(
265264
text = "을 원하는 중이에요.",
266-
isBold = false
267-
)
265+
isBold = false,
266+
),
268267
)
269268

270269
return OnBoardingAbstractTextDto(

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ import com.threegap.bitnagil.domain.onboarding.model.OnBoardingAbstract
44

55
data class OnBoardingAbstractDto(
66
val prefixText: String,
7-
val detailTextsList: List<OnBoardingAbstractTextDto>
7+
val detailTextsList: List<OnBoardingAbstractTextDto>,
88
) {
99
fun toOnBoardingAbstract(): OnBoardingAbstract {
1010
return OnBoardingAbstract(
1111
prefix = prefixText,
1212
abstractTexts = detailTextsList.map { detailTexts ->
1313
detailTexts.toOnBoardingAbstractText()
14-
}
14+
},
1515
)
1616
}
1717
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ package com.threegap.bitnagil.data.onboarding.model.dto
33
import com.threegap.bitnagil.domain.onboarding.model.OnBoardingAbstractText
44

55
data class OnBoardingAbstractTextDto(
6-
val textItemList: List<OnBoardingAbstractTextItemDto>
6+
val textItemList: List<OnBoardingAbstractTextItemDto>,
77
) {
88
fun toOnBoardingAbstractText(): OnBoardingAbstractText {
99
return OnBoardingAbstractText(
1010
textItems = textItemList.map { textItemDto ->
1111
textItemDto.toOnBoardingAbstractTextItem()
12-
}
12+
},
1313
)
1414
}
1515
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ data class OnBoardingAbstractTextItemDto(
99
fun toOnBoardingAbstractTextItem(): OnBoardingAbstractTextItem {
1010
return OnBoardingAbstractTextItem(
1111
text = text,
12-
isBold= isBold,
12+
isBold = isBold,
1313
)
1414
}
1515
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ data class OnBoardingDto(
4242
OnBoardingItemDto.RealOutingOneToTwoPerWeek,
4343
OnBoardingItemDto.RealOutingThreeToFourPerWeek,
4444
OnBoardingItemDto.RealOutingMoreThanFivePerWeek,
45-
)
45+
),
4646
)
4747

4848
val EmotionType = OnBoardingDto(
@@ -55,7 +55,7 @@ data class OnBoardingDto(
5555
OnBoardingItemDto.Connectedness,
5656
OnBoardingItemDto.Vitality,
5757
OnBoardingItemDto.Growth,
58-
)
58+
),
5959
)
6060

6161
val TargetOutingFrequency = OnBoardingDto(
@@ -68,7 +68,7 @@ data class OnBoardingDto(
6868
OnBoardingItemDto.TargetOutingThreeToFourPerWeek,
6969
OnBoardingItemDto.TargetOutingMoreThenFivePerWeek,
7070
OnBoardingItemDto.TargetOutingUnknown,
71-
)
71+
),
7272
)
7373
}
7474
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ data class OnBoardingRecommendRoutineDto(
1313
@SerialName("routineDescription")
1414
val routineDescription: String,
1515
@SerialName("recommendedRoutineDetails")
16-
val recommendedRoutineDetails: List<OnBoardingRecommendRoutineDetailDto>
16+
val recommendedRoutineDetails: List<OnBoardingRecommendRoutineDetailDto>,
1717
) {
1818
fun toOnBoardingRecommendRoutine(): OnBoardingRecommendRoutine {
1919
return OnBoardingRecommendRoutine(

‎data/src/main/java/com/threegap/bitnagil/data/onboarding/model/request/RegisterOnBoardingRecommendRoutinesRequest.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ import kotlinx.serialization.Serializable
66
@Serializable
77
data class RegisterOnBoardingRecommendRoutinesRequest(
88
@SerialName("recommendedRoutineIds")
9-
val recommendedRoutineIds: List<String>
9+
val recommendedRoutineIds: List<String>,
1010
)

‎data/src/main/java/com/threegap/bitnagil/data/onboarding/model/response/GetOnBoardingRecommendRoutinesResponse.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ import kotlinx.serialization.Serializable
77
@Serializable
88
data class GetOnBoardingRecommendRoutinesResponse(
99
@SerialName("recommendedRoutines")
10-
val recommendedRoutines: List<OnBoardingRecommendRoutineDto>
10+
val recommendedRoutines: List<OnBoardingRecommendRoutineDto>,
1111
)

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import com.threegap.bitnagil.domain.onboarding.repository.OnBoardingRepository
1111
import javax.inject.Inject
1212

1313
class OnBoardingRepositoryImpl @Inject constructor(
14-
private val onBoardingDataSource: OnBoardingDataSource
14+
private val onBoardingDataSource: OnBoardingDataSource,
1515
) : OnBoardingRepository {
1616
override suspend fun getOnBoardingList(): List<OnBoarding> {
1717
val onBoardingDtos = onBoardingDataSource.getOnBoardingList()
@@ -25,7 +25,9 @@ class OnBoardingRepositoryImpl @Inject constructor(
2525
return onBoardingAbstractDto.toOnBoardingAbstract()
2626
}
2727

28-
override suspend fun getRecommendOnBoardingRouteList(selectedItemIdsWithOnBoardingId: List<Pair<String, List<String>>>): Result<List<OnBoardingRecommendRoutine>> {
28+
override suspend fun getRecommendOnBoardingRouteList(
29+
selectedItemIdsWithOnBoardingId: List<Pair<String, List<String>>>,
30+
): Result<List<OnBoardingRecommendRoutine>> {
2931
val timeSlot = selectedItemIdsWithOnBoardingId.find { it.first == OnBoardingDto.TimeSlot.id }?.second?.first()
3032
val emotionType = selectedItemIdsWithOnBoardingId.find { it.first == OnBoardingDto.EmotionType.id }?.second?.first()
3133
val realOutingFrequency = selectedItemIdsWithOnBoardingId.find { it.first == OnBoardingDto.RealOutingFrequency.id }?.second?.first()
@@ -35,7 +37,7 @@ class OnBoardingRepositoryImpl @Inject constructor(
3537
timeSlot = timeSlot ?: "",
3638
emotionType = emotionType ?: "",
3739
realOutingFrequency = realOutingFrequency ?: "",
38-
targetOutingFrequency = targetOutingFrequency ?: ""
40+
targetOutingFrequency = targetOutingFrequency ?: "",
3941
)
4042

4143
return onBoardingDataSource.getOnBoardingRecommendRoutines(request = request).map {
@@ -51,5 +53,4 @@ class OnBoardingRepositoryImpl @Inject constructor(
5153
// todo - 서버측 구현시 연결
5254
return Result.success(Unit)
5355
}
54-
5556
}

‎data/src/main/java/com/threegap/bitnagil/data/onboarding/service/OnBoardingService.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ import retrofit2.http.POST
99
interface OnBoardingService {
1010
@POST("/api/v1/onboarding")
1111
suspend fun postOnBoarding(
12-
@Body onBoardingRecommendRoutinesRequest: GetOnBoardingRecommendRoutinesRequest
12+
@Body onBoardingRecommendRoutinesRequest: GetOnBoardingRecommendRoutinesRequest,
1313
): BaseResponse<GetOnBoardingRecommendRoutinesResponse>
1414
}

0 commit comments

Comments
 (0)