feat: moved stemmer to OpenSearchModuleOptions

Refs: SITKO-CORE-T-18
sitkoru · Jul 17, 2024 · 1256fdb · 1256fdb
1 parent c372e7b
commit 1256fdb
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/src/Sitko.Core.Search.OpenSearch/OpenSearchModuleOptions.cs b/src/Sitko.Core.Search.OpenSearch/OpenSearchModuleOptions.cs
@@ -10,6 +10,7 @@ public class OpenSearchModuleOptions : SearchModuleOptions
     public string Password { get; set; } = "";
     public bool EnableClientLogging { get; set; }
     public bool DisableCertificatesValidation { get; set; }
+    public string CustomStemmer { get; set; } = "";
 }
 
 public class OpenSearchModuleOptionsValidator : AbstractValidator<OpenSearchModuleOptions>

diff --git a/src/Sitko.Core.Search.OpenSearch/OpenSearchSearcher.cs b/src/Sitko.Core.Search.OpenSearch/OpenSearchSearcher.cs
@@ -15,7 +15,7 @@ public class OpenSearchSearcher<TSearchModel>(
     private OpenSearchModuleOptions Options => optionsMonitor.CurrentValue;
     private OpenSearchClient? client;
     private const string CustomAnalyze = "custom_analyze";
-    private const string RussianStemmer = "russian_stemmer";
+    private const string StemmerName = "custom_stemmer";
 
     public async Task<bool> AddOrUpdateAsync(string indexName, IEnumerable<TSearchModel> searchModels,
         CancellationToken cancellationToken = default)
@@ -231,10 +231,10 @@ private static SearchDescriptor<TSearchModel> GetSearchRequest(SearchDescriptor<
     private AnalysisDescriptor CreateAnalysisDescriptor(AnalysisDescriptor a) =>
         a.Analyzers(aa => aa.Custom(CustomAnalyze, ca => ca
                 .Tokenizer("standard")
-                .Filters("lowercase", "stop", "snowball", RussianStemmer)
+                .Filters("lowercase", "stop", "snowball", StemmerName)
             )
         ).TokenFilters(descriptor =>
-            descriptor.Stemmer(RussianStemmer, filterDescriptor => filterDescriptor.Language("russian")));
+            descriptor.Stemmer(StemmerName, filterDescriptor => filterDescriptor.Language(Options.CustomStemmer)));
 
     private CreateIndexDescriptor CreateIndexDescriptor(CreateIndexDescriptor createIndexDescriptor) =>
         createIndexDescriptor.Settings(s => s.Analysis(CreateAnalysisDescriptor))

diff --git a/tests/Sitko.Core.Search.OpenSearch.Tests/OpenSearchTests.cs b/tests/Sitko.Core.Search.OpenSearch.Tests/OpenSearchTests.cs
@@ -128,6 +128,7 @@ protected override IHostApplicationBuilder ConfigureApplication(IHostApplication
             moduleOptions.Password = hostBuilder.Configuration.GetSection("OpenSearchModuleOptions")["Password"];
             moduleOptions.InitProviders = false;
             moduleOptions.DisableCertificatesValidation = true;
+            moduleOptions.CustomStemmer = "russian";
         });
 
         hostBuilder.Services.AddSingleton<TestModelProvider>();