More changes

Author: jsuarezruiz

10.0/Apps/WhatToEat/src/WhatToEat/Constants.cs

@@ -1,42 +1,26 @@
-using System.Text.Json.Serialization;
-
-namespace Recipes
+namespace Recipes
 {
     public class RecipeData
     {
-        [JsonPropertyName("q")]
-        public string QueryText { get; set; }
-
-        [JsonPropertyName("from")]
-        public int StartIndex { get; set; }
-
-        [JsonPropertyName("to")]
-        public int EndIndex { get; set; }
-
-        [JsonPropertyName("hits")]
         public Hit[] Hits { get; set; }
     }
 
     public class Hit
     {
-        [JsonPropertyName("recipe")]
         public Recipe Recipe { get; set; }
-
         public int Id { get; set; }
     }
 
     public class Recipe
     {
-        [JsonPropertyName("label")]
         public string RecipeName { get; set; }
 
-        [JsonPropertyName("ingredientLines")]
         public string[] Ingredients { get; set; }
 
-        [JsonPropertyName("image")]
+        public string[] Tags { get; set; }
+
         public string ImageUrl { get; set; }
 
-        [JsonPropertyName("url")]
         public string RecipeUrl { get; set; }
     }
-}
+}

10.0/Apps/WhatToEat/src/WhatToEat/MockRestService.cs

@@ -84,7 +84,7 @@ async Task OnSearch()
 
             if (!string.IsNullOrWhiteSpace(SearchQuery) || !string.IsNullOrWhiteSpace(SearchFilter))
             {
-                RecipeData recipeData = await _restService.GetRecipeDataAsync(GenerateRequestUri(Constants.EdamamEndpoint));
+                RecipeData recipeData = await _restService.GetRecipeDataAsync(SearchFilter);
 
                 if (recipeData == null || recipeData.Hits.Length == 0)
                 {
@@ -108,30 +108,6 @@ async Task OnSearch()
             }
         }
 
-        string GenerateRequestUri(string endpoint)
-        {
-            string searchFilterName = SearchFilter.Substring(SearchFilter.IndexOf("=") + 1);
-
-            if (string.IsNullOrEmpty(SearchQuery))
-            {
-                SearchQuery = searchFilterName;
-            }
-
-            string requestUri = endpoint;
-            requestUri += $"?q={SearchQuery}";
-            requestUri += $"&app_id={Constants.EdamamAppId}";
-            requestUri += $"&app_key={Constants.EdamamAppKey}";
-            requestUri += $"&to=100";
-
-            if (!string.IsNullOrEmpty(SearchFilter))
-            {
-                Title = $"Search {searchFilterName} recipes";
-                requestUri += $"&{SearchFilter}";
-            }
-
-            return requestUri;
-        }
-
         async void OnItemSelected(Hit hit)
         {
             if (hit == null)

10.0/Apps/WhatToEat/src/WhatToEat/RecipeData.cs

@@ -34,37 +34,13 @@ 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(GenerateRequestUri(Constants.EdamamEndpoint, filter));
+                RecipeData recipeData = await _restService.GetRecipeDataAsync(filter);
 
                 string urlEncodedFilter = System.Net.WebUtility.UrlEncode(filter);
                 await Shell.Current.GoToAsync($"{nameof(SearchResultsPage)}?SearchQuery={SearchQuery}&SearchFilter={urlEncodedFilter}");
 
                 SearchQuery = string.Empty;
             }
         }
-
-        string GenerateRequestUri(string endpoint, string filter)
-        {
-            string requestUri = endpoint;
-
-            if (string.IsNullOrEmpty(SearchQuery) && !string.IsNullOrEmpty(filter))
-            {
-                requestUri += $"?q={filter.Substring(filter.IndexOf("=") + 1)}";
-            }
-            else
-            {
-                requestUri += $"?q={SearchQuery}";
-            }
-
-            requestUri += $"&app_id={Constants.EdamamAppId}";
-            requestUri += $"&app_key={Constants.EdamamAppKey}";
-
-            if (!string.IsNullOrEmpty(filter))
-            {
-                requestUri += $"&{filter}";
-            }
-
-            return requestUri;
-        }
     }
 }