From 27356ef7471651c4930698b8f19e33abceab93eb Mon Sep 17 00:00:00 2001 From: sbwalker Date: Tue, 11 Jun 2024 10:38:44 -0400 Subject: [PATCH] use List instead of IList, remove "List" from method names. remove unnecessary using statements --- .../Managers/Search/ModuleSearchIndexManager.cs | 2 +- .../Managers/Search/PageSearchIndexManager.cs | 6 +----- .../Managers/Search/SearchIndexManagerBase.cs | 2 +- Oqtane.Server/Providers/DatabaseSearchProvider.cs | 6 +++--- .../Repository/SearchContentRepository.cs | 14 +++++++------- Oqtane.Server/Services/SearchService.cs | 8 +++----- Oqtane.Shared/Interfaces/ISearchIndexManager.cs | 5 +---- Oqtane.Shared/Models/SearchContent.cs | 4 ++-- Oqtane.Shared/Models/SearchQuery.cs | 2 +- Oqtane.Shared/Models/SearchResults.cs | 2 +- Oqtane.Shared/Shared/SearchUtils.cs | 4 ++-- 11 files changed, 23 insertions(+), 32 deletions(-) diff --git a/Oqtane.Server/Managers/Search/ModuleSearchIndexManager.cs b/Oqtane.Server/Managers/Search/ModuleSearchIndexManager.cs index 8545e86e..23971383 100644 --- a/Oqtane.Server/Managers/Search/ModuleSearchIndexManager.cs +++ b/Oqtane.Server/Managers/Search/ModuleSearchIndexManager.cs @@ -36,7 +36,7 @@ namespace Oqtane.Managers.Search public override int Priority => ModuleSearchIndexManagerPriority; - public override int IndexContent(int siteId, DateTime? startTime, Action> processSearchContent, Action handleError) + public override int IndexContent(int siteId, DateTime? startTime, Action> processSearchContent, Action handleError) { var pageModules = _pageModuleRepostory.GetPageModules(siteId).DistinctBy(i => i.ModuleId); var searchContentList = new List(); diff --git a/Oqtane.Server/Managers/Search/PageSearchIndexManager.cs b/Oqtane.Server/Managers/Search/PageSearchIndexManager.cs index 07601905..7e6e593c 100644 --- a/Oqtane.Server/Managers/Search/PageSearchIndexManager.cs +++ b/Oqtane.Server/Managers/Search/PageSearchIndexManager.cs @@ -1,11 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; -using Microsoft.AspNetCore.Mvc.RazorPages; -using System.Reflection.Metadata; -using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -using Oqtane.Interfaces; using Oqtane.Models; using Oqtane.Repository; using Oqtane.Shared; @@ -35,7 +31,7 @@ namespace Oqtane.Managers.Search public override int Priority => PageSearchIndexManagerPriority; - public override int IndexContent(int siteId, DateTime? startTime, Action> processSearchContent, Action handleError) + public override int IndexContent(int siteId, DateTime? startTime, Action> processSearchContent, Action handleError) { var startTimeValue = startTime.GetValueOrDefault(DateTime.MinValue); var pages = _pageRepository.GetPages(siteId).Where(i => i.ModifiedOn >= startTimeValue); diff --git a/Oqtane.Server/Managers/Search/SearchIndexManagerBase.cs b/Oqtane.Server/Managers/Search/SearchIndexManagerBase.cs index 779a950d..a3898967 100644 --- a/Oqtane.Server/Managers/Search/SearchIndexManagerBase.cs +++ b/Oqtane.Server/Managers/Search/SearchIndexManagerBase.cs @@ -23,7 +23,7 @@ namespace Oqtane.Managers.Search public abstract string Name { get; } - public abstract int IndexContent(int siteId, DateTime? startDate, Action> processSearchContent, Action handleError); + public abstract int IndexContent(int siteId, DateTime? startDate, Action> processSearchContent, Action handleError); public virtual bool IsIndexEnabled(int siteId) { diff --git a/Oqtane.Server/Providers/DatabaseSearchProvider.cs b/Oqtane.Server/Providers/DatabaseSearchProvider.cs index 24e8a7da..3e09638b 100644 --- a/Oqtane.Server/Providers/DatabaseSearchProvider.cs +++ b/Oqtane.Server/Providers/DatabaseSearchProvider.cs @@ -147,7 +147,7 @@ namespace Oqtane.Providers private float CalculateScore(SearchContent searchContent, SearchQuery searchQuery) { var score = 0f; - foreach (var keyword in SearchUtils.GetKeywordsList(searchQuery.Keywords)) + foreach (var keyword in SearchUtils.GetKeywords(searchQuery.Keywords)) { score += searchContent.SearchContentWords.Where(i => i.SearchWord.Word.StartsWith(keyword)).Sum(i => i.Count); } @@ -159,7 +159,7 @@ namespace Oqtane.Providers { var content = $"{searchContent.Title} {searchContent.Description} {searchContent.Body}"; var snippet = string.Empty; - foreach (var keyword in SearchUtils.GetKeywordsList(searchQuery.Keywords)) + foreach (var keyword in SearchUtils.GetKeywords(searchQuery.Keywords)) { if (!string.IsNullOrWhiteSpace(keyword) && content.Contains(keyword, StringComparison.OrdinalIgnoreCase)) { @@ -191,7 +191,7 @@ namespace Oqtane.Providers snippet = content.Substring(0, searchQuery.BodySnippetLength); } - foreach (var keyword in SearchUtils.GetKeywordsList(searchQuery.Keywords)) + foreach (var keyword in SearchUtils.GetKeywords(searchQuery.Keywords)) { snippet = Regex.Replace(snippet, $"({keyword})", $"$1", RegexOptions.IgnoreCase); } diff --git a/Oqtane.Server/Repository/SearchContentRepository.cs b/Oqtane.Server/Repository/SearchContentRepository.cs index 5bc9eca0..2d4c3bed 100644 --- a/Oqtane.Server/Repository/SearchContentRepository.cs +++ b/Oqtane.Server/Repository/SearchContentRepository.cs @@ -20,7 +20,7 @@ namespace Oqtane.Repository public async Task> GetSearchContentsAsync(SearchQuery searchQuery) { using var db = _dbContextFactory.CreateDbContext(); - var searchContentList = db.SearchContent.AsNoTracking() + var searchContents = db.SearchContent.AsNoTracking() .Include(i => i.SearchContentProperties) .Include(i => i.SearchContentWords) .ThenInclude(w => w.SearchWord) @@ -28,33 +28,33 @@ namespace Oqtane.Repository if (searchQuery.EntityNames != null && searchQuery.EntityNames.Any()) { - searchContentList = searchContentList.Where(i => searchQuery.EntityNames.Contains(i.EntityName)); + searchContents = searchContents.Where(i => searchQuery.EntityNames.Contains(i.EntityName)); } if (searchQuery.BeginModifiedTimeUtc != DateTime.MinValue) { - searchContentList = searchContentList.Where(i => i.ModifiedTime >= searchQuery.BeginModifiedTimeUtc); + searchContents = searchContents.Where(i => i.ModifiedTime >= searchQuery.BeginModifiedTimeUtc); } if (searchQuery.EndModifiedTimeUtc != DateTime.MinValue) { - searchContentList = searchContentList.Where(i => i.ModifiedTime <= searchQuery.EndModifiedTimeUtc); + searchContents = searchContents.Where(i => i.ModifiedTime <= searchQuery.EndModifiedTimeUtc); } if (searchQuery.Properties != null && searchQuery.Properties.Any()) { foreach (var property in searchQuery.Properties) { - searchContentList = searchContentList.Where(i => i.SearchContentProperties.Any(p => p.Name == property.Key && p.Value == property.Value)); + searchContents = searchContents.Where(i => i.SearchContentProperties.Any(p => p.Name == property.Key && p.Value == property.Value)); } } var filteredContentList = new List(); if (!string.IsNullOrEmpty(searchQuery.Keywords)) { - foreach (var keyword in SearchUtils.GetKeywordsList(searchQuery.Keywords)) + foreach (var keyword in SearchUtils.GetKeywords(searchQuery.Keywords)) { - filteredContentList.AddRange(await searchContentList.Where(i => i.SearchContentWords.Any(w => w.SearchWord.Word.StartsWith(keyword))).ToListAsync()); + filteredContentList.AddRange(await searchContents.Where(i => i.SearchContentWords.Any(w => w.SearchWord.Word.StartsWith(keyword))).ToListAsync()); } } diff --git a/Oqtane.Server/Services/SearchService.cs b/Oqtane.Server/Services/SearchService.cs index 8d3fe4ef..f92757da 100644 --- a/Oqtane.Server/Services/SearchService.cs +++ b/Oqtane.Server/Services/SearchService.cs @@ -1,9 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Net; using System.Threading.Tasks; -using HtmlAgilityPack; using Microsoft.Extensions.Caching.Memory; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; @@ -143,7 +141,7 @@ namespace Oqtane.Services _tenantManager.SetAlias(alias); } - private IList GetSearchIndexManagers(Action initManager) + private List GetSearchIndexManagers(Action initManager) { var managers = new List(); var managerTypes = AppDomain.CurrentDomain.GetAssemblies() @@ -160,7 +158,7 @@ namespace Oqtane.Services return managers.OrderBy(i => i.Priority).ToList(); } - private IList GetSearchResultManagers() + private List GetSearchResultManagers() { var managers = new List(); var managerTypes = AppDomain.CurrentDomain.GetAssemblies() @@ -176,7 +174,7 @@ namespace Oqtane.Services return managers.ToList(); } - private void SaveSearchContent(IList searchContentList) + private void SaveSearchContent(List searchContentList) { if(searchContentList.Any()) { diff --git a/Oqtane.Shared/Interfaces/ISearchIndexManager.cs b/Oqtane.Shared/Interfaces/ISearchIndexManager.cs index 0a4123f8..576176fd 100644 --- a/Oqtane.Shared/Interfaces/ISearchIndexManager.cs +++ b/Oqtane.Shared/Interfaces/ISearchIndexManager.cs @@ -1,8 +1,5 @@ using System; using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using System.Web; using Oqtane.Models; namespace Oqtane.Services @@ -15,6 +12,6 @@ namespace Oqtane.Services bool IsIndexEnabled(int siteId); - int IndexContent(int siteId, DateTime? startTime, Action> processSearchContent, Action handleError); + int IndexContent(int siteId, DateTime? startTime, Action> processSearchContent, Action handleError); } } diff --git a/Oqtane.Shared/Models/SearchContent.cs b/Oqtane.Shared/Models/SearchContent.cs index f9ecafa4..2a242d7a 100644 --- a/Oqtane.Shared/Models/SearchContent.cs +++ b/Oqtane.Shared/Models/SearchContent.cs @@ -31,9 +31,9 @@ namespace Oqtane.Models public string AdditionalContent { get; set; } - public IList SearchContentProperties { get; set; } + public List SearchContentProperties { get; set; } - public IList SearchContentWords { get; set; } + public List SearchContentWords { get; set; } public override string ToString() { diff --git a/Oqtane.Shared/Models/SearchQuery.cs b/Oqtane.Shared/Models/SearchQuery.cs index cf03e8c1..70e3880d 100644 --- a/Oqtane.Shared/Models/SearchQuery.cs +++ b/Oqtane.Shared/Models/SearchQuery.cs @@ -14,7 +14,7 @@ namespace Oqtane.Models public string Keywords { get; set; } - public IList EntityNames { get; set; } = new List(); + public List EntityNames { get; set; } = new List(); public DateTime BeginModifiedTimeUtc { get; set; } diff --git a/Oqtane.Shared/Models/SearchResults.cs b/Oqtane.Shared/Models/SearchResults.cs index 5642468c..0c167cbd 100644 --- a/Oqtane.Shared/Models/SearchResults.cs +++ b/Oqtane.Shared/Models/SearchResults.cs @@ -4,7 +4,7 @@ namespace Oqtane.Models { public class SearchResults { - public IList Results { get; set; } + public List Results { get; set; } public int TotalResults { get; set; } } diff --git a/Oqtane.Shared/Shared/SearchUtils.cs b/Oqtane.Shared/Shared/SearchUtils.cs index d49c932d..bf5f5986 100644 --- a/Oqtane.Shared/Shared/SearchUtils.cs +++ b/Oqtane.Shared/Shared/SearchUtils.cs @@ -4,14 +4,14 @@ namespace Oqtane.Shared { public sealed class SearchUtils { - private static readonly IList _systemPages; + private static readonly List _systemPages; static SearchUtils() { _systemPages = new List { "login", "register", "profile", "404", "search" }; } - public static IList GetKeywordsList(string keywords) + public static List GetKeywords(string keywords) { var keywordsList = new List(); if(!string.IsNullOrEmpty(keywords))