From 902d7a15fd7d1e1c7946597457ad904498ec1029 Mon Sep 17 00:00:00 2001 From: MarcEricMartel <74071476+MarcEricMartel@users.noreply.github.com> Date: Tue, 25 Oct 2022 10:17:54 -0700 Subject: [PATCH 1/4] Update SearchController.cs --- .../GrossesMitainesAPI/Controllers/SearchController.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/GrossesMitaines/GrossesMitainesAPI/Controllers/SearchController.cs b/GrossesMitaines/GrossesMitainesAPI/Controllers/SearchController.cs index 4043923..9d60e2f 100644 --- a/GrossesMitaines/GrossesMitainesAPI/Controllers/SearchController.cs +++ b/GrossesMitaines/GrossesMitainesAPI/Controllers/SearchController.cs @@ -107,10 +107,10 @@ public class SearchController : Controller { products.AddRange(cat); } else { products = _searchCache.Where(x => x.Title.Contains(query)).ToList(); - foreach (Product prod in _searchCache.Where(x => x.Description.Contains(query)).ToList()) + foreach (Product prod in _searchCache.Where(x => x.Description.Contains(query)).ToArray()) if (!products.Contains(prod)) products.Add(prod); - foreach (Product prod in _searchCache.Where(x => x.Category.Contains(query)).ToList()) + foreach (Product prod in _searchCache.Where(x => x.Category.Contains(query)).ToArray()) if (!products.Contains(prod)) products.Add(prod); } From 6ae69e29471f1f3725a62f6fde5602c3346e136e Mon Sep 17 00:00:00 2001 From: MarcEricMartel <74071476+MarcEricMartel@users.noreply.github.com> Date: Tue, 25 Oct 2022 10:19:30 -0700 Subject: [PATCH 2/4] Update SearchController.cs --- .../GrossesMitainesAPI/Controllers/SearchController.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/GrossesMitaines/GrossesMitainesAPI/Controllers/SearchController.cs b/GrossesMitaines/GrossesMitainesAPI/Controllers/SearchController.cs index 9d60e2f..bf9b019 100644 --- a/GrossesMitaines/GrossesMitainesAPI/Controllers/SearchController.cs +++ b/GrossesMitaines/GrossesMitainesAPI/Controllers/SearchController.cs @@ -80,7 +80,7 @@ public class SearchController : Controller { query = query.Trim(); if (_searchCache is null) { _logger.LogError(8, "Erreur de cache."); - return Search(query, preview, deep); + return Search(query, preview, deep); // Fallback vers version non-cached. } try { // Pour faire une liste priorisée. if (preview.HasValue && preview == true) @@ -117,7 +117,7 @@ public class SearchController : Controller { } } catch (Exception e) { _logger.LogError(8, e.Message); - return Search(query, preview, deep); + return Search(query, preview, deep); // Fallback vers version non-cached. } return products; } From 1312cc3903d3e277fc883f2672a6bf89d28f7fab Mon Sep 17 00:00:00 2001 From: MarcEricMartel <74071476+MarcEricMartel@users.noreply.github.com> Date: Tue, 25 Oct 2022 10:27:11 -0700 Subject: [PATCH 3/4] Update SearchController.cs --- .../GrossesMitainesAPI/Controllers/SearchController.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/GrossesMitaines/GrossesMitainesAPI/Controllers/SearchController.cs b/GrossesMitaines/GrossesMitainesAPI/Controllers/SearchController.cs index bf9b019..4153cb4 100644 --- a/GrossesMitaines/GrossesMitainesAPI/Controllers/SearchController.cs +++ b/GrossesMitaines/GrossesMitainesAPI/Controllers/SearchController.cs @@ -22,7 +22,7 @@ public class SearchController : Controller { _logger = logger; _context = context; _cache = cache; - if (_cache.isOk()) + if (_cache.isOk()) // Se fait une copie de la cache si elle est fonctionnelle. _searchCache = _cache.GetCacheCopy(); } @@ -61,10 +61,10 @@ public class SearchController : Controller { products.AddRange(cat); } else { products = _context.Products.Where(x => x.Title.Contains(query)).ToList(); - foreach (Product prod in _context.Products.Where(x => x.Description.Contains(query)).ToList()) + foreach (Product prod in _context.Products.Where(x => x.Description.Contains(query)).ToArray()) if (!products.Contains(prod)) products.Add(prod); - foreach (Product prod in _context.Products.Where(x => x.Category.Contains(query)).ToList()) + foreach (Product prod in _context.Products.Where(x => x.Category.Contains(query)).ToArray()) if (!products.Contains(prod)) products.Add(prod); } @@ -80,7 +80,7 @@ public class SearchController : Controller { query = query.Trim(); if (_searchCache is null) { _logger.LogError(8, "Erreur de cache."); - return Search(query, preview, deep); // Fallback vers version non-cached. + return Search(query, preview, deep); // Fallback vers version non-cached en cas d'erreur. } try { // Pour faire une liste priorisée. if (preview.HasValue && preview == true) @@ -117,7 +117,7 @@ public class SearchController : Controller { } } catch (Exception e) { _logger.LogError(8, e.Message); - return Search(query, preview, deep); // Fallback vers version non-cached. + return Search(query, preview, deep); // Fallback vers version non-cached en cas d'erreur. } return products; } From acef0f0b3389b4fba876075fa45b617b2f784d16 Mon Sep 17 00:00:00 2001 From: MarcEricMartel <74071476+MarcEricMartel@users.noreply.github.com> Date: Tue, 25 Oct 2022 10:28:34 -0700 Subject: [PATCH 4/4] argh --- .../GrossesMitainesAPI/Controllers/SearchController.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GrossesMitaines/GrossesMitainesAPI/Controllers/SearchController.cs b/GrossesMitaines/GrossesMitainesAPI/Controllers/SearchController.cs index 4153cb4..4eafcbb 100644 --- a/GrossesMitaines/GrossesMitainesAPI/Controllers/SearchController.cs +++ b/GrossesMitaines/GrossesMitainesAPI/Controllers/SearchController.cs @@ -43,7 +43,7 @@ public class SearchController : Controller { if (deep.HasValue && deep == true) { List title = new(), desc = new(), cat = new(); query = query.ToLower(); - foreach (Product prod in _context.Products.ToList()) { + foreach (Product prod in _context.Products.ToArray()) { string sTitle = prod.Title.Replace(",", " ").ToLower(), sCat = prod.Category.ToLower(), sDesc = prod.Description.Replace(".", " ").Replace(",", " ").ToLower();