Merge pull request #140 from Vettvangur/feature/performance-update

Feature/performance update

Author: acoumb

src/Umbraco.Cms.Integrations.Search.Algolia/Builders/ContentRecordBuilder.cs

@@ -26,7 +26,56 @@ public ContentRecordBuilder(IUserService userService, IPublishedUrlProvider urlP
 
             _algoliaSearchPropertyIndexValueFactory = algoliaSearchPropertyIndexValueFactory;
         }
+        public ContentRecordBuilder BuildFromContent(IPublishedContent content, Func<IPublishedProperty, bool> filter = null)
+        {
+            _record.ObjectID = content.Key.ToString();
+
+            _record.Id = content.Id;
+            _record.Name = content.Name;
+
+            _record.CreateDate = content.CreateDate.ToString();
+            _record.CreatorName = content.CreatorName();
+            _record.UpdateDate = content.UpdateDate.ToString();
+            _record.WriterName = content.WriterName();
+
+            _record.TemplateId = content.TemplateId.HasValue ? content.TemplateId.Value : -1;
+            _record.Level = content.Level;
+            _record.Path = content.Path;
+            _record.ContentTypeAlias = content.ContentType.Alias;
+            _record.Url = _urlProvider.GetUrl(content.Id);
+
+            if (content.Cultures.Any())
+            {
+                foreach (var culture in content.Cultures)
+                {
+                    _record.Data.Add($"name{(!string.IsNullOrEmpty(culture.Value.Culture) ? "-" + culture.Value.Culture : "")}", culture.Value.Name);
+                    _record.Data.Add($"url{(!string.IsNullOrEmpty(culture.Value.Culture) ? "-" + culture.Value.Culture : "")}", content.Url(culture.Value.Culture));
+                }
+            }
 
+            foreach (var property in content.Properties.Where(filter ?? (p => true)))
+            {
+                if (!_record.Data.ContainsKey(property.Alias))
+                {
+                    if (property.PropertyType.VariesByCulture())
+                    {
+                        foreach (var culture in content.Cultures)
+                        {
+                            var indexValue = _algoliaSearchPropertyIndexValueFactory.GetValue(property, culture.Value.Culture);
+                            _record.Data.Add($"{indexValue.Key}-{culture.Value.Culture}", indexValue.Value);
+                        }
+                    }
+                    else
+                    {
+                        var indexValue = _algoliaSearchPropertyIndexValueFactory.GetValue(property, string.Empty);
+                        _record.Data.Add(indexValue.Key, indexValue.Value);
+                    }
+
+                }
+            }
+
+            return this;
+        }
         public ContentRecordBuilder BuildFromContent(IContent content, Func<IProperty, bool> filter = null)
         {
             _record.ObjectID = content.Key.ToString();

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

@@ -1,9 +1,10 @@
-using Algolia.Search.Models.Search;
+using System.Diagnostics;
+using Algolia.Search.Models.Search;
 
 using Microsoft.AspNetCore.Mvc;
 
 using System.Text.Json;
-
+using Microsoft.Extensions.Logging;
 using Umbraco.Cms.Core.Routing;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Core.Services.Implement;
@@ -40,6 +41,8 @@ public class SearchController : UmbracoAuthorizedApiController
 
         private readonly IUmbracoContextFactory _umbracoContextFactory;
 
+        private readonly ILogger<SearchController> _logger;
+
         public SearchController(
             IAlgoliaIndexService indexService, 
             IAlgoliaSearchService<SearchResponse<Record>> searchService, 
@@ -49,7 +52,8 @@ public SearchController(
             IPublishedUrlProvider urlProvider,
             IContentService contentService,
             IAlgoliaSearchPropertyIndexValueFactory algoliaSearchPropertyIndexValueFactory,
-            IUmbracoContextFactory umbracoContextFactory)
+            IUmbracoContextFactory umbracoContextFactory, 
+            ILogger<SearchController> logger)
         {
             _indexService = indexService;
 
@@ -68,6 +72,8 @@ public SearchController(
             _algoliaSearchPropertyIndexValueFactory = algoliaSearchPropertyIndexValueFactory;
 
             _umbracoContextFactory = umbracoContextFactory;
+            
+            _logger = logger;
         }
 
         [HttpGet]
@@ -122,18 +128,27 @@ public async Task<IActionResult> BuildIndex([FromBody] IndexConfiguration indexC
 
                 foreach (var contentDataItem in indexContentData)
                 {
+                    var sw = new Stopwatch();
+                    sw.Start();
+                    
                     using var ctx = _umbracoContextFactory.EnsureUmbracoContext();
                     var contentType = ctx.UmbracoContext.Content.GetContentType(contentDataItem.ContentType.Alias);
                     var contentItems = ctx.UmbracoContext.Content.GetByContentType(contentType);
 
+                    _logger.LogInformation("Building index for {ContentType} with {Count} items", contentDataItem.ContentType.Alias, contentItems.Count());
+
                     foreach (var contentItem in contentItems)
                     {
                         var record = new ContentRecordBuilder(_userService, _urlProvider, _algoliaSearchPropertyIndexValueFactory)
-                            .BuildFromContent(_contentService.GetById(contentItem.Id), (p) => contentDataItem.Properties.Any(q => q.Alias == p.Alias))
+                            .BuildFromContent(contentItem, (p) => contentDataItem.Properties.Any(q => q.Alias == p.Alias))
                             .Build();
 
                         payload.Add(record);
                     }
+
+                    sw.Stop();
+
+                    _logger.LogInformation("Finished building index for {ContentType} in {Elapsed} ms", contentDataItem.ContentType.Alias, sw.ElapsedMilliseconds);
                 }
 
                 var result = await _indexService.PushData(index.Name, payload);

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

@@ -1,6 +1,7 @@
 using System.Text.Json;
 
 using Umbraco.Cms.Core.Models;
+using Umbraco.Cms.Core.Models.PublishedContent;
 using Umbraco.Cms.Core.Services;
 
 namespace Umbraco.Cms.Integrations.Search.Algolia.Services
@@ -46,6 +47,21 @@ public virtual KeyValuePair<string, string> GetValue(IProperty property, string
 
             return new KeyValuePair<string, string>(indexValue.Key, ParseIndexValue(indexValue.Value));
         }
+        public virtual KeyValuePair<string, string> GetValue(IPublishedProperty property, string culture)
+        {
+
+            var listOfObjects = new List<object> { property.GetSourceValue(culture) };
+
+            var indexValue = new KeyValuePair<string, IEnumerable<object>>(property.Alias, listOfObjects);
+            
+            if (Converters.ContainsKey(property.PropertyType.EditorAlias))
+            {
+                var result = Converters[property.PropertyType.EditorAlias].Invoke(indexValue);
+                return new KeyValuePair<string, string>(property.Alias, result);
+            }
+
+            return new KeyValuePair<string, string>(indexValue.Key, ParseIndexValue(indexValue.Value));
+        }
 
         public string ParseIndexValue(IEnumerable<object> values)
         {

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

@@ -1,4 +1,5 @@
 using Umbraco.Cms.Core.Models;
+using Umbraco.Cms.Core.Models.PublishedContent;
 
 namespace Umbraco.Cms.Integrations.Search.Algolia.Services
 {
@@ -13,5 +14,12 @@ public interface IAlgoliaSearchPropertyIndexValueFactory
         /// <param name="culture"></param>
         /// <returns>[alias, value] pair</returns>
         KeyValuePair<string, string> GetValue(IProperty property, string culture);
+        /// <summary>
+        /// Get property indexed value
+        /// </summary>
+        /// <param name="property"></param>
+        /// <param name="culture"></param>
+        /// <returns>[alias, value] pair</returns>
+        KeyValuePair<string, string> GetValue(IPublishedProperty property, string culture);
     }
 }