Merge pull request #287 from umbraco/bugfix/v16/algolia-load-balancing

Update V16 with changes for load balancing environments and converters

Author: acoumb

src/Umbraco.Cms.Integrations.Search.Algolia/AlgoliaComposer.cs

@@ -24,6 +24,7 @@ public void Compose(IUmbracoBuilder builder)
             builder.AddNotificationHandler<UmbracoApplicationStartingNotification, RunAlgoliaIndicesMigration>();
 
             builder.AddNotificationAsyncHandler<ContentCacheRefresherNotification, AlgoliaContentCacheRefresherHandler>();
+            builder.AddNotificationAsyncHandler<ContentPublishedNotification, AlgoliaContentPublishedHandler>();
 
             builder.Services.AddOptions<AlgoliaSettings>()
                  .Bind(builder.Config.GetSection(Constants.SettingsPath));

src/Umbraco.Cms.Integrations.Search.Algolia/Client/public/umbraco-package.json

@@ -1,7 +1,7 @@
 {
   "id": "Umbraco.Cms.Integrations.Search.Algolia",
   "name": "Umbraco CMS Integrations: Search - Algolia",
-  "version": "5.0.0",
+  "version": "5.0.2",
   "extensions": [
     {
       "name": "Umbraco EntryPoint",

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

@@ -7,6 +7,8 @@ namespace Umbraco.Cms.Integrations.Search.Algolia.Converters
 {
     public class UmbracoMediaPickerConverter : IAlgoliaIndexValueConverter
     {
+        const string udiPrefix = "umb://media/";
+
         private readonly IMediaService _mediaService;
 
         public UmbracoMediaPickerConverter(IMediaService mediaService) => _mediaService = mediaService;
@@ -21,19 +23,34 @@ public object ParseIndexValues(IProperty property, IndexValue indexValue)
 
             if (string.IsNullOrEmpty(parsedIndexValue)) return list;
 
-            var inputMedia = JsonSerializer.Deserialize<IEnumerable<MediaItem>>(parsedIndexValue);
+            if (parsedIndexValue.StartsWith(udiPrefix))
+            {
+                var guidPart = parsedIndexValue.Substring(udiPrefix.Length);
+                if (Guid.TryParse(guidPart, out Guid guid))
+                {
+                    var mediaItem = _mediaService.GetById(guid);
+                    if (mediaItem != null)
+                    {
+                        list.Add(mediaItem.GetValue("umbracoFile")?.ToString() ?? string.Empty);
+                    }
+                }
+            }
+            else
+            {
+                var inputMedia = JsonSerializer.Deserialize<IEnumerable<MediaItem>>(parsedIndexValue);
 
-            if (inputMedia == null) return string.Empty;
+                if (inputMedia == null) return string.Empty;
 
-            foreach (var item in inputMedia)
-            {
-                if (item == null) continue;
+                foreach (var item in inputMedia)
+                {
+                    if (item == null) continue;
 
-                var mediaItem = _mediaService.GetById(Guid.Parse(item.MediaKey));
+                    var mediaItem = _mediaService.GetById(Guid.Parse(item.MediaKey));
 
-                if (mediaItem == null) continue;
+                    if (mediaItem == null) continue;
 
-                list.Add(mediaItem.GetValue("umbracoFile")?.ToString() ?? string.Empty);
+                    list.Add(mediaItem.GetValue("umbracoFile")?.ToString() ?? string.Empty);
+                }
             }
 
             return list;

src/Umbraco.Cms.Integrations.Search.Algolia/Handlers/AlgoliaContentPublishedHandler.cs

@@ -0,0 +1,31 @@
+using Umbraco.Cms.Core.Cache;
+using Umbraco.Cms.Core.Events;
+using Umbraco.Cms.Core.Notifications;
+using Umbraco.Cms.Core.Sync;
+using Umbraco.Extensions;
+
+namespace Umbraco.Cms.Integrations.Search.Algolia.Handlers
+{
+    public class AlgoliaContentPublishedHandler : INotificationAsyncHandler<ContentPublishedNotification>
+    {
+        private readonly IServerRoleAccessor _serverRoleAccessor;
+        private readonly DistributedCache _distributedCache;
+
+        public AlgoliaContentPublishedHandler(
+            IServerRoleAccessor serverRoleAccessor,
+            DistributedCache distributedCache)
+        {
+            _serverRoleAccessor = serverRoleAccessor;
+            _distributedCache = distributedCache;
+        }
+
+        public Task HandleAsync(ContentPublishedNotification notification, CancellationToken cancellationToken)
+        {
+            if (_serverRoleAccessor.CurrentServerRole == ServerRole.SchedulingPublisher)
+            {
+                _distributedCache.RefreshAllContentCache();
+            }
+            return Task.CompletedTask;
+        }
+    }
+}

src/Umbraco.Cms.Integrations.Search.Algolia/Umbraco.Cms.Integrations.Search.Algolia.csproj

@@ -15,7 +15,7 @@
 		<PackageIconUrl></PackageIconUrl>
 		<PackageProjectUrl>https://github.com/umbraco/Umbraco.Cms.Integrations/tree/main/src/Umbraco.Cms.Integrations.Search.Algolia</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/umbraco/Umbraco.Cms.Integrations</RepositoryUrl>
-		<Version>5.0.1</Version>
+		<Version>5.0.2</Version>
 		<Authors>Umbraco HQ</Authors>
 		<Company>Umbraco</Company>
 		<PackageTags>Umbraco;Umbraco-Marketplace</PackageTags>