[MOD] #293 코스 생성 !! 제거 후 null 처리 대체값 대신 토스트

- 사용자가 의도하지 않은 CourseData라면 아예 다음 Activity로 안 넘어가는 게 낫겠단 판단 하에 대체값 대신 toast를 띄우는 방향으로 수정
- 관련 dto 이름 수정

Author: unam98

app/src/main/java/com/runnect/runnect/data/dto/CourseData.kt

@@ -11,8 +11,8 @@ data class CourseData(
     val publicCourseId: Int?,
     val touchList: ArrayList<LatLng>,
     val startLatLng: LatLng,
-    val departure: String,
-    val distance: Float,
+    val departure: String?,
+    val distance: Float?,
     val image: String,
     val dataFrom: String
 ) : Parcelable

…ta/dto/response/ResponsePostCourseDTO.kt …dto/response/ResponsePostMyDrawCourse.ktapp/src/main/java/com/runnect/runnect/data/dto/response/ResponsePostCourseDTO.kt renamed to app/src/main/java/com/runnect/runnect/data/dto/response/ResponsePostMyDrawCourse.kt app/src/main/java/com/runnect/runnect/data/dto/response/ResponsePostCourseDTO.kt renamed to app/src/main/java/com/runnect/runnect/data/dto/response/ResponsePostMyDrawCourse.kt

@@ -5,7 +5,7 @@ import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class ResponsePostCourseDTO(
+data class ResponsePostMyDrawCourse(
     @SerialName("data")
     val data: Data,
     @SerialName("message")

app/src/main/java/com/runnect/runnect/data/repository/CourseRepositoryImpl.kt

@@ -1,23 +1,23 @@
 package com.runnect.runnect.data.repository
 
-import com.runnect.runnect.domain.entity.CourseDetail
 import com.runnect.runnect.data.dto.CourseLoadInfoDTO
 import com.runnect.runnect.data.dto.CourseSearchDTO
 import com.runnect.runnect.data.dto.RecommendCourseDTO
 import com.runnect.runnect.data.dto.request.RequestCourseScrap
+import com.runnect.runnect.data.dto.request.RequestPatchPublicCourseDto
 import com.runnect.runnect.data.dto.request.RequestPostRecordDTO
 import com.runnect.runnect.data.dto.request.RequestPutMyDrawDTO
-import com.runnect.runnect.data.dto.request.RequestPatchPublicCourseDto
 import com.runnect.runnect.data.dto.request.RequestUploadMyCourse
 import com.runnect.runnect.data.dto.response.PublicCourse
 import com.runnect.runnect.data.dto.response.ResponseCourseScrap
 import com.runnect.runnect.data.dto.response.ResponseGetMyDrawDetailDTO
-import com.runnect.runnect.data.dto.response.ResponsePostCourseDTO
+import com.runnect.runnect.data.dto.response.ResponsePostMyDrawCourse
 import com.runnect.runnect.data.dto.response.ResponsePostRecordDTO
 import com.runnect.runnect.data.dto.response.ResponsePutMyDrawDTO
 import com.runnect.runnect.data.dto.response.ResponseUploadMyCourse
 import com.runnect.runnect.data.source.remote.RemoteCourseDataSource
 import com.runnect.runnect.domain.CourseRepository
+import com.runnect.runnect.domain.entity.CourseDetail
 import com.runnect.runnect.util.extension.toData
 import okhttp3.MultipartBody
 import okhttp3.RequestBody
@@ -78,7 +78,10 @@ class CourseRepositoryImpl @Inject constructor(private val remoteCourseDataSourc
     override suspend fun uploadCourse(
         image: MultipartBody.Part,
         courseCreateRequestDto: RequestBody
-    ): Response<ResponsePostCourseDTO> {
-        return remoteCourseDataSource.uploadCourse(image = image, courseCreateRequestDto = courseCreateRequestDto)
+    ): Response<ResponsePostMyDrawCourse> {
+        return remoteCourseDataSource.uploadCourse(
+            image = image,
+            courseCreateRequestDto = courseCreateRequestDto
+        )
     }
 }

app/src/main/java/com/runnect/runnect/data/service/CourseService.kt

@@ -1,9 +1,9 @@
 package com.runnect.runnect.data.service
 
 import com.runnect.runnect.data.dto.request.RequestCourseScrap
+import com.runnect.runnect.data.dto.request.RequestPatchPublicCourseDto
 import com.runnect.runnect.data.dto.request.RequestPostRecordDTO
 import com.runnect.runnect.data.dto.request.RequestPutMyDrawDTO
-import com.runnect.runnect.data.dto.request.RequestPatchPublicCourseDto
 import com.runnect.runnect.data.dto.request.RequestUploadMyCourse
 import com.runnect.runnect.data.dto.response.*
 import com.runnect.runnect.data.dto.response.base.BaseResponse
@@ -17,7 +17,7 @@ interface CourseService {
     @GET("/api/public-course")
     suspend fun getRecommendCourse(
         @Query("pageNo") pageNo: String?,
-        ): ResponseRecommendCourse
+    ): ResponseRecommendCourse
 
     @POST("/api/scrap")
     suspend fun postCourseScrap(
@@ -49,7 +49,6 @@ interface CourseService {
         @Body requestPatchPublicCourseDto: RequestPatchPublicCourseDto
     ): BaseResponse<ResponsePatchPublicCourseDto>
 
-    //스크랩 - 지훈이랑 나랑 타입 통일이 안 돼있음. 일단 DataSource 통일부터하고 나중에 여기 타입 맞춰줘서 스크랩 함수 둘 중 하나 삭제해야 함.
     @POST("/api/scrap")
     suspend fun postScrap(
         @Body requestCourseScrap: RequestCourseScrap,
@@ -90,5 +89,5 @@ interface CourseService {
     suspend fun uploadCourse(
         @Part image: MultipartBody.Part,
         @Part("courseCreateRequestDto") courseCreateRequestDto: RequestBody,
-    ): Response<ResponsePostCourseDTO>
+    ): Response<ResponsePostMyDrawCourse>
 }

app/src/main/java/com/runnect/runnect/domain/CourseRepository.kt

@@ -1,22 +1,21 @@
 package com.runnect.runnect.domain
 
-import com.runnect.runnect.domain.entity.CourseDetail
 import com.runnect.runnect.data.dto.CourseLoadInfoDTO
 import com.runnect.runnect.data.dto.CourseSearchDTO
 import com.runnect.runnect.data.dto.RecommendCourseDTO
 import com.runnect.runnect.data.dto.request.RequestCourseScrap
+import com.runnect.runnect.data.dto.request.RequestPatchPublicCourseDto
 import com.runnect.runnect.data.dto.request.RequestPostRecordDTO
 import com.runnect.runnect.data.dto.request.RequestPutMyDrawDTO
-import com.runnect.runnect.data.dto.request.RequestPatchPublicCourseDto
 import com.runnect.runnect.data.dto.request.RequestUploadMyCourse
 import com.runnect.runnect.data.dto.response.PublicCourse
 import com.runnect.runnect.data.dto.response.ResponseCourseScrap
 import com.runnect.runnect.data.dto.response.ResponseGetMyDrawDetailDTO
-import com.runnect.runnect.data.dto.response.ResponsePostCourseDTO
+import com.runnect.runnect.data.dto.response.ResponsePostMyDrawCourse
 import com.runnect.runnect.data.dto.response.ResponsePostRecordDTO
 import com.runnect.runnect.data.dto.response.ResponsePutMyDrawDTO
-import com.runnect.runnect.data.dto.response.ResponsePatchPublicCourseDto
 import com.runnect.runnect.data.dto.response.ResponseUploadMyCourse
+import com.runnect.runnect.domain.entity.CourseDetail
 import okhttp3.MultipartBody
 import okhttp3.RequestBody
 import retrofit2.Response
@@ -47,5 +46,5 @@ interface CourseRepository {
 
     suspend fun uploadCourse(
         image: MultipartBody.Part, courseCreateRequestDto: RequestBody
-    ): Response<ResponsePostCourseDTO>
+    ): Response<ResponsePostMyDrawCourse>
 }

app/src/main/java/com/runnect/runnect/presentation/draw/DrawActivity.kt

@@ -92,7 +92,6 @@ class DrawActivity :
 
     var isFirstInit: Boolean = true
 
-    private lateinit var bottomSheetBinding: BottomsheetRequireCourseNameBinding  // Bottom Sheet 바인딩
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
@@ -287,7 +286,7 @@ class DrawActivity :
     }
 
     private fun requireCourseNameDialog(): BottomSheetDialog {
-        bottomSheetBinding = BottomsheetRequireCourseNameBinding.inflate(layoutInflater)
+        val bottomSheetBinding = BottomsheetRequireCourseNameBinding.inflate(layoutInflater)
         val bottomSheetView = bottomSheetBinding.root
         val etCourseName = bottomSheetBinding.etCourseName
         val btnCreateCourse = bottomSheetBinding.btnCreateCourse
@@ -449,21 +448,28 @@ class DrawActivity :
 
         with(dialogLayout) {
             this.btn_run.setOnClickListener {
-                val intent = Intent(this@DrawActivity, CountDownActivity::class.java).apply {
-                    putExtra(
-                        EXTRA_COURSE_DATA, CourseData(
-                            courseId = viewModel.uploadResult.value!!.data.id,
-                            publicCourseId = null,
-                            touchList = touchList,
-                            startLatLng = departureLatLng,
-                            departure = viewModel.departureName.value!!,
-                            distance = viewModel.distanceSum.value!!,
-                            image = captureUri.toString(),
-                            dataFrom = "fromDrawCourse"
-                        )
-                    )
+                val courseData = CourseData(
+                    courseId = viewModel.uploadResult.value?.data?.id,
+                    publicCourseId = null,
+                    touchList = touchList,
+                    startLatLng = departureLatLng,
+                    departure = viewModel.departureName.value,
+                    distance = viewModel.distanceSum.value,
+                    image = captureUri.toString(),
+                    dataFrom = "fromDrawCourse"
+                )
+                if (courseData.courseId == null || courseData.departure == null || courseData.distance == null) {
+                    Toast.makeText(
+                        this@DrawActivity,
+                        ERROR_COURSE_NULL,
+                        Toast.LENGTH_LONG
+                    ).show()
+                } else {
+                    val intent = Intent(this@DrawActivity, CountDownActivity::class.java).apply {
+                        putExtra(EXTRA_COURSE_DATA, courseData)
+                    }
+                    startActivity(intent)
                 }
-                startActivity(intent)
                 dialog.dismiss()
             }
 
@@ -746,5 +752,7 @@ class DrawActivity :
         const val EXTRA_FRAGMENT_REPLACEMENT_DIRECTION = "fragmentReplacementDirection"
         const val CUSTOM_DEPARTURE = "내가 설정한 출발지"
         const val NOTIFY_LIMIT_MARKER_NUM = "마커는 20개까지 생성 가능합니다"
+
+        const val ERROR_COURSE_NULL = "Error: Course data is incomplete"
     }
 }

app/src/main/java/com/runnect/runnect/presentation/run/RunActivity.kt

@@ -241,12 +241,12 @@ class RunActivity :
 
         courseId = courseData.courseId
         publicCourseId = courseData.publicCourseId
-        departure = courseData.departure
+        departure = courseData.departure ?: ""
         startLatLng = courseData.startLatLng
         touchList = courseData.touchList
         captureUri = courseData.image
         dataFrom = courseData.dataFrom
-        distanceSum = courseData.distance.toDouble().round(1)
+        distanceSum = courseData.distance?.toDouble()?.round(1) ?: 0.0
 
         viewModel.distanceSum.value = distanceSum
     }