reorder

nzdev · Jul 30, 2023 · 774342b · 774342b
1 parent f92ca59
commit 774342b
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 21 deletions.
diff --git a/src/Examine.Core/BaseSearchProvider.cs b/src/Examine.Core/BaseSearchProvider.cs
@@ -23,6 +23,8 @@ protected BaseSearchProvider(string name)
 
         /// <inheritdoc />
 		public abstract IQuery CreateQuery(string? category = null, BooleanOperation defaultOperation = BooleanOperation.And);
-
+
+        /// <inheritdoc />
+        public abstract IQuery CreateQuery(Action<IFilter> filter, string? category = null, BooleanOperation defaultOperation = BooleanOperation.And);
     }
 }
diff --git a/src/Examine.Core/ISearcher.cs b/src/Examine.Core/ISearcher.cs
@@ -1,3 +1,4 @@
+using System;
 using Examine.Search;
 
 namespace Examine
@@ -29,5 +30,16 @@ public interface ISearcher
         /// An instance of <see cref="IQueryExecutor"/>
         /// </returns>
         IQuery CreateQuery(string? category = null, BooleanOperation defaultOperation = BooleanOperation.And);
+
+
+        /// <summary>
+        /// Creates a search criteria instance as required by the implementation
+        /// </summary>
+        /// <param name="category">The type of data in the index.</param>
+        /// <param name="defaultOperation">The default operation.</param>
+        /// <returns>
+        /// An instance of <see cref="IQueryExecutor"/>
+        /// </returns>
+        IQuery CreateQuery(Action<IFilter> filter, string? category = null, BooleanOperation defaultOperation = BooleanOperation.And);
     }
 }
diff --git a/src/Examine.Core/Search/IQuery.cs b/src/Examine.Core/Search/IQuery.cs
@@ -135,11 +135,5 @@ public interface IQuery
         /// <returns></returns>
         IBooleanOperation RangeQuery<T>(string[] fields, T? min, T? max, bool minInclusive = true, bool maxInclusive = true) where T : struct;
 
-        /// <summary>
-        /// Apply Filters
-        /// </summary>
-        /// <param name="filter"></param>
-        /// <returns></returns>
-        IQuery Filter(Action<IFilter> filter);
     }
 }
diff --git a/src/Examine.Test/Examine.Lucene/Search/FluentApiTests.cs b/src/Examine.Test/Examine.Lucene/Search/FluentApiTests.cs
@@ -5246,20 +5246,19 @@ public void BasicFilter(FacetTestType withFacets)
 
                 var searcher = indexer.Searcher;
 
-                var criteria = searcher.CreateQuery("content")
-                    .Filter(
-                        filter =>
-                        {
-                            filter.Term(new FilterTerm("nodeTypeAlias", "CWS_Home"))
-                                .And()
-                                .TermPrefix(new FilterTerm("nodeName", "my name"))
-                                .And()
-                                .ChainFilters(chain =>
-                                    chain.Chain(chainedFilter => chainedFilter.FieldValueExists("nodeTypeAlias"))
-                                            .Chain(ChainOperation.ANDNOT, chainedFilter => chainedFilter.FieldValueNotExists("nodeTypeAlias"))
-                                            );
-
-                        });
+                Action<IFilter> filtering = filter =>
+                {
+                    filter.Term(new FilterTerm("nodeTypeAlias", "CWS_Home"))
+                        .And()
+                        .TermPrefix(new FilterTerm("nodeName", "my name"))
+                        .And()
+                        .ChainFilters(chain =>
+                            chain.Chain(chainedFilter => chainedFilter.FieldValueExists("nodeTypeAlias"))
+                                    .Chain(ChainOperation.ANDNOT, chainedFilter => chainedFilter.FieldValueNotExists("nodeTypeAlias"))
+                                    );
+
+                };
+                var criteria = searcher.CreateQuery(filtering, "content");
                 var boolOp = criteria.Field("nodeTypeAlias", "CWS_Home".Escape());
 
                 if (HasFacets(withFacets))