refactor/usecase: Repository 감싸는 UseCase 작성 및 적용

app/src/androidTest/java/com/survivalcoding/gangnam2kiandroidstudy/presentation/screen/search_recipe/SearchToIngredientIntegrationTest.kt

@@ -71,7 +71,6 @@ class SearchToIngredientIntegrationTest {
                             override fun copyText(text: String) {}
                         }
                     }
-                    single { GetRecipeProcedureUseCase(get()) }
                     single { CopyLinkUseCase(get()) }
                     viewModel { SearchRecipesViewModel(get()) }
                     viewModel { IngredientViewModel(get(), get(), get()) }

app/src/main/java/com/survivalcoding/gangnam2kiandroidstudy/core/di/UseCaseModule.kt

@@ -1,12 +1,16 @@
 package com.survivalcoding.gangnam2kiandroidstudy.core.di
 
 import com.survivalcoding.gangnam2kiandroidstudy.domain.usecase.CopyLinkUseCase
+import com.survivalcoding.gangnam2kiandroidstudy.domain.usecase.GetRecipeDetailsUseCase
 import com.survivalcoding.gangnam2kiandroidstudy.domain.usecase.GetRecipeProcedureUseCase
+import com.survivalcoding.gangnam2kiandroidstudy.domain.usecase.GetRecipesUseCase
 import com.survivalcoding.gangnam2kiandroidstudy.domain.usecase.GetSavedRecipesUseCase
 import org.koin.dsl.module
 
 val useCaseModule = module {
-    single { GetRecipeProcedureUseCase(get()) }
     single { GetSavedRecipesUseCase(get(), get()) }
     single { CopyLinkUseCase(get()) }
+    single { GetRecipesUseCase(get()) }
+    single { GetRecipeDetailsUseCase(get()) }
+    single { GetRecipeProcedureUseCase(get()) }
 }

app/src/main/java/com/survivalcoding/gangnam2kiandroidstudy/core/di/ViewModelModule.kt

@@ -9,21 +9,21 @@ import org.koin.core.module.dsl.viewModel
 import org.koin.dsl.module
 
 val viewModelModule = module {
-    viewModel { HomeViewModel(recipeRepository = get()) }
+    viewModel { HomeViewModel(getRecipesUseCase = get()) }
     viewModel {
         SavedRecipesViewModel(
-            recipeRepository = get(),
             getSavedRecipesUseCase = get(),
+            getRecipeDetailsUseCase = get(),
         )
     }
     viewModel {
         SearchRecipesViewModel(
-            recipeRepository = get(),
+            getRecipesUseCase = get(),
         )
     }
     viewModel {
         IngredientViewModel(
-            recipeRepository = get(),
+            getRecipeDetailsUseCase = get(),
             getRecipeProcedureUseCase = get(),
             copyLinkUseCase = get(),
         )

app/src/main/java/com/survivalcoding/gangnam2kiandroidstudy/domain/usecase/GetRecipeDetailsUseCase.kt

@@ -1,24 +1,13 @@
 package com.survivalcoding.gangnam2kiandroidstudy.domain.usecase
 
 import com.survivalcoding.gangnam2kiandroidstudy.core.Result
-import com.survivalcoding.gangnam2kiandroidstudy.domain.repository.ProcedureRepository
+import com.survivalcoding.gangnam2kiandroidstudy.domain.model.Recipe
+import com.survivalcoding.gangnam2kiandroidstudy.domain.repository.RecipeRepository
 
-class GetRecipeProcedureUseCase(
-    private val procedureRepository: ProcedureRepository,
+class GetRecipeDetailsUseCase(
+    private val recipeRepository: RecipeRepository
 ) {
-    suspend fun execute(recipeId: Long): Result<List<String>, String> {
-        try {
-            val result = procedureRepository.getProcedure(recipeId)
-            return Result.Success(
-                listOf(
-                    "Lorem Ipsum tempor incididunt ut labore et dolore,in voluptate velit esse cillum dolore eu fugiat nulla pariatur?",
-                    "Lorem Ipsum tempor incididunt ut labore et dolore,in voluptate velit esse cillum dolore eu fugiat nulla pariatur? Tempor incididunt ut labore et dolore,in voluptate velit esse cillum dolore eu fugiat nulla pariatur?",
-                    "Lorem Ipsum tempor incididunt ut labore et dolore,in voluptate velit esse cillum dolore eu fugiat nulla pariatur?",
-                    "Lorem Ipsum tempor incididunt ut labore et dolore,in voluptate velit esse cillum dolore eu fugiat nulla pariatur?",
-                )
-            )
-        } catch (e: Exception) {
-            return Result.Error("Failed to get recipe's procedure: $e")
-        }
+    suspend fun execute(id: Long): Result<Recipe, String> {
+        return recipeRepository.findRecipe(id)
     }
 }

app/src/main/java/com/survivalcoding/gangnam2kiandroidstudy/domain/usecase/GetRecipeProcedureUseCase.kt

@@ -0,0 +1,24 @@
+package com.survivalcoding.gangnam2kiandroidstudy.domain.usecase
+
+import com.survivalcoding.gangnam2kiandroidstudy.core.Result
+import com.survivalcoding.gangnam2kiandroidstudy.domain.repository.ProcedureRepository
+
+class GetRecipeProcedureUseCase(
+    private val procedureRepository: ProcedureRepository,
+) {
+    suspend fun execute(recipeId: Long): Result<List<String>, String> {
+        try {
+            val result = procedureRepository.getProcedure(recipeId)
+            return Result.Success(
+                listOf(
+                    "Lorem Ipsum tempor incididunt ut labore et dolore,in voluptate velit esse cillum dolore eu fugiat nulla pariatur?",
+                    "Lorem Ipsum tempor incididunt ut labore et dolore,in voluptate velit esse cillum dolore eu fugiat nulla pariatur? Tempor incididunt ut labore et dolore,in voluptate velit esse cillum dolore eu fugiat nulla pariatur?",
+                    "Lorem Ipsum tempor incididunt ut labore et dolore,in voluptate velit esse cillum dolore eu fugiat nulla pariatur?",
+                    "Lorem Ipsum tempor incididunt ut labore et dolore,in voluptate velit esse cillum dolore eu fugiat nulla pariatur?",
+                )
+            )
+        } catch (e: Exception) {
+            return Result.Error("Failed to get recipe's procedure: $e")
+        }
+    }
+}

app/src/main/java/com/survivalcoding/gangnam2kiandroidstudy/domain/usecase/GetRecipesUseCase.kt

@@ -0,0 +1,13 @@
+package com.survivalcoding.gangnam2kiandroidstudy.domain.usecase
+
+import com.survivalcoding.gangnam2kiandroidstudy.core.Result
+import com.survivalcoding.gangnam2kiandroidstudy.domain.model.Recipe
+import com.survivalcoding.gangnam2kiandroidstudy.domain.repository.RecipeRepository
+
+class GetRecipesUseCase(
+    private val recipeRepository: RecipeRepository
+) {
+    suspend fun execute(): Result<List<Recipe>, String> {
+        return recipeRepository.findRecipes()
+    }
+}

app/src/main/java/com/survivalcoding/gangnam2kiandroidstudy/presentation/screen/home/HomeViewModel.kt

@@ -5,7 +5,8 @@ import androidx.lifecycle.viewModelScope
 import com.survivalcoding.gangnam2kiandroidstudy.core.Result
 import com.survivalcoding.gangnam2kiandroidstudy.domain.model.RecipeCategory
 import com.survivalcoding.gangnam2kiandroidstudy.domain.model.toCategory
-import com.survivalcoding.gangnam2kiandroidstudy.domain.repository.RecipeRepository
+import com.survivalcoding.gangnam2kiandroidstudy.domain.model.toCategory
+import com.survivalcoding.gangnam2kiandroidstudy.domain.usecase.GetRecipesUseCase
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -16,7 +17,7 @@ import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 
 class HomeViewModel(
-    private val recipeRepository: RecipeRepository,
+    private val getRecipesUseCase: GetRecipesUseCase,
 ) : ViewModel() {
 
     private val _state = MutableStateFlow(HomeState())
@@ -98,7 +99,7 @@ class HomeViewModel(
         loadJob = viewModelScope.launch {
             _state.update { it.copy(isLoading = true, isError = false) }
 
-            when (val response = recipeRepository.findRecipes()) {
+            when (val response = getRecipesUseCase.execute()) {
                 is Result.Success -> _state.update { currentState ->
                     val all = response.data
 

app/src/main/java/com/survivalcoding/gangnam2kiandroidstudy/presentation/screen/ingredient/IngredientViewModel.kt

@@ -3,8 +3,8 @@ package com.survivalcoding.gangnam2kiandroidstudy.presentation.screen.ingredient
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.survivalcoding.gangnam2kiandroidstudy.core.Result
-import com.survivalcoding.gangnam2kiandroidstudy.domain.repository.RecipeRepository
 import com.survivalcoding.gangnam2kiandroidstudy.domain.usecase.CopyLinkUseCase
+import com.survivalcoding.gangnam2kiandroidstudy.domain.usecase.GetRecipeDetailsUseCase
 import com.survivalcoding.gangnam2kiandroidstudy.domain.usecase.GetRecipeProcedureUseCase
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
@@ -13,7 +13,7 @@ import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 
 class IngredientViewModel(
-    private val recipeRepository: RecipeRepository,
+    private val getRecipeDetailsUseCase: GetRecipeDetailsUseCase,
     private val getRecipeProcedureUseCase: GetRecipeProcedureUseCase,
     private val copyLinkUseCase: CopyLinkUseCase,
 ) : ViewModel() {
@@ -27,7 +27,7 @@ class IngredientViewModel(
 
     fun loadRecipeDetail(recipeId: Long) {
         viewModelScope.launch {
-            when (val response = recipeRepository.findRecipe(recipeId)) {
+            when (val response = getRecipeDetailsUseCase.execute(recipeId)) {
                 is Result.Success -> _state.update { it.copy(recipe = response.data) }
 
                 is Result.Error -> println("에러 처리")

app/src/main/java/com/survivalcoding/gangnam2kiandroidstudy/presentation/screen/saved_recipe/SavedRecipesViewModel.kt

@@ -3,7 +3,7 @@ package com.survivalcoding.gangnam2kiandroidstudy.presentation.screen.saved_reci
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.survivalcoding.gangnam2kiandroidstudy.core.Result
-import com.survivalcoding.gangnam2kiandroidstudy.domain.repository.RecipeRepository
+import com.survivalcoding.gangnam2kiandroidstudy.domain.usecase.GetRecipeDetailsUseCase
 import com.survivalcoding.gangnam2kiandroidstudy.domain.usecase.GetSavedRecipesUseCase
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
@@ -12,8 +12,8 @@ import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 
 class SavedRecipesViewModel(
-    private val recipeRepository: RecipeRepository,
     private val getSavedRecipesUseCase: GetSavedRecipesUseCase,
+    private val getRecipeDetailsUseCase: GetRecipeDetailsUseCase,
 ) : ViewModel() {
 
     private val _state = MutableStateFlow(SavedRecipesState())
@@ -27,7 +27,7 @@ class SavedRecipesViewModel(
     }
 
     suspend fun loadRecipes() {
-        when (val response = recipeRepository.findRecipes()) {
+        when (val response = getSavedRecipesUseCase.execute()) {
             is Result.Success -> _state.update {
                 it.copy(savedRecipes = response.data)
             }
@@ -37,7 +37,7 @@ class SavedRecipesViewModel(
     }
 
     suspend fun saveNewRecipe(id: Long) {
-        when (val response = recipeRepository.findRecipe(id)) {
+        when (val response = getRecipeDetailsUseCase.execute(id)) {
             is Result.Success -> _state.update { currentState ->
                 // 이미 저장된 레시피면 그대로
                 if (currentState.savedRecipes.any { it.id == id }) {

app/src/main/java/com/survivalcoding/gangnam2kiandroidstudy/presentation/screen/search_recipe/SearchRecipesViewModel.kt

@@ -5,7 +5,8 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.survivalcoding.gangnam2kiandroidstudy.core.Result
 import com.survivalcoding.gangnam2kiandroidstudy.domain.model.toFormatString
-import com.survivalcoding.gangnam2kiandroidstudy.domain.repository.RecipeRepository
+import com.survivalcoding.gangnam2kiandroidstudy.domain.model.toFormatString
+import com.survivalcoding.gangnam2kiandroidstudy.domain.usecase.GetRecipesUseCase
 import kotlinx.coroutines.FlowPreview
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -20,7 +21,7 @@ import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 
 open class SearchRecipesViewModel(
-    private val recipeRepository: RecipeRepository,
+    private val getRecipesUseCase: GetRecipesUseCase,
 ) : ViewModel() {
 
     // 상태
@@ -165,7 +166,7 @@ open class SearchRecipesViewModel(
         viewModelScope.launch {
             _state.update { it.copy(isLoading = true) }
 
-            when (val response = recipeRepository.findRecipes()) {
+            when (val response = getRecipesUseCase.execute()) {
                 is Result.Success -> {
                     _state.update { currentState ->
                         currentState.copy(

app/src/test/java/com/survivalcoding/gangnam2kiandroidstudy/presentation/screen/saved_recipe/SavedRecipesViewModelTest.kt

@@ -1,35 +1,30 @@
 package com.survivalcoding.gangnam2kiandroidstudy.presentation.screen.saved_recipe
 
-import androidx.lifecycle.SavedStateHandle
-import com.survivalcoding.gangnam2kiandroidstudy.data.data_source.MockRecipeDataSourceImpl
-import com.survivalcoding.gangnam2kiandroidstudy.data.data_source.RecipeDataSource
-import com.survivalcoding.gangnam2kiandroidstudy.data.mapper.toModel
-import com.survivalcoding.gangnam2kiandroidstudy.domain.repository.RecipeRepository
-import com.survivalcoding.gangnam2kiandroidstudy.data.repository.RecipeRepositoryImpl
 import com.survivalcoding.gangnam2kiandroidstudy.core.Result
-import com.survivalcoding.gangnam2kiandroidstudy.domain.model.Ingredient
 import com.survivalcoding.gangnam2kiandroidstudy.domain.model.Recipe
 import com.survivalcoding.gangnam2kiandroidstudy.domain.model.RecipeCategory
+import com.survivalcoding.gangnam2kiandroidstudy.domain.usecase.GetRecipeDetailsUseCase
 import com.survivalcoding.gangnam2kiandroidstudy.domain.usecase.GetSavedRecipesUseCase
 import io.mockk.coEvery
 import io.mockk.mockk
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.StandardTestDispatcher
-import kotlinx.coroutines.test.advanceUntilIdle
 import kotlinx.coroutines.test.resetMain
 import kotlinx.coroutines.test.runTest
 import kotlinx.coroutines.test.setMain
 import org.junit.After
-import org.junit.Assert.*
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Test
 
+@OptIn(ExperimentalCoroutinesApi::class)
 class SavedRecipesViewModelTest {
 
     private val testDispatcher = StandardTestDispatcher()
-    private val dataSource: RecipeDataSource = MockRecipeDataSourceImpl()
-    private val repository: RecipeRepository = RecipeRepositoryImpl(dataSource) // 가짜 리스트
+    private val getSavedRecipesUseCase: GetSavedRecipesUseCase = mockk()
+    private val getRecipeDetailsUseCase: GetRecipeDetailsUseCase = mockk()
 
     @Before
     fun setup() {
@@ -41,32 +36,45 @@ class SavedRecipesViewModelTest {
         Dispatchers.resetMain()
     }
 
-    @OptIn(ExperimentalCoroutinesApi::class)
     @Test
     fun `loadRecipes 메서드 - 모든 레시피를 받아온다`() = runTest {
         // given
-        val viewModel: SavedRecipesViewModel = SavedRecipesViewModel(
-            recipeRepository = repository,
-            getSavedRecipesUseCase = mockk(),
+        val sampleRecipes = listOf(
+            Recipe(
+                id = 1,
+                category = RecipeCategory.INDIAN,
+                name = "Traditional Indian Curry",
+                imageUrl = "",
+                chef = "Chef A",
+                time = "30 mins",
+                rating = 4.5,
+                ingredients = emptyList()
+            )
+        )
+        coEvery { getSavedRecipesUseCase.execute() } returns Result.Success(sampleRecipes)
+
+        val viewModel = SavedRecipesViewModel(
+            getSavedRecipesUseCase = getSavedRecipesUseCase,
+            getRecipeDetailsUseCase = getRecipeDetailsUseCase
         )
 
         // when
-        val expected = dataSource.getRecipes()?.filterNotNull()?.map { it.toModel() } ?: emptyList()
-        viewModel.loadRecipes()
-        // launch가 Main 디스패처에서 돌기 때문에 기다려줘야 함
-        advanceUntilIdle()
+        // init block calls loadRecipes() which launches a coroutine.
+        // We need to advance time to let it execute.
+        testDispatcher.scheduler.advanceUntilIdle()
 
         // then
         assertTrue(viewModel.state.value.savedRecipes.isNotEmpty())
-        assertEquals(expected, viewModel.state.value.savedRecipes)
+        assertEquals(sampleRecipes, viewModel.state.value.savedRecipes)
     }
 
-    @OptIn(ExperimentalCoroutinesApi::class)
     @Test
     fun `saveNewRecipe 메서드 - 특정 id의 레시피를 state에 추가한다`() = runTest {
-        // given: ViewModel의 init에서 모든 레시피를 불러오도록 되어있음
-        // 특정 레시피 저장 확인을 위해 모킹
-        val expected = Recipe(
+        // given
+        // Initial load returns empty list
+        coEvery { getSavedRecipesUseCase.execute() } returns Result.Success(emptyList())
+
+        val newRecipe = Recipe(
             id = 2,
             category = RecipeCategory.ASIAN,
             name = "Spice roasted chicken with flavored rice",
@@ -76,25 +84,20 @@ class SavedRecipesViewModelTest {
             rating = 4.0,
             ingredients = listOf()
         )
+        coEvery { getRecipeDetailsUseCase.execute(2) } returns Result.Success(newRecipe)
 
-        val mockRepository = mockk<RecipeRepository>()
-        coEvery { mockRepository.findRecipes() } returns Result.Success(listOf())
-        // findRecipe()도 반드시 mock 해야 함!
-        coEvery { mockRepository.findRecipe(2) } returns Result.Success(expected)
-
-        val viewModel: SavedRecipesViewModel = SavedRecipesViewModel(
-            recipeRepository = mockRepository,
-            getSavedRecipesUseCase = mockk(),
+        val viewModel = SavedRecipesViewModel(
+            getSavedRecipesUseCase = getSavedRecipesUseCase,
+            getRecipeDetailsUseCase = getRecipeDetailsUseCase
         )
-        advanceUntilIdle()
+        testDispatcher.scheduler.advanceUntilIdle() // Finish init load
 
         // when: id가 2인 레시피 추가하기
         viewModel.saveNewRecipe(2)
-        advanceUntilIdle()
+        testDispatcher.scheduler.advanceUntilIdle() // Finish saveNewRecipe
 
         // then
         assertTrue(viewModel.state.value.savedRecipes.isNotEmpty())
-        assertEquals(listOf(expected), viewModel.state.value.savedRecipes)
+        assertEquals(listOf(newRecipe), viewModel.state.value.savedRecipes)
     }
-
-}
+}