From c866cf52f357775cfb38e7903720e047b6035f3f Mon Sep 17 00:00:00 2001
From: Sean Wright <sean@seangwright.me>
Date: Thu, 26 May 2022 17:33:37 -0400
Subject: [PATCH 1/7] build(vscode): add workspace settings to support VS Code

---
 .vscode/settings.json | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 .vscode/settings.json

diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..02ac4a1
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,20 @@
+{
+  "files.exclude": {
+    "**/.git": true,
+    "**/.svn": true,
+    "**/.hg": true,
+    "**/CVS": true,
+    "**/.DS_Store": true
+  },
+
+  "search.exclude": {
+    "**/node_modules": true,
+    "**/bower_components": true,
+    "**/*.code-search": true,
+    "**/bin": true,
+    "**/obj": true
+  },
+
+  "omnisharp.defaultLaunchSolution": "./XperienceAlgolia.sln",
+  "omnisharp.enableImportCompletion": true
+}

From 13c30e3b974bde551f842e21e667570484e65933 Mon Sep 17 00:00:00 2001
From: Sean Wright <sean@seangwright.me>
Date: Thu, 26 May 2022 17:35:06 -0400
Subject: [PATCH 2/7] chore(sln): clean up XML doc comments

---
 src/AlgoliaQueueWorker.cs                                     | 2 +-
 src/AlgoliaStartupExtensions.cs                               | 1 +
 src/Models/Facets/AlgoliaFacetFilterViewModel.cs              | 4 +---
 src/Services/Implementations/DefaultAlgoliaIndexingService.cs | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/AlgoliaQueueWorker.cs b/src/AlgoliaQueueWorker.cs
index 0b9c820..f849b43 100644
--- a/src/AlgoliaQueueWorker.cs
+++ b/src/AlgoliaQueueWorker.cs
@@ -36,7 +36,7 @@ public AlgoliaQueueWorker()
         /// <summary>
         /// Adds an <see cref="AlgoliaQueueItem"/> to the worker queue to be processed.
         /// </summary>
-        /// <param name="updatedNode"></param>
+        /// <param name="queueItem"></param>
         public static void EnqueueAlgoliaQueueItem(AlgoliaQueueItem queueItem)
         {
             if (queueItem == null || queueItem.Node == null || String.IsNullOrEmpty(queueItem.IndexName))
diff --git a/src/AlgoliaStartupExtensions.cs b/src/AlgoliaStartupExtensions.cs
index e9662b2..7e7e3e6 100644
--- a/src/AlgoliaStartupExtensions.cs
+++ b/src/AlgoliaStartupExtensions.cs
@@ -18,6 +18,7 @@ public static class AlgoliaStartupExtensions
         /// Registers instances of <see cref="IInsightsClient"/> and <see cref="ISearchClient"/>
         /// with Dependency Injection.
         /// </summary>
+        /// <param name="services"></param>
         /// <param name="configuration">The application configuration.</param>
         public static IServiceCollection AddAlgolia(this IServiceCollection services, IConfiguration configuration)
         {
diff --git a/src/Models/Facets/AlgoliaFacetFilterViewModel.cs b/src/Models/Facets/AlgoliaFacetFilterViewModel.cs
index 2a99e15..320c384 100644
--- a/src/Models/Facets/AlgoliaFacetFilterViewModel.cs
+++ b/src/Models/Facets/AlgoliaFacetFilterViewModel.cs
@@ -1,6 +1,4 @@
-using Algolia.Search.Models.Search;
-
-using Kentico.Xperience.AlgoliaSearch.Attributes;
+using Kentico.Xperience.AlgoliaSearch.Attributes;
 
 using Microsoft.Extensions.Localization;
 
diff --git a/src/Services/Implementations/DefaultAlgoliaIndexingService.cs b/src/Services/Implementations/DefaultAlgoliaIndexingService.cs
index a107039..4ee24f6 100644
--- a/src/Services/Implementations/DefaultAlgoliaIndexingService.cs
+++ b/src/Services/Implementations/DefaultAlgoliaIndexingService.cs
@@ -21,7 +21,7 @@
 namespace Kentico.Xperience.AlgoliaSearch.Services
 {
     /// <summary>
-    /// Default implementation of <see cref="AlgoliaIndexingService"/>.
+    /// Default implementation of <see cref="IAlgoliaIndexingService"/>.
     /// </summary>
     internal class DefaultAlgoliaIndexingService : IAlgoliaIndexingService
     {

From 9a08a12b08608b79ce9d0cecad6e683b5aeb42f8 Mon Sep 17 00:00:00 2001
From: Sean Wright <sean@seangwright.me>
Date: Thu, 26 May 2022 17:37:17 -0400
Subject: [PATCH 3/7] chore(sln): internal c# analyzer fixes

---
 tests/Fakes/FakeNodes.cs                  | 2 +-
 tests/Tests/IAlgoliaSearchServiceTests.cs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/Fakes/FakeNodes.cs b/tests/Fakes/FakeNodes.cs
index 75436cf..c486d16 100644
--- a/tests/Fakes/FakeNodes.cs
+++ b/tests/Fakes/FakeNodes.cs
@@ -9,7 +9,7 @@ namespace Kentico.Xperience.AlgoliaSearch.Test
 {
     internal class FakeNodes
     {
-        private static Dictionary<string, TreeNode> nodes = new Dictionary<string, TreeNode>();
+        private static readonly Dictionary<string, TreeNode> nodes = new Dictionary<string, TreeNode>();
 
 
         public static string DOCTYPE_ARTICLE = "Test.Article";
diff --git a/tests/Tests/IAlgoliaSearchServiceTests.cs b/tests/Tests/IAlgoliaSearchServiceTests.cs
index 49f43af..3573a88 100644
--- a/tests/Tests/IAlgoliaSearchServiceTests.cs
+++ b/tests/Tests/IAlgoliaSearchServiceTests.cs
@@ -31,7 +31,7 @@ public void GetFacetedAttributesTests_SetUp()
             }
 
 
-            private Dictionary<string, Dictionary<string, long>> facetsFromResponse = new Dictionary<string, Dictionary<string, long>>()
+            private readonly Dictionary<string, Dictionary<string, long>> facetsFromResponse = new Dictionary<string, Dictionary<string, long>>()
             {
                 {
                     "attr1",
@@ -44,7 +44,7 @@ public void GetFacetedAttributesTests_SetUp()
             };
 
 
-            private AlgoliaFacetedAttribute[] facetsFromFilter = new AlgoliaFacetedAttribute[] {
+            private readonly AlgoliaFacetedAttribute[] facetsFromFilter = new AlgoliaFacetedAttribute[] {
                 new AlgoliaFacetedAttribute() {
                     Attribute = "attr1",
                     Facets = new AlgoliaFacet[] {

From 06aa951f96bc41e5654c148037df3e56fbf92e7f Mon Sep 17 00:00:00 2001
From: Sean Wright <sean@seangwright.me>
Date: Thu, 26 May 2022 17:39:07 -0400
Subject: [PATCH 4/7] fix(lib): remove invalid public modifier on interfaces
 for C# 7.3

---
 src/Kentico.Xperience.AlgoliaSearch.csproj  |  1 +
 src/Models/Facets/IAlgoliaFacetFilter.cs    |  4 ++--
 src/Services/IAlgoliaConnection.cs          |  8 ++++----
 src/Services/IAlgoliaIndexingService.cs     |  6 +++---
 src/Services/IAlgoliaInsightsService.cs     | 16 ++++++++--------
 src/Services/IAlgoliaRegistrationService.cs | 19 ++++++++++---------
 src/Services/IAlgoliaSearchService.cs       | 10 +++++-----
 7 files changed, 33 insertions(+), 31 deletions(-)

diff --git a/src/Kentico.Xperience.AlgoliaSearch.csproj b/src/Kentico.Xperience.AlgoliaSearch.csproj
index c6e7c8f..ca334ee 100644
--- a/src/Kentico.Xperience.AlgoliaSearch.csproj
+++ b/src/Kentico.Xperience.AlgoliaSearch.csproj
@@ -21,6 +21,7 @@
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
 		<NoWarn>1591</NoWarn>
+		<LangVersion>7.3</LangVersion>
 	</PropertyGroup>
 
 	<PropertyGroup Condition=" $(Configuration) == 'Release' ">
diff --git a/src/Models/Facets/IAlgoliaFacetFilter.cs b/src/Models/Facets/IAlgoliaFacetFilter.cs
index c428a6c..ee91182 100644
--- a/src/Models/Facets/IAlgoliaFacetFilter.cs
+++ b/src/Models/Facets/IAlgoliaFacetFilter.cs
@@ -15,7 +15,7 @@ public interface IAlgoliaFacetFilter
         /// <summary>
         /// A collection of an Algolia index's faceted attributes and the available facets.
         /// </summary>
-        public abstract AlgoliaFacetedAttribute[] FacetedAttributes
+        AlgoliaFacetedAttribute[] FacetedAttributes
         {
             get;
             set;
@@ -28,7 +28,7 @@ public abstract AlgoliaFacetedAttribute[] FacetedAttributes
         /// </summary>
         /// <param name="searchModelType">The Algolia search model that is being used in
         /// the current query. If null, all facet filters will use the "OR" condition.</param>
-        public string GetFilter(Type searchModelType = null);
+        string GetFilter(Type searchModelType = null);
 
 
         /// <summary>
diff --git a/src/Services/IAlgoliaConnection.cs b/src/Services/IAlgoliaConnection.cs
index 1fb5f2c..6264f31 100644
--- a/src/Services/IAlgoliaConnection.cs
+++ b/src/Services/IAlgoliaConnection.cs
@@ -23,7 +23,7 @@ public interface IAlgoliaConnection
         /// or null.</exception>
         /// <exception cref="InvalidOperationException">Thrown if the search model is configured
         /// incorrectly or index settings cannot be loaded.</exception>
-        public void Initialize(string indexName);
+        void Initialize(string indexName);
 
 
         /// <summary>
@@ -33,7 +33,7 @@ public interface IAlgoliaConnection
         /// </summary>
         /// <param name="objectIds">The Algolia internal IDs of the records to delete.</param>
         /// <returns>The number of records deleted.</returns>
-        public int DeleteRecords(IEnumerable<string> objectIds);
+        int DeleteRecords(IEnumerable<string> objectIds);
 
 
         /// <summary>
@@ -44,7 +44,7 @@ public interface IAlgoliaConnection
         /// <remarks>Logs an error if there are issues loading the node data.</remarks>
         /// <param name="dataObjects">The objects to upsert into Algolia.</param>
         /// <returns>The number of objects processed.</returns>
-        public int UpsertRecords(IEnumerable<JObject> dataObjects);
+        int UpsertRecords(IEnumerable<JObject> dataObjects);
 
 
         /// <summary>
@@ -53,6 +53,6 @@ public interface IAlgoliaConnection
         /// </summary>
         /// <exception cref="InvalidOperationException">Thrown if a search model class is not
         /// found for the index.</exception>
-        public void Rebuild();
+        void Rebuild();
     }
 }
diff --git a/src/Services/IAlgoliaIndexingService.cs b/src/Services/IAlgoliaIndexingService.cs
index 1fefb74..6e74089 100644
--- a/src/Services/IAlgoliaIndexingService.cs
+++ b/src/Services/IAlgoliaIndexingService.cs
@@ -23,7 +23,7 @@ public interface IAlgoliaIndexingService
         /// <param name="node">The <see cref="TreeNode"/> that triggered the event.</param>
         /// <param name="wasDeleted">True if the <paramref name="node"/> was deleted.</param>
         /// <param name="isNew">True if the <paramref name="node"/> was created.</param>
-        public void EnqueueAlgoliaItems(TreeNode node, bool wasDeleted, bool isNew);
+        void EnqueueAlgoliaItems(TreeNode node, bool wasDeleted, bool isNew);
 
 
         /// <summary>
@@ -36,7 +36,7 @@ public interface IAlgoliaIndexingService
         /// <returns>A <see cref="JObject"/> with its properties and values set.</returns>
         /// <exception cref="ArgumentNullException">Thrown if <paramref name="node"/> or
         /// <paramref name="searchModelType"/> are null.</exception>
-        public JObject GetTreeNodeData(TreeNode node, Type searchModelType);
+        JObject GetTreeNodeData(TreeNode node, Type searchModelType);
 
 
         /// <summary>
@@ -47,6 +47,6 @@ public interface IAlgoliaIndexingService
         /// <remarks>Logs errors if there are issues initializing the <see cref="IAlgoliaConnection"/>.</remarks>
         /// <param name="items">The items to process.</param>
         /// <returns>The number of items processed.</returns>
-        public int ProcessAlgoliaTasks(IEnumerable<AlgoliaQueueItem> items);
+        int ProcessAlgoliaTasks(IEnumerable<AlgoliaQueueItem> items);
     }
 }
diff --git a/src/Services/IAlgoliaInsightsService.cs b/src/Services/IAlgoliaInsightsService.cs
index 9029b78..27247d5 100644
--- a/src/Services/IAlgoliaInsightsService.cs
+++ b/src/Services/IAlgoliaInsightsService.cs
@@ -23,7 +23,7 @@ public interface IAlgoliaInsightsService
         /// </summary>
         /// <returns>The response from Algolia, or null if the request was skipped or an error occurred communicating
         /// with Algolia.</returns>
-        public Task<InsightsResponse> LogSearchResultClicked(string eventName, string indexName);
+        Task<InsightsResponse> LogSearchResultClicked(string eventName, string indexName);
 
 
         /// <summary>
@@ -32,7 +32,7 @@ public interface IAlgoliaInsightsService
         /// </summary>
         /// <returns>The response from Algolia, or null if the request was skipped or an error occurred communicating
         /// with Algolia.</returns>
-        public Task<InsightsResponse> LogSearchResultConversion(string conversionName, string indexName);
+        Task<InsightsResponse> LogSearchResultConversion(string conversionName, string indexName);
 
 
         /// <summary>
@@ -44,7 +44,7 @@ public interface IAlgoliaInsightsService
         /// <param name="indexName">The code name of the Algolia index.</param>
         /// <returns>The response from Algolia, or null if the request was skipped or an error occurred communicating
         /// with Algolia.</returns>
-        public Task<InsightsResponse> LogPageConversion(int documentId, string conversionName, string indexName);
+        Task<InsightsResponse> LogPageConversion(int documentId, string conversionName, string indexName);
 
 
         /// <summary>
@@ -57,7 +57,7 @@ public interface IAlgoliaInsightsService
         /// <param name="indexName">The code name of the Algolia index.</param>
         /// <returns>The response from Algolia, or null if the request was skipped or an error occurred communicating
         /// with Algolia.</returns>
-        public Task<InsightsResponse> LogPageViewed(int documentId, string eventName, string indexName);
+        Task<InsightsResponse> LogPageViewed(int documentId, string eventName, string indexName);
 
 
         /// <summary>
@@ -68,7 +68,7 @@ public interface IAlgoliaInsightsService
         /// <param name="indexName">The code name of the Algolia index.</param>
         /// <returns>The response from Algolia, or null if the request was skipped or an error occurred communicating
         /// with Algolia.</returns>
-        public Task<InsightsResponse> LogFacetsViewed(IEnumerable<AlgoliaFacetedAttribute> facets, string eventName, string indexName);
+        Task<InsightsResponse> LogFacetsViewed(IEnumerable<AlgoliaFacetedAttribute> facets, string eventName, string indexName);
 
 
         /// <summary>
@@ -79,7 +79,7 @@ public interface IAlgoliaInsightsService
         /// <param name="indexName">The code name of the Algolia index.</param>
         /// <returns>The response from Algolia, or null if the request was skipped or an error occurred communicating
         /// with Algolia.</returns>
-        public Task<InsightsResponse> LogFacetClicked(string facet, string eventName, string indexName);
+        Task<InsightsResponse> LogFacetClicked(string facet, string eventName, string indexName);
 
 
         /// <summary>
@@ -90,7 +90,7 @@ public interface IAlgoliaInsightsService
         /// <param name="indexName">The code name of the Algolia index.</param>
         /// <returns>The response from Algolia, or null if the request was skipped or an error occurred communicating
         /// with Algolia.</returns>
-        public Task<InsightsResponse> LogFacetConverted(string facet, string conversionName, string indexName);
+        Task<InsightsResponse> LogFacetConverted(string facet, string conversionName, string indexName);
 
 
         /// <summary>
@@ -99,6 +99,6 @@ public interface IAlgoliaInsightsService
         /// </summary>
         /// <typeparam name="TModel">The type of the Algolia search model.</typeparam>
         /// <param name="searchResponse">The full response of an Algolia search.</param>
-        public void SetInsightsUrls<TModel>(SearchResponse<TModel> searchResponse) where TModel : AlgoliaSearchModel;
+        void SetInsightsUrls<TModel>(SearchResponse<TModel> searchResponse) where TModel : AlgoliaSearchModel;
     }
 }
diff --git a/src/Services/IAlgoliaRegistrationService.cs b/src/Services/IAlgoliaRegistrationService.cs
index 0ec2b90..a59704b 100644
--- a/src/Services/IAlgoliaRegistrationService.cs
+++ b/src/Services/IAlgoliaRegistrationService.cs
@@ -1,4 +1,5 @@
-using Algolia.Search.Models.Settings;
+using Algolia.Search.Clients;
+using Algolia.Search.Models.Settings;
 
 using CMS.DocumentEngine;
 
@@ -20,7 +21,7 @@ public interface IAlgoliaRegistrationService
         /// A collection of registered Algolia indexes as identified by the
         /// <see cref="RegisterAlgoliaIndexAttribute"/> in the search model class.
         /// </summary>
-        public List<RegisterAlgoliaIndexAttribute> RegisteredIndexes
+        List<RegisterAlgoliaIndexAttribute> RegisteredIndexes
         {
             get;
         }
@@ -31,7 +32,7 @@ public List<RegisterAlgoliaIndexAttribute> RegisteredIndexes
         /// </summary>
         /// <remarks>Logs an error if the were issues scanning the assembly.</remarks>
         /// <param name="assembly">The assembly to scan for attributes.</param>
-        public IEnumerable<RegisterAlgoliaIndexAttribute> GetAlgoliaIndexAttributes(Assembly assembly);
+        IEnumerable<RegisterAlgoliaIndexAttribute> GetAlgoliaIndexAttributes(Assembly assembly);
 
 
         /// <summary>
@@ -40,7 +41,7 @@ public List<RegisterAlgoliaIndexAttribute> RegisteredIndexes
         /// <param name="indexName">The Algolia index code name.</param>
         /// <returns>The index settings, or null if not found.</returns>
         /// <exception cref="ArgumentNullException"></exception>
-        public IndexSettings GetIndexSettings(string indexName);
+        IndexSettings GetIndexSettings(string indexName);
 
 
         /// <summary>
@@ -51,7 +52,7 @@ public List<RegisterAlgoliaIndexAttribute> RegisteredIndexes
         /// </summary>
         /// <param name="indexName">The code name of the Algolia index.</param>
         /// <returns>The names of the database columns that are indexed, or an empty array.</returns>
-        public string[] GetIndexedColumnNames(string indexName);
+        string[] GetIndexedColumnNames(string indexName);
 
 
         /// <summary>
@@ -59,7 +60,7 @@ public List<RegisterAlgoliaIndexAttribute> RegisteredIndexes
         /// </summary>
         /// <param name="node">The <see cref="TreeNode"/> to check for indexing.</param>
         /// <exception cref="ArgumentNullException"></exception>
-        public bool IsNodeAlgoliaIndexed(TreeNode node);
+        bool IsNodeAlgoliaIndexed(TreeNode node);
 
 
         /// <summary>
@@ -70,7 +71,7 @@ public List<RegisterAlgoliaIndexAttribute> RegisteredIndexes
         /// <param name="node">The node to check for indexing.</param>
         /// <param name="indexName">The Algolia index code name.</param>
         /// <exception cref="ArgumentNullException"></exception>
-        public bool IsNodeIndexedByIndex(TreeNode node, string indexName);
+        bool IsNodeIndexedByIndex(TreeNode node, string indexName);
 
 
         /// <summary>
@@ -80,7 +81,7 @@ public List<RegisterAlgoliaIndexAttribute> RegisteredIndexes
         /// based on the attributes defined in the search model.
         /// </summary>
         /// <remarks>Logs an error if the index settings cannot be loaded.</remarks>
-        public void RegisterAlgoliaIndexes();
+        void RegisterAlgoliaIndexes();
 
 
         /// <summary>
@@ -89,6 +90,6 @@ public List<RegisterAlgoliaIndexAttribute> RegisteredIndexes
         /// <remarks>Logs errors if the parameters are invalid, or the index is already registered.</remarks>
         /// <param name="registerAlgoliaIndexAttribute">The <see cref="RegisterAlgoliaIndexAttribute"/> defined
         /// in the search model code file.</param>
-        public void RegisterIndex(RegisterAlgoliaIndexAttribute registerAlgoliaIndexAttribute);
+        void RegisterIndex(RegisterAlgoliaIndexAttribute registerAlgoliaIndexAttribute);
     }
 }
diff --git a/src/Services/IAlgoliaSearchService.cs b/src/Services/IAlgoliaSearchService.cs
index 947c34e..69d7571 100644
--- a/src/Services/IAlgoliaSearchService.cs
+++ b/src/Services/IAlgoliaSearchService.cs
@@ -19,7 +19,7 @@ public interface IAlgoliaSearchService
         /// Gets the indices of the Algolia application with basic statistics.
         /// </summary>
         /// <remarks>See <see href="https://www.algolia.com/doc/api-reference/api-methods/list-indices/#response"/></remarks>
-        public List<IndicesResponse> GetStatistics();
+        List<IndicesResponse> GetStatistics();
 
 
         /// <summary>
@@ -33,7 +33,7 @@ public interface IAlgoliaSearchService
         /// to the returned list with a count of zero.</param>
         /// <returns>A new list of <see cref="AlgoliaFacetedAttribute"/>s that are available to filter search
         /// results.</returns>
-        public AlgoliaFacetedAttribute[] GetFacetedAttributes(Dictionary<string, Dictionary<string, long>> facetsFromResponse, IAlgoliaFacetFilter filter = null, bool displayEmptyFacets = true);
+        AlgoliaFacetedAttribute[] GetFacetedAttributes(Dictionary<string, Dictionary<string, long>> facetsFromResponse, IAlgoliaFacetFilter filter = null, bool displayEmptyFacets = true);
 
 
         /// <summary>
@@ -45,13 +45,13 @@ public interface IAlgoliaSearchService
         /// <exception cref="InvalidOperationException">Thrown if the <see cref="FacetableAttribute"/>
         /// has both <see cref="FacetableAttribute.FilterOnly"/> and <see cref="FacetableAttribute.Searchable"/>
         /// set to true.</exception>
-        public string GetFilterablePropertyName(PropertyInfo property);
+        string GetFilterablePropertyName(PropertyInfo property);
 
 
         /// <summary>
         /// Returns true if Algolia indexing is enabled, or if the settings key doesn't exist.
         /// </summary>
-        public bool IsIndexingEnabled();
+        bool IsIndexingEnabled();
 
 
         /// <summary>
@@ -62,6 +62,6 @@ public interface IAlgoliaSearchService
         /// <param name="searchableProperties">The properties of the search model to be ordered.</param>
         /// <returns>A list of strings appropriate for setting Algolia searchable attributes (see
         /// <see href="https://www.algolia.com/doc/api-reference/api-parameters/searchableAttributes/"/>).</returns>
-        public List<string> OrderSearchableProperties(IEnumerable<PropertyInfo> searchableProperties);
+        List<string> OrderSearchableProperties(IEnumerable<PropertyInfo> searchableProperties);
     }
 }

From 97417cb2634dc98c09caa5537227be676638f39a Mon Sep 17 00:00:00 2001
From: Sean Wright <sean@seangwright.me>
Date: Thu, 26 May 2022 17:42:25 -0400
Subject: [PATCH 5/7] feat(lib): add IAlgoliaIndexSearch as index customization
 point

---
 src/Services/IAlgoliaIndexService.cs          | 17 +++++++++++++
 .../DefaultAlgoliaIndexService.cs             | 25 +++++++++++++++++++
 .../DefaultAlgoliaRegistrationService.cs      | 11 +++++---
 .../Tests/IAlgoliaRegistrationServiceTests.cs | 11 ++++----
 4 files changed, 55 insertions(+), 9 deletions(-)
 create mode 100644 src/Services/IAlgoliaIndexService.cs
 create mode 100644 src/Services/Implementations/DefaultAlgoliaIndexService.cs

diff --git a/src/Services/IAlgoliaIndexService.cs b/src/Services/IAlgoliaIndexService.cs
new file mode 100644
index 0000000..b8d3cd8
--- /dev/null
+++ b/src/Services/IAlgoliaIndexService.cs
@@ -0,0 +1,17 @@
+using Algolia.Search.Clients;
+
+namespace Kentico.Xperience.AlgoliaSearch.Services
+{
+    /// <summary>
+    /// Initializes <see cref="ISearchIndex" /> instances
+    /// </summary>
+    public interface IAlgoliaIndexService
+    {
+        /// <summary>
+        /// Initializes a new <see cref="ISearchIndex" /> for the given <paramref name="indexName" />.
+        /// </summary>
+        /// <param name="indexName"></param>
+        /// <returns></returns>
+        ISearchIndex InitializeIndex(string indexName);
+    }
+}
\ No newline at end of file
diff --git a/src/Services/Implementations/DefaultAlgoliaIndexService.cs b/src/Services/Implementations/DefaultAlgoliaIndexService.cs
new file mode 100644
index 0000000..630c881
--- /dev/null
+++ b/src/Services/Implementations/DefaultAlgoliaIndexService.cs
@@ -0,0 +1,25 @@
+using Algolia.Search.Clients;
+using CMS;
+using CMS.Core;
+using Kentico.Xperience.AlgoliaSearch.Services;
+
+[assembly: RegisterImplementation(typeof(IAlgoliaIndexService), typeof(DefaultAlgoliaIndexService), Lifestyle = Lifestyle.Singleton, Priority = RegistrationPriority.SystemDefault)]
+
+namespace Kentico.Xperience.AlgoliaSearch.Services
+{
+    /// <inheritdoc />
+    public class DefaultAlgoliaIndexService : IAlgoliaIndexService
+    {
+        private readonly ISearchClient searchClient;
+
+        public DefaultAlgoliaIndexService(ISearchClient searchClient)
+        {
+            this.searchClient = searchClient;
+        }
+
+        public ISearchIndex InitializeIndex(string indexName)
+        {
+            return searchClient.InitIndex(indexName);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Services/Implementations/DefaultAlgoliaRegistrationService.cs b/src/Services/Implementations/DefaultAlgoliaRegistrationService.cs
index 5c6abeb..3b3b7e9 100644
--- a/src/Services/Implementations/DefaultAlgoliaRegistrationService.cs
+++ b/src/Services/Implementations/DefaultAlgoliaRegistrationService.cs
@@ -25,8 +25,9 @@ internal class DefaultAlgoliaRegistrationService : IAlgoliaRegistrationService
         private readonly IAlgoliaSearchService algoliaSearchService;
         private readonly IEventLogService eventLogService;
         private readonly ISearchClient searchClient;
-        private List<RegisterAlgoliaIndexAttribute> mRegisteredIndexes = new List<RegisterAlgoliaIndexAttribute>();
-        private string[] ignoredPropertiesForTrackingChanges = new string[] {
+        private readonly IAlgoliaIndexService algoliaIndexService;
+        private readonly List<RegisterAlgoliaIndexAttribute> mRegisteredIndexes = new List<RegisterAlgoliaIndexAttribute>();
+        private readonly string[] ignoredPropertiesForTrackingChanges = new string[] {
             nameof(AlgoliaSearchModel.ObjectID),
             nameof(AlgoliaSearchModel.Url),
             nameof(AlgoliaSearchModel.ClassName)
@@ -47,11 +48,13 @@ public List<RegisterAlgoliaIndexAttribute> RegisteredIndexes
         /// </summary>
         public DefaultAlgoliaRegistrationService(IAlgoliaSearchService algoliaSearchService,
             IEventLogService eventLogService,
-            ISearchClient searchClient)
+            ISearchClient searchClient,
+            IAlgoliaIndexService algoliaIndexService)
         {
             this.algoliaSearchService = algoliaSearchService;
             this.eventLogService = eventLogService;
             this.searchClient = searchClient;
+            this.algoliaIndexService = algoliaIndexService;
         }
 
 
@@ -220,7 +223,7 @@ public void RegisterAlgoliaIndexes()
                 {
                     RegisterIndex(attribute);
 
-                    var searchIndex = searchClient.InitIndex(attribute.IndexName);
+                    var searchIndex = algoliaIndexService.InitializeIndex(attribute.IndexName);
                     var indexSettings = GetIndexSettings(attribute.IndexName);
                     if (indexSettings == null)
                     {
diff --git a/tests/Tests/IAlgoliaRegistrationServiceTests.cs b/tests/Tests/IAlgoliaRegistrationServiceTests.cs
index 12965f1..77f286d 100644
--- a/tests/Tests/IAlgoliaRegistrationServiceTests.cs
+++ b/tests/Tests/IAlgoliaRegistrationServiceTests.cs
@@ -31,7 +31,8 @@ public void GetIndexSettingsTests_SetUp()
             {
                 var mockSearchClient = Substitute.For<ISearchClient>();
                 var algoliaSearchService = new DefaultAlgoliaSearchService(mockSearchClient);
-                algoliaRegistrationService = new DefaultAlgoliaRegistrationService(algoliaSearchService, new MockEventLogService(), mockSearchClient);
+                var mockIndexService = Substitute.For<IAlgoliaIndexService>();
+                algoliaRegistrationService = new DefaultAlgoliaRegistrationService(algoliaSearchService, new MockEventLogService(), mockSearchClient, mockIndexService);
 
                 var attributes = algoliaRegistrationService.GetAlgoliaIndexAttributes(Assembly.GetExecutingAssembly());
                 foreach (var attribute in attributes)
@@ -114,7 +115,7 @@ internal class IsNodeAlgoliaIndexed : AlgoliaTests
             [SetUp]
             public void IsNodeAlgoliaIndexed_SetUp()
             {
-                algoliaRegistrationService = new DefaultAlgoliaRegistrationService(Substitute.For<IAlgoliaSearchService>(), new MockEventLogService(), Substitute.For<ISearchClient>());
+                algoliaRegistrationService = new DefaultAlgoliaRegistrationService(Substitute.For<IAlgoliaSearchService>(), new MockEventLogService(), Substitute.For<ISearchClient>(), Substitute.For<IAlgoliaIndexService>());
 
                 var attributes = algoliaRegistrationService.GetAlgoliaIndexAttributes(Assembly.GetExecutingAssembly());
                 foreach (var attribute in attributes)
@@ -153,7 +154,7 @@ internal class IsNodeIndexedByIndexTests : AlgoliaTests
             [SetUp]
             public void IsNodeIndexedByIndexTests_SetUp()
             {
-                algoliaRegistrationService = new DefaultAlgoliaRegistrationService(Substitute.For<IAlgoliaSearchService>(), new MockEventLogService(), Substitute.For<ISearchClient>());
+                algoliaRegistrationService = new DefaultAlgoliaRegistrationService(Substitute.For<IAlgoliaSearchService>(), new MockEventLogService(), Substitute.For<ISearchClient>(), Substitute.For<IAlgoliaIndexService>());
 
                 var attributes = algoliaRegistrationService.GetAlgoliaIndexAttributes(Assembly.GetExecutingAssembly());
                 foreach (var attribute in attributes)
@@ -228,7 +229,7 @@ internal class GetIndexedColumnNamesTests : AlgoliaTests
             [SetUp]
             public void GetIndexedColumnNamesTests_SetUp()
             {
-                algoliaRegistrationService = new DefaultAlgoliaRegistrationService(Substitute.For<IAlgoliaSearchService>(), new MockEventLogService(), Substitute.For<ISearchClient>());
+                algoliaRegistrationService = new DefaultAlgoliaRegistrationService(Substitute.For<IAlgoliaSearchService>(), new MockEventLogService(), Substitute.For<ISearchClient>(), Substitute.For<IAlgoliaIndexService>());
 
                 var attributes = algoliaRegistrationService.GetAlgoliaIndexAttributes(Assembly.GetExecutingAssembly());
                 foreach (var attribute in attributes)
@@ -262,7 +263,7 @@ internal class RegisterIndexTests : AlgoliaTests
             [SetUp]
             public void RegisterIndexTests_SetUp()
             {
-                algoliaRegistrationService = new DefaultAlgoliaRegistrationService(Substitute.For<IAlgoliaSearchService>(), new MockEventLogService(), Substitute.For<ISearchClient>());
+                algoliaRegistrationService = new DefaultAlgoliaRegistrationService(Substitute.For<IAlgoliaSearchService>(), new MockEventLogService(), Substitute.For<ISearchClient>(), Substitute.For<IAlgoliaIndexService>());
             }
 
 

From 5c9536172c30e2b0661f8a206893176c2f406c54 Mon Sep 17 00:00:00 2001
From: Eric Dugre <ericd@kentico.com>
Date: Wed, 1 Jun 2022 19:07:52 -0400
Subject: [PATCH 6/7] update README and custom module to use new interface

---
 .../Kentico.Xperience.AlgoliaSearch.1.0.1.zip | Bin 18220 -> 0 bytes
 .../Pages/AlgoliaSearch_Preview.aspx.cs       |   8 ++++----
 README.md                                     |  18 +++++++++---------
 src/AlgoliaQueueWorker.cs                     |   2 +-
 src/AlgoliaStartupExtensions.cs               |   2 +-
 src/Kentico.Xperience.AlgoliaSearch.csproj    |   2 +-
 src/Services/IAlgoliaIndexService.cs          |   5 ++---
 .../DefaultAlgoliaIndexService.cs             |  13 +++++++++++--
 8 files changed, 29 insertions(+), 21 deletions(-)
 delete mode 100644 CMS/CMSModules/Kentico.Xperience.AlgoliaSearch/Kentico.Xperience.AlgoliaSearch.1.0.1.zip

diff --git a/CMS/CMSModules/Kentico.Xperience.AlgoliaSearch/Kentico.Xperience.AlgoliaSearch.1.0.1.zip b/CMS/CMSModules/Kentico.Xperience.AlgoliaSearch/Kentico.Xperience.AlgoliaSearch.1.0.1.zip
deleted file mode 100644
index 57ca59a3db24381cc46db564df7991cfb431c0bb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 18220
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
O$-cj;M?U`X>;D0|n=Wtw

diff --git a/CMS/CMSModules/Kentico.Xperience.AlgoliaSearch/Pages/AlgoliaSearch_Preview.aspx.cs b/CMS/CMSModules/Kentico.Xperience.AlgoliaSearch/Pages/AlgoliaSearch_Preview.aspx.cs
index cdee5da..2796344 100644
--- a/CMS/CMSModules/Kentico.Xperience.AlgoliaSearch/Pages/AlgoliaSearch_Preview.aspx.cs
+++ b/CMS/CMSModules/Kentico.Xperience.AlgoliaSearch/Pages/AlgoliaSearch_Preview.aspx.cs
@@ -1,5 +1,5 @@
-using Algolia.Search.Clients;
-using Algolia.Search.Models.Search;
+using Algolia.Search.Models.Search;
+
 using CMS.Core;
 using CMS.Helpers;
 
@@ -34,8 +34,8 @@ protected override void OnLoad(EventArgs e)
                 string searchText = QueryHelper.GetString("searchtext", "");
                 if (!string.IsNullOrEmpty(searchText))
                 {
-                    var client = Service.Resolve<ISearchClient>();
-                    var searchIndex = client.InitIndex(indexName);
+                    var searchIndexService = Service.Resolve<IAlgoliaIndexService>();
+                    var searchIndex = searchIndexService.InitializeIndex(indexName);
                     if (searchIndex == null)
                     {
                         ShowError("Error loading search index. Please check the Event Log for more details.");
diff --git a/README.md b/README.md
index 5e6a0f3..b5212a3 100644
--- a/README.md
+++ b/README.md
@@ -311,21 +311,21 @@ public string Thumbnail { get; set; }
 
 ## :mag_right: Implementing the search interface
 
-You can use Algolia's [.NET API](https://www.algolia.com/doc/api-client/getting-started/what-is-the-api-client/csharp/?client=csharp), [JavaScript API](https://www.algolia.com/doc/api-client/getting-started/what-is-the-api-client/javascript/?client=javascript), or [InstantSearch.js](https://www.algolia.com/doc/guides/building-search-ui/what-is-instantsearch/js/) to implement a search interface on your live site. The following example will help you with creating a search interface for .NET Core. In your Controllers, you can get a `SearchIndex` object by injecting the `ISearchClient` interface and calling the `InitIndex()` method on the client using your index's code name. Then, construct a `Query` to search the Algolia index. Algolia's pagination is zero-based, so in the Dancing Goat sample project we subtract 1 from the current page number:
+You can use Algolia's [.NET API](https://www.algolia.com/doc/api-client/getting-started/what-is-the-api-client/csharp/?client=csharp), [JavaScript API](https://www.algolia.com/doc/api-client/getting-started/what-is-the-api-client/javascript/?client=javascript), or [InstantSearch.js](https://www.algolia.com/doc/guides/building-search-ui/what-is-instantsearch/js/) to implement a search interface on your live site. The following example will help you with creating a search interface for .NET Core. In your Controllers, you can get a `SearchIndex` object by injecting the `IAlgoliaIndexService` interface and calling the `InitializeIndex()` method on the client using your index's code name. Then, construct a `Query` to search the Algolia index. Algolia's pagination is zero-based, so in the Dancing Goat sample project we subtract 1 from the current page number:
 
 ```cs
-private readonly ISearchClient _searchClient;
+private readonly IAlgoliaIndexService _indexService;
 
-public SearchController(ISearchClient searchClient)
+public SearchController(IAlgoliaIndexService indexService)
 {
-    _searchClient = searchClient;
+    _indexService = indexService;
 }
 
 public ActionResult Search(string searchText, int page = DEFAULT_PAGE_NUMBER)
 {
     page = Math.Max(page, DEFAULT_PAGE_NUMBER);
 
-    var searchIndex = _searchClient.InitIndex(AlgoliaSiteSearchModel.IndexName);
+    var searchIndex = _indexService.InitializeIndex(AlgoliaSiteSearchModel.IndexName);
     var query = new Query(searchText)
     {
         Page = page - 1,
@@ -552,7 +552,7 @@ As the search interface can be designed in multiple languages using Algolia's AP
 
 The Dancing Goat store doesn't use search out-of-the-box, so first you need to hook it up to Algolia. In this example, the search model seen in [Determining which pages to index](#determining-which-pages-to-index) will be used.
 
-1. Inject `ISearchClient` into the `CoffeesController` as shown in [this section](#mag_right-implementing-the-search-interface).
+1. Inject `IAlgoliaIndexService` into the `CoffeesController` as shown in [this section](#mag_right-implementing-the-search-interface).
 
 2. In __CoffeesController.cs__, create a method that will perform a standard Algolia search. In the `Query.Filters` property, add a filter to only retrieve records where `ClassName` is `DancingGoatCore.Coffee.` You also specify which `Facets` you want to retrieve, but they are not used yet.
 
@@ -571,7 +571,7 @@ private SearchResponse<AlgoliaSiteSearchModel> Search()
         Facets = facetsToRetrieve
     };
 
-    var searchIndex = _searchClient.InitIndex(AlgoliaSiteSearchModel.IndexName);
+    var searchIndex = _indexService.InitializeIndex(AlgoliaSiteSearchModel.IndexName);
     return searchIndex.Search<AlgoliaSiteSearchModel>(query);
 }
 ```
@@ -700,7 +700,7 @@ private SearchResponse<AlgoliaSiteSearchModel> Search(IAlgoliaFacetFilter filter
         Facets = facetsToRetrieve
     };
 
-    var searchIndex = _searchClient.InitIndex(AlgoliaSiteSearchModel.IndexName);
+    var searchIndex = _indexService.InitializeIndex(AlgoliaSiteSearchModel.IndexName);
     return searchIndex.Search<AlgoliaSiteSearchModel>(query);
 }
 ```
@@ -1256,7 +1256,7 @@ While the Xperience Algolia integration works without any changes to the Xperien
 
 ### Importing the custom module
 
-1.  Download the latest _Kentico.Xperience.AlgoliaSearch_ ZIP package in the [/CMS/CMSModules/Kentico.Xperience.AlgoliaSearch](/CMS/CMSModules/Kentico.Xperience.AlgoliaSearch) directory
+1.  Download the _Kentico.Xperience.AlgoliaSearch_ ZIP package by locating the latest "Custom module" [Release](https://github.com/Kentico/xperience-algolia/releases).
 1. In the Xperience adminstration, open the __Sites__ application.
 1. [Import](https://docs.xperience.io/deploying-websites/exporting-and-importing-sites/importing-a-site-or-objects) the downloaded package with the __Import files__ and __Import code files__ [settings](https://docs.xperience.io/deploying-websites/exporting-and-importing-sites/importing-a-site-or-objects#Importingasiteorobjects-Import-Objectselectionsettings) enabled.
 1. Perform the [necessary steps](https://docs.xperience.io/deploying-websites/exporting-and-importing-sites/importing-a-site-or-objects#Importingasiteorobjects-Importingpackageswithfiles) to include the following imported folder in your project:
diff --git a/src/AlgoliaQueueWorker.cs b/src/AlgoliaQueueWorker.cs
index f849b43..7d1ba3a 100644
--- a/src/AlgoliaQueueWorker.cs
+++ b/src/AlgoliaQueueWorker.cs
@@ -36,7 +36,7 @@ public AlgoliaQueueWorker()
         /// <summary>
         /// Adds an <see cref="AlgoliaQueueItem"/> to the worker queue to be processed.
         /// </summary>
-        /// <param name="queueItem"></param>
+        /// <param name="queueItem">The item to be added to the queue.</param>
         public static void EnqueueAlgoliaQueueItem(AlgoliaQueueItem queueItem)
         {
             if (queueItem == null || queueItem.Node == null || String.IsNullOrEmpty(queueItem.IndexName))
diff --git a/src/AlgoliaStartupExtensions.cs b/src/AlgoliaStartupExtensions.cs
index 7e7e3e6..c88cb04 100644
--- a/src/AlgoliaStartupExtensions.cs
+++ b/src/AlgoliaStartupExtensions.cs
@@ -18,7 +18,7 @@ public static class AlgoliaStartupExtensions
         /// Registers instances of <see cref="IInsightsClient"/> and <see cref="ISearchClient"/>
         /// with Dependency Injection.
         /// </summary>
-        /// <param name="services"></param>
+        /// <param name="services">The service collection.</param>
         /// <param name="configuration">The application configuration.</param>
         public static IServiceCollection AddAlgolia(this IServiceCollection services, IConfiguration configuration)
         {
diff --git a/src/Kentico.Xperience.AlgoliaSearch.csproj b/src/Kentico.Xperience.AlgoliaSearch.csproj
index ca334ee..91b19cd 100644
--- a/src/Kentico.Xperience.AlgoliaSearch.csproj
+++ b/src/Kentico.Xperience.AlgoliaSearch.csproj
@@ -9,7 +9,7 @@
 	<PropertyGroup>
 		<Title>Xperience Algolia Search</Title>
 		<PackageId>Kentico.Xperience.AlgoliaSearch</PackageId>
-		<Version>2.1.0</Version>
+		<Version>2.2.0</Version>
 		<Authors>Kentico Software</Authors>
 		<Company>Kentico Software</Company>
 		<PackageIcon>icon.png</PackageIcon>
diff --git a/src/Services/IAlgoliaIndexService.cs b/src/Services/IAlgoliaIndexService.cs
index b8d3cd8..addd20b 100644
--- a/src/Services/IAlgoliaIndexService.cs
+++ b/src/Services/IAlgoliaIndexService.cs
@@ -3,15 +3,14 @@
 namespace Kentico.Xperience.AlgoliaSearch.Services
 {
     /// <summary>
-    /// Initializes <see cref="ISearchIndex" /> instances
+    /// Initializes <see cref="ISearchIndex" /> instances.
     /// </summary>
     public interface IAlgoliaIndexService
     {
         /// <summary>
         /// Initializes a new <see cref="ISearchIndex" /> for the given <paramref name="indexName" />.
         /// </summary>
-        /// <param name="indexName"></param>
-        /// <returns></returns>
+        /// <param name="indexName">The code name of the index.</param>
         ISearchIndex InitializeIndex(string indexName);
     }
 }
\ No newline at end of file
diff --git a/src/Services/Implementations/DefaultAlgoliaIndexService.cs b/src/Services/Implementations/DefaultAlgoliaIndexService.cs
index 630c881..6b3d50d 100644
--- a/src/Services/Implementations/DefaultAlgoliaIndexService.cs
+++ b/src/Services/Implementations/DefaultAlgoliaIndexService.cs
@@ -1,22 +1,31 @@
 using Algolia.Search.Clients;
+
 using CMS;
 using CMS.Core;
+
 using Kentico.Xperience.AlgoliaSearch.Services;
 
 [assembly: RegisterImplementation(typeof(IAlgoliaIndexService), typeof(DefaultAlgoliaIndexService), Lifestyle = Lifestyle.Singleton, Priority = RegistrationPriority.SystemDefault)]
-
 namespace Kentico.Xperience.AlgoliaSearch.Services
 {
-    /// <inheritdoc />
+    /// <summary>
+    /// Default implementation of <see cref="IAlgoliaIndexService"/> which simply calls
+    /// <see cref="ISearchClient.InitIndex(string)"/>.
+    /// </summary>
     public class DefaultAlgoliaIndexService : IAlgoliaIndexService
     {
         private readonly ISearchClient searchClient;
 
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DefaultAlgoliaIndexService"/> class.
+        /// </summary>
         public DefaultAlgoliaIndexService(ISearchClient searchClient)
         {
             this.searchClient = searchClient;
         }
 
+
         public ISearchIndex InitializeIndex(string indexName)
         {
             return searchClient.InitIndex(indexName);

From d071f0a8ae65a65df360485197f9386234cce942 Mon Sep 17 00:00:00 2001
From: Eric Dugre <ericd@kentico.com>
Date: Thu, 2 Jun 2022 12:24:50 -0400
Subject: [PATCH 7/7] mark DefaultAlgoliaIndexService internal

---
 src/Services/Implementations/DefaultAlgoliaIndexService.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Services/Implementations/DefaultAlgoliaIndexService.cs b/src/Services/Implementations/DefaultAlgoliaIndexService.cs
index 6b3d50d..4e6cdf6 100644
--- a/src/Services/Implementations/DefaultAlgoliaIndexService.cs
+++ b/src/Services/Implementations/DefaultAlgoliaIndexService.cs
@@ -12,7 +12,7 @@ namespace Kentico.Xperience.AlgoliaSearch.Services
     /// Default implementation of <see cref="IAlgoliaIndexService"/> which simply calls
     /// <see cref="ISearchClient.InitIndex(string)"/>.
     /// </summary>
-    public class DefaultAlgoliaIndexService : IAlgoliaIndexService
+    internal class DefaultAlgoliaIndexService : IAlgoliaIndexService
     {
         private readonly ISearchClient searchClient;