PR updates and filtering for content that is not deleted

Author: acoumb

src/Umbraco.Cms.Integrations.Search.Algolia/Controllers/SearchController.cs

@@ -134,7 +134,7 @@ public async Task<IActionResult> BuildIndex([FromBody] IndexConfiguration indexC
 
                     _logger.LogInformation("Building index for {ContentType} with {Count} items", contentDataItem.ContentType.Alias, contentItems.Count());
 
-                    foreach (var contentItem in contentItems)
+                    foreach (var contentItem in contentItems.Where(p => !p.Trashed))
                     {
                         var record = new ContentRecordBuilder(_userService, _urlProvider, _algoliaSearchPropertyIndexValueFactory)
                             .BuildFromContent(contentItem, (p) => contentDataItem.Properties.Any(q => q.Alias == p.Alias))

src/Umbraco.Cms.Integrations.Search.Algolia/Converters/IConverter.cs renamed to src/Umbraco.Cms.Integrations.Search.Algolia/Converters/IAlgoliaIndexValueConverter.cs

@@ -3,16 +3,16 @@
     /// <summary>
     /// Defines a custom index converter.
     /// </summary>
-    public interface IConverter
+    public interface IAlgoliaIndexValueConverter
     {
         /// <summary>
         /// Gets the name of the converter.
         /// </summary>
         string Name { get; }
 
         /// <summary>
-        /// Parses the index value.
+        /// Parses the index values.
         /// </summary>
-        object ParseIndexValue(KeyValuePair<string, IEnumerable<object>> indexValue);
+        object ParseIndexValues(IEnumerable<object> indexValues);
     }
 }

src/Umbraco.Cms.Integrations.Search.Algolia/Converters/UmbracoBooleanConverter.cs

@@ -1,14 +1,14 @@
 namespace Umbraco.Cms.Integrations.Search.Algolia.Converters
 {
-    public class UmbracoBooleanConverter : IConverter
+    public class UmbracoBooleanConverter : IAlgoliaIndexValueConverter
     {
         public string Name => Core.Constants.PropertyEditors.Aliases.Boolean;
 
-        public object ParseIndexValue(KeyValuePair<string, IEnumerable<object>> indexValue)
+        public object ParseIndexValues(IEnumerable<object> indexValues)
         {
-            if (indexValue.Value != null && indexValue.Value.Any())
+            if (indexValues != null && indexValues.Any())
             {
-                var value = indexValue.Value.FirstOrDefault();
+                var value = indexValues.FirstOrDefault();
 
                 return value != null
                     ? value.Equals(1)

src/Umbraco.Cms.Integrations.Search.Algolia/Converters/UmbracoDecimalConverter.cs

@@ -1,14 +1,14 @@
 namespace Umbraco.Cms.Integrations.Search.Algolia.Converters
 {
-    public class UmbracoDecimalConverter : IConverter
+    public class UmbracoDecimalConverter : IAlgoliaIndexValueConverter
     {
         public string Name => Core.Constants.PropertyEditors.Aliases.Decimal;
 
-        public object ParseIndexValue(KeyValuePair<string, IEnumerable<object>> indexValue)
+        public object ParseIndexValues(IEnumerable<object> indexValues)
         {
-            if (indexValue.Value != null && indexValue.Value.Any())
+            if (indexValues != null && indexValues.Any())
             {
-                var value = indexValue.Value.FirstOrDefault();
+                var value = indexValues.FirstOrDefault();
 
                 return value != null
                     ? decimal.Parse(value.ToString())

src/Umbraco.Cms.Integrations.Search.Algolia/Converters/UmbracoIntegerConverter.cs

@@ -1,16 +1,14 @@
-using System.Windows.Markup;
-
-namespace Umbraco.Cms.Integrations.Search.Algolia.Converters
+namespace Umbraco.Cms.Integrations.Search.Algolia.Converters
 {
-    public class UmbracoIntegerConverter : IConverter
+    public class UmbracoIntegerConverter : IAlgoliaIndexValueConverter
     {
         public string Name => Core.Constants.PropertyEditors.Aliases.Integer;
 
-        public object ParseIndexValue(KeyValuePair<string, IEnumerable<object>> indexValue)
+        public object ParseIndexValues(IEnumerable<object> indexValues)
         {
-            if (indexValue.Value != null && indexValue.Value.Any())
+            if (indexValues != null && indexValues.Any())
             {
-                var value = indexValue.Value.FirstOrDefault();
+                var value = indexValues.FirstOrDefault();
 
                 return value ?? default(int);
             }

src/Umbraco.Cms.Integrations.Search.Algolia/Converters/UmbracoMediaPickerConverter.cs

@@ -3,19 +3,19 @@
 
 namespace Umbraco.Cms.Integrations.Search.Algolia.Converters
 {
-    public class UmbracoMediaPickerConverter : IConverter
+    public class UmbracoMediaPickerConverter : IAlgoliaIndexValueConverter
     {
         private readonly IMediaService _mediaService;
 
         public UmbracoMediaPickerConverter(IMediaService mediaService) => _mediaService = mediaService;
 
         public string Name => Core.Constants.PropertyEditors.Aliases.MediaPicker3;
 
-        public object ParseIndexValue(KeyValuePair<string, IEnumerable<object>> indexValue)
+        public object ParseIndexValues(IEnumerable<object> indexValues)
         {
             var list = new List<string>();
 
-            var parsedIndexValue = ParseIndexValue(indexValue.Value);
+            var parsedIndexValue = ParseIndexValue(indexValues);
 
             if (string.IsNullOrEmpty(parsedIndexValue)) return list;
 

src/Umbraco.Cms.Integrations.Search.Algolia/Converters/UmbracoTagsConverter.cs

@@ -2,15 +2,15 @@
 
 namespace Umbraco.Cms.Integrations.Search.Algolia.Converters
 {
-    public class UmbracoTagsConverter : IConverter
+    public class UmbracoTagsConverter : IAlgoliaIndexValueConverter
     {
         public string Name => Core.Constants.PropertyEditors.Aliases.Tags;
 
-        public object ParseIndexValue(KeyValuePair<string, IEnumerable<object>> indexValue)
+        public object ParseIndexValues(IEnumerable<object> indexValues)
         {
-            if (indexValue.Value != null && indexValue.Value.Any())
+            if (indexValues != null && indexValues.Any())
             {
-                return indexValue.Value;
+                return indexValues;
             }
 
             return Enumerable.Empty<string>();

src/Umbraco.Cms.Integrations.Search.Algolia/Providers/ConverterCollection.cs

@@ -3,9 +3,9 @@
 
 namespace Umbraco.Cms.Integrations.Search.Algolia.Providers
 {
-    public class ConverterCollection : BuilderCollectionBase<IConverter>
+    public class ConverterCollection : BuilderCollectionBase<IAlgoliaIndexValueConverter>
     {
-        public ConverterCollection(Func<IEnumerable<IConverter>> items)
+        public ConverterCollection(Func<IEnumerable<IAlgoliaIndexValueConverter>> items)
             : base(items) 
         { 
         }

src/Umbraco.Cms.Integrations.Search.Algolia/Providers/ConverterCollectionBuilder.cs

@@ -3,7 +3,7 @@
 
 namespace Umbraco.Cms.Integrations.Search.Algolia.Providers
 {
-    public class ConverterCollectionBuilder : OrderedCollectionBuilderBase<ConverterCollectionBuilder, ConverterCollection, IConverter>
+    public class ConverterCollectionBuilder : OrderedCollectionBuilderBase<ConverterCollectionBuilder, ConverterCollection, IAlgoliaIndexValueConverter>
     {
         protected override ConverterCollectionBuilder This => this;
     }

src/Umbraco.Cms.Integrations.Search.Algolia/Services/AlgoliaSearchPropertyIndexValueFactory.cs

@@ -37,11 +37,11 @@ public virtual KeyValuePair<string, object> GetValue(IProperty property, string
             var converter = _converterCollection.FirstOrDefault(p => p.Name == property.PropertyType.PropertyEditorAlias);
             if (converter != null)
             {
-                var result = converter.ParseIndexValue(indexValue);
+                var result = converter.ParseIndexValues(indexValue.Value);
                 return new KeyValuePair<string, object>(property.Alias, result);
             }
 
-            return new KeyValuePair<string, object>(indexValue.Key, indexValue.Value);
+            return new KeyValuePair<string, object>(property.Alias, indexValue.Value);
         }
     }
 }