Merge pull request #95 from Nexters/feature/change-diary-get-patch-api-FD-306

soyeonLee126 · web-flow · commit 1404107a553f · 2026-03-14T22:18:55.000+09:00
[FD-306] change diary get patch api
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -60,7 +60,7 @@ android {
         minSdk = libs.versions.minSdk.get().toInt()
         targetSdk = libs.versions.targetSdk.get().toInt()
         versionCode = project.findProperty("versionCode")?.toString()?.toInt() ?: 1
-        versionName = "1.2"
+        versionName = "1.3.0"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 
diff --git a/app/src/main/java/com/nexters/fooddiary/navigation/FoodDiaryNavHost.kt b/app/src/main/java/com/nexters/fooddiary/navigation/FoodDiaryNavHost.kt
@@ -62,6 +62,7 @@ import com.nexters.fooddiary.presentation.mypage.navigation.MyPageRoute
 import com.nexters.fooddiary.presentation.mypage.navigation.WebViewPage
 import com.nexters.fooddiary.presentation.mypage.navigation.myPageScreen
 import com.nexters.fooddiary.presentation.modify.navigation.ModifyRoute
+import com.nexters.fooddiary.presentation.modify.navigation.MODIFY_SEARCH_RESULT_ADDRESS_NAME
 import com.nexters.fooddiary.presentation.modify.navigation.MODIFY_SEARCH_RESULT_NAME
 import com.nexters.fooddiary.presentation.modify.navigation.MODIFY_SEARCH_RESULT_ROAD_ADDRESS
 import com.nexters.fooddiary.presentation.modify.navigation.MODIFY_SEARCH_RESULT_URL
@@ -420,6 +421,10 @@ fun FoodDiaryNavHost(
                             MODIFY_SEARCH_RESULT_ROAD_ADDRESS,
                             restaurant.roadAddress,
                         )
+                        navController.previousBackStackEntry?.savedStateHandle?.set(
+                            MODIFY_SEARCH_RESULT_ADDRESS_NAME,
+                            restaurant.addressName.orEmpty(),
+                        )
                         navController.previousBackStackEntry?.savedStateHandle?.set(
                             MODIFY_SEARCH_RESULT_URL,
                             restaurant.url,
diff --git a/data/src/main/java/com/nexters/fooddiary/data/mapper/DiaryMapper.kt b/data/src/main/java/com/nexters/fooddiary/data/mapper/DiaryMapper.kt
@@ -21,7 +21,9 @@ class DiaryMapper @Inject constructor() {
                 createdAt = diary.createdAt,
                 restaurantName = diary.restaurantName,
                 category = diary.category,
-                location = diary.roadAddress,
+                addressName = diary.addressName,
+                roadAddress = diary.roadAddress,
+                location = diary.addressName ?: diary.roadAddress,
                 tags = diary.tags,
                 note = diary.note,
                 coverPhotoUrl = diary.coverPhotoUrl,
diff --git a/data/src/main/java/com/nexters/fooddiary/data/mapper/RestaurantMapper.kt b/data/src/main/java/com/nexters/fooddiary/data/mapper/RestaurantMapper.kt
@@ -8,6 +8,7 @@ import com.nexters.fooddiary.domain.model.RestaurantSearchResult
 internal fun RestaurantResponseItem.toDomainModel(): RestaurantItem {
     return RestaurantItem(
         name = name,
+        addressName = addressName,
         roadAddress = roadAddress,
         url = url,
     )
diff --git a/data/src/main/java/com/nexters/fooddiary/data/remote/diary/model/DiaryDetailResponse.kt b/data/src/main/java/com/nexters/fooddiary/data/remote/diary/model/DiaryDetailResponse.kt
@@ -23,6 +23,8 @@ data class DiarySummaryResponse(
     val restaurantName: String?,
     @SerialName("restaurant_url")
     val restaurantUrl: String? = null,
+    @SerialName("address_name")
+    val addressName: String? = null,
     @SerialName("category")
     val category: String?,
     @SerialName("note")
diff --git a/data/src/main/java/com/nexters/fooddiary/data/remote/diary/model/UpdateDiaryRequest.kt b/data/src/main/java/com/nexters/fooddiary/data/remote/diary/model/UpdateDiaryRequest.kt
@@ -11,6 +11,8 @@ data class UpdateDiaryRequest(
     val restaurantName: String? = null,
     @SerialName("restaurant_url")
     val restaurantUrl: String? = null,
+    @SerialName("address_name")
+    val addressName: String? = null,
     @SerialName("road_address")
     val roadAddress: String? = null,
     @SerialName("tags")
diff --git a/data/src/main/java/com/nexters/fooddiary/data/remote/restaurant/model/response/RestaurantSearchResponse.kt b/data/src/main/java/com/nexters/fooddiary/data/remote/restaurant/model/response/RestaurantSearchResponse.kt
@@ -21,6 +21,8 @@ data class RestaurantSearchResponse(
 data class RestaurantResponseItem(
     @SerialName("name")
     val name: String,
+    @SerialName("address_name")
+    val addressName: String? = null,
     @SerialName("road_address")
     val roadAddress: String,
     @SerialName("url")
diff --git a/data/src/main/java/com/nexters/fooddiary/data/repository/DiaryRepositoryImpl.kt b/data/src/main/java/com/nexters/fooddiary/data/repository/DiaryRepositoryImpl.kt
@@ -88,6 +88,7 @@ class DiaryRepositoryImpl @Inject constructor(
             category = param.category,
             restaurantName = param.restaurantName,
             restaurantUrl = param.restaurantUrl,
+            addressName = param.addressName,
             roadAddress = param.roadAddress,
             tags = param.tags,
             note = param.note,
diff --git a/data/src/test/java/com/nexters/fooddiary/data/mapper/RestaurantMapperTest.kt b/data/src/test/java/com/nexters/fooddiary/data/mapper/RestaurantMapperTest.kt
@@ -0,0 +1,37 @@
+package com.nexters.fooddiary.data.mapper
+
+import com.nexters.fooddiary.data.remote.restaurant.model.response.RestaurantResponseItem
+import org.junit.Assert.assertEquals
+import org.junit.Test
+
+class RestaurantMapperTest {
+
+    @Test
+    fun `address_name 과 road_address 를 각각 보존해 매핑한다`() {
+        val item = RestaurantResponseItem(
+            name = "식당",
+            addressName = "서울시 강남구 역삼동 123-4",
+            roadAddress = "서울시 강남구 테헤란로 123",
+            url = "https://example.com",
+        )
+
+        val mapped = item.toDomainModel()
+
+        assertEquals("서울시 강남구 역삼동 123-4", mapped.addressName)
+        assertEquals("서울시 강남구 테헤란로 123", mapped.roadAddress)
+    }
+
+    @Test
+    fun `address_name 이 없으면 road_address 를 매핑한다`() {
+        val item = RestaurantResponseItem(
+            name = "식당",
+            addressName = null,
+            roadAddress = "서울시 강남구 테헤란로 123",
+            url = "https://example.com",
+        )
+
+        val mapped = item.toDomainModel()
+
+        assertEquals("서울시 강남구 테헤란로 123", mapped.roadAddress)
+    }
+}
diff --git a/data/src/test/java/com/nexters/fooddiary/data/remote/diary/DiaryApiTest.kt b/data/src/test/java/com/nexters/fooddiary/data/remote/diary/DiaryApiTest.kt
@@ -2,12 +2,17 @@ package com.nexters.fooddiary.data.remote.diary
 
 import com.nexters.fooddiary.data.mock.BaseMockServerTest
 import com.nexters.fooddiary.data.remote.diary.model.CreateDiaryRequest
+import com.nexters.fooddiary.data.remote.diary.model.UpdateDiaryRequest
 import kotlinx.coroutines.test.runTest
 import kotlinx.serialization.json.Json
 import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.OkHttpClient
+import okhttp3.mockwebserver.Dispatcher
+import okhttp3.mockwebserver.MockResponse
+import okhttp3.mockwebserver.RecordedRequest
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotNull
+import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Test
 import retrofit2.Retrofit
@@ -101,4 +106,69 @@ class DiaryApiTest : BaseMockServerTest() {
             recordedRequest.path,
         )
     }
+
+    @Test
+    fun `다이어리_수정시_address_name을_요청_바디에_포함한다`() = runTest {
+        // Given
+        val fallbackDispatcher = mockWebServer.dispatcher
+        mockWebServer.dispatcher = object : Dispatcher() {
+            override fun dispatch(request: RecordedRequest): MockResponse {
+                return if (request.method == "PATCH" && request.path == "/diaries/42") {
+                    MockResponse()
+                        .setResponseCode(200)
+                        .setHeader("Content-Type", "application/json")
+                        .setBody(
+                            """
+                            {
+                              "id": 42,
+                              "diary_date": "2026-03-12T15:09:52.066Z",
+                              "time_type": "lunch",
+                              "analysis_status": "done",
+                              "restaurant_name": "식당",
+                              "restaurant_url": "https://example.com",
+                              "address_name": "서울시 강남구 테헤란로 123",
+                              "road_address": "서울시 강남구 테헤란로 123",
+                              "category": "한식",
+                              "note": "노트",
+                              "tags": ["점심"],
+                              "cover_photo_url": "https://example.com/cover.jpg",
+                              "user_id": "3fa85f64-5717-4562-b3fc-2c963f66afa6",
+                              "cover_photo_id": 100,
+                              "created_at": "2026-03-12T15:09:52.066Z",
+                              "updated_at": "2026-03-12T15:09:52.066Z",
+                              "photo_count": 1,
+                              "photos": [
+                                { "photo_id": 100, "image_url": "https://example.com/cover.jpg" }
+                              ]
+                            }
+                            """.trimIndent()
+                        )
+                } else {
+                    fallbackDispatcher.dispatch(request)
+                }
+            }
+        }
+
+        val request = UpdateDiaryRequest(
+            category = "한식",
+            restaurantName = "식당",
+            restaurantUrl = "https://example.com",
+            addressName = "서울시 강남구 테헤란로 123",
+            roadAddress = "서울시 강남구 테헤란로 123",
+            tags = listOf("점심"),
+            note = "노트",
+            coverPhotoId = 100,
+            photoIds = listOf(100),
+        )
+
+        // When
+        diaryApi.updateDiary(diaryId = 42, request = request)
+
+        // Then
+        val recordedRequest = mockWebServer.takeRequest()
+        assertEquals("PATCH", recordedRequest.method)
+        assertEquals("/diaries/42", recordedRequest.path)
+        val body = recordedRequest.body.readUtf8()
+        assertTrue(body.contains("\"address_name\":\"서울시 강남구 테헤란로 123\""))
+    }
 }
diff --git a/data/src/test/java/com/nexters/fooddiary/data/repository/DiaryRepositoryImplTest.kt b/data/src/test/java/com/nexters/fooddiary/data/repository/DiaryRepositoryImplTest.kt
@@ -11,6 +11,7 @@ import com.nexters.fooddiary.data.remote.diary.model.DiarySummaryResponse
 import com.nexters.fooddiary.data.remote.diary.model.DiarySummaryByDateItemResponse
 import com.nexters.fooddiary.domain.model.AnalysisStatus
 import com.nexters.fooddiary.domain.model.MealType
+import com.nexters.fooddiary.domain.model.UpdateDiaryParam
 import io.mockk.coEvery
 import io.mockk.coVerify
 import io.mockk.mockk
@@ -170,11 +171,90 @@ class DiaryRepositoryImplTest {
         assertTrue(result.containsKey(LocalDate.parse("2026-02-26")))
     }
 
+    @Test
+    fun `일별_조회시_address_name이_있으면_location으로_우선_매핑한다`() = runTest {
+        // Given
+        val repository = DiaryRepositoryImpl(
+            diaryApi = diaryApi,
+            diaryMapper = DiaryMapper(),
+            isDebug = true,
+        )
+        val requestedDate = LocalDate.parse("2026-02-25")
+        coEvery {
+            diaryApi.getDiary("2026-02-25", "2026-02-25", true)
+        } returns DiaryDetailResponse(
+            diaries = listOf(
+                diarySummary(
+                    diaryId = 125L,
+                    diaryDate = "2026-02-25T00:00:00",
+                    timeType = DiaryMealTypeResponse.LUNCH,
+                    analysisStatus = DiaryAnalysisStatusResponse.DONE,
+                    addressName = "서울시 강남구 테헤란로 123",
+                    roadAddress = "서울시 강남구 테헤란로 999",
+                ),
+            )
+        )
+
+        // When
+        val result = repository.getDiary(requestedDate)
+
+        // Then
+        assertEquals("서울시 강남구 테헤란로 123", result.diaries.first().location)
+    }
+
+    @Test
+    fun `수정_요청시_address_name과_road_address를_서로_치환하지_않고_그대로_전달한다`() = runTest {
+        // Given
+        val repository = DiaryRepositoryImpl(
+            diaryApi = diaryApi,
+            diaryMapper = DiaryMapper(),
+            isDebug = true,
+        )
+        val param = UpdateDiaryParam(
+            category = "한식",
+            restaurantName = "식당",
+            restaurantUrl = "https://example.com",
+            addressName = "대전 서구 둔산동 1005",
+            roadAddress = "대전 서구 둔산로31번길 52",
+            tags = listOf("점심"),
+            note = "메모",
+            coverPhotoId = 10,
+            photoIds = listOf(10),
+        )
+
+        coEvery {
+            diaryApi.updateDiary(any(), any())
+        } returns diarySummary(
+            diaryId = 1L,
+            diaryDate = "2026-02-25T12:00:00",
+            timeType = DiaryMealTypeResponse.LUNCH,
+            analysisStatus = DiaryAnalysisStatusResponse.DONE,
+            addressName = "대전 서구 둔산동 1005",
+            roadAddress = "대전 서구 둔산로31번길 52",
+        )
+
+        // When
+        repository.updateDiary(diaryId = 1, param = param)
+
+        // Then
+        coVerify(exactly = 1) {
+            diaryApi.updateDiary(
+                diaryId = 1,
+                request = match {
+                    it.addressName == "대전 서구 둔산동 1005" &&
+                        it.roadAddress == "대전 서구 둔산로31번길 52"
+                }
+            )
+        }
+    }
+
     private fun diarySummary(
         diaryId: Long,
         diaryDate: String,
         timeType: DiaryMealTypeResponse,
         analysisStatus: DiaryAnalysisStatusResponse,
+        addressName: String? = null,
+        roadAddress: String? = null,
     ): DiarySummaryResponse {
         return DiarySummaryResponse(
             diaryId = diaryId,
@@ -183,9 +263,10 @@ class DiaryRepositoryImplTest {
             analysisStatus = analysisStatus,
             restaurantName = "식당",
             restaurantUrl = null,
+            addressName = addressName,
             category = "한식",
             note = null,
-            roadAddress = null,
+            roadAddress = roadAddress,
             tags = emptyList(),
             coverPhotoUrl = "https://example.com/$diaryId.jpg",
             userId = "user-$diaryId",
diff --git a/domain/src/main/kotlin/com/nexters/fooddiary/domain/model/DiaryDetail.kt b/domain/src/main/kotlin/com/nexters/fooddiary/domain/model/DiaryDetail.kt
@@ -15,6 +15,8 @@ data class DiaryEntry(
     val createdAt: String?,
     val restaurantName: String?,
     val category: String?,
+    val addressName: String? = null,
+    val roadAddress: String? = null,
     val location: String?,
     val tags: List<String>,
     val note: String? = null,
diff --git a/domain/src/main/kotlin/com/nexters/fooddiary/domain/model/RestaurantSearchResult.kt b/domain/src/main/kotlin/com/nexters/fooddiary/domain/model/RestaurantSearchResult.kt
@@ -2,6 +2,7 @@ package com.nexters.fooddiary.domain.model
 
 data class RestaurantItem(
     val name: String,
+    val addressName: String? = null,
     val roadAddress: String,
     val url: String,
 )
diff --git a/domain/src/main/kotlin/com/nexters/fooddiary/domain/model/UpdateDiaryParam.kt b/domain/src/main/kotlin/com/nexters/fooddiary/domain/model/UpdateDiaryParam.kt
@@ -4,6 +4,7 @@ data class UpdateDiaryParam(
     val category: String? = null,
     val restaurantName: String? = null,
     val restaurantUrl: String? = null,
+    val addressName: String? = null,
     val roadAddress: String? = null,
     val tags: List<String>? = null,
     val note: String? = null,
diff --git a/presentation/modify/src/main/java/com/nexters/fooddiary/presentation/modify/ModifyScreen.kt b/presentation/modify/src/main/java/com/nexters/fooddiary/presentation/modify/ModifyScreen.kt
diff --git a/presentation/modify/src/main/java/com/nexters/fooddiary/presentation/modify/ModifyState.kt b/presentation/modify/src/main/java/com/nexters/fooddiary/presentation/modify/ModifyState.kt
diff --git a/presentation/modify/src/main/java/com/nexters/fooddiary/presentation/modify/ModifyViewModel.kt b/presentation/modify/src/main/java/com/nexters/fooddiary/presentation/modify/ModifyViewModel.kt
diff --git a/presentation/modify/src/main/java/com/nexters/fooddiary/presentation/modify/navigation/ModifyNavigation.kt b/presentation/modify/src/main/java/com/nexters/fooddiary/presentation/modify/navigation/ModifyNavigation.kt
diff --git a/presentation/modify/src/test/java/com/nexters/fooddiary/presentation/modify/ModifyViewModelStateTest.kt b/presentation/modify/src/test/java/com/nexters/fooddiary/presentation/modify/ModifyViewModelStateTest.kt
diff --git a/presentation/search/src/main/java/com/nexters/fooddiary/presentation/search/SearchScreen.kt b/presentation/search/src/main/java/com/nexters/fooddiary/presentation/search/SearchScreen.kt

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ import com.nexters.fooddiary.domain.model.RestaurantSearchResult`
`8`	`8`	`internal fun RestaurantResponseItem.toDomainModel(): RestaurantItem {`
`9`	`9`	`return RestaurantItem(`
`10`	`10`	`name = name,`
	`11`	`+ addressName = addressName,`
`11`	`12`	`roadAddress = roadAddress,`
`12`	`13`	`url = url,`
`13`	`14`	`)`