Merge pull request #284 from Runnect/feature/refactor-course-discover…

…-screen

[REFACTOR] 코스 발견 / 전면 리팩토링

app/src/main/AndroidManifest.xml

@@ -103,7 +103,7 @@
             android:name=".presentation.discover.search.DiscoverSearchActivity"
             android:exported="false" />
         <activity
-            android:name=".presentation.discover.load.DiscoverLoadActivity"
+            android:name=".presentation.discover.pick.DiscoverPickActivity"
             android:exported="false" />
         <activity
             android:name=".presentation.discover.upload.DiscoverUploadActivity"

app/src/main/java/com/runnect/runnect/data/dto/request/RequestDeleteHistoryDto.kt → app/src/main/java/com/runnect/runnect/data/dto/request/RequestDeleteHistory.kt

@@ -4,7 +4,7 @@ import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class RequestDeleteHistoryDto(
+data class RequestDeleteHistory(
     @SerialName("recordIdList")
     val recordIdList: List<Int>
 )

app/src/main/java/com/runnect/runnect/data/dto/request/RequestDeleteUploadCourseDto.kt → app/src/main/java/com/runnect/runnect/data/dto/request/RequestDeleteUploadCourse.kt

@@ -4,7 +4,7 @@ import com.google.gson.annotations.SerializedName
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class RequestDeleteUploadCourseDto(
+data class RequestDeleteUploadCourse(
     @SerializedName("publicCourseIdList")
     val publicCourseIdList: List<Int>
-)
+)

app/src/main/java/com/runnect/runnect/data/dto/request/RequestPatchHistoryTitleDto.kt → app/src/main/java/com/runnect/runnect/data/dto/request/RequestPatchHistoryTitle.kt

@@ -3,9 +3,8 @@ package com.runnect.runnect.data.dto.request
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
-
 @Serializable
-data class RequestPatchHistoryTitleDto(
+data class RequestPatchHistoryTitle(
     @SerialName("title")
     val title: String
 )

app/src/main/java/com/runnect/runnect/data/dto/request/RequestUpdateNickName.kt → app/src/main/java/com/runnect/runnect/data/dto/request/RequestPatchNickName.kt

@@ -1,8 +1,10 @@
 package com.runnect.runnect.data.dto.request
 
+import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class RequestUpdateNickName(
+data class RequestPatchNickName(
+    @SerialName("nickname")
     val nickname: String
 )

app/src/main/java/com/runnect/runnect/data/dto/request/RequestPatchPublicCourseDto.kt → app/src/main/java/com/runnect/runnect/data/dto/request/RequestPatchPublicCourse.kt

@@ -4,9 +4,9 @@ import com.google.gson.annotations.SerializedName
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class RequestPatchPublicCourseDto(
+data class RequestPatchPublicCourse(
     @SerializedName("title")
     val title: String,
     @SerializedName("description")
     val description: String,
-)
+)

app/src/main/java/com/runnect/runnect/data/dto/request/RequestCourseScrap.kt → app/src/main/java/com/runnect/runnect/data/dto/request/RequestPostCourseScrap.kt

@@ -1,8 +1,12 @@
 package com.runnect.runnect.data.dto.request
+
+import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class RequestCourseScrap(
+data class RequestPostCourseScrap(
+    @SerialName("publicCourseId")
     val publicCourseId: Int,
+    @SerialName("scrapTF")
     val scrapTF: String
-)
+)

app/src/main/java/com/runnect/runnect/data/dto/request/RequestLogin.kt → app/src/main/java/com/runnect/runnect/data/dto/request/RequestPostLogin.kt

@@ -1,14 +1,12 @@
 package com.runnect.runnect.data.dto.request
 
-
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class RequestLogin(
+data class RequestPostLogin(
     @SerialName("token")
     val token: String?,
-
     @SerialName("provider")
     val provider: String,
-)
+)

app/src/main/java/com/runnect/runnect/data/dto/request/RequestUploadMyCourse.kt → app/src/main/java/com/runnect/runnect/data/dto/request/RequestPostPublicCourse.kt

@@ -2,7 +2,7 @@ package com.runnect.runnect.data.dto.request
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class RequestUploadMyCourse(
+data class RequestPostPublicCourse(
     val courseId: Int,
     val description: String,
     val title: String

app/src/main/java/com/runnect/runnect/data/dto/request/RequestPostRecordDTO.kt → app/src/main/java/com/runnect/runnect/data/dto/request/RequestPostRunningHistory.kt

@@ -1,11 +1,10 @@
 package com.runnect.runnect.data.dto.request
 
-
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class RequestPostRecordDTO(
+data class RequestPostRunningHistory(
     @SerialName("courseId")
     val courseId: Int,
     @SerialName("publicCourseId")

app/src/main/java/com/runnect/runnect/data/dto/request/RequestPutMyDrawDto.kt → app/src/main/java/com/runnect/runnect/data/dto/request/RequestPutMyDrawCourse.kt

@@ -5,7 +5,7 @@ import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class RequestPutMyDrawDTO(
+data class RequestPutMyDrawCourse(
     @SerialName("courseIdList")
     val courseIdList: List<Int>
 )

app/src/main/java/com/runnect/runnect/data/dto/response/ResponseDeleteHistoryDto.kt → app/src/main/java/com/runnect/runnect/data/dto/response/ResponseDeleteHistory.kt

@@ -4,7 +4,7 @@ import com.google.gson.annotations.SerializedName
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class ResponseDeleteHistoryDto(
+data class ResponseDeleteHistory(
     @SerializedName("deletedRecordIdCount")
     val deletedRecordIdCount: Int
 )

app/src/main/java/com/runnect/runnect/data/dto/response/ResponseDeleteUploadCourseDto.kt → app/src/main/java/com/runnect/runnect/data/dto/response/ResponseDeleteUploadCourse.kt

@@ -3,7 +3,7 @@ package com.runnect.runnect.data.dto.response
 import com.google.gson.annotations.SerializedName
 import kotlinx.serialization.Serializable
 @Serializable
-data class ResponseDeleteUploadCourseDto(
+data class ResponseDeleteUploadCourse(
     @SerializedName("deletedPublicCourseCount")
     val deletedPublicCourseCount: Int
 )

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

@@ -3,12 +3,6 @@ package com.runnect.runnect.data.dto.response
 import com.google.gson.annotations.SerializedName
 import kotlinx.serialization.Serializable
 
-@Serializable
-data class UserDeleteData(
-    @SerializedName("deletedUserId")
-    val deletedUserId: Int
-)
-
 @Serializable
 data class ResponseDeleteUser(
     @SerializedName("data")
@@ -19,4 +13,10 @@ data class ResponseDeleteUser(
     val status: Int,
     @SerializedName("success")
     val success: Boolean
+)
+
+@Serializable
+data class UserDeleteData(
+    @SerializedName("deletedUserId")
+    val deletedUserId: Int
 )

app/src/main/java/com/runnect/runnect/data/dto/response/ResponseGetCourseDetailDto.kt → app/src/main/java/com/runnect/runnect/data/dto/response/ResponseGetCourseDetail.kt

@@ -6,7 +6,7 @@ import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class ResponseGetCourseDetailDto(
+data class ResponseGetCourseDetail(
     @SerialName("user")
     val user: User,
     @SerialName("publicCourse")
@@ -32,6 +32,8 @@ data class ResponseGetCourseDetailDto(
         val courseId: Int,
         @SerialName("scrap")
         val scrap: Boolean,
+        @SerialName("scrapCount")
+        val scrapCount: Long,
         @SerialName("image")
         val image: String,
         @SerialName("title")
@@ -72,7 +74,8 @@ data class ResponseGetCourseDetailDto(
         description = publicCourse.description,
         distance = publicCourse.distance.toString(),
         image = publicCourse.image,
-        isScrap = publicCourse.scrap,
+        scrap = publicCourse.scrap,
+        scrapCount = publicCourse.scrapCount.toString(),
         title = publicCourse.title,
         path = publicCourse.path
     )

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

@@ -0,0 +1,46 @@
+package com.runnect.runnect.data.dto.response
+
+import com.runnect.runnect.domain.entity.DiscoverMultiViewItem
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class ResponseGetDiscoverMarathon(
+    @SerialName("marathonPublicCourses")
+    val marathonPublicCourses: List<PublicCourse>
+) {
+    @Serializable
+    data class PublicCourse(
+        @SerialName("id")
+        val id: Int,
+        @SerialName("courseId")
+        val courseId: Int,
+        @SerialName("title")
+        val title: String,
+        @SerialName("image")
+        val image: String,
+        @SerialName("scrap")
+        val scrap: Boolean,
+        @SerialName("departure")
+        val departure: Departure
+    ) {
+        @Serializable
+        data class Departure(
+            @SerialName("city")
+            val city: String,
+            @SerialName("region")
+            val region: String
+        )
+    }
+
+    fun toMarathonCourses(): List<DiscoverMultiViewItem.MarathonCourse> = marathonPublicCourses.map { course ->
+        DiscoverMultiViewItem.MarathonCourse(
+            id = course.id,
+            courseId = course.courseId,
+            title = course.title,
+            image = course.image,
+            scrap = course.scrap,
+            departure = "${course.departure.region} ${course.departure.city}"
+        )
+    }
+}

app/src/main/java/com/runnect/runnect/data/dto/response/ResponseMyCourseLoad.kt → app/src/main/java/com/runnect/runnect/data/dto/response/ResponseGetDiscoverPick.kt

@@ -4,7 +4,7 @@ import com.google.gson.annotations.SerializedName
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class ResponseMyCourseLoad(
+data class ResponseGetDiscoverPick(
     @SerializedName("data")
     val `data`: LoadData,
     @SerializedName("message")

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

@@ -0,0 +1,48 @@
+package com.runnect.runnect.data.dto.response
+
+import com.runnect.runnect.domain.entity.DiscoverMultiViewItem
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class ResponseGetDiscoverRecommend(
+    @SerialName("ordering")
+    val ordering: String,
+    @SerialName("publicCourses")
+    val publicCourses: List<PublicCourse>
+) {
+    @Serializable
+    data class PublicCourse(
+        @SerialName("id")
+        val id: Int,
+        @SerialName("courseId")
+        val courseId: Int,
+        @SerialName("title")
+        val title: String,
+        @SerialName("image")
+        val image: String,
+        @SerialName("scrap")
+        val scrap: Boolean,
+        @SerialName("departure")
+        val departure: Departure
+    ) {
+        @Serializable
+        data class Departure(
+            @SerialName("city")
+            val city: String,
+            @SerialName("region")
+            val region: String
+        )
+    }
+
+    fun toRecommendCourses(): List<DiscoverMultiViewItem.RecommendCourse> = publicCourses.map { course ->
+        DiscoverMultiViewItem.RecommendCourse(
+            id = course.id,
+            courseId = course.courseId,
+            title = course.title,
+            image = course.image,
+            scrap = course.scrap,
+            departure = "${course.departure.region} ${course.departure.city}"
+        )
+    }
+}

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

@@ -0,0 +1,35 @@
+package com.runnect.runnect.data.dto.response
+import com.runnect.runnect.domain.entity.DiscoverSearchCourse
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class ResponseGetDiscoverSearch(
+    val publicCourses: List<PublicCourse>
+) {
+    @Serializable
+    data class PublicCourse(
+        val id: Int,
+        val courseId: Int,
+        val title: String,
+        val image: String,
+        val scrap: Boolean,
+        val departure: Departure,
+    )
+
+    @Serializable
+    data class Departure(
+        val city: String,
+        val region: String
+    )
+
+    fun toDiscoverSearchCourses(): List<DiscoverSearchCourse> = publicCourses.map { course ->
+        DiscoverSearchCourse(
+            id = course.id,
+            courseId = course.courseId,
+            title = course.title,
+            image = course.image,
+            scrap = course.scrap,
+            departure = "${course.departure.region} ${course.departure.city}"
+        )
+    }
+}