[NDGL-118] feature: 내 여행 관련 API 연동

mj010504 · mj010504 · commit 783b8292e2bb · 2026-02-25T17:41:35.000+09:00
- 내 여행 전체 일정 수정
- 내 여행 장소 한건 추가
- 내 여행 장소 정보 수정(메모, 비용)
diff --git a/data/travel/src/main/java/com/yapp/ndgl/data/travel/api/UserTravelApi.kt b/data/travel/src/main/java/com/yapp/ndgl/data/travel/api/UserTravelApi.kt
@@ -1,15 +1,19 @@
 package com.yapp.ndgl.data.travel.api
 
 import com.yapp.ndgl.data.core.model.BaseResponse
+import com.yapp.ndgl.data.travel.model.AddItineraryRequest
+import com.yapp.ndgl.data.travel.model.AddItineraryResponse
 import com.yapp.ndgl.data.travel.model.BulkUpdateStartTimeRequest
 import com.yapp.ndgl.data.travel.model.UpcomingTravelList
 import com.yapp.ndgl.data.travel.model.UpcomingTravelResponse
 import com.yapp.ndgl.data.travel.model.UpdateItineraryRequest
+import com.yapp.ndgl.data.travel.model.UpdateTravelPlaceRequest
 import com.yapp.ndgl.data.travel.model.UserTravelTemplateContentInfo
 import com.yapp.ndgl.data.travel.model.UserTravelTemplateItinerary
 import retrofit2.http.Body
 import retrofit2.http.GET
 import retrofit2.http.PATCH
+import retrofit2.http.POST
 import retrofit2.http.PUT
 import retrofit2.http.Path
 import retrofit2.http.Query
@@ -41,6 +45,19 @@ interface UserTravelApi {
         @Body request: BulkUpdateStartTimeRequest,
     ): BaseResponse<Unit>
 
+    @PATCH("/api/v1/travels/{id}/itinerary/{userTravelPlaceId}")
+    suspend fun updateTravelPlace(
+        @Path("id") id: Long,
+        @Path("userTravelPlaceId") userTravelPlaceId: Long,
+        @Body request: UpdateTravelPlaceRequest,
+    ): BaseResponse<Unit>
+
+    @POST("/api/v1/travels/{id}/itinerary")
+    suspend fun addItinerary(
+        @Path("id") id: Long,
+        @Body request: AddItineraryRequest,
+    ): BaseResponse<AddItineraryResponse>
+
     @PUT("/api/v1/travels/{id}/itinerary")
     suspend fun updateItinerary(
         @Path("id") id: Long,
diff --git a/data/travel/src/main/java/com/yapp/ndgl/data/travel/model/AddItineraryRequest.kt b/data/travel/src/main/java/com/yapp/ndgl/data/travel/model/AddItineraryRequest.kt
@@ -0,0 +1,18 @@
+package com.yapp.ndgl.data.travel.model
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class AddItineraryRequest(
+    val googlePlaceId: String,
+    val day: Int,
+    val sequence: Int,
+    val startTime: String? = null,
+    val estimatedDuration: String? = null,
+    val memo: String? = null,
+    @SerialName("budget")
+    val cost: Int? = null,
+    val distanceKm: Double? = null,
+    val transportation: List<TransportationItem>? = null,
+)
diff --git a/data/travel/src/main/java/com/yapp/ndgl/data/travel/model/AddItineraryResponse.kt b/data/travel/src/main/java/com/yapp/ndgl/data/travel/model/AddItineraryResponse.kt
@@ -0,0 +1,48 @@
+package com.yapp.ndgl.data.travel.model
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class AddItineraryResponse(
+    val id: Long,
+    val day: Int,
+    val sequence: Int,
+    val startTime: String? = null,
+    val estimatedDuration: Int,
+    val memo: String? = null,
+    @SerialName("budget")
+    val cost: Int? = null,
+    val distanceKm: Double? = null,
+    val transportation: List<Transportation>? = null,
+    val travelerTips: List<String>? = null,
+    val planB: List<PlanBPlace>? = null,
+    val place: ItineraryPlace,
+) {
+    @Serializable
+    data class Transportation(
+        val mode: TransportCategory,
+        val timeMin: Int,
+    )
+
+    @Serializable
+    data class PlanBPlace(
+        val googlePlaceId: String,
+        val name: String,
+        val thumbnail: String? = null,
+        val category: PlaceCategory,
+    )
+
+    @Serializable
+    data class ItineraryPlace(
+        val googlePlaceId: String,
+        val thumbnail: String? = null,
+        val latitude: Double,
+        val longitude: Double,
+        val name: String,
+        val regularOpeningHours: String? = null,
+        val googleMapsUri: String? = null,
+        val category: PlaceCategory,
+        val priceRange: String? = null,
+    )
+}
diff --git a/data/travel/src/main/java/com/yapp/ndgl/data/travel/model/TransportationItem.kt b/data/travel/src/main/java/com/yapp/ndgl/data/travel/model/TransportationItem.kt
@@ -0,0 +1,9 @@
+package com.yapp.ndgl.data.travel.model
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class TransportationItem(
+    val mode: TransportCategory,
+    val timeMin: Int,
+)
diff --git a/data/travel/src/main/java/com/yapp/ndgl/data/travel/model/UpdateItineraryRequest.kt b/data/travel/src/main/java/com/yapp/ndgl/data/travel/model/UpdateItineraryRequest.kt
@@ -10,19 +10,14 @@ data class UpdateItineraryRequest(
 
 @Serializable
 data class ItineraryUpdateItem(
-    val placeId: Long,
+    val googlePlaceId: String,
     val day: Int,
     val sequence: Int,
-    val startTime: String,
+    val startTime: String? = null,
     val estimatedDuration: Int,
-    @SerialName("travelerTip")
-    val memo: String?,
+    val memo: String? = null,
+    @SerialName("budget")
+    val cost: Int? = null,
     val distanceKm: Double? = null,
     val transportation: List<TransportationItem>? = null,
 )
-
-@Serializable
-data class TransportationItem(
-    val mode: TransportCategory,
-    val timeMin: Int,
-)
diff --git a/data/travel/src/main/java/com/yapp/ndgl/data/travel/model/UpdateTravelPlaceRequest.kt b/data/travel/src/main/java/com/yapp/ndgl/data/travel/model/UpdateTravelPlaceRequest.kt
@@ -0,0 +1,11 @@
+package com.yapp.ndgl.data.travel.model
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class UpdateTravelPlaceRequest(
+    val memo: String? = null,
+    @SerialName("budget")
+    val cost: Int? = null,
+)
diff --git a/data/travel/src/main/java/com/yapp/ndgl/data/travel/model/UserTravelTemplateItinerary.kt b/data/travel/src/main/java/com/yapp/ndgl/data/travel/model/UserTravelTemplateItinerary.kt
@@ -1,5 +1,6 @@
 package com.yapp.ndgl.data.travel.model
 
+import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
 @Serializable
@@ -14,6 +15,8 @@ data class UserTravelTemplateItinerary(
         val startTime: String? = null,
         val estimatedDuration: Int,
         val memo: String? = null,
+        @SerialName("budget")
+        val cost: Int? = null,
         val distanceKm: Double? = null,
         val transportation: List<Transportation>? = null,
         val travelerTips: List<String>? = null,
diff --git a/data/travel/src/main/java/com/yapp/ndgl/data/travel/repository/UserTravelRepository.kt b/data/travel/src/main/java/com/yapp/ndgl/data/travel/repository/UserTravelRepository.kt
@@ -6,8 +6,10 @@ import com.yapp.ndgl.data.travel.api.UserTravelApi
 import com.yapp.ndgl.data.travel.model.AddItineraryRequest
 import com.yapp.ndgl.data.travel.model.AddPlaceEvent
 import com.yapp.ndgl.data.travel.model.BulkUpdateStartTimeRequest
+import com.yapp.ndgl.data.travel.model.ChangePlaceEvent
 import com.yapp.ndgl.data.travel.model.ItineraryUpdateItem
 import com.yapp.ndgl.data.travel.model.StartTimeUpdateItem
+import com.yapp.ndgl.data.travel.model.TransportationItem
 import com.yapp.ndgl.data.travel.model.TravelCreatedEvent
 import com.yapp.ndgl.data.travel.model.UpcomingTravelList
 import com.yapp.ndgl.data.travel.model.UpcomingTravelResponse
@@ -41,6 +43,13 @@ class UserTravelRepository @Inject constructor(
     )
     val travelCreatedEvent: SharedFlow<TravelCreatedEvent> = _travelCreatedEvent.asSharedFlow()
 
+    private val _changePlaceEvent = MutableSharedFlow<ChangePlaceEvent>(
+        replay = 0,
+        extraBufferCapacity = 1,
+        onBufferOverflow = BufferOverflow.DROP_OLDEST,
+    )
+    val changePlaceEvent: SharedFlow<ChangePlaceEvent> = _changePlaceEvent.asSharedFlow()
+
     suspend fun emitAddPlaceEvent(event: AddPlaceEvent) {
         _addPlaceEvent.emit(event)
     }
@@ -49,6 +58,10 @@ class UserTravelRepository @Inject constructor(
         _travelCreatedEvent.emit(event)
     }
 
+    suspend fun emitChangePlaceEvent(event: ChangePlaceEvent) {
+        _changePlaceEvent.emit(event)
+    }
+
     suspend fun getUpcomingTravel(): UpcomingTravelResponse? {
         return try {
             userTravelApi.getUpcomingTravel().getData()
@@ -128,18 +141,20 @@ class UserTravelRepository @Inject constructor(
         estimatedDuration: String? = null,
         cost: Int? = null,
         memo: String? = null,
-    ) {
-        userTravelApi.addItinerary(
-            id = travelId,
-            request = AddItineraryRequest(
-                googlePlaceId = googlePlaceId,
-                day = day,
-                sequence = sequence,
-                startTime = startTime,
-                estimatedDuration = estimatedDuration,
-                cost = cost,
-                memo = memo,
-            ),
-        ).getData()
-    }
+        distanceKm: Double? = null,
+        transportation: List<TransportationItem>? = null,
+    ) = userTravelApi.addItinerary(
+        id = travelId,
+        request = AddItineraryRequest(
+            googlePlaceId = googlePlaceId,
+            day = day,
+            sequence = sequence,
+            startTime = startTime,
+            estimatedDuration = estimatedDuration,
+            cost = cost,
+            memo = memo,
+            distanceKm = distanceKm,
+            transportation = transportation,
+        ),
+    ).getData()
 }
diff --git a/feature/travel/src/main/java/com/yapp/ndgl/feature/travel/model/TransportSegment.kt b/feature/travel/src/main/java/com/yapp/ndgl/feature/travel/model/TransportSegment.kt
@@ -1,14 +1,19 @@
 package com.yapp.ndgl.feature.travel.model
 
+import com.yapp.ndgl.data.travel.model.TransportationItem
 import java.util.Locale.getDefault
+import kotlin.math.roundToInt
 import kotlin.time.Duration
 
 data class TransportSegment(
     val googlePlaceId: String,
     val type: TransportType,
-    val duration: Duration,
+    val duration: Duration, // m 단위
     val distance: Int,
 ) {
+    val distanceKm: Double
+        get() = (distance / 100.0).roundToInt() / 10.0
+
     fun formatDistance(): String {
         return when {
             distance >= 1000 -> {
@@ -23,4 +28,11 @@ data class TransportSegment(
             else -> "${distance}m"
         }
     }
+
+    fun toTransportationItem(): TransportationItem {
+        return TransportationItem(
+            mode = type.toTransportCategory(),
+            timeMin = duration.inWholeMinutes.toInt(),
+        )
+    }
 }
diff --git a/feature/travel/src/main/java/com/yapp/ndgl/feature/travel/traveldetail/TravelDetailContract.kt b/feature/travel/src/main/java/com/yapp/ndgl/feature/travel/traveldetail/TravelDetailContract.kt
@@ -15,6 +15,8 @@ import kotlin.time.Duration.Companion.hours
 data class TravelDetailState(
     val contentInfo: ContentInfo = ContentInfo(),
     val countryCode: String = "",
+    val creatorName: String = "",
+    val startDate: String = "",
     val days: Int = 1,
     val selectedDay: Int = 1,
     val itineraries: List<Itinerary> = emptyList(),
@@ -45,7 +47,7 @@ data class TravelDetailState(
     val representativeLatLng: LatLng
         get() {
             val currentDayPlaces = itineraries.getOrNull(selectedDay - 1)?.places
-            val firstPlaceInSelectedDay = currentDayPlaces?.firstOrNull()
+            val firstPlaceInSelectedDay = currentDayPlaces?.lastOrNull()
 
             if (firstPlaceInSelectedDay != null) {
                 return LatLng(firstPlaceInSelectedDay.placeInfo.latitude, firstPlaceInSelectedDay.placeInfo.longitude)
@@ -54,7 +56,7 @@ data class TravelDetailState(
             return itineraries
                 .flatMap { it.places }
                 .firstOrNull()
-                ?.let { LatLng(it.placeInfo.latitude, it.placeInfo.longitude) } ?: LatLng(37.5665, 126.9780) // 모든 일차가 비어 있다면 '서울' 좌표 반환
+                ?.let { LatLng(it.placeInfo.latitude, it.placeInfo.longitude) } ?: LatLng(37.5665, 126.9780) // FIXME: 모든 일차가 비어 있다면 '서울' 좌표 반환
         }
 
     // 헤더(0) + stickyHeader(1) + 맵 아이템(2) = 3개가 장소 아이템 앞에 위치
@@ -138,6 +140,8 @@ sealed interface TravelDetailSideEffect : UiSideEffect {
         val googlePlaceId: String,
         val tipContent: TipContent?,
         val alternativePlaces: List<AlternativePlace>?,
+        val day: Int,
+        val itineraryId: Long,
     ) : TravelDetailSideEffect
 
     data class NavigateToBrowser(val url: String) : TravelDetailSideEffect
@@ -150,4 +154,5 @@ sealed interface TravelDetailSideEffect : UiSideEffect {
 
     data object NavigateToMyTravel : TravelDetailSideEffect
     data class ScrollToPlace(val placeId: Long) : TravelDetailSideEffect
+    data class AnimatePlaceChange(val googlePlaceId: String) : TravelDetailSideEffect
 }
diff --git a/feature/travel/src/main/java/com/yapp/ndgl/feature/travel/traveldetail/TravelDetailScreen.kt b/feature/travel/src/main/java/com/yapp/ndgl/feature/travel/traveldetail/TravelDetailScreen.kt
@@ -99,7 +99,7 @@ import kotlin.time.Duration.Companion.minutes
 internal fun TravelDetailRoute(
     viewModel: TravelDetailViewModel = hiltViewModel(),
     navigateBack: () -> Unit,
-    navigateToTravelPlaceDetail: (String, TipContent?, List<AlternativePlace>?) -> Unit,
+    navigateToTravelPlaceDetail: (String, TipContent?, List<AlternativePlace>?, Int, Long) -> Unit,
     navigateToAddItinerary:
     (travelId: Long, day: Int, country: String, representativeLatitude: Double, representativeLongitude: Double) -> Unit,
 ) {
@@ -112,7 +112,13 @@ internal fun TravelDetailRoute(
         when (sideEffect) {
             is TravelDetailSideEffect.NavigateBack -> navigateBack()
             is TravelDetailSideEffect.NavigateToTravelPlaceDetail -> {
-                navigateToTravelPlaceDetail(sideEffect.googlePlaceId, sideEffect.tipContent, sideEffect.alternativePlaces)
+                navigateToTravelPlaceDetail(
+                    sideEffect.googlePlaceId,
+                    sideEffect.tipContent,
+                    sideEffect.alternativePlaces,
+                    sideEffect.day,
+                    sideEffect.itineraryId,
+                )
             }
 
             is TravelDetailSideEffect.NavigateToBrowser -> {
@@ -145,6 +151,20 @@ internal fun TravelDetailRoute(
                     }
                 }
             }
+
+            is TravelDetailSideEffect.AnimatePlaceChange -> {
+                coroutineScope.launch {
+                    val dayIndex = state.selectedDay - 1
+                    val places = state.itineraries.getOrNull(dayIndex)?.places.orEmpty()
+                    val placeIndex = places.indexOfFirst { it.placeInfo.googlePlaceId == sideEffect.googlePlaceId }
+
+                    if (placeIndex >= 0) {
+                        val targetIndex = state.placesOffset + placeIndex
+                        delay(100)
+                        listState.animateScrollToItem(targetIndex)
+                    }
+                }
+            }
         }
     }
 
@@ -431,16 +451,18 @@ private fun TravelDetailScreen(
                         }
 
                         if (index < state.currentPlaces.size - 1) {
+                            Spacer(Modifier.height(10.dp))
+
                             place.transportToNext?.let { segment ->
-                                Spacer(Modifier.height(10.dp))
                                 Box(modifier = Modifier.padding(horizontal = 24.dp)) {
                                     TransportSegment(
                                         segment = segment,
                                         onClick = { clickTransportSegment(place) },
                                     )
                                 }
-                                Spacer(Modifier.height(10.dp))
                             }
+
+                            Spacer(Modifier.height(10.dp))
                         }
                     }
                 }
diff --git a/feature/travel/src/main/java/com/yapp/ndgl/feature/travel/traveldetail/TravelDetailViewModel.kt b/feature/travel/src/main/java/com/yapp/ndgl/feature/travel/traveldetail/TravelDetailViewModel.kt
