Merge branch 'develop' into feat/menufolder-api

Author: casper-jr

.idea/deploymentTargetSelector.xml

@@ -6,11 +6,13 @@ import kotlinx.serialization.Serializable
 @Serializable
 data class MapDetailResponse(
     @SerialName("menuId")
-    val menuId: Int,
+    val menuId: Long,
     @SerialName("menuTitle")
     val menuTitle: String,
     @SerialName("menuPrice")
     val menuPrice: Int,
+    @SerialName("storeTitle")
+    val storeTitle: String,
     @SerialName("menuPinImgUrl")
     val menuPinImgUrl: String,
     @SerialName("menuTagImgUrls")

app/src/main/java/com/kuit/ourmenu/data/model/map/response/MapDetailResponse.kt

@@ -6,9 +6,11 @@ import kotlinx.serialization.Serializable
 @Serializable
 data class MapMenuDetailResponse(
     @SerialName("menuId")
-    val menuId: Int,
+    val menuId: Long,
     @SerialName("menuTitle")
     val menuTitle: String,
+    @SerialName("storeTitle")
+    val storeTitle: String,
     @SerialName("menuPrice")
     val menuPrice: Int,
     @SerialName("menuPinImgUrl")
@@ -20,11 +22,11 @@ data class MapMenuDetailResponse(
     @SerialName("menuFolderInfo")
     val menuFolderInfo: MenuFolderInfo,
     @SerialName("mapId")
-    val mapId: Int,
+    val mapId: Long,
     @SerialName("mapX")
-    val mapX: Int,
+    val mapX: Double,
     @SerialName("mapY")
-    val mapY: Int,
+    val mapY: Double,
 )
 
 

app/src/main/java/com/kuit/ourmenu/data/model/map/response/MapMenuDetailResponse.kt

@@ -6,7 +6,7 @@ import kotlinx.serialization.Serializable
 @Serializable
 data class MapSearchHistoryResponse(
     @SerialName("menuId")
-    val menuId: Int,
+    val menuId: Long,
     @SerialName("menuTitle")
     val menuTitle: String,
     @SerialName("storeTitle")

app/src/main/java/com/kuit/ourmenu/data/model/map/response/MapSearchHistoryResponse.kt

@@ -4,7 +4,7 @@ import kotlinx.serialization.Serializable
 
 @Serializable
 data class MenuFolderAllResponse(
-    override val menuId: Int,
+    override val menuId: Long,
     override val menuTitle: String,
     override val storeTitle: String,
     override val storeAddress: String,

app/src/main/java/com/kuit/ourmenu/data/model/menuFolder/response/MenuFolderAllResponse.kt

@@ -13,7 +13,7 @@ data class MenuFolderDetailResponse(
 
 @Serializable
 data class MenuFolderDetailMenus(
-    override val menuId: Int = 0,
+    override val menuId: Long = 0,
     override val menuTitle: String = "",
     override val storeTitle: String = "",
     override val storeAddress: String = "",

app/src/main/java/com/kuit/ourmenu/data/model/menuFolder/response/MenuFolderDetailResponse.kt

@@ -1,7 +1,7 @@
 package com.kuit.ourmenu.data.model.menuFolder.response
 
 interface MenuFolderMenuItem {
-    val menuId: Int
+    val menuId: Long
     val menuTitle: String
     val storeTitle: String
     val storeAddress: String

app/src/main/java/com/kuit/ourmenu/data/model/menuFolder/response/MenuFolderMenuItem.kt

@@ -10,7 +10,7 @@ data class MenuFolderResponse(
 
 @Serializable
 data class MenuFolderList(
-    val menuFolderId: Int,
+    val menuFolderId: Long,
     val menuFolderTitle: String,
     val menuFolderImgUrl: String,
     val menuFolderIconImgUrl: String,

app/src/main/java/com/kuit/ourmenu/data/model/menuFolder/response/MenuFolderResponse.kt

@@ -4,10 +4,12 @@ import kotlinx.serialization.Serializable
 
 @Serializable
 data class MenuInfoResponse(
-    val menuId: Int = 0,
+    val menuId: Long = 0,
     val menuTitle: String = "",
     val menuPrice: Int = 0,
     val menuPinImgUrl: String = "",
+    val menuMemoTitle: String = "",
+    val menuMemoContent: String = "",
     val storeTitle: String = "",
     val storeAddress: String = "",
     val tagImgUrls: List<String> = emptyList(),

app/src/main/java/com/kuit/ourmenu/data/model/menuinfo/response/MenuInfoResponse.kt

@@ -15,7 +15,7 @@ class MenuFolderRepository @Inject constructor(
     }
 
     suspend fun getMenuFolderDetail(
-        menuFolderId: Int,
+        menuFolderId: Long,
         sortOrder: String,
     ) = runCatching {
         menuFolderService.getMenuFolderDetails(