Skip to content

Commit d8dd161

Browse files
dongx0915dongx0915
committed
Revert "Merge pull request #345 from Runnect/feature/refactor-api-flow-discover-mypage"
This reverts commit 2f2fa5d, reversing changes made to 5661733.
1 parent a217fb2 commit d8dd161

File tree

78 files changed

+1321
-1343
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+1321
-1343
lines changed

‎app/src/main/java/com/runnect/runnect/data/dto/LocationData.kt‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package com.runnect.runnect.data.dto
2+
3+
4+
import android.os.Parcelable
5+
import kotlinx.android.parcel.Parcelize
6+
7+
@Parcelize
8+
data class LocationData(
9+
val buildingName: String,
10+
val fullAddress: String,
11+
) : Parcelable

‎app/src/main/java/com/runnect/runnect/data/dto/LoginDTO.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.runnect.runnect.data.dto
22

33
data class LoginDTO(
4+
val status: Int,
45
val accessToken: String,
56
val refreshToken: String,
67
val email: String,

app/src/main/java/com/runnect/runnect/domain/entity/UserUploadCourse.kt renamed to app/src/main/java/com/runnect/runnect/data/dto/UserUploadCourseDTO.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package com.runnect.runnect.domain.entity
1+
package com.runnect.runnect.data.dto
22

3-
data class UserUploadCourse(
3+
data class UserUploadCourseDTO(
44
val id:Int,
55
val img:String,
66
var title:String,

‎app/src/main/java/com/runnect/runnect/data/dto/response/ResponseGetMyDrawCourse.kt‎

Lines changed: 17 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -7,29 +7,29 @@ import kotlinx.serialization.Serializable
77
@Serializable
88
data class ResponseGetMyDrawCourse(
99
@SerialName("courses")
10-
val courses: List<Course>?,
10+
val courses: List<Course>,
1111
@SerialName("user")
12-
val user: User?,
12+
val user: User,
1313
) {
1414
@Serializable
1515
data class Course(
1616
@SerialName("createdAt")
17-
val createdAt: String?,
17+
val createdAt: String,
1818
@SerialName("departure")
19-
val departure: Departure?,
19+
val departure: Departure,
2020
@SerialName("id")
21-
val id: Int?,
21+
val id: Int,
2222
@SerialName("image")
23-
val image: String?,
23+
val image: String,
2424
@SerialName("title")
25-
val title: String?
25+
val title: String
2626
) {
2727
@Serializable
2828
data class Departure(
2929
@SerialName("city")
30-
val city: String?,
30+
val city: String,
3131
@SerialName("region")
32-
val region: String?,
32+
val region: String,
3333
)
3434
}
3535

@@ -41,17 +41,13 @@ data class ResponseGetMyDrawCourse(
4141
}
4242

4343
fun ResponseGetMyDrawCourse.toMyDrawCourse(): List<MyDrawCourse> {
44-
45-
return if (this.courses.isNullOrEmpty()) emptyList()
46-
else {
47-
this.courses.map {
48-
MyDrawCourse(
49-
courseId = it.id,
50-
image = it.image,
51-
city = it.departure?.city ?: "", //todo - 예외 처리 논의
52-
region = it.departure?.region ?: "",
53-
title = it.title ?: ""
54-
)
55-
}
44+
return this.courses.map {
45+
MyDrawCourse(
46+
courseId = it.id,
47+
image = it.image,
48+
city = it.departure.city,
49+
region = it.departure.region,
50+
title = it.title
51+
)
5652
}
5753
}

‎app/src/main/java/com/runnect/runnect/data/dto/response/ResponseGetMyDrawDetail.kt‎

Lines changed: 47 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,61 @@
11
package com.runnect.runnect.data.dto.response
22

3+
34
import kotlinx.serialization.SerialName
45
import kotlinx.serialization.Serializable
56

67
@Serializable
78
data class ResponseGetMyDrawDetail(
8-
@SerialName("course")
9-
val course: Course,
10-
@SerialName("user")
11-
val user: User,
9+
@SerialName("data")
10+
val data: Data,
11+
@SerialName("message")
12+
val message: String,
13+
@SerialName("status")
14+
val status: Int,
15+
@SerialName("success")
16+
val success: Boolean,
1217
) {
1318
@Serializable
14-
data class User(
15-
@SerialName("userId")
16-
val id: Int,
17-
)
18-
19-
@Serializable
20-
data class Course(
21-
@SerialName("id")
22-
val id: Int,
23-
@SerialName("createdAt")
24-
val createdAt: String,
25-
@SerialName("path")
26-
val path: List<List<Double>>,
27-
@SerialName("distance")
28-
val distance: Float,
29-
@SerialName("image")
30-
val image: String,
31-
@SerialName("title")
32-
val title: String,
33-
@SerialName("departure")
34-
val departure: Departure,
19+
data class Data(
20+
@SerialName("course")
21+
val course: Course,
22+
@SerialName("user")
23+
val user: User,
3524
) {
25+
3626
@Serializable
37-
data class Departure(
38-
@SerialName("region")
39-
val region: String,
40-
@SerialName("city")
41-
val city: String,
42-
@SerialName("town")
43-
val town: String,
44-
@SerialName("name")
45-
val name: String,
27+
data class User(
28+
@SerialName("userId")
29+
val id: Int,
4630
)
31+
@Serializable
32+
data class Course(
33+
@SerialName("id")
34+
val id: Int,
35+
@SerialName("createdAt")
36+
val createdAt: String,
37+
@SerialName("path")
38+
val path: List<List<Double>>,
39+
@SerialName("distance")
40+
val distance: Float,
41+
@SerialName("image")
42+
val image: String,
43+
@SerialName("title")
44+
val title: String,
45+
@SerialName("departure")
46+
val departure: Departure,
47+
) {
48+
@Serializable
49+
data class Departure(
50+
@SerialName("region")
51+
val region: String,
52+
@SerialName("city")
53+
val city: String,
54+
@SerialName("town")
55+
val town: String,
56+
@SerialName("name")
57+
val name: String,
58+
)
59+
}
4760
}
48-
4961
}

‎app/src/main/java/com/runnect/runnect/data/dto/response/ResponseGetMyHistory.kt‎

Lines changed: 33 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,44 @@
11
package com.runnect.runnect.data.dto.response
22

3-
import com.runnect.runnect.data.dto.HistoryInfoDTO
43
import kotlinx.serialization.SerialName
54
import kotlinx.serialization.Serializable
65

76
@Serializable
87
data class ResponseGetMyHistory(
9-
val user: RecordUser,
10-
val records: List<Record>,
11-
) {
12-
@Serializable
13-
data class RecordUser(
14-
@SerialName("userId") val id: Int
15-
)
8+
val `data`: HistoryData,
9+
val message: String,
10+
val status: Int,
11+
val success: Boolean
12+
)
1613

17-
@Serializable
18-
data class Record(
19-
val courseId: Int,
20-
val createdAt: String,
21-
val departure: Departure,
22-
val distance: Double,
23-
val id: Int,
24-
val image: String,
25-
val pace: String,
26-
val publicCourseId: Int?,
27-
val time: String,
28-
val title: String
29-
) {
30-
@Serializable
31-
data class Departure(
32-
val city: String,
33-
val region: String
34-
)
35-
}
14+
@Serializable
15+
data class Record(
16+
val courseId: Int,
17+
val createdAt: String,
18+
val departure: Departure,
19+
val distance: Double,
20+
val id: Int,
21+
val image: String,
22+
val pace: String,
23+
val publicCourseId: Int?,
24+
val time: String,
25+
val title: String
26+
)
3627

37-
fun toHistoryInfoList(): List<HistoryInfoDTO> {
38-
return records.map {
39-
HistoryInfoDTO(
40-
id = it.id,
41-
img = it.image,
42-
title = it.title,
43-
location = "${it.departure.region} ${it.departure.city}",
44-
date = (it.createdAt.split(" ")[0]).replace("-", "."),
45-
distance = it.distance.toString(),
46-
time = timeConvert(it.time),
47-
pace = paceConvert(it.pace)
48-
)
49-
}
50-
}
28+
@Serializable
29+
data class Departure(
30+
val city: String,
31+
val region: String
32+
)
5133

52-
private fun timeConvert(time: String): String {
53-
val hms = time.split(":").toMutableList()
54-
if (hms[0] == "00") {
55-
hms[0] = "0"
56-
}
57-
return "${hms[0]}:${hms[1]}:${hms[2]}"
58-
}
34+
@Serializable
35+
data class RecordUser(
36+
@SerialName("userId") val id: Int
37+
)
38+
39+
@Serializable
40+
data class HistoryData(
41+
val records: List<Record>,
42+
val user: RecordUser
43+
)
5944

60-
private fun paceConvert(p: String): String {
61-
val pace = p.split(":").toMutableList()
62-
return if (pace[0] == "00") {
63-
pace.removeAt(0)
64-
if (pace[0][0] == '0') {
65-
pace[0] = pace[0][1].toString()
66-
}
67-
"${pace[0]}’${pace[1]}”"
68-
} else {
69-
"${pace[0]}’${pace[1]}”${pace[2]}”"
70-
}
71-
}
72-
}

‎app/src/main/java/com/runnect/runnect/data/dto/response/ResponseGetMyStamp.kt‎

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,26 @@
11
package com.runnect.runnect.data.dto.response
2-
32
import kotlinx.serialization.Serializable
43

54
@Serializable
65
data class ResponseGetMyStamp(
7-
val user: StampUser,
6+
val `data`: StampData,
7+
val message: String,
8+
val status: Int,
9+
val success: Boolean
10+
)
11+
12+
@Serializable
13+
data class StampData(
814
val stamps: List<Stamp>,
9-
) {
10-
@Serializable
11-
data class StampUser(
12-
val id: Int
13-
)
15+
val user: StampUser
16+
)
1417

15-
@Serializable
16-
data class Stamp(
17-
val id: String
18-
)
18+
@Serializable
19+
data class Stamp(
20+
val id: String
21+
)
1922

20-
fun toStampList() = stamps.map { it.id }
21-
}
23+
@Serializable
24+
data class StampUser(
25+
val id: Int
26+
)

‎app/src/main/java/com/runnect/runnect/data/dto/response/ResponseGetUser.kt‎

Lines changed: 17 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,25 @@
11
package com.runnect.runnect.data.dto.response
22

3-
import com.runnect.runnect.domain.entity.User
43
import kotlinx.serialization.Serializable
54

65
@Serializable
76
data class ResponseGetUser(
8-
val user: UserResponse,
9-
) {
7+
val data: Data,
8+
val message: String,
9+
val status: Int,
10+
val success: Boolean
11+
)
1012

11-
@Serializable
12-
data class UserResponse(
13-
val email: String,
14-
val latestStamp: String,
15-
val level: Int,
16-
val levelPercent: Int,
17-
val nickname: String
18-
)
13+
@Serializable
14+
data class Data(
15+
val user: User
16+
)
1917

20-
fun toUser(): User {
21-
return User(
22-
email = user.email,
23-
latestStamp = user.latestStamp,
24-
level = user.level,
25-
levelPercent = user.levelPercent,
26-
nickname = user.nickname
27-
)
28-
}
29-
}
18+
@Serializable
19+
data class User(
20+
val email:String,
21+
val latestStamp: String,
22+
val level: Int,
23+
val levelPercent: Int,
24+
val nickname: String
25+
)

0 commit comments

Comments
 (0)