Merge pull request #81 from Nico1eKim/api/home

[FEAT] home api 연결

Author: casper-jr

.gitignore

@@ -59,6 +59,7 @@ output.json
 misc.xml
 deploymentTargetDropDown.xml
 render.experimental.xml
+deploymentTargetSelector.xml
 
 # Keystore files
 *.jks

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

@@ -3,6 +3,7 @@ package com.kuit.ourmenu.data.di
 import com.kuit.ourmenu.data.service.AuthService
 import com.kuit.ourmenu.data.service.CacheService
 import com.kuit.ourmenu.data.service.DummyService
+import com.kuit.ourmenu.data.service.HomeService
 import com.kuit.ourmenu.data.service.MapService
 import com.kuit.ourmenu.data.service.MenuFolderService
 import com.kuit.ourmenu.data.service.MenuInfoService
@@ -48,6 +49,11 @@ object ServiceModule {
     fun provideMenuFolderService(retrofit: Retrofit): MenuFolderService =
         retrofit.create(MenuFolderService::class.java)
 
+    @Provides
+    @Singleton
+    fun provideHomeService(retrofit: Retrofit): HomeService =
+        retrofit.create(HomeService::class.java)
+
     @Provides
     @Singleton
     fun provideMenuInfoService(retrofit: Retrofit): MenuInfoService =

app/src/main/java/com/kuit/ourmenu/data/model/home/request/HomeAnswerRequest.kt

@@ -0,0 +1,8 @@
+package com.kuit.ourmenu.data.model.home.request
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class HomeAnswerRequest(
+    val answer: String
+)

app/src/main/java/com/kuit/ourmenu/data/model/home/response/HomeQuestionResponse.kt

@@ -0,0 +1,15 @@
+package com.kuit.ourmenu.data.model.home.response
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class HomeQuestionResponse(
+    val question: String,
+    val answers: List<Answer>
+)
+
+@Serializable
+data class Answer(
+    val answer: String,
+    val answerImgUrl: String
+)

app/src/main/java/com/kuit/ourmenu/data/model/home/response/HomeResponse.kt

@@ -0,0 +1,21 @@
+package com.kuit.ourmenu.data.model.home.response
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class HomeResponse(
+    val answerImgUrl: String = "",
+    val answerRecommendMenus: List<RecommendMenuList> = emptyList(),
+    val tagRecommendImgUrl: String = "",
+    val tagRecommendMenus: List<RecommendMenuList> = emptyList(),
+    val otherRecommendImgUrl: String = "",
+    val otherRecommendMenus: List<RecommendMenuList> = emptyList(),
+)
+
+@Serializable
+data class RecommendMenuList(
+    val menuId: Long = 0,
+    val menuTitle: String = "",
+    val storeName: String = "",
+    val menuImgUrl: String = "",
+)

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

@@ -0,0 +1,26 @@
+package com.kuit.ourmenu.data.repository
+
+import com.kuit.ourmenu.data.model.base.handleBaseResponse
+import com.kuit.ourmenu.data.model.home.request.HomeAnswerRequest
+import com.kuit.ourmenu.data.service.HomeService
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class HomeRepository @Inject constructor(
+    private val homeService: HomeService,
+) {
+    suspend fun getHome() = runCatching {
+        homeService.getHome().handleBaseResponse().getOrThrow()
+    }
+
+    suspend fun postHomeQuestion() = runCatching {
+        homeService.postHomeQuestion().handleBaseResponse().getOrThrow()
+    }
+
+    suspend fun postHomeAnswer(answer: String) = runCatching {
+        homeService.postHomeAnswer(HomeAnswerRequest(answer))
+            .handleBaseResponse()
+            .getOrThrow()
+    }
+}

app/src/main/java/com/kuit/ourmenu/data/service/HomeService.kt

@@ -0,0 +1,22 @@
+package com.kuit.ourmenu.data.service
+
+import com.kuit.ourmenu.data.model.base.BaseResponse
+import com.kuit.ourmenu.data.model.home.request.HomeAnswerRequest
+import com.kuit.ourmenu.data.model.home.response.HomeQuestionResponse
+import com.kuit.ourmenu.data.model.home.response.HomeResponse
+import retrofit2.http.Body
+import retrofit2.http.GET
+import retrofit2.http.POST
+
+interface HomeService {
+    @GET("api/home")
+    suspend fun getHome(): BaseResponse<HomeResponse>
+
+    @POST("/api/home/questions")
+    suspend fun postHomeQuestion(): BaseResponse<HomeQuestionResponse>
+
+    @POST("/api/home/questions/answers")
+    suspend fun postHomeAnswer(
+        @Body answerRequest: HomeAnswerRequest
+    ): BaseResponse<Unit>
+}

app/src/main/java/com/kuit/ourmenu/ui/common/dialog/DialogBigButton.kt

@@ -18,7 +18,10 @@ import com.kuit.ourmenu.ui.theme.NeutralWhite
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
-fun OurMenuAddButtonTopAppBar(modifier: Modifier = Modifier) {
+fun OurMenuAddButtonTopAppBar(
+    modifier: Modifier = Modifier,
+    onAddMenuClick: () -> Unit = {}
+) {
     // 기본
     TopAppBar(
         modifier = modifier.fillMaxWidth(),
@@ -35,7 +38,7 @@ fun OurMenuAddButtonTopAppBar(modifier: Modifier = Modifier) {
         },
         actions = {
             IconButton(
-                onClick = { /* TODO : Add Menu Button Click Event */ },
+                onClick = onAddMenuClick,
                 modifier = Modifier.padding(end = 20.dp)
             ) {
                 Icon(