Merge branch 'develop' into feat/mypage-api

Author: ikseong00

app/build.gradle.kts

@@ -69,6 +69,7 @@ dependencies {
     implementation(libs.androidx.navigation.compose)
     implementation(libs.androidx.datastore.preferences)
     implementation(libs.androidx.espresso.core)
+    implementation(libs.play.services.location)
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.junit)
     androidTestImplementation(libs.androidx.espresso.core)

app/src/main/AndroidManifest.xml

@@ -3,6 +3,8 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
 
     <application
         android:name=".OurMenuApp"

app/src/main/java/com/kuit/ourmenu/data/di/ServiceModule.kt

@@ -5,6 +5,7 @@ import com.kuit.ourmenu.data.service.CacheService
 import com.kuit.ourmenu.data.service.DummyService
 import com.kuit.ourmenu.data.service.MapService
 import com.kuit.ourmenu.data.service.MenuFolderService
+import com.kuit.ourmenu.data.service.MenuInfoService
 import com.kuit.ourmenu.data.service.UserService
 import dagger.Module
 import dagger.Provides
@@ -47,4 +48,8 @@ object ServiceModule {
     fun provideMenuFolderService(retrofit: Retrofit): MenuFolderService =
         retrofit.create(MenuFolderService::class.java)
 
+    @Provides
+    @Singleton
+    fun provideMenuInfoService(retrofit: Retrofit): MenuInfoService =
+        retrofit.create(MenuInfoService::class.java)
 }

…enuFolder/response/MenuFolderIconType.kt …ta/model/base/type/MenuFolderIconType.ktapp/src/main/java/com/kuit/ourmenu/data/model/menuFolder/response/MenuFolderIconType.kt renamed to app/src/main/java/com/kuit/ourmenu/data/model/base/type/MenuFolderIconType.kt app/src/main/java/com/kuit/ourmenu/data/model/menuFolder/response/MenuFolderIconType.kt renamed to app/src/main/java/com/kuit/ourmenu/data/model/base/type/MenuFolderIconType.kt

@@ -1,4 +1,4 @@
-package com.kuit.ourmenu.data.model.menuFolder.response
+package com.kuit.ourmenu.data.model.base.type
 
 enum class MenuFolderIconType {
     ANGRY,

…del/menuFolder/response/SortOrderType.kt …nu/data/model/base/type/SortOrderType.ktapp/src/main/java/com/kuit/ourmenu/data/model/menuFolder/response/SortOrderType.kt renamed to app/src/main/java/com/kuit/ourmenu/data/model/base/type/SortOrderType.kt app/src/main/java/com/kuit/ourmenu/data/model/menuFolder/response/SortOrderType.kt renamed to app/src/main/java/com/kuit/ourmenu/data/model/base/type/SortOrderType.kt

@@ -1,6 +1,7 @@
-package com.kuit.ourmenu.data.model.menuFolder.response
+package com.kuit.ourmenu.data.model.base.type
 
-enum class SortOrderType(val apiValue: String, val displayName: String) {
+enum class
+SortOrderType(val apiValue: String, val displayName: String) {
     TITLE_ASC("TITLE_ASC", "이름순"),
 //    TITLE_DESC("TITLE_DESC", "이름역순"),
 //    CREATED_AT_ASC("CREATED_AT_ASC", "최신순"),

…ata/model/menuFolder/response/TagType.kt …/ourmenu/data/model/base/type/TagType.ktapp/src/main/java/com/kuit/ourmenu/data/model/menuFolder/response/TagType.kt renamed to app/src/main/java/com/kuit/ourmenu/data/model/base/type/TagType.kt app/src/main/java/com/kuit/ourmenu/data/model/menuFolder/response/TagType.kt renamed to app/src/main/java/com/kuit/ourmenu/data/model/base/type/TagType.kt

@@ -1,4 +1,4 @@
-package com.kuit.ourmenu.data.model.menuFolder.response
+package com.kuit.ourmenu.data.model.base.type
 
 enum class TagType(val apiValue: String, val displayName: String) {
     KOREA("KOREA", "한식"),

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

@@ -4,10 +4,19 @@ import kotlinx.serialization.Serializable
 
 @Serializable
 data class MenuFolderDetailResponse(
-    override val menuId: Int,
-    override val menuTitle: String,
-    override val storeTitle: String,
-    override val storeAddress: String,
-    override val menuPrice: Int,
-    override val menuImgUrl: String
+    val menuFolderId: Int = 0,
+    val menuFolderTitle: String = "",
+    val menuFolderImgUrl: String = "",
+    val menuFolderIconImgUrl: String = "",
+    val menus: List<MenuFolderDetailMenus> = emptyList()
+)
+
+@Serializable
+data class MenuFolderDetailMenus(
+    override val menuId: Int = 0,
+    override val menuTitle: String = "",
+    override val storeTitle: String = "",
+    override val storeAddress: String = "",
+    override val menuPrice: Int = 0,
+    override val menuImgUrl: String = ""
 ) : MenuFolderMenuItem

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

@@ -12,8 +12,8 @@ data class MenuFolderResponse(
 data class MenuFolderList(
     val menuFolderId: Int,
     val menuFolderTitle: String,
-    val menuFolderUrl: String,
-    val menuFolderIcon: String,
+    val menuFolderImgUrl: String,
+    val menuFolderIconImgUrl: String,
     val menuIds: List<Int>,
     val index: Int,
 )

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

@@ -0,0 +1,23 @@
+package com.kuit.ourmenu.data.model.menuinfo.response
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class MenuInfoResponse(
+    val menuId: Int = 0,
+    val menuTitle: String = "",
+    val menuPrice: Int = 0,
+    val menuPinImgUrl: String = "",
+    val storeTitle: String = "",
+    val storeAddress: String = "",
+    val tagImgUrls: List<String> = emptyList(),
+    val menuImgUrls: List<String> = emptyList(),
+    val menuFolders: List<MenuFolder> = emptyList(),
+)
+
+@Serializable
+data class MenuFolder(
+    val menuFolderId: Int = 0,
+    val menuFolderTitle: String = "",
+    val menuFolderIconImgUrl: String = "",
+)

app/src/main/java/com/kuit/ourmenu/data/repository/MenuFolderRepository.kt

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