냉장고 칸별 재료 목록보기 추가 (#57)

* feat: orbit 4.4.0 의존성 추가

* feat: Retrofit 을 Result 응답 받을 수 있다

* feat: HomeScreen MVVM to MVI

* feat: Add Ingredient Item Design

Android/core/data-api/src/main/java/com/sundaegukbap/banchango/core/data/repository/api/IngredientRepository.kt

@@ -4,4 +4,5 @@ import com.sundaegukbap.banchango.ContainerIngredient
 
 interface IngredientRepository {
     suspend fun getIngredientContainers(): Result<List<ContainerIngredient>>
+    suspend fun addIngredientContainer(containerName: String): Result<Unit>
 }

Android/core/data/build.gradle.kts

@@ -61,6 +61,7 @@ dependencies {
     implementation(libs.okhttp3.okhttp)
     implementation(libs.retrofit2.kotlinx.serialization.converter)
     implementation(libs.kotlinx.serialization.json)
+    implementation(libs.retrofit.adapters.result)
 }
 
 fun getSecretKey(propertyKey: String): String {

Android/core/data/src/main/java/com/sundaegukbap/banchango/core/data/api/IngredientApi.kt

@@ -1,13 +1,22 @@
 package com.sundaegukbap.banchango.core.data.api
 
+import com.sundaegukbap.banchango.core.data.api.model.AddIngredientContainerRequest
 import com.sundaegukbap.banchango.core.data.api.model.ContainerIngredientDtos
-import retrofit2.Response
+import retrofit2.http.Body
 import retrofit2.http.GET
+import retrofit2.http.POST
 import retrofit2.http.Path
 
 internal interface IngredientApi {
     @GET("api/ingredients/main/list/{userid}")
     suspend fun getIngredients(
         @Path("userid") userId: Long,
-    ): Response<ContainerIngredientDtos>
-}
+    ): Result<ContainerIngredientDtos>
+
+    @POST("/api/container/{userId}")
+    suspend fun addIngredientContainer(
+        @Path("userId") userId: Long,
+        @Body addIngredientContainerRequest: AddIngredientContainerRequest,
+    ): Result<Unit>
+}
+

Android/core/data/src/main/java/com/sundaegukbap/banchango/core/data/api/model/AddIngredientContainerRequest.kt

@@ -0,0 +1,8 @@
+package com.sundaegukbap.banchango.core.data.api.model
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class AddIngredientContainerRequest(
+    val containerName: String,
+)

Android/core/data/src/main/java/com/sundaegukbap/banchango/core/data/di/ApiModule.kt

@@ -1,6 +1,7 @@
 package com.sundaegukbap.banchango.core.data.di
 
 import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory
+import com.skydoves.retrofit.adapters.result.ResultCallAdapterFactory
 import com.sundaegukbap.banchango.core.data.BuildConfig
 import com.sundaegukbap.banchango.core.data.api.IngredientApi
 import com.sundaegukbap.banchango.core.data.api.RecipeApi
@@ -44,6 +45,7 @@ internal object ApiModule {
     ): Retrofit = Retrofit.Builder()
         .baseUrl(baseUrl)
         .addConverterFactory(converterFactory)
+        .addCallAdapterFactory(ResultCallAdapterFactory.create())
         .build()
 
     @Provides

Android/core/data/src/main/java/com/sundaegukbap/banchango/core/data/di/RepositoryModule.kt

@@ -2,8 +2,6 @@ package com.sundaegukbap.banchango.core.data.di
 
 import com.sundaegukbap.banchango.core.data.repository.DefaultIngredientRepository
 import com.sundaegukbap.banchango.core.data.repository.DefaultRecipeRepository
-import com.sundaegukbap.banchango.core.data.repository.FakeIngredientRepository
-import com.sundaegukbap.banchango.core.data.repository.FakeRecipeRepository
 import com.sundaegukbap.banchango.core.data.repository.api.IngredientRepository
 import com.sundaegukbap.banchango.core.data.repository.api.RecipeRepository
 import dagger.Binds
@@ -17,9 +15,9 @@ import javax.inject.Singleton
 internal interface RepositoryModule {
     @Singleton
     @Binds
-    fun bindsRecipeRepository(recipeRepository: FakeRecipeRepository): RecipeRepository
+    fun bindsRecipeRepository(recipeRepository: DefaultRecipeRepository): RecipeRepository
 
     @Singleton
     @Binds
-    fun bindsIngredientRepository(ingredientRepository: FakeIngredientRepository): IngredientRepository
+    fun bindsIngredientRepository(ingredientRepository: DefaultIngredientRepository): IngredientRepository
 }

Android/core/data/src/main/java/com/sundaegukbap/banchango/core/data/repository/DefaultIngredientRepository.kt

@@ -1,31 +1,22 @@
 package com.sundaegukbap.banchango.core.data.repository
 
-import android.util.Log
-import com.sundaegukbap.banchango.Container
 import com.sundaegukbap.banchango.ContainerIngredient
-import com.sundaegukbap.banchango.Ingredient
-import com.sundaegukbap.banchango.IngredientKind
 import com.sundaegukbap.banchango.core.data.api.IngredientApi
+import com.sundaegukbap.banchango.core.data.api.model.AddIngredientContainerRequest
 import com.sundaegukbap.banchango.core.data.mapper.toData
 import com.sundaegukbap.banchango.core.data.repository.api.IngredientRepository
-import java.time.LocalDateTime
 import javax.inject.Inject
 
 internal class DefaultIngredientRepository @Inject constructor(
     private val ingredientApi: IngredientApi,
 ) : IngredientRepository {
     override suspend fun getIngredientContainers(): Result<List<ContainerIngredient>> {
-        return runCatching {
-            val response = ingredientApi.getIngredients(1)
-            Log.d("asdf", "response: $response")
-            if (response.isSuccessful) {
-                if (response.body() == null) {
-                    throw IllegalStateException("Response body is null")
-                }
-                response.body()!!.containerIngredientDtos.map { it.toData() }
-            } else {
-                throw IllegalStateException("Response is not successful")
-            }
+        return ingredientApi.getIngredients(1).mapCatching { dto ->
+            dto.containerIngredientDtos.map { it.toData() }
         }
     }
+
+    override suspend fun addIngredientContainer(containerName: String): Result<Unit> {
+        return ingredientApi.addIngredientContainer(1, AddIngredientContainerRequest(containerName))
+    }
 }

Android/core/data/src/main/java/com/sundaegukbap/banchango/core/data/repository/FakeIngredientRepository.kt

@@ -51,4 +51,7 @@ internal class FakeIngredientRepository @Inject constructor() : IngredientReposi
         )
     }
 
+    override suspend fun addIngredientContainer(containerName: String): Result<Unit> {
+        return Result.success(Unit)
+    }
 }

Android/core/designsystem/src/main/java/com/sundaegukbap/banchango/core/designsystem/component/NetworkImage.kt

@@ -14,7 +14,7 @@ import com.sundaegukbap.banchango.core.designsystem.theme.BanchangoTheme
 
 @OptIn(ExperimentalGlideComposeApi::class)
 @Composable
-fun NetworkImage(modifier: Modifier, url: String) {
+fun NetworkImage(url: String, modifier: Modifier = Modifier) {
     GlideImage(
         model = url,
         contentScale = ContentScale.Crop,

Android/core/model/src/main/java/com/sundaegukbap/banchango/IngredientContainers.kt

@@ -3,17 +3,32 @@ package com.sundaegukbap.banchango
 class ContainerIngredients(
     containerIngredients: List<ContainerIngredient>
 ) {
-    private val _value: MutableList<ContainerIngredient> = containerIngredients.toMutableList()
-    val value: List<ContainerIngredient> get() = _value.toList()
+    private val _value: MutableMap<Container, IngredientContainer> = containerIngredients
+        .groupBy { it.container }
+        .mapValues { (container, containerIngredients) ->
+            IngredientContainer(
+                container = container,
+                kindIngredientContainers = containerIngredients.toKindIngredientContainers()
+            )
+        }.toMutableMap()
+
+    val value: Map<Container, IngredientContainer> get() = _value.toMap()
+
+    fun getKindIngredientContainerDetail(
+        container: Container,
+        kind: IngredientKind
+    ): KindIngredientContainer {
+        return _value[container]?.kindIngredientContainers?.find { it.kind == kind }!!
+    }
+
 
     fun getIngredientContainers(): List<IngredientContainer> {
-        return _value.groupBy { it.container }
-            .map { (container, containerIngredients) ->
-                IngredientContainer(
-                    container = container,
-                    kindIngredientContainers = containerIngredients.toKindIngredientContainers()
-                )
-            }
+        return value.map { container ->
+            IngredientContainer(
+                container = container.key,
+                kindIngredientContainers = container.value.kindIngredientContainers
+            )
+        }
     }
 
     private fun List<ContainerIngredient>.toKindIngredientContainers(): List<KindIngredientContainer> {

Android/feature/home/build.gradle.kts

@@ -70,6 +70,11 @@ dependencies {
     implementation(libs.navigation.compose)
     implementation(libs.hilt.navigation.compose)
 
+    implementation(libs.orbit.core)
+    implementation(libs.orbit.viewmodel)
+    implementation(libs.orbit.compose)
+    testImplementation(libs.orbit.test)
+
     // status bar
     implementation(libs.accompanist.systemuicontroller)