breaking search modifications into smaller PRs

This commit is contained in:
sbwalker
2024-06-28 15:43:54 -04:00
parent 22063248ca
commit 0178e015e3
9 changed files with 89 additions and 57 deletions

View File

@ -24,7 +24,7 @@ namespace Oqtane.Repository
.Include(i => i.SearchContentProperties)
.Include(i => i.SearchContentWords)
.ThenInclude(w => w.SearchWord)
.Where(i => i.SiteId == searchQuery.SiteId && i.IsActive);
.Where(i => i.SiteId == searchQuery.SiteId);
if (searchQuery.EntityNames != null && searchQuery.EntityNames.Any())
{
@ -33,12 +33,12 @@ namespace Oqtane.Repository
if (searchQuery.BeginModifiedTimeUtc != DateTime.MinValue)
{
searchContents = searchContents.Where(i => i.ModifiedTime >= searchQuery.BeginModifiedTimeUtc);
searchContents = searchContents.Where(i => i.ContentModifiedOn >= searchQuery.BeginModifiedTimeUtc);
}
if (searchQuery.EndModifiedTimeUtc != DateTime.MinValue)
{
searchContents = searchContents.Where(i => i.ModifiedTime <= searchQuery.EndModifiedTimeUtc);
searchContents = searchContents.Where(i => i.ContentModifiedOn <= searchQuery.EndModifiedTimeUtc);
}
if (searchQuery.Properties != null && searchQuery.Properties.Any())
@ -88,7 +88,7 @@ namespace Oqtane.Repository
db.SaveChanges();
}
public void DeleteSearchContent(string entityName, int entryId)
public void DeleteSearchContent(string entityName, string entryId)
{
using var db = _dbContextFactory.CreateDbContext();
var searchContent = db.SearchContent.FirstOrDefault(i => i.EntityName == entityName && i.EntityId == entryId);