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

core/ui/src/main/java/com/yapp/ndgl/core/ui/designsystem/NDGLInputModal.kt

@@ -57,24 +57,14 @@ fun NDGLInputModal(
     textAlign: TextAlign = TextAlign.Start,
 ) {
     val focusRequester = remember { FocusRequester() }
-    var textFieldValue by remember(value) {
+    var textFieldValue by remember {
         mutableStateOf(TextFieldValue(value, selection = TextRange(value.length)))
     }
 
     LaunchedEffect(Unit) {
         focusRequester.requestFocus()
     }
 
-    // value가 변경되면 textFieldValue 업데이트
-    LaunchedEffect(value) {
-        if (textFieldValue.text != value) {
-            textFieldValue = TextFieldValue(
-                text = value,
-                selection = TextRange(value.length),
-            )
-        }
-    }
-
     Dialog(onDismissRequest = onDismissRequest) {
         Surface(
             modifier = modifier.wrapContentHeight(),

core/ui/src/main/res/values/strings.xml

@@ -62,10 +62,12 @@
     <string name="start_time_setting">여행 시작 시간 설정</string>
     <string name="edit_travel">편집하기</string>
     <string name="edit_done">편집 완료</string>
-    <string name="add_schedule">일정 추가하기</string>
+    <string name="add_schedule_button_text">일정 추가하기</string>
     <string name="select_all">전체 선택</string>
     <string name="delete_selected">선택 삭제</string>
-    <string name="no_schedule_message">아직 %d일차 일정이 없어요</string>
+    <string name="no_schedule_message">일정이 없어요</string>
+    <string name="no_schedule_message_detail">아직 %d일차 일정이 없어요</string>
+    <string name="add_schedule_button_text_no_schedule">%d일차 첫 일정 추가하기</string>
 
     <!-- Dialog - Cancel Edit -->
     <string name="cancel_edit_dialog_title">편집 중단</string>

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,

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: Int,
+    val memo: String? = null,
+    @SerialName("budget")
+    val cost: Int? = null,
+    val distanceKm: Double? = null,
+    val transportation: List<TransportationItem>? = null,
+)

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,
+    )
+}

data/travel/src/main/java/com/yapp/ndgl/data/travel/model/ChangePlaceEvent.kt

@@ -0,0 +1,9 @@
+package com.yapp.ndgl.data.travel.model
+
+data class ChangePlaceEvent(
+    val travelId: Long,
+    val itineraryId: Long,
+    val day: Int,
+    val oldGooglePlaceId: String,
+    val newGooglePlaceId: String,
+)

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,
+)

data/travel/src/main/java/com/yapp/ndgl/data/travel/model/TravelCreatedEvent.kt

@@ -0,0 +1,6 @@
+package com.yapp.ndgl.data.travel.model
+
+data class TravelCreatedEvent(
+    val userTravelId: Long,
+    val templateId: Long,
+)

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,
-)

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,
+)

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,

data/travel/src/main/java/com/yapp/ndgl/data/travel/repository/PlaceRepository.kt

@@ -1,6 +1,8 @@
 package com.yapp.ndgl.data.travel.repository
 
+import com.google.android.gms.maps.model.LatLng
 import com.google.android.libraries.places.api.model.AutocompleteSessionToken
+import com.google.android.libraries.places.api.model.CircularBounds
 import com.google.android.libraries.places.api.net.FindAutocompletePredictionsRequest
 import com.google.android.libraries.places.api.net.PlacesClient
 import com.yapp.ndgl.data.core.model.error.HttpResponseException
@@ -23,15 +25,16 @@ class PlaceRepository @Inject constructor(
 ) {
     private var sessionToken: AutocompleteSessionToken? = null
 
-    suspend fun searchKeyword(keyword: String, countryCode: String): SearchKeywordResponse {
+    suspend fun searchKeyword(keyword: String, representativeLatLng: LatLng): SearchKeywordResponse {
         if (sessionToken == null) {
             sessionToken = AutocompleteSessionToken.newInstance()
         }
 
+        val bias = CircularBounds.newInstance(representativeLatLng, 10000.0)
         val requestBuilder = FindAutocompletePredictionsRequest.builder()
             .setQuery(keyword)
             .setSessionToken(sessionToken)
-            .setCountries(countryCode)
+            .setLocationBias(bias)
 
         val response = placesClient.findAutocompletePredictions(requestBuilder.build()).await()
 

data/travel/src/main/java/com/yapp/ndgl/data/travel/repository/UserTravelRepository.kt

@@ -3,13 +3,18 @@ package com.yapp.ndgl.data.travel.repository
 import com.yapp.ndgl.data.core.model.error.HttpResponseException
 import com.yapp.ndgl.data.core.model.getData
 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
 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 kotlinx.coroutines.channels.BufferOverflow
@@ -31,10 +36,32 @@ class UserTravelRepository @Inject constructor(
     )
     val addPlaceEvent: SharedFlow<AddPlaceEvent> = _addPlaceEvent.asSharedFlow()
 
+    private val _travelCreatedEvent = MutableSharedFlow<TravelCreatedEvent>(
+        replay = 0,
+        extraBufferCapacity = 1,
+        onBufferOverflow = BufferOverflow.DROP_OLDEST,
+    )
+    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)
     }
 
+    suspend fun emitTravelCreatedEvent(event: TravelCreatedEvent) {
+        _travelCreatedEvent.emit(event)
+    }
+
+    suspend fun emitChangePlaceEvent(event: ChangePlaceEvent) {
+        _changePlaceEvent.emit(event)
+    }
+
     suspend fun getUpcomingTravel(): UpcomingTravelResponse? {
         return try {
             userTravelApi.getUpcomingTravel().getData()
@@ -51,6 +78,24 @@ class UserTravelRepository @Inject constructor(
         return userTravelApi.getUpcomingTravelList().getData()
     }
 
+    suspend fun getUserTravelTemplateItinerary(
+        travelId: Long,
+        day: Int,
+    ): UserTravelTemplateItinerary {
+        return userTravelApi.getUserTravelTemplateItinerary(
+            id = travelId,
+            day = day,
+        ).getData()
+    }
+
+    suspend fun getUserTravelTemplateContentInfo(
+        travelId: Long,
+    ): UserTravelTemplateContentInfo {
+        return userTravelApi.getUserTravelTemplateContentInfo(
+            id = travelId,
+        ).getData()
+    }
+
     suspend fun bulkUpdateStartTime(
         travelId: Long,
         updates: List<StartTimeUpdateItem>,
@@ -71,21 +116,45 @@ class UserTravelRepository @Inject constructor(
         ).getData()
     }
 
-    suspend fun getUserTravelTemplateItinerary(
+    suspend fun updateTravelPlace(
         travelId: Long,
-        day: Int,
-    ): UserTravelTemplateItinerary {
-        return userTravelApi.getUserTravelTemplateItinerary(
+        userTravelPlaceId: Long,
+        memo: String? = null,
+        cost: Int? = null,
+    ) {
+        userTravelApi.updateTravelPlace(
             id = travelId,
-            day = day,
+            userTravelPlaceId = userTravelPlaceId,
+            request = UpdateTravelPlaceRequest(
+                memo = memo,
+                cost = cost,
+            ),
         ).getData()
     }
 
-    suspend fun getUserTravelTemplateContentInfo(
+    suspend fun addItinerary(
         travelId: Long,
-    ): UserTravelTemplateContentInfo {
-        return userTravelApi.getUserTravelTemplateContentInfo(
-            id = travelId,
-        ).getData()
-    }
+        googlePlaceId: String,
+        day: Int,
+        sequence: Int,
+        startTime: String? = null,
+        estimatedDuration: Int,
+        cost: Int? = null,
+        memo: String? = null,
+        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()
 }