Fix filtering recipes by search

jsuarezruiz · jsuarezruiz · commit 6adda67484d9 · 2025-05-11T20:42:32.000+02:00
diff --git a/10.0/Apps/WhatToEat/src/WhatToEat/ViewModels/SearchResultsViewModel.cs b/10.0/Apps/WhatToEat/src/WhatToEat/ViewModels/SearchResultsViewModel.cs
@@ -82,30 +82,47 @@ async Task OnSearch()
         {
             NoResultsLabelVisible = false;
 
-            if (!string.IsNullOrWhiteSpace(SearchQuery) || !string.IsNullOrWhiteSpace(SearchFilter))
+            if (!string.IsNullOrWhiteSpace(SearchQuery))
             {
-                RecipeData recipeData = await _restService.GetRecipeDataAsync(SearchFilter);
+                RecipeData recipeDataQuery = await _restService.GetRecipeDataAsync(SearchQuery);
 
-                if (recipeData == null || recipeData.Hits.Length == 0)
+                if (recipeDataQuery != null && recipeDataQuery.Hits.Length > 0)
                 {
-                    NoResultsLabel = $"Sorry! We couldn't find any recipes for {SearchQuery}. Try searching for a different recipe!";
-                    NoResultsLabelVisible = true;
-                    SearchResultsVisible = false;
+                    ProcessRecipeData(recipeDataQuery);
+                    return;
                 }
-                else
-                {
-                    NoResultsLabelVisible = false;
-                    SearchResultsVisible = true;
+            }
 
-                    for (int i = 0; i < recipeData.Hits.Length; i++)
-                    {
-                        recipeData.Hits[i].Id = i;
-                    }
+            if (!string.IsNullOrWhiteSpace(SearchFilter))
+            {
+                RecipeData recipeDataFilter = await _restService.GetRecipeDataAsync(SearchFilter);
 
-                    RecipeData = recipeData;
-                    AppShell.Data = RecipeData;
+                if (recipeDataFilter != null && recipeDataFilter.Hits.Length > 0)
+                {
+                    ProcessRecipeData(recipeDataFilter);
+                    return;
                 }
             }
+
+            // If both searches return no results
+            string searchQuery = SearchQuery ?? SearchFilter;
+            NoResultsLabel = $"Sorry! We couldn't find any recipes for '{searchQuery}'. Try searching for a different recipe!";
+            NoResultsLabelVisible = true;
+            SearchResultsVisible = false;
+        }
+
+        void ProcessRecipeData(RecipeData recipeData)
+        {
+            NoResultsLabelVisible = false;
+            SearchResultsVisible = true;
+
+            for (int i = 0; i < recipeData.Hits.Length; i++)
+            {
+                recipeData.Hits[i].Id = i;
+            }
+
+            RecipeData = recipeData;
+            AppShell.Data = RecipeData;
         }
 
         async void OnItemSelected(Hit hit)
diff --git a/10.0/Apps/WhatToEat/src/WhatToEat/ViewModels/StartingPageViewModel.cs b/10.0/Apps/WhatToEat/src/WhatToEat/ViewModels/StartingPageViewModel.cs
@@ -34,7 +34,7 @@ async Task OnSearch(string filter = null)
             // Require query and/or filter to search
             if (!string.IsNullOrWhiteSpace(SearchQuery) || !string.IsNullOrWhiteSpace(filter))
             {
-                RecipeData recipeData = await _restService.GetRecipeDataAsync(filter);
+                RecipeData recipeData = await _restService.GetRecipeDataAsync(SearchQuery);
 
                 string urlEncodedFilter = System.Net.WebUtility.UrlEncode(filter);
                 await Shell.Current.GoToAsync($"{nameof(SearchResultsPage)}?SearchQuery={SearchQuery}&SearchFilter={urlEncodedFilter}");
diff --git a/9.0/Apps/WhatToEat/src/WhatToEat/ViewModels/SearchResultsViewModel.cs b/9.0/Apps/WhatToEat/src/WhatToEat/ViewModels/SearchResultsViewModel.cs
@@ -28,7 +28,7 @@ public SearchResultsViewModel()
             ItemTapped = new Command<Hit>(OnItemSelected);
             SearchCommand = new Command(async () => await OnSearch());
 
-		}
+        }
 
         public RecipeData RecipeData
         {
@@ -82,30 +82,47 @@ async Task OnSearch()
         {
             NoResultsLabelVisible = false;
 
-            if (!string.IsNullOrWhiteSpace(SearchQuery) || !string.IsNullOrWhiteSpace(SearchFilter))
+            if (!string.IsNullOrWhiteSpace(SearchQuery))
             {
-                RecipeData recipeData = await _restService.GetRecipeDataAsync(SearchFilter);
+                RecipeData recipeDataQuery = await _restService.GetRecipeDataAsync(SearchQuery);
 
-                if (recipeData == null || recipeData.Hits.Length == 0)
+                if (recipeDataQuery != null && recipeDataQuery.Hits.Length > 0)
                 {
-                    NoResultsLabel = $"Sorry! We couldn't find any recipes for {SearchQuery}. Try searching for a different recipe!";
-                    NoResultsLabelVisible = true;
-                    SearchResultsVisible = false;
+                    ProcessRecipeData(recipeDataQuery);
+                    return;
                 }
-                else
-                {
-                    NoResultsLabelVisible = false;
-                    SearchResultsVisible = true;
+            }
 
-                    for (int i = 0; i < recipeData.Hits.Length; i++)
-                    {
-                        recipeData.Hits[i].Id = i;
-                    }
+            if (!string.IsNullOrWhiteSpace(SearchFilter))
+            {
+                RecipeData recipeDataFilter = await _restService.GetRecipeDataAsync(SearchFilter);
 
-                    RecipeData = recipeData;
-                    AppShell.Data = RecipeData;
+                if (recipeDataFilter != null && recipeDataFilter.Hits.Length > 0)
+                {
+                    ProcessRecipeData(recipeDataFilter);
+                    return;
                 }
             }
+
+            // If both searches return no results
+            string searchQuery = SearchQuery ?? SearchFilter;
+            NoResultsLabel = $"Sorry! We couldn't find any recipes for '{searchQuery}'. Try searching for a different recipe!";
+            NoResultsLabelVisible = true;
+            SearchResultsVisible = false;
+        }
+
+        void ProcessRecipeData(RecipeData recipeData)
+        {
+            NoResultsLabelVisible = false;
+            SearchResultsVisible = true;
+
+            for (int i = 0; i < recipeData.Hits.Length; i++)
+            {
+                recipeData.Hits[i].Id = i;
+            }
+
+            RecipeData = recipeData;
+            AppShell.Data = RecipeData;
         }
 
         async void OnItemSelected(Hit hit)
@@ -117,4 +134,4 @@ async void OnItemSelected(Hit hit)
             await Shell.Current.GoToAsync($"{nameof(SearchResultDetailPage)}?HitId={hit.Id}");
         }
     }
-}
+}
diff --git a/9.0/Apps/WhatToEat/src/WhatToEat/ViewModels/StartingPageViewModel.cs b/9.0/Apps/WhatToEat/src/WhatToEat/ViewModels/StartingPageViewModel.cs
@@ -29,12 +29,12 @@ public string SearchQuery
             set => SetProperty(ref _searchQuery, value);
         }
 
-		async Task OnSearch(string filter = null)
+        async Task OnSearch(string filter = null)
         {
             // Require query and/or filter to search
             if (!string.IsNullOrWhiteSpace(SearchQuery) || !string.IsNullOrWhiteSpace(filter))
             {
-                RecipeData recipeData = await _restService.GetRecipeDataAsync(filter);
+                RecipeData recipeData = await _restService.GetRecipeDataAsync(SearchQuery);
 
                 string urlEncodedFilter = System.Net.WebUtility.UrlEncode(filter);
                 await Shell.Current.GoToAsync($"{nameof(SearchResultsPage)}?SearchQuery={SearchQuery}&SearchFilter={urlEncodedFilter}");
@@ -43,4 +43,4 @@ async Task OnSearch(string filter = null)
             }
         }
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ async Task OnSearch(string filter = null)`
`34`	`34`	`// Require query and/or filter to search`
`35`	`35`	`if (!string.IsNullOrWhiteSpace(SearchQuery) \|\| !string.IsNullOrWhiteSpace(filter))`
`36`	`36`	`{`
`37`		`- RecipeData recipeData = await _restService.GetRecipeDataAsync(filter);`
	`37`	`+ RecipeData recipeData = await _restService.GetRecipeDataAsync(SearchQuery);`
`38`	`38`
`39`	`39`	`string urlEncodedFilter = System.Net.WebUtility.UrlEncode(filter);`
`40`	`40`	`await Shell.Current.GoToAsync($"{nameof(SearchResultsPage)}?SearchQuery={SearchQuery}&SearchFilter={urlEncodedFilter}");`
Original file line number	Diff line number	Diff line change
`@@ -29,12 +29,12 @@ public string SearchQuery`
`29`	`29`	`set => SetProperty(ref _searchQuery, value);`
`30`	`30`	`}`
`31`	`31`
`32`		`- async Task OnSearch(string filter = null)`
	`32`	`+ async Task OnSearch(string filter = null)`
`33`	`33`	`{`
`34`	`34`	`// Require query and/or filter to search`
`35`	`35`	`if (!string.IsNullOrWhiteSpace(SearchQuery) \|\| !string.IsNullOrWhiteSpace(filter))`
`36`	`36`	`{`
`37`		`- RecipeData recipeData = await _restService.GetRecipeDataAsync(filter);`
	`37`	`+ RecipeData recipeData = await _restService.GetRecipeDataAsync(SearchQuery);`
`38`	`38`
`39`	`39`	`string urlEncodedFilter = System.Net.WebUtility.UrlEncode(filter);`
`40`	`40`	`await Shell.Current.GoToAsync($"{nameof(SearchResultsPage)}?SearchQuery={SearchQuery}&SearchFilter={urlEncodedFilter}");`
`@@ -43,4 +43,4 @@ async Task OnSearch(string filter = null)`
`43`	`43`	`}`
`44`	`44`	`}`
`45`	`45`	`}`
`46`		`-}`
	`46`	`+}`