Merge pull request #225 from umbraco/bugfix/v14/fix-index-properties-selection

Fix property selection on persisting index data

Author: acoumb

src/Umbraco.Cms.Integrations.Search.Algolia/Api/Management/Controllers/SaveIndexController.cs

@@ -2,6 +2,7 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using System.Text.Json;
+using Umbraco.Cms.Integrations.Search.Algolia.Extensions;
 using Umbraco.Cms.Integrations.Search.Algolia.Migrations;
 using Umbraco.Cms.Integrations.Search.Algolia.Models;
 using Umbraco.Cms.Integrations.Search.Algolia.Services;
@@ -31,8 +32,7 @@ public async Task<IActionResult> SaveIndex([FromBody] IndexConfiguration index)
             {
                 Id = index.Id,
                 Name = index.Name,
-                SerializedData = JsonSerializer.Serialize(index.ContentData
-                        .Where(p => p.Selected && p.Properties.Any(q => q.Selected))),
+                SerializedData = JsonSerializer.Serialize(index.ContentData.FilterByPropertySelected()),
                 Date = DateTime.Now
             });
 

src/Umbraco.Cms.Integrations.Search.Algolia/Extensions/ContentTypeExtensions.cs

@@ -0,0 +1,23 @@
+using Umbraco.Cms.Integrations.Search.Algolia.Models.ContentTypeDtos;
+
+namespace Umbraco.Cms.Integrations.Search.Algolia.Extensions
+{
+    public static class ContentTypeExtensions
+    {
+        public static IEnumerable<ContentTypeDto> FilterByPropertySelected(this IEnumerable<ContentTypeDto> source)
+        {
+            foreach (var item in source)
+            {
+                if (!item.Selected) continue;
+
+                var contentType = item;
+
+                contentType.Properties = item.Properties.Where(x => x.Selected);
+
+                if (!contentType.Properties.Any()) continue;
+
+                yield return contentType;
+            }
+        }
+    }
+}

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

@@ -1,6 +1,7 @@
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.PublishedContent;
+using Microsoft.Extensions.Logging;
+using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.PropertyEditors;
+using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Integrations.Search.Algolia.Providers;
 
 namespace Umbraco.Cms.Integrations.Search.Algolia.Services
@@ -11,13 +12,23 @@ public class AlgoliaSearchPropertyIndexValueFactory : IAlgoliaSearchPropertyInde
 
         private readonly ConverterCollection _converterCollection;
 
+        private readonly IContentTypeService _contentTypeService;
+
+        private readonly ILogger<AlgoliaSearchPropertyIndexValueFactory> _logger;
+
         public AlgoliaSearchPropertyIndexValueFactory(
             PropertyEditorCollection propertyEditorCollection,
-            ConverterCollection converterCollection)
+            ConverterCollection converterCollection,
+            IContentTypeService contentTypeService,
+            ILogger<AlgoliaSearchPropertyIndexValueFactory> logger)
         {
             _propertyEditorsCollection = propertyEditorCollection;
 
             _converterCollection = converterCollection;
+
+            _contentTypeService = contentTypeService;
+
+            _logger = logger;
         }
 
         public virtual KeyValuePair<string, object> GetValue(IProperty property, string culture)
@@ -28,20 +39,36 @@ public virtual KeyValuePair<string, object> GetValue(IProperty property, string
                 return default;
             }
 
-            var indexValues = propertyEditor.PropertyIndexValueFactory.GetIndexValues(property, culture, null, true, Enumerable.Empty<string>(), null);
+            Dictionary<Guid, IContentType> contentTypeDictionary = _contentTypeService.GetAll().ToDictionary(x => x.Key);
+
+            try
+            {
+                var indexValues = propertyEditor.PropertyIndexValueFactory.GetIndexValues(
+                    property,
+                    culture,
+                    null,
+                    true,
+                    Enumerable.Empty<string>(),
+                    contentTypeDictionary);
+
+                if (indexValues == null || !indexValues.Any()) return new KeyValuePair<string, object>(property.Alias, string.Empty);
 
-            if (indexValues == null || !indexValues.Any()) return new KeyValuePair<string, object>(property.Alias, string.Empty);
+                var indexValue = indexValues.First();
 
-            var indexValue = indexValues.First();
+                var converter = _converterCollection.FirstOrDefault(p => p.Name == property.PropertyType.PropertyEditorAlias);
+                if (converter != null)
+                {
+                    var result = converter.ParseIndexValues(property, indexValue.Value);
+                    return new KeyValuePair<string, object>(property.Alias, result);
+                }
 
-            var converter = _converterCollection.FirstOrDefault(p => p.Name == property.PropertyType.PropertyEditorAlias);
-            if (converter != null)
+                return new KeyValuePair<string, object>(property.Alias, indexValue.Value);
+            }
+            catch (Exception ex)
             {
-                var result = converter.ParseIndexValues(property, indexValue.Value);
-                return new KeyValuePair<string, object>(property.Alias, result);
+                _logger.LogError($"Failed to get values for {property.Alias}: {ex.Message}");
+                return default;
             }
-
-            return new KeyValuePair<string, object>(property.Alias, indexValue.Value);
         }
     }
 }