diff --git a/app/src/main/java/com/runnect/runnect/data/dto/response/ResponsePostMyDrawCourse.kt b/app/src/main/java/com/runnect/runnect/data/dto/response/ResponsePostMyDrawCourse.kt
index 2cc95367..f5bc6775 100644
--- a/app/src/main/java/com/runnect/runnect/data/dto/response/ResponsePostMyDrawCourse.kt
+++ b/app/src/main/java/com/runnect/runnect/data/dto/response/ResponsePostMyDrawCourse.kt
@@ -5,14 +5,8 @@ import kotlinx.serialization.Serializable
 
 @Serializable
 data class ResponsePostMyDrawCourse(
-    @SerialName("data")
-    val data: Data
-) {
-    @Serializable
-    data class Data(
-        @SerialName("id")
-        val id: Int,
-        @SerialName("createdAt")
-        val createdAt: String
-    )
-}
\ No newline at end of file
+    @SerialName("id")
+    val id: Int,
+    @SerialName("createdAt")
+    val createdAt: String
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/runnect/runnect/data/repository/CourseRepositoryImpl.kt b/app/src/main/java/com/runnect/runnect/data/repository/CourseRepositoryImpl.kt
index 0155cd8a..b25a7335 100644
--- a/app/src/main/java/com/runnect/runnect/data/repository/CourseRepositoryImpl.kt
+++ b/app/src/main/java/com/runnect/runnect/data/repository/CourseRepositoryImpl.kt
@@ -7,10 +7,6 @@ import com.runnect.runnect.data.dto.request.RequestPostPublicCourse
 import com.runnect.runnect.data.dto.request.RequestPostRunningHistory
 import com.runnect.runnect.data.dto.request.RequestPutMyDrawCourse
 import com.runnect.runnect.data.dto.response.ResponseGetMyDrawDetail
-import com.runnect.runnect.data.dto.response.ResponsePostDiscoverUpload
-import com.runnect.runnect.data.dto.response.ResponsePostMyDrawCourse
-import com.runnect.runnect.data.dto.response.ResponsePostMyHistory
-import com.runnect.runnect.data.dto.response.ResponsePutMyDrawCourse
 import com.runnect.runnect.data.network.mapToFlowResult
 import com.runnect.runnect.data.source.remote.RemoteCourseDataSource
 import com.runnect.runnect.domain.entity.CourseDetail
@@ -26,8 +22,9 @@ import okhttp3.MultipartBody
 import okhttp3.RequestBody
 import javax.inject.Inject
 
-class CourseRepositoryImpl @Inject constructor(private val remoteCourseDataSource: RemoteCourseDataSource) :
-    CourseRepository {
+class CourseRepositoryImpl @Inject constructor(
+    private val remoteCourseDataSource: RemoteCourseDataSource
+) : CourseRepository {
 
     override suspend fun getMarathonCourse(): Flow<Result<List<MarathonCourse>>> {
         return remoteCourseDataSource.getMarathonCourse().mapToFlowResult {
@@ -67,8 +64,8 @@ class CourseRepositoryImpl @Inject constructor(private val remoteCourseDataSourc
         return remoteCourseDataSource.getMyDrawDetail(courseId = courseId).mapToFlowResult { it }
     }
 
-    override suspend fun deleteMyDrawCourse(deleteCourseList: RequestPutMyDrawCourse): Flow<Result<ResponsePutMyDrawCourse>> {
-        return remoteCourseDataSource.deleteMyDrawCourse(deleteCourseList = deleteCourseList).mapToFlowResult { it }
+    override suspend fun deleteMyDrawCourse(deleteCourseList: RequestPutMyDrawCourse): Flow<Result<Unit>> {
+        return remoteCourseDataSource.deleteMyDrawCourse(deleteCourseList = deleteCourseList).mapToFlowResult {}
     }
 
     override suspend fun postCourseScrap(
@@ -79,6 +76,10 @@ class CourseRepositoryImpl @Inject constructor(private val remoteCourseDataSourc
         }
     }
 
+    override suspend fun postUploadMyCourse(requestPostPublicCourse: RequestPostPublicCourse): Flow<Result<Unit>> {
+        return remoteCourseDataSource.postUploadMyCourse(requestPostPublicCourse = requestPostPublicCourse).mapToFlowResult {}
+    }
+
     override suspend fun patchMyDrawCourseTitle(
         courseId: Int,
         requestPatchMyDrawCourseTitle: RequestPatchMyDrawCourseTitle
@@ -86,10 +87,6 @@ class CourseRepositoryImpl @Inject constructor(private val remoteCourseDataSourc
         remoteCourseDataSource.patchMyDrawCourseTitle(courseId, requestPatchMyDrawCourseTitle).data?.toEditableMyDrawCourseDetail()
     }
 
-    override suspend fun postUploadMyCourse(requestPostPublicCourse: RequestPostPublicCourse): Flow<Result<ResponsePostDiscoverUpload>> {
-        return remoteCourseDataSource.postUploadMyCourse(requestPostPublicCourse = requestPostPublicCourse).mapToFlowResult { it }
-    }
-
     override suspend fun patchPublicCourse(
         publicCourseId: Int,
         requestPatchPublicCourse: RequestPatchPublicCourse
@@ -101,14 +98,16 @@ class CourseRepositoryImpl @Inject constructor(private val remoteCourseDataSourc
             it.toEditableCourseDetail()
         }
 
-    override suspend fun postRecord(request: RequestPostRunningHistory): Flow<Result<ResponsePostMyHistory>> {
-        return remoteCourseDataSource.postRecord(request = request).mapToFlowResult { it }
+    override suspend fun postRecord(request: RequestPostRunningHistory): Flow<Result<Unit>> {
+        return remoteCourseDataSource.postRecord(request = request).mapToFlowResult {}
     }
 
     override suspend fun uploadCourse(
         image: MultipartBody.Part,
         data: RequestBody
-    ): Flow<Result<ResponsePostMyDrawCourse>> {
-        return remoteCourseDataSource.uploadCourse(image = image, data = data).mapToFlowResult { it }
+    ): Flow<Result<Int>> {
+        return remoteCourseDataSource.uploadCourse(image = image, data = data).mapToFlowResult {
+            it.id
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/runnect/runnect/data/repository/StorageRepositoryImpl.kt b/app/src/main/java/com/runnect/runnect/data/repository/StorageRepositoryImpl.kt
index 94fb3a28..d03f88a5 100644
--- a/app/src/main/java/com/runnect/runnect/data/repository/StorageRepositoryImpl.kt
+++ b/app/src/main/java/com/runnect/runnect/data/repository/StorageRepositoryImpl.kt
@@ -1,7 +1,6 @@
 package com.runnect.runnect.data.repository
 
 import com.runnect.runnect.data.dto.request.RequestPutMyDrawCourse
-import com.runnect.runnect.data.dto.response.ResponsePutMyDrawCourse
 import com.runnect.runnect.data.dto.response.toMyDrawCourse
 import com.runnect.runnect.data.network.mapToFlowResult
 import com.runnect.runnect.data.source.remote.RemoteStorageDataSource
@@ -18,8 +17,8 @@ class StorageRepositoryImpl @Inject constructor(
     override suspend fun getMyDrawCourse(): Flow<Result<List<MyDrawCourse>>> =
         remoteStorageDataSource.getMyDrawCourse().mapToFlowResult { it.toMyDrawCourse() }
 
-    override suspend fun deleteMyDrawCourse(deleteCourseList: RequestPutMyDrawCourse): Flow<Result<ResponsePutMyDrawCourse>> {
-        return remoteStorageDataSource.deleteMyDrawCourse(deleteCourseList = deleteCourseList).mapToFlowResult { it }
+    override suspend fun deleteMyDrawCourse(deleteCourseList: RequestPutMyDrawCourse): Flow<Result<Unit>> {
+        return remoteStorageDataSource.deleteMyDrawCourse(deleteCourseList = deleteCourseList).mapToFlowResult {}
     }
 
     override suspend fun getMyScrapCourse(): Flow<Result<List<MyScrapCourse>>> =
diff --git a/app/src/main/java/com/runnect/runnect/data/repository/UserRepositoryImpl.kt b/app/src/main/java/com/runnect/runnect/data/repository/UserRepositoryImpl.kt
index 045cc4bc..dba12a12 100644
--- a/app/src/main/java/com/runnect/runnect/data/repository/UserRepositoryImpl.kt
+++ b/app/src/main/java/com/runnect/runnect/data/repository/UserRepositoryImpl.kt
@@ -1,26 +1,22 @@
 package com.runnect.runnect.data.repository
 
 import com.runnect.runnect.data.dto.HistoryInfoDTO
-import com.runnect.runnect.domain.entity.UserProfile
 import com.runnect.runnect.data.dto.request.RequestDeleteHistory
 import com.runnect.runnect.data.dto.request.RequestDeleteUploadCourse
 import com.runnect.runnect.data.dto.request.RequestPatchHistoryTitle
 import com.runnect.runnect.data.dto.request.RequestPatchNickName
-import com.runnect.runnect.data.dto.response.ResponseDeleteHistory
-import com.runnect.runnect.data.dto.response.ResponseDeleteUploadCourse
-import com.runnect.runnect.data.dto.response.ResponseDeleteUser
-import com.runnect.runnect.data.dto.response.ResponsePatchHistoryTitle
-import com.runnect.runnect.data.dto.response.ResponsePatchUserNickName
 import com.runnect.runnect.data.network.mapToFlowResult
 import com.runnect.runnect.data.source.remote.RemoteUserDataSource
 import com.runnect.runnect.domain.entity.User
+import com.runnect.runnect.domain.entity.UserProfile
 import com.runnect.runnect.domain.entity.UserUploadCourse
 import com.runnect.runnect.domain.repository.UserRepository
 import kotlinx.coroutines.flow.Flow
 import javax.inject.Inject
 
-class UserRepositoryImpl @Inject constructor(private val remoteUserDataSource: RemoteUserDataSource) :
-    UserRepository {
+class UserRepositoryImpl @Inject constructor(
+    private val remoteUserDataSource: RemoteUserDataSource
+) : UserRepository {
 
     override suspend fun getUserInfo(): Flow<Result<User>> = remoteUserDataSource.getUserInfo()
         .mapToFlowResult { it.toUser() }
@@ -33,29 +29,31 @@ class UserRepositoryImpl @Inject constructor(private val remoteUserDataSource: R
 
     override suspend fun putDeleteUploadCourse(
         requestDeleteUploadCourse: RequestDeleteUploadCourse
-    ): Flow<Result<ResponseDeleteUploadCourse>> {
-        return remoteUserDataSource.putDeleteUploadCourse(requestDeleteUploadCourse).mapToFlowResult { it }
+    ): Flow<Result<Unit>> {
+        return remoteUserDataSource.putDeleteUploadCourse(requestDeleteUploadCourse).mapToFlowResult {}
     }
 
     override suspend fun putDeleteHistory(
         requestDeleteHistory: RequestDeleteHistory
-    ): Flow<Result<ResponseDeleteHistory>> {
-        return remoteUserDataSource.putDeleteHistory(requestDeleteHistory).mapToFlowResult { it }
+    ): Flow<Result<Unit>> {
+        return remoteUserDataSource.putDeleteHistory(requestDeleteHistory).mapToFlowResult {}
     }
 
     override suspend fun patchHistoryTitle(
         historyId: Int, requestPatchHistoryTitle: RequestPatchHistoryTitle
-    ): Flow<Result<ResponsePatchHistoryTitle>> =
-        remoteUserDataSource.patchHistoryTitle(historyId, requestPatchHistoryTitle).mapToFlowResult { it }
+    ): Flow<Result<String>> =
+        remoteUserDataSource.patchHistoryTitle(historyId, requestPatchHistoryTitle).mapToFlowResult {
+            it.record.title
+        }
 
-    override suspend fun deleteUser(): Flow<Result<ResponseDeleteUser>> {
-        return remoteUserDataSource.deleteUser().mapToFlowResult { it }
+    override suspend fun deleteUser(): Flow<Result<Unit>> {
+        return remoteUserDataSource.deleteUser().mapToFlowResult {}
     }
 
     override suspend fun updateNickName(
         requestPatchNickName: RequestPatchNickName
-    ): Flow<Result<ResponsePatchUserNickName>> =
-        remoteUserDataSource.updateNickName(requestPatchNickName).mapToFlowResult { it }
+    ): Flow<Result<Unit>> =
+        remoteUserDataSource.updateNickName(requestPatchNickName).mapToFlowResult {}
 
     override suspend fun getRecord(): Flow<Result<List<HistoryInfoDTO>>> {
         return remoteUserDataSource.getRecord().mapToFlowResult {
diff --git a/app/src/main/java/com/runnect/runnect/domain/repository/CourseRepository.kt b/app/src/main/java/com/runnect/runnect/domain/repository/CourseRepository.kt
index b9cbbf1a..e0e388f6 100644
--- a/app/src/main/java/com/runnect/runnect/domain/repository/CourseRepository.kt
+++ b/app/src/main/java/com/runnect/runnect/domain/repository/CourseRepository.kt
@@ -7,10 +7,6 @@ import com.runnect.runnect.data.dto.request.RequestPostPublicCourse
 import com.runnect.runnect.data.dto.request.RequestPostRunningHistory
 import com.runnect.runnect.data.dto.request.RequestPutMyDrawCourse
 import com.runnect.runnect.data.dto.response.ResponseGetMyDrawDetail
-import com.runnect.runnect.data.dto.response.ResponsePostDiscoverUpload
-import com.runnect.runnect.data.dto.response.ResponsePostMyDrawCourse
-import com.runnect.runnect.data.dto.response.ResponsePostMyHistory
-import com.runnect.runnect.data.dto.response.ResponsePutMyDrawCourse
 import com.runnect.runnect.domain.entity.CourseDetail
 import com.runnect.runnect.domain.entity.DiscoverMultiViewItem.MarathonCourse
 import com.runnect.runnect.domain.entity.DiscoverSearchCourse
@@ -24,6 +20,7 @@ import okhttp3.MultipartBody
 import okhttp3.RequestBody
 
 interface CourseRepository {
+
     suspend fun getMarathonCourse(): Flow<Result<List<MarathonCourse>>>
 
     suspend fun getRecommendCourse(
@@ -39,25 +36,25 @@ interface CourseRepository {
 
     suspend fun getMyDrawDetail(courseId: Int): Flow<Result<ResponseGetMyDrawDetail>>
 
-    suspend fun deleteMyDrawCourse(deleteCourseList: RequestPutMyDrawCourse): Flow<Result<ResponsePutMyDrawCourse>>
-
     suspend fun postCourseScrap(requestPostCourseScrap: RequestPostCourseScrap): Flow<Result<PostScrap>>
 
+    suspend fun postUploadMyCourse(requestPostPublicCourse: RequestPostPublicCourse): Flow<Result<Unit>>
+
+    suspend fun postRecord(request: RequestPostRunningHistory): Flow<Result<Unit>>
+
+    suspend fun uploadCourse(
+        image: MultipartBody.Part, data: RequestBody
+    ): Flow<Result<Int>>
+
     suspend fun patchMyDrawCourseTitle(
         courseId: Int,
         requestPatchMyDrawCourseTitle: RequestPatchMyDrawCourseTitle
     ): Result<EditableMyDrawCourseDetail?>
 
-    suspend fun postUploadMyCourse(requestPostPublicCourse: RequestPostPublicCourse): Flow<Result<ResponsePostDiscoverUpload>>
-
     suspend fun patchPublicCourse(
         publicCourseId: Int,
         requestPatchPublicCourse: RequestPatchPublicCourse
     ): Flow<Result<EditableCourseDetail>>
 
-    suspend fun postRecord(request: RequestPostRunningHistory): Flow<Result<ResponsePostMyHistory>>
-
-    suspend fun uploadCourse(
-        image: MultipartBody.Part, data: RequestBody
-    ): Flow<Result<ResponsePostMyDrawCourse>>
+    suspend fun deleteMyDrawCourse(deleteCourseList: RequestPutMyDrawCourse): Flow<Result<Unit>>
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/runnect/runnect/domain/repository/StorageRepository.kt b/app/src/main/java/com/runnect/runnect/domain/repository/StorageRepository.kt
index 258841be..6001dcc5 100644
--- a/app/src/main/java/com/runnect/runnect/domain/repository/StorageRepository.kt
+++ b/app/src/main/java/com/runnect/runnect/domain/repository/StorageRepository.kt
@@ -9,5 +9,5 @@ import kotlinx.coroutines.flow.Flow
 interface StorageRepository {
     suspend fun getMyDrawCourse(): Flow<Result<List<MyDrawCourse>>>
     suspend fun getMyScrapCourse(): Flow<Result<List<MyScrapCourse>>>
-    suspend fun deleteMyDrawCourse(deleteCourseList: RequestPutMyDrawCourse) : Flow<Result<ResponsePutMyDrawCourse>>
+    suspend fun deleteMyDrawCourse(deleteCourseList: RequestPutMyDrawCourse) : Flow<Result<Unit>>
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/runnect/runnect/domain/repository/UserRepository.kt b/app/src/main/java/com/runnect/runnect/domain/repository/UserRepository.kt
index 45fb4183..ce5316ab 100644
--- a/app/src/main/java/com/runnect/runnect/domain/repository/UserRepository.kt
+++ b/app/src/main/java/com/runnect/runnect/domain/repository/UserRepository.kt
@@ -1,17 +1,12 @@
 package com.runnect.runnect.domain.repository
 
 import com.runnect.runnect.data.dto.HistoryInfoDTO
-import com.runnect.runnect.domain.entity.UserProfile
 import com.runnect.runnect.data.dto.request.RequestDeleteHistory
 import com.runnect.runnect.data.dto.request.RequestDeleteUploadCourse
 import com.runnect.runnect.data.dto.request.RequestPatchHistoryTitle
 import com.runnect.runnect.data.dto.request.RequestPatchNickName
-import com.runnect.runnect.data.dto.response.ResponseDeleteHistory
-import com.runnect.runnect.data.dto.response.ResponseDeleteUploadCourse
-import com.runnect.runnect.data.dto.response.ResponseDeleteUser
-import com.runnect.runnect.data.dto.response.ResponsePatchHistoryTitle
-import com.runnect.runnect.data.dto.response.ResponsePatchUserNickName
 import com.runnect.runnect.domain.entity.User
+import com.runnect.runnect.domain.entity.UserProfile
 import com.runnect.runnect.domain.entity.UserUploadCourse
 import kotlinx.coroutines.flow.Flow
 
@@ -22,11 +17,11 @@ interface UserRepository {
 
     suspend fun putDeleteUploadCourse(
         requestDeleteUploadCourse: RequestDeleteUploadCourse
-    ): Flow<Result<ResponseDeleteUploadCourse>>
+    ): Flow<Result<Unit>>
 
-    suspend fun putDeleteHistory(requestDeleteHistory: RequestDeleteHistory): Flow<Result<ResponseDeleteHistory>>
+    suspend fun putDeleteHistory(requestDeleteHistory: RequestDeleteHistory): Flow<Result<Unit>>
 
-    suspend fun deleteUser(): Flow<Result<ResponseDeleteUser>>
+    suspend fun deleteUser(): Flow<Result<Unit>>
 
     suspend fun getRecord(): Flow<Result<List<HistoryInfoDTO>>>
 
@@ -35,11 +30,11 @@ interface UserRepository {
     suspend fun patchHistoryTitle(
         historyId: Int,
         requestPatchHistoryTitle: RequestPatchHistoryTitle
-    ): Flow<Result<ResponsePatchHistoryTitle>>
+    ): Flow<Result<String>>
 
     suspend fun updateNickName(
         requestPatchNickName: RequestPatchNickName
-    ): Flow<Result<ResponsePatchUserNickName>>
+    ): Flow<Result<Unit>>
 
     suspend fun getUserProfile(userId: Int): Flow<Result<UserProfile>>
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/runnect/runnect/presentation/detail/CourseDetailViewModel.kt b/app/src/main/java/com/runnect/runnect/presentation/detail/CourseDetailViewModel.kt
index c91ddfb3..1a8d3293 100644
--- a/app/src/main/java/com/runnect/runnect/presentation/detail/CourseDetailViewModel.kt
+++ b/app/src/main/java/com/runnect/runnect/presentation/detail/CourseDetailViewModel.kt
@@ -34,8 +34,8 @@ class CourseDetailViewModel @Inject constructor(
     val coursePatchState: LiveData<UiStateV2<EditableCourseDetail?>>
         get() = _coursePatchState
 
-    private val _courseDeleteState = MutableLiveData<UiStateV2<ResponseDeleteUploadCourse?>>()
-    val courseDeleteState: LiveData<UiStateV2<ResponseDeleteUploadCourse?>>
+    private val _courseDeleteState = MutableLiveData<UiStateV2<Unit>>()
+    val courseDeleteState: LiveData<UiStateV2<Unit>>
         get() = _courseDeleteState
 
     private val _courseScrapState = MutableLiveData<UiStateV2<PostScrap>>()
diff --git a/app/src/main/java/com/runnect/runnect/presentation/draw/DrawActivity.kt b/app/src/main/java/com/runnect/runnect/presentation/draw/DrawActivity.kt
index 28a648ca..5cd069a4 100644
--- a/app/src/main/java/com/runnect/runnect/presentation/draw/DrawActivity.kt
+++ b/app/src/main/java/com/runnect/runnect/presentation/draw/DrawActivity.kt
@@ -162,7 +162,7 @@ class DrawActivity : BindingActivity<ActivityDrawBinding>(R.layout.activity_draw
 
         binding.tvGuide.isVisible = false
         viewModel.searchResult.value = searchResult
-        viewModel.departureName.value = searchResult.name
+        viewModel.departureName = searchResult.name
 
         setDepartureLatLng(
             latLng = LatLng(
@@ -515,11 +515,11 @@ class DrawActivity : BindingActivity<ActivityDrawBinding>(R.layout.activity_draw
                 if (isCustomLocationMode) departureLatLng = customDepartureLatLng
 
                 val courseData = CourseData(
-                    courseId = viewModel.uploadResult.value?.data?.id,
+                    courseId = viewModel.uploadCourseId,
                     publicCourseId = null, //직접 생성하는 코스는 publicCourseId가 없지만 코스 발견 -> 러닝 등의 루트로 넘어올 시 기록 업로드에서 requestBody에 필요함
                     touchList = touchList,
                     startLatLng = departureLatLng,
-                    departure = viewModel.departureName.value,
+                    departure = viewModel.departureName,
                     distance = viewModel.distanceSum.value,
                     image = captureUri.toString(),
                     dataFrom = "fromDrawCourse"
@@ -791,18 +791,18 @@ class DrawActivity : BindingActivity<ActivityDrawBinding>(R.layout.activity_draw
         val uploadLatLngList: List<UploadLatLng> = distanceList.map { latLng ->
             UploadLatLng(latLng.latitude, latLng.longitude)
         }
-        viewModel.path.value = uploadLatLngList
+        viewModel.path = uploadLatLngList
 
         when {
             isSearchLocationMode -> {
-                viewModel.departureAddress.value = searchResult.fullAddress
-                viewModel.departureName.value = searchResult.name
+                viewModel.departureAddress = searchResult.fullAddress
+                viewModel.departureName = searchResult.name
             }
 
             isCurrentLocationMode || isCustomLocationMode -> {
-                viewModel.departureAddress.value =
-                    viewModel.reverseGeocodingResult.value?.fullAddress
-                viewModel.departureName.value =
+                viewModel.departureAddress =
+                    viewModel.reverseGeocodingResult.value?.fullAddress ?: ""
+                viewModel.departureName =
                     viewModel.reverseGeocodingResult.value?.buildingName ?: "내가 설정한 출발지"
             }
         }
diff --git a/app/src/main/java/com/runnect/runnect/presentation/draw/DrawViewModel.kt b/app/src/main/java/com/runnect/runnect/presentation/draw/DrawViewModel.kt
index 149bb786..e7acb175 100644
--- a/app/src/main/java/com/runnect/runnect/presentation/draw/DrawViewModel.kt
+++ b/app/src/main/java/com/runnect/runnect/presentation/draw/DrawViewModel.kt
@@ -4,7 +4,6 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import com.runnect.runnect.data.dto.SearchResultEntity
 import com.runnect.runnect.data.dto.UploadLatLng
-import com.runnect.runnect.data.dto.response.ResponsePostMyDrawCourse
 import com.runnect.runnect.domain.common.toLog
 import com.runnect.runnect.domain.entity.LocationData
 import com.runnect.runnect.domain.repository.CourseRepository
@@ -15,6 +14,7 @@ import com.runnect.runnect.util.extension.collectResult
 import com.runnect.runnect.util.multipart.ContentUriRequestBody
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.onStart
+import timber.log.Timber
 import javax.inject.Inject
 import kotlin.math.acos
 
@@ -30,15 +30,20 @@ class DrawViewModel @Inject constructor(
 
     val searchResult = MutableLiveData<SearchResultEntity>()
 
-    val path = MutableLiveData<List<UploadLatLng>>()
+    var path: List<UploadLatLng> = listOf(
+        UploadLatLng(
+            37.52901832956373,
+            126.9136196847032
+        )
+    )
     var distanceSum = MutableLiveData(0.0f)
-    val departureAddress = MutableLiveData<String>()
-    var courseTitle = ""
-    val departureName = MutableLiveData("내가 설정한 출발지")
     val isBtnAvailable = MutableLiveData(false)
-
     val reverseGeocodingResult = MutableLiveData<LocationData>()
 
+    var departureAddress: String = ""
+    var departureName: String = "내가 설정한 출발지"
+    var courseTitle: String = ""
+    var uploadCourseId: Int? = null
 
     private val _image = MutableLiveData<ContentUriRequestBody>()
     val image: LiveData<ContentUriRequestBody>
@@ -48,9 +53,6 @@ class DrawViewModel @Inject constructor(
         _image.value = requestBody
     }
 
-    val uploadResult = MutableLiveData<ResponsePostMyDrawCourse>()
-    val errorMessage = MutableLiveData<String>()
-
 
     fun distance(lat1: Double, lon1: Double, lat2: Double, lon2: Double, unit: String): Double {
 
@@ -87,27 +89,22 @@ class DrawViewModel @Inject constructor(
             courseRepository.uploadCourse(
                 image = _image.value!!.toFormData(),
                 data = CourseCreateRequestDto(
-                    path = path.value ?: listOf(
-                        UploadLatLng(
-                            37.52901832956373,
-                            126.9136196847032
-                        )
-                    ),
+                    path = path,
                     title = courseTitle,
                     distance = distanceSum.value!!,
-                    departureAddress = departureAddress.value!!,
-                    departureName = departureName.value!!
+                    departureAddress = departureAddress,
+                    departureName = departureName
                 ).toRequestBody()
             ).onStart {
                 _drawState.value = UiState.Loading
             }.collectResult(
                 onSuccess = {
-                    uploadResult.value = it
+                    uploadCourseId = it
                     _drawState.value = UiState.Success
                 },
                 onFailure = {
-                    errorMessage.value = it.message
                     _drawState.value = UiState.Failure
+                    Timber.e(it.toLog())
                 }
             )
         }
@@ -122,7 +119,7 @@ class DrawViewModel @Inject constructor(
                 reverseGeocodingResult.value = it
             },
             onFailure = {
-                errorMessage.value = it.toLog()
+                Timber.e(it.toLog())
             }
         )
     }
diff --git a/app/src/main/java/com/runnect/runnect/presentation/endrun/EndRunActivity.kt b/app/src/main/java/com/runnect/runnect/presentation/endrun/EndRunActivity.kt
index d5ab7b3c..56eec2de 100644
--- a/app/src/main/java/com/runnect/runnect/presentation/endrun/EndRunActivity.kt
+++ b/app/src/main/java/com/runnect/runnect/presentation/endrun/EndRunActivity.kt
@@ -200,7 +200,6 @@ class EndRunActivity: BindingActivity<ActivityEndRunBinding>(R.layout.activity_e
 
     private fun notifyUploadFinish() {
         RunnectToast.createToast(this@EndRunActivity, "저장한 러닝 기록은 마이페이지에서 볼 수 있어요").show()
-        Timber.tag(ContentValues.TAG).d("서버 성공 : ${viewModel.uploadResult.value!!.message}")
     }
 
     private fun showErrorMessage() {
diff --git a/app/src/main/java/com/runnect/runnect/presentation/endrun/EndRunViewModel.kt b/app/src/main/java/com/runnect/runnect/presentation/endrun/EndRunViewModel.kt
index 03ca0c34..dc115ac0 100644
--- a/app/src/main/java/com/runnect/runnect/presentation/endrun/EndRunViewModel.kt
+++ b/app/src/main/java/com/runnect/runnect/presentation/endrun/EndRunViewModel.kt
@@ -25,7 +25,6 @@ class EndRunViewModel @Inject constructor(private val courseRepository: CourseRe
     val courseId = MutableLiveData<Int>()
     val publicCourseId = MutableLiveData<Int?>()
     val editTextValue = MutableLiveData<String>()
-    val uploadResult = MutableLiveData<ResponsePostMyHistory>()
     val errorMessage = MutableLiveData<String>()
     val currentTime = MutableLiveData<String>()
     val dataFrom = MutableLiveData<String>()
@@ -49,7 +48,6 @@ class EndRunViewModel @Inject constructor(private val courseRepository: CourseRe
                 _endRunState.value = UiState.Loading
             }.collectResult(
                 onSuccess = {
-                    uploadResult.value = it
                     _endRunState.value = UiState.Success
                 },
                 onFailure = {
diff --git a/app/src/main/java/com/runnect/runnect/presentation/mypage/history/detail/MyHistoryDetailActivity.kt b/app/src/main/java/com/runnect/runnect/presentation/mypage/history/detail/MyHistoryDetailActivity.kt
index 87c9b691..a918ea02 100644
--- a/app/src/main/java/com/runnect/runnect/presentation/mypage/history/detail/MyHistoryDetailActivity.kt
+++ b/app/src/main/java/com/runnect/runnect/presentation/mypage/history/detail/MyHistoryDetailActivity.kt
@@ -202,8 +202,7 @@ class MyHistoryDetailActivity :
                     dismissLoadingProgressBar()
                     enterReadMode()
 
-                    val response = state.data ?: return@observe
-                    val newTitle = response.record.title
+                    val newTitle = state.data
                     viewModel.updateHistoryTitle(newTitle)
 
                     showToast(getString(R.string.course_detail_title_edit_success_msg))
diff --git a/app/src/main/java/com/runnect/runnect/presentation/mypage/history/detail/MyHistoryDetailViewModel.kt b/app/src/main/java/com/runnect/runnect/presentation/mypage/history/detail/MyHistoryDetailViewModel.kt
index d2a13284..1e8edc18 100644
--- a/app/src/main/java/com/runnect/runnect/presentation/mypage/history/detail/MyHistoryDetailViewModel.kt
+++ b/app/src/main/java/com/runnect/runnect/presentation/mypage/history/detail/MyHistoryDetailViewModel.kt
@@ -5,8 +5,6 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.map
 import com.runnect.runnect.data.dto.request.RequestDeleteHistory
 import com.runnect.runnect.data.dto.request.RequestPatchHistoryTitle
-import com.runnect.runnect.data.dto.response.ResponseDeleteHistory
-import com.runnect.runnect.data.dto.response.ResponsePatchHistoryTitle
 import com.runnect.runnect.domain.common.toLog
 import com.runnect.runnect.domain.repository.UserRepository
 import com.runnect.runnect.presentation.base.BaseViewModel
@@ -22,13 +20,12 @@ class MyHistoryDetailViewModel @Inject constructor(
     private val userRepository: UserRepository
 ) : BaseViewModel() {
 
-    private val _historyDeleteState =
-        MutableLiveData<UiStateV2<ResponseDeleteHistory?>>()
-    val historyDeleteState: LiveData<UiStateV2<ResponseDeleteHistory?>>
+    private val _historyDeleteState = MutableLiveData<UiStateV2<Unit>>()
+    val historyDeleteState: LiveData<UiStateV2<Unit>>
         get() = _historyDeleteState
 
-    private val _titlePatchState = MutableLiveData<UiStateV2<ResponsePatchHistoryTitle?>>()
-    val titlePatchState: LiveData<UiStateV2<ResponsePatchHistoryTitle?>>
+    private val _titlePatchState = MutableLiveData<UiStateV2<String>>()
+    val titlePatchState: LiveData<UiStateV2<String>>
         get() = _titlePatchState
 
     val _title = MutableLiveData("")