From 7227a603fa81fb13499b341c80330b5b3867e2b7 Mon Sep 17 00:00:00 2001 From: malik masis Date: Mon, 1 Aug 2022 12:56:14 +0300 Subject: [PATCH 1/3] Added filter for the `Slug` on Page --- .../Volo/CmsKit/Pages/EfCorePageRepository.cs | 2 +- .../Volo/CmsKit/MongoDB/Pages/MongoPageRepository.cs | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Pages/EfCorePageRepository.cs b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Pages/EfCorePageRepository.cs index 248c42282a..2c411df5dd 100644 --- a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Pages/EfCorePageRepository.cs +++ b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Pages/EfCorePageRepository.cs @@ -39,7 +39,7 @@ public class EfCorePageRepository : EfCoreRepository - x.Title.Contains(filter)) + x.Title.Contains(filter) || x.Slug.Contains(filter)) .OrderBy(sorting.IsNullOrEmpty() ? nameof(Page.Title) : sorting) .PageBy(skipCount, maxResultCount) .ToListAsync(GetCancellationToken(cancellationToken)); diff --git a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Pages/MongoPageRepository.cs b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Pages/MongoPageRepository.cs index 85b596ff1b..92e05e2f7e 100644 --- a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Pages/MongoPageRepository.cs +++ b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Pages/MongoPageRepository.cs @@ -1,13 +1,13 @@ using System; +using System.Collections.Generic; using System.Linq; using System.Linq.Dynamic.Core; -using JetBrains.Annotations; -using MongoDB.Driver; -using Volo.Abp; -using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; +using JetBrains.Annotations; +using MongoDB.Driver; using MongoDB.Driver.Linq; +using Volo.Abp; using Volo.Abp.Domain.Repositories.MongoDB; using Volo.Abp.MongoDB; using Volo.CmsKit.Pages; @@ -46,9 +46,7 @@ public class MongoPageRepository : MongoDbRepository>( !filter.IsNullOrWhiteSpace(), - u => - u.Title.Contains(filter) - ) + u => u.Title.Contains(filter) || u.Slug.Contains(filter)) .OrderBy(sorting.IsNullOrEmpty() ? nameof(Page.Title) : sorting) .As>() .PageBy>(skipCount, maxResultCount) From 41fa4b04cd66e17910c4026545de49a9acb48984 Mon Sep 17 00:00:00 2001 From: malik masis Date: Mon, 1 Aug 2022 13:56:43 +0300 Subject: [PATCH 2/3] Made case insensitive --- .../Volo/CmsKit/Pages/EfCorePageRepository.cs | 4 ++-- .../Volo/CmsKit/MongoDB/Pages/MongoPageRepository.cs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Pages/EfCorePageRepository.cs b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Pages/EfCorePageRepository.cs index 2c411df5dd..39b4220279 100644 --- a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Pages/EfCorePageRepository.cs +++ b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Pages/EfCorePageRepository.cs @@ -25,7 +25,7 @@ public class EfCorePageRepository : EfCoreRepository - x.Title.Contains(filter) + x.Title.ToLower().Contains(filter) || x.Slug.Contains(filter) ).CountAsync(GetCancellationToken(cancellationToken)); } @@ -39,7 +39,7 @@ public class EfCorePageRepository : EfCoreRepository - x.Title.Contains(filter) || x.Slug.Contains(filter)) + x.Title.ToLower().Contains(filter) || x.Slug.Contains(filter)) .OrderBy(sorting.IsNullOrEmpty() ? nameof(Page.Title) : sorting) .PageBy(skipCount, maxResultCount) .ToListAsync(GetCancellationToken(cancellationToken)); diff --git a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Pages/MongoPageRepository.cs b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Pages/MongoPageRepository.cs index 92e05e2f7e..74c5d8cc3c 100644 --- a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Pages/MongoPageRepository.cs +++ b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Pages/MongoPageRepository.cs @@ -30,7 +30,7 @@ public class MongoPageRepository : MongoDbRepository>( !filter.IsNullOrWhiteSpace(), u => - u.Title.Contains(filter) + u.Title.ToLower().Contains(filter) || u.Slug.Contains(filter) ).CountAsync(cancellation); } @@ -46,7 +46,7 @@ public class MongoPageRepository : MongoDbRepository>( !filter.IsNullOrWhiteSpace(), - u => u.Title.Contains(filter) || u.Slug.Contains(filter)) + u => u.Title.ToLower().Contains(filter) || u.Slug.Contains(filter)) .OrderBy(sorting.IsNullOrEmpty() ? nameof(Page.Title) : sorting) .As>() .PageBy>(skipCount, maxResultCount) From 93162e73d24a299be6bad3fffcf99d17c95d91ec Mon Sep 17 00:00:00 2001 From: malik masis Date: Mon, 1 Aug 2022 15:52:32 +0300 Subject: [PATCH 3/3] Added tolower for efcore --- .../Volo/CmsKit/Pages/EfCorePageRepository.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Pages/EfCorePageRepository.cs b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Pages/EfCorePageRepository.cs index 39b4220279..125c1a97ff 100644 --- a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Pages/EfCorePageRepository.cs +++ b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Pages/EfCorePageRepository.cs @@ -25,7 +25,7 @@ public class EfCorePageRepository : EfCoreRepository - x.Title.ToLower().Contains(filter) || x.Slug.Contains(filter) + x.Title.ToLower().Contains(filter.ToLower()) || x.Slug.Contains(filter) ).CountAsync(GetCancellationToken(cancellationToken)); } @@ -39,7 +39,7 @@ public class EfCorePageRepository : EfCoreRepository - x.Title.ToLower().Contains(filter) || x.Slug.Contains(filter)) + x.Title.ToLower().Contains(filter.ToLower()) || x.Slug.Contains(filter)) .OrderBy(sorting.IsNullOrEmpty() ? nameof(Page.Title) : sorting) .PageBy(skipCount, maxResultCount) .ToListAsync(GetCancellationToken(cancellationToken));