Merge pull request #186 from umbraco/bugfix/algolia-umbraco-context

Bugfix/algolia umbraco context

Author: acoumb

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

@@ -1,6 +1,7 @@
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Routing;
 using Umbraco.Cms.Core.Services;
+using Umbraco.Cms.Core.Web;
 using Umbraco.Cms.Integrations.Search.Algolia.Models;
 using Umbraco.Cms.Integrations.Search.Algolia.Services;
 using Umbraco.Extensions;
@@ -19,7 +20,12 @@ public class ContentRecordBuilder
 
         private readonly IRecordBuilderFactory _recordBuilderFactory;
 
-        public ContentRecordBuilder(IUserService userService, IPublishedUrlProvider urlProvider, IAlgoliaSearchPropertyIndexValueFactory algoliaSearchPropertyIndexValueFactory, IRecordBuilderFactory recordBuilderFactory)
+        private readonly IUmbracoContextFactory _umbracoContextFactory;
+
+        public ContentRecordBuilder(IUserService userService, IPublishedUrlProvider urlProvider, 
+            IAlgoliaSearchPropertyIndexValueFactory algoliaSearchPropertyIndexValueFactory, 
+            IRecordBuilderFactory recordBuilderFactory,
+            IUmbracoContextFactory umbracoContextFactory)
         {
             _userService = userService;
 
@@ -28,10 +34,14 @@ public ContentRecordBuilder(IUserService userService, IPublishedUrlProvider urlP
             _algoliaSearchPropertyIndexValueFactory = algoliaSearchPropertyIndexValueFactory;
 
             _recordBuilderFactory = recordBuilderFactory;
+
+            _umbracoContextFactory = umbracoContextFactory;
         }
 
         public ContentRecordBuilder BuildFromContent(IContent content, Func<IProperty, bool> filter = null)
         {
+            using var contextReference = _umbracoContextFactory.EnsureUmbracoContext();
+
             _record.ObjectID = content.Key.ToString();
 
             var creator = _userService.GetProfileById(content.CreatorId);

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

@@ -136,7 +136,7 @@ public async Task<IActionResult> BuildIndex([FromBody] IndexConfiguration indexC
 
                     foreach (var contentItem in contentItems.Where(p => !p.Trashed))
                     {
-                        var record = new ContentRecordBuilder(_userService, _urlProvider, _algoliaSearchPropertyIndexValueFactory, _recordBuilderFactory)
+                        var record = new ContentRecordBuilder(_userService, _urlProvider, _algoliaSearchPropertyIndexValueFactory, _recordBuilderFactory, _umbracoContextFactory)
                             .BuildFromContent(contentItem, (p) => contentDataItem.Properties.Any(q => q.Alias == p.Alias))
                             .Build();
 

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

@@ -37,6 +37,8 @@ public class AlgoliaContentCacheRefresherHandler : INotificationAsyncHandler<Con
 
         private readonly IRecordBuilderFactory _recordBuilderFactory;
 
+        private readonly IUmbracoContextFactory _umbracoContextFactory;
+
         public AlgoliaContentCacheRefresherHandler(
             IServerRoleAccessor serverRoleAccessor,
             ILogger<AlgoliaContentCacheRefresherHandler> logger,
@@ -46,7 +48,8 @@ public AlgoliaContentCacheRefresherHandler(
             IUserService userService,
             IPublishedUrlProvider urlProvider,
             IAlgoliaSearchPropertyIndexValueFactory algoliaSearchPropertyIndexValueFactory, 
-            IRecordBuilderFactory recordBuilderFactory)
+            IRecordBuilderFactory recordBuilderFactory,
+            IUmbracoContextFactory umbracoContextFactory)
         {
             _serverRoleAccessor = serverRoleAccessor;
             _contentService = contentService;
@@ -57,6 +60,7 @@ public AlgoliaContentCacheRefresherHandler(
             _urlProvider = urlProvider;
             _algoliaSearchPropertyIndexValueFactory = algoliaSearchPropertyIndexValueFactory;
             _recordBuilderFactory = recordBuilderFactory;
+            _umbracoContextFactory = umbracoContextFactory;
         }
 
         public async Task HandleAsync(ContentCacheRefresherNotification notification, CancellationToken cancellationToken)
@@ -103,7 +107,7 @@ protected async Task RebuildIndex(IEnumerable<IContent> entities)
                             .FirstOrDefault(p => p.ContentType.Alias == entity.ContentType.Alias);
                         if (indexConfiguration == null || indexConfiguration.ContentType.Alias != entity.ContentType.Alias) continue;
 
-                        var record = new ContentRecordBuilder(_userService, _urlProvider, _algoliaSearchPropertyIndexValueFactory, _recordBuilderFactory)
+                        var record = new ContentRecordBuilder(_userService, _urlProvider, _algoliaSearchPropertyIndexValueFactory, _recordBuilderFactory, _umbracoContextFactory)
                            .BuildFromContent(entity, (p) => indexConfiguration.Properties.Any(q => q.Alias == p.Alias))
                            .Build();
 

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

@@ -13,7 +13,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>2.1.3</Version>
+		<Version>2.1.4</Version>
 		<Authors>Umbraco HQ</Authors>
 		<Company>Umbraco</Company>
 		<PackageTags>Umbraco;Umbraco-Marketplace</PackageTags>