M4 Submission (#357)

Removed mocked API calls and fixed Spoonacular bugs (#355)

* Bug fixes

* Fixed broken navigation

* Fixed broken tests

* Fixed flaky test

* Fixed flaky test

* Removed Previous impl test

Author: RandomUsername1315

app/src/androidTest/java/com/github/se/polyfit/data/api/SpoonacularApiCallerTest.kt

@@ -333,8 +333,7 @@ class SpoonacularApiCallerTest {
 
     val response = spoonacularApiCaller.getCompleteRecipesFromIngredients(listOf("apple", "banana"))
 
-    assert(response.first().recipeInformation.ingredients.isEmpty())
-    assert(response.first().recipeInformation.instructions.isEmpty())
+    assert(response.isEmpty())
   }
 
   @After

app/src/androidTest/java/com/github/se/polyfit/ui/screen/RecipeRecommendationScreenTest.kt

@@ -3,11 +3,9 @@ package com.github.se.polyfit.ui.screen
 import androidx.compose.ui.test.assertIsDisplayed
 import androidx.compose.ui.test.junit4.createComposeRule
 import androidx.compose.ui.test.onNodeWithTag
-import androidx.compose.ui.test.onNodeWithText
+import androidx.lifecycle.MutableLiveData
 import androidx.navigation.NavHostController
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.github.se.polyfit.model.recipe.Recipe
-import com.github.se.polyfit.ui.components.button.LikeButtonScreen
 import com.github.se.polyfit.ui.screen.recipeRec.RecommendationScreen
 import com.github.se.polyfit.viewmodel.qrCode.BarCodeCodeViewModel
 import com.github.se.polyfit.viewmodel.recipe.RecipeRecommendationViewModel
@@ -27,38 +25,15 @@ class RecipeRecommendationScreenTest {
 
   private val barcodeViewModel: BarCodeCodeViewModel = mockk<BarCodeCodeViewModel>(relaxed = true)
 
-  @Test
-  fun testEverythingIsDisplayed() {
-    val mockkNavigation = mockk<NavHostController>(relaxed = true)
-    val mockkRecommendationViewModel = mockk<RecipeRecommendationViewModel>()
-
-    val recipeList = mutableListOf<Recipe>()
-    for (i in 1..10) {
-      recipeList.add(Recipe.default())
-    }
-    coEvery { mockkRecommendationViewModel.ingredientList() } returns listOf("apple", "banana")
-    coEvery { mockkRecommendationViewModel.recipeFromIngredients(any()) } returns recipeList
-
-    composeTestRule.setContent {
-      RecommendationScreen(mockkNavigation, mockkRecommendationViewModel, {}, barcodeViewModel)
-    }
-    composeTestRule.waitForIdle()
-
-    ComposeScreen.onComposeScreen<LikeButtonScreen>(composeTestRule) {
-      composeTestRule.onNodeWithText("Recommended Recipes").assertIsDisplayed()
-      composeTestRule.onNodeWithTag("RecipeList").assertExists().assertIsDisplayed()
-    }
-  }
-
   @Test
   fun testLoadingAnimation() {
     val mockkNavigation = mockk<NavHostController>(relaxed = true)
 
     val mockkRecommendationViewModel = mockk<RecipeRecommendationViewModel>()
 
-    coEvery { mockkRecommendationViewModel.recipeFromIngredients(any()) } returns emptyList()
-    coEvery { mockkRecommendationViewModel.ingredientList() } returns listOf("apple", "banana")
-
+    coEvery { mockkRecommendationViewModel.recipeFromIngredients() } returns emptyList()
+    coEvery { mockkRecommendationViewModel.recipes } returns MutableLiveData(listOf())
+    coEvery { mockkRecommendationViewModel.isFetching } returns MutableLiveData(true)
     composeTestRule.setContent {
       RecommendationScreen(mockkNavigation, mockkRecommendationViewModel, {}, barcodeViewModel)
     }

app/src/androidTest/java/com/github/se/polyfit/viewmodel/recipe/RecipeRecommendationViewModelTest.kt

@@ -25,21 +25,6 @@ class RecipeRecommendationViewModelTest {
     viewModel = RecipeRecommendationViewModel(spoonacularApiCaller)
   }
 
-  @Test
-  fun recipeFromIngredientsReturnsRecipes() = runBlocking {
-    val ingredients = listOf("apple", "banana")
-    val expectedRecipes = listOf(Recipe.default())
-
-    coEvery { spoonacularApiCaller.recipeByIngredients(any()) } returns
-        RecipeFromIngredientsResponseAPI(APIResponse.SUCCESS, expectedRecipes)
-    coEvery { spoonacularApiCaller.getCompleteRecipesFromIngredients(any()) } returns
-        listOf(Recipe.default())
-
-    val actualRecipes = viewModel.recipeFromIngredients(listOf("apple", "banana"))
-
-    assertEquals(listOf(Recipe.default()), actualRecipes)
-  }
-
   @Test
   fun recipeFromIngredientsReturnsEmptyWhenInvalid() = runBlocking {
     val ingredients = listOf("invalid", "ingredients")
@@ -48,16 +33,8 @@ class RecipeRecommendationViewModelTest {
     coEvery { spoonacularApiCaller.recipeByIngredients(ingredients) } returns
         RecipeFromIngredientsResponseAPI(APIResponse.FAILURE, expectedRecipes)
 
-    val actualRecipes = viewModel.recipeFromIngredients(ingredients)
+    val actualRecipes = viewModel.recipeFromIngredients()
 
     assertEquals(listOf<Recipe>(), actualRecipes)
   }
-
-  @Test
-  fun testIngredientListReturns() {
-    val expectedIngredients = listOf("apple", "banana")
-    val actualIngredients = viewModel.ingredientList()
-
-    assertEquals(expectedIngredients, actualIngredients)
-  }
 }

app/src/main/java/com/github/se/polyfit/MainActivity.kt

@@ -125,7 +125,7 @@ class MainActivity : ComponentActivity() {
           }
 
           // the navcontroller is needed for the generic screen
-          composable(Route.RecipeRecFlow) { RecipeRecFlow() }
+          composable(Route.RecipeRecFlow) { RecipeRecFlow(navAction = navigation) }
         }
       }
     }

app/src/main/java/com/github/se/polyfit/data/api/Spoonacular/SpoonacularAPI.kt

@@ -228,12 +228,11 @@ class SpoonacularApiCaller {
    * @throws Exception if the response is not successful or an error occurs
    */
   fun getCompleteRecipesFromIngredients(ingredients: List<String>): List<Recipe> {
-    //        val recipesResponse = recipeByIngredients(ingredients)
+
     return try {
 
-      // done to avoid making a bunch of API calls, will need to remove later
-      val recipesResponse =
-          RecipeFromIngredientsResponseAPI(APIResponse.SUCCESS, listOf(Recipe.default()))
+      val recipesResponse = recipeByIngredients(ingredients)
+
       recipesResponse.recipes.forEach { recipe ->
         val recipeInfo = getRecipeSteps(recipe.id)
 

app/src/main/java/com/github/se/polyfit/di/HiltProvides.kt

@@ -15,7 +15,6 @@ import com.github.se.polyfit.model.data.User
 import com.github.se.polyfit.model.post.PostLocationModel
 import com.github.se.polyfit.viewmodel.graph.GraphViewModel
 import com.github.se.polyfit.viewmodel.map.MapViewModel
-import com.github.se.polyfit.viewmodel.qrCode.BarCodeCodeViewModel
 import com.github.se.polyfit.viewmodel.recipe.RecipeRecommendationViewModel
 import com.google.firebase.auth.FirebaseAuth
 import dagger.Module
@@ -107,15 +106,6 @@ object HiltProvides {
     return FirebaseAuth.getInstance()
   }
 
-  @Provides
-  @Singleton
-  fun providesBarCodeCodeViewModel(
-      recipeRecommendationViewModel: RecipeRecommendationViewModel,
-      foodFactsApi: OpenFoodFactsApi
-  ): BarCodeCodeViewModel {
-    return BarCodeCodeViewModel(recipeRecommendationViewModel, foodFactsApi)
-  }
-
   @Provides
   @Singleton
   fun provideFoodFactsApi(): OpenFoodFactsApi {

app/src/main/java/com/github/se/polyfit/ui/flow/RecipeRecFlow.kt

@@ -9,30 +9,30 @@ import com.github.se.polyfit.ui.navigation.Navigation
 import com.github.se.polyfit.ui.navigation.Route
 import com.github.se.polyfit.ui.screen.recipeRec.MoreDetailScreen
 import com.github.se.polyfit.ui.screen.recipeRec.RecommendationScreen
-import com.github.se.polyfit.viewmodel.qrCode.BarCodeCodeViewModel
 import com.github.se.polyfit.viewmodel.recipe.RecipeRecommendationViewModel
 
 @Composable
 fun RecipeRecFlow(
     recipeRecommendationViewModel: RecipeRecommendationViewModel = hiltViewModel(),
-    barcodeViewModel: BarCodeCodeViewModel = hiltViewModel<BarCodeCodeViewModel>()
+    navAction: Navigation
 ) {
-  val navigation = rememberNavController()
+  // Needed because of the nested navigation
+  // Will cause a crash if a different one is not used
+  val navController = rememberNavController()
+  val navigation = Navigation(navController)
 
-  val navAction = Navigation(navigation)
-
-  NavHost(navController = navigation, startDestination = Route.RecipeRecommendation) {
+  NavHost(navController = navController, startDestination = Route.RecipeRecommendation) {
     composable(Route.RecipeRecommendation) {
       RecommendationScreen(
-          navigation,
+          navAction.navHostController,
           recipeRecommendationViewModel,
-          navAction::navigateToRecipeRecommendationMore,
+          navigation::navigateToRecipeRecommendationMore,
       )
     }
     composable(Route.RecipeRecommendationMore) {
       MoreDetailScreen(
           recipeRecommendationViewModel,
-          navigateBack = navAction::goBack,
+          navigateBack = navigation::goBack,
       )
     }
   }

app/src/main/java/com/github/se/polyfit/ui/navigation/Navigation.kt

@@ -3,7 +3,7 @@ package com.github.se.polyfit.ui.navigation
 import android.util.Log
 import androidx.navigation.NavHostController
 
-class Navigation(private val navHostController: NavHostController) {
+class Navigation(val navHostController: NavHostController) {
   fun goBack() {
     navHostController.popBackStack()
   }

app/src/main/java/com/github/se/polyfit/ui/screen/recipeRec/RecommendationScreen.kt

@@ -10,10 +10,7 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
+import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
@@ -24,8 +21,6 @@ import androidx.core.content.ContextCompat
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.navigation.NavHostController
 import com.github.se.polyfit.R
-import com.github.se.polyfit.data.local.ingredientscanned.IngredientsScanned
-import com.github.se.polyfit.model.recipe.Recipe
 import com.github.se.polyfit.ui.components.GenericScreen
 import com.github.se.polyfit.ui.components.recipe.RecipeCard
 import com.github.se.polyfit.viewmodel.qrCode.BarCodeCodeViewModel
@@ -41,27 +36,23 @@ fun RecommendationScreen(
   GenericScreen(
       navController = navController,
       content = { paddingValues ->
-        RecipeDisplay(
-            recipeRecViewModel, barcodeViewModel, paddingValues, navigateToRecipeRecommendationMore)
+        RecipeDisplay(recipeRecViewModel, paddingValues, navigateToRecipeRecommendationMore)
       },
       modifier = Modifier.testTag("RecipeDisplay"))
 }
 
 @Composable
 fun RecipeDisplay(
     recipesRec: RecipeRecommendationViewModel,
-    barcodeViewModel: BarCodeCodeViewModel,
     paddingValues: PaddingValues,
     navigateToRecipeRecommendationMore: () -> Unit
 ) {
   val context = LocalContext.current
 
-  val recipes = remember { mutableStateOf(listOf<Recipe>()) }
-  var ingredientList by remember { mutableStateOf(listOf<IngredientsScanned>()) }
-  LaunchedEffect(Unit) {
-    barcodeViewModel.listIngredients.observeForever { ingredientList = it }
-    recipes.value = recipesRec.recipeFromIngredients(ingredientList.map { it.name })
-  }
+  val recipes = recipesRec.recipes.observeAsState(initial = emptyList())
+  val fetching = recipesRec.isFetching.observeAsState(initial = true)
+
+  LaunchedEffect(Unit) { recipesRec.recipeFromIngredients() }
 
   LazyColumn(
       horizontalAlignment = Alignment.CenterHorizontally,
@@ -73,9 +64,21 @@ fun RecipeDisplay(
               fontWeight = FontWeight.Bold,
           )
         }
-        if (recipes.value.isEmpty()) {
+        if (fetching.value) {
           item { Loader(paddingValues) }
           return@LazyColumn
+        } else if (recipes.value.isEmpty()) {
+
+          item {
+            Box(
+                modifier = Modifier.fillMaxSize().padding(paddingValues),
+                contentAlignment = Alignment.Center) {
+                  Text(
+                      text = context.getString(R.string.noRecipesFound),
+                      fontSize = MaterialTheme.typography.bodyLarge.fontSize)
+                }
+          }
+          return@LazyColumn
         }
 
         recipes.value.forEach {
@@ -93,6 +96,7 @@ fun RecipeDisplay(
       }
 }
 
+/** Animation displayed while waiting for the data to be fetched */
 @Composable
 fun Loader(paddingValues: PaddingValues) {
   Box(

app/src/main/java/com/github/se/polyfit/viewmodel/qrCode/barcodeViewModel.kt

@@ -122,7 +122,7 @@ constructor(
         _listIngredients.postValue(list)
       } catch (e: Exception) {
         removeId(id)
-        Log.w("QrCodeViewModel", "Error in getting ingredient, surely not a food id: $e")
+        Log.e("QrCodeViewModel", "Error in getting ingredient, surely not a food id: $e")
       }
     }
   }