[Feat/#31] 평가하기 API 연결

composeApp/build.gradle.kts

@@ -68,6 +68,7 @@ kotlin {
             implementation(project(":shared:data:home"))
             implementation(project(":shared:data:community"))
             implementation(project(":shared:data:detail"))
+            implementation(project(":shared:data:evaluate"))
 
             implementation(project(":shared:feature:community"))
             implementation(project(":shared:feature:draw"))
@@ -88,6 +89,8 @@ kotlin {
             implementation(project(":shared:domain:home"))
             implementation(project(":shared:domain:model"))
             implementation(project(":shared:domain:detail"))
+            implementation(project(":shared:domain:evaluate"))
+            implementation(project(":shared:domain:model"))
         }
         commonTest.dependencies {
             implementation(libs.kotlin.test)

composeApp/src/commonMain/kotlin/com/kus/kustaurant/App.kt

@@ -1,6 +1,5 @@
 package com.kus.kustaurant
 
-import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
@@ -118,7 +117,7 @@ fun SetNavigation() {
     val showBottomBar = shouldShowBottomBar(destination)
     val currentRoute = destination?.route
     val selectedKey = BottomTab.fromRoute(currentRoute).key
-  
+
     val applySystemBarsPadding = !isEdgeToEdgeScreen(currentRoute)
     val isWriter =
         navBackStackEntry?.destination?.hasRoute<CommunityWrite>() == true ||
@@ -136,7 +135,7 @@ fun SetNavigation() {
                     navController = navController,
                 )
             },
-            modifier = if (applySystemBarsPadding) Modifier.systemBarsPadding() else Modifier, 
+            modifier = if (applySystemBarsPadding) Modifier.systemBarsPadding() else Modifier,
             contentWindowInsets = WindowInsets.systemBars,
         ) { padding ->
             Box(
@@ -170,6 +169,7 @@ fun SetNavigation() {
                 }
             }
         }
+    }
 }
 
 

composeApp/src/commonMain/kotlin/com/kus/kustaurant/di/initKoin.kt

@@ -10,6 +10,7 @@ import com.kus.domain.auth.di.authDomainModule
 import com.kus.domain.community.di.communityDomainModule
 import com.kus.feature.community.di.communityFeatureModule
 import com.kus.feature.detail.di.detailFeatureModule
+import com.kus.feature.evaluate.di.evaluateFeatureModule
 import com.kus.feature.home.di.homeFeatureModule
 import com.kus.feature.login.di.featureLoginModule
 import com.kus.feature.onboarding.di.onboardingFeatureModule
@@ -19,8 +20,10 @@ import com.kus.shared.domain.tier.di.tierDomainModule
 import org.koin.core.KoinApplication
 import com.kus.feature.splash.di.splashFeatureModule
 import com.kus.kustaurant.detail.di.detailDataModule
+import com.kus.kustaurant.evaluate.di.evaluateDataModule
 import com.kus.kustaurant.home.di.homeDataModule
 import com.kus.shared.domain.detail.di.detailDomainModule
+import com.kus.shared.domain.evaluate.di.evaluateDomainModule
 import com.kus.shared.domain.home.di.homeDomainModule
 import org.koin.core.context.startKoin
 import org.koin.core.module.Module
@@ -44,6 +47,7 @@ fun initKoin(
             homeDomainModule,
             communityDomainModule,
             detailDomainModule,
+            evaluateDomainModule,
 
             // data (repository 등 공통)
             networkModule,
@@ -53,15 +57,17 @@ fun initKoin(
             homeDataModule,
             communityDataModule,
             detailDataModule,
+            evaluateDataModule,
 
             // feature
             splashFeatureModule,
             onboardingFeatureModule,
             featureLoginModule,
             tierFeatureModule,
             homeFeatureModule,
-            communityFeatureModule
-            detailFeatureModule
+            communityFeatureModule,
+            detailFeatureModule,
+            evaluateFeatureModule
         )
 
         modules(additionalModules)

composeApp/src/commonMain/kotlin/com/kus/kustaurant/navigation/KusNavHost.kt

@@ -154,7 +154,7 @@ fun KusNavHost(
 
                 navController.navigate(TierCategorySelect)
             },
-            navigateToDetail = { navController.navigate(Detail) },
+            navigateToDetail = { restaurantId -> navController.navigate(Detail(restaurantId)) },
             popBackStackWithResult = { result ->
                 val json = KusJson.json.encodeToString(result)
                 navController.previousBackStackEntry
@@ -228,7 +228,21 @@ fun KusNavHost(
 
         detailNavGraph(
             navigateToUp = navController::popBackStack,
-            navigateToEvaluate = { navController.navigate(Evaluate) },
+            navigateToEvaluate = { restaurant ->
+                navController.navigate(
+                    Evaluate(
+                        restaurantId = restaurant.restaurantId,
+                        restaurantName = restaurant.restaurantName,
+                        mainTier = restaurant.mainTier,
+                        restaurantCuisine = restaurant.restaurantCuisine,
+                        restaurantCuisineImgUrl = restaurant.restaurantCuisineImgUrl,
+                        restaurantPosition = restaurant.restaurantPosition,
+                        restaurantAddress = restaurant.restaurantAddress,
+                        situationList = restaurant.situationList,
+                        partnershipInfo = restaurant.partnershipInfo,
+                    )
+                )
+            },
         )
 
         evaluateNavGraph(

settings.gradle.kts

@@ -54,8 +54,9 @@ include(
     ":shared:data:tier",
     ":shared:data:auth",
     ":shared:data:home",
-    ":shared:data:community"
-    ":shared:data:detail"
+    ":shared:data:community",
+    ":shared:data:detail",
+    ":shared:data:evaluate"
 )
 
 include(
@@ -65,7 +66,8 @@ include(
     ":shared:domain:auth",
     ":shared:domain:home",
     ":shared:domain:community",
-    ":shared:domain:detail"
+    ":shared:domain:detail",
+    ":shared:domain:evaluate"
 )
 
 include(

shared/core/designSystem/src/commonMain/kotlin/com/kus/designsystem/component/KusButton.kt

@@ -58,6 +58,8 @@ fun KusButton(
     isShadowVisible: Boolean = false,
     onClick: () -> Unit,
 ) {
+    val resolvedBorderColor = if (enabled) borderColor else KusTheme.colors.c_E0E0E0
+
     Box(
         modifier = modifier
     ) {
@@ -84,7 +86,7 @@ fun KusButton(
                 disabledContainerColor = KusTheme.colors.c_E0E0E0,
                 disabledContentColor = KusTheme.colors.c_AAAAAA,
             ),
-            border = BorderStroke(1.dp, borderColor),
+            border = BorderStroke(1.dp, resolvedBorderColor),
             contentPadding = contentPadding,
         ) {
             Row(

shared/data/evaluate/build.gradle.kts

@@ -0,0 +1,88 @@
+plugins {
+    alias(libs.plugins.kotlinMultiplatform)
+    alias(libs.plugins.androidKotlinMultiplatformLibrary)
+    alias(libs.plugins.androidLint)
+    alias(libs.plugins.kotlin.serialization)
+}
+
+kotlin {
+    androidLibrary {
+        namespace = "com.kus.shared.data.evaluate"
+        compileSdk = 36
+        minSdk = 26
+
+        withHostTestBuilder {
+        }
+
+        withDeviceTestBuilder {
+            sourceSetTreeName = "test"
+        }.configure {
+            instrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        }
+    }
+
+    val xcfName = "shared:data:evaluateKit"
+
+    iosX64 {
+        binaries.framework {
+            baseName = xcfName
+        }
+    }
+
+    iosArm64 {
+        binaries.framework {
+            baseName = xcfName
+        }
+    }
+
+    iosSimulatorArm64 {
+        binaries.framework {
+            baseName = xcfName
+        }
+    }
+
+    jvm("desktop")
+
+    sourceSets {
+        commonMain {
+            dependencies {
+                implementation(libs.koin.core)
+                implementation(libs.kotlinx.coroutines.core)
+
+                implementation(libs.kotlinx.serialization.json)
+                implementation(libs.bundles.ktor)
+
+                implementation(project(":shared:domain:model"))
+                implementation(project(":shared:domain:evaluate"))
+                implementation(project(":shared:data:network"))
+            }
+        }
+
+        commonTest {
+            dependencies {
+                implementation(libs.kotlin.test)
+            }
+        }
+
+        androidMain {
+            dependencies {
+                implementation(libs.koin.android)
+                implementation(libs.datastore.preferences)
+            }
+        }
+
+        getByName("androidDeviceTest") {
+            dependencies {
+                implementation(libs.androidx.runner)
+                implementation(libs.androidx.core)
+                implementation(libs.androidx.testExt.junit)
+            }
+        }
+
+        iosMain {
+            dependencies {
+            }
+        }
+    }
+
+}

shared/data/evaluate/src/androidMain/AndroidManifest.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+</manifest>

shared/data/evaluate/src/commonMain/kotlin/com/kus/kustaurant/evaluate/api/EvaluateApi.kt

@@ -0,0 +1,56 @@
+package com.kus.kustaurant.evaluate.api
+
+import com.kus.kustaurant.evaluate.remote.request.EvaluationRequest
+import com.kus.kustaurant.evaluate.remote.response.EvaluationResponse
+import io.ktor.client.HttpClient
+import io.ktor.client.call.body
+import io.ktor.client.request.forms.MultiPartFormDataContent
+import io.ktor.client.request.forms.formData
+import io.ktor.client.request.get
+import io.ktor.client.request.post
+import io.ktor.client.request.setBody
+import io.ktor.http.Headers
+import io.ktor.http.HttpHeaders
+
+class EvaluateApi(
+    private val client: HttpClient,
+) {
+    suspend fun getEvaluation(restaurantId: Long): EvaluationResponse {
+        return client.get("/api/v2/auth/restaurants/$restaurantId/evaluation").body()
+    }
+
+    suspend fun postEvaluation(
+        restaurantId: Long,
+        request: EvaluationRequest,
+        imageBytes: ByteArray?,
+    ) {
+        client.post("/api/v2/auth/restaurants/$restaurantId/evaluation") {
+            setBody(
+                MultiPartFormDataContent(
+                    formData {
+                        append("evaluationScore", request.evaluationScore.toString())
+
+                        request.evaluationSituations?.forEach { situation ->
+                            append("evaluationSituations", situation.toString())
+                        }
+
+                        request.evaluationComment?.let {
+                            append("evaluationComment", it)
+                        }
+
+                        imageBytes?.let {
+                            append(
+                                key = "newImage",
+                                value = it,
+                                headers = Headers.build {
+                                    append(HttpHeaders.ContentType, "image/jpeg")
+                                    append(HttpHeaders.ContentDisposition, "filename=evaluation.jpg")
+                                }
+                            )
+                        }
+                    }
+                )
+            )
+        }
+    }
+}

shared/data/evaluate/src/commonMain/kotlin/com/kus/kustaurant/evaluate/di/evaluateDataModule.kt

@@ -0,0 +1,13 @@
+package com.kus.kustaurant.evaluate.di
+
+import com.kus.kustaurant.evaluate.api.EvaluateApi
+import com.kus.kustaurant.evaluate.repositoryimpl.EvaluateRepositoryImpl
+import com.kus.shared.domain.evaluate.repository.EvaluateRepository
+import org.koin.core.module.dsl.singleOf
+import org.koin.dsl.bind
+import org.koin.dsl.module
+
+val evaluateDataModule = module {
+    singleOf(::EvaluateApi)
+    singleOf(::EvaluateRepositoryImpl) bind EvaluateRepository::class
+}

shared/data/evaluate/src/commonMain/kotlin/com/kus/kustaurant/evaluate/remote/mapper/EvaluateMapper.kt

@@ -0,0 +1,21 @@
+package com.kus.kustaurant.evaluate.remote.mapper
+
+import com.kus.kustaurant.evaluate.remote.response.EvaluationResponse
+import com.kus.kustaurant.evaluate.remote.response.StarCommentResponse
+import com.kus.shared.domain.model.evaluate.PreviousEvaluation
+import com.kus.shared.domain.model.evaluate.PreviousStarComment
+
+fun EvaluationResponse.toDomain(): PreviousEvaluation =
+    PreviousEvaluation(
+        evaluationScore = evaluationScore,
+        evaluationSituations = evaluationSituations ?: emptyList(),
+        evaluationImgUrl = evaluationImgUrl,
+        evaluationComment = evaluationComment,
+        starComments = starComments.map { it.toDomain() },
+    )
+
+fun StarCommentResponse.toDomain(): PreviousStarComment =
+    PreviousStarComment(
+        star = star,
+        comment = comment,
+    )

shared/data/evaluate/src/commonMain/kotlin/com/kus/kustaurant/evaluate/remote/request/EvaluationRequest.kt

@@ -0,0 +1,10 @@
+package com.kus.kustaurant.evaluate.remote.request
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class EvaluationRequest(
+    val evaluationScore: Double,
+    val evaluationSituations: List<Int>? = null,
+    val evaluationComment: String? = null,
+)

shared/data/evaluate/src/commonMain/kotlin/com/kus/kustaurant/evaluate/remote/response/EvaluationResponse.kt

@@ -0,0 +1,19 @@
+package com.kus.kustaurant.evaluate.remote.response
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class EvaluationResponse(
+    val evaluationScore: Double? = null,
+    val evaluationSituations: List<Int>? = null,
+    val evaluationImgUrl: String? = null,
+    val evaluationComment: String? = null,
+    val starComments: List<StarCommentResponse> = emptyList(),
+    val newImage: String? = null,
+)
+
+@Serializable
+data class StarCommentResponse(
+    val star: Double,
+    val comment: String,
+)