Add provider default implementation and remove service

Author: acoumb

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

@@ -37,8 +37,7 @@ public void Compose(IUmbracoBuilder builder)
 
             builder.Services.AddScoped<IAlgoliaSearchPropertyIndexValueFactory, AlgoliaSearchPropertyIndexValueFactory>();
 
-            // register only as singleton to prevent exceptions in IAlgoliaIndexService
-            builder.Services.AddSingleton<AlgoliaGeolocationService>();
+            builder.Services.AddSingleton<IAlgoliaGeolocationProvider, AlgoliaNullGeolocationProvider>();
 
             builder.AddAlgoliaConverters();
         }

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

@@ -23,15 +23,15 @@ public class ContentRecordBuilder
 
         private readonly IUmbracoContextFactory _umbracoContextFactory;
 
-        private readonly AlgoliaGeolocationService _algoliaGeolocationService;
+        private readonly IAlgoliaGeolocationProvider _algoliaGeolocationProvider;
 
         public ContentRecordBuilder(
             IUserService userService, 
             IPublishedUrlProvider urlProvider, 
             IAlgoliaSearchPropertyIndexValueFactory algoliaSearchPropertyIndexValueFactory, 
             IRecordBuilderFactory recordBuilderFactory,
             IUmbracoContextFactory umbracoContextFactory,
-            AlgoliaGeolocationService algoliaGeolocationService)
+            IAlgoliaGeolocationProvider algoliaGeolocationProvider)
         {
             _userService = userService;
 
@@ -43,7 +43,7 @@ public ContentRecordBuilder(
 
             _umbracoContextFactory = umbracoContextFactory;
 
-            _algoliaGeolocationService = algoliaGeolocationService;
+            _algoliaGeolocationProvider = algoliaGeolocationProvider;
         }
 
         public ContentRecordBuilder BuildFromContent(IContent content, Func<IProperty, bool> filter = null)
@@ -70,7 +70,7 @@ public ContentRecordBuilder BuildFromContent(IContent content, Func<IProperty, b
             _record.Path = content.Path.Split(',').ToList();
             _record.ContentTypeAlias = content.ContentType.Alias;
             _record.Url = _urlProvider.GetUrl(content.Id);
-            _record.GeolocationData = _algoliaGeolocationService.GetGeolocationDataAsync().ConfigureAwait(false).GetAwaiter().GetResult();
+            _record.GeolocationData = _algoliaGeolocationProvider.GetGeolocationAsync()?.ConfigureAwait(false).GetAwaiter().GetResult();
             _record.Data = new();
 
             if (content.PublishedCultures.Count() > 0)

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

@@ -37,7 +37,7 @@ public class SearchController : UmbracoAuthorizedApiController
 
         private readonly IAlgoliaSearchPropertyIndexValueFactory _algoliaSearchPropertyIndexValueFactory;
 
-        private readonly AlgoliaGeolocationService _algoliaGeolocationService;
+        private readonly IAlgoliaGeolocationProvider _algoliaGeolocationProvider;
 
         private readonly IUmbracoContextFactory _umbracoContextFactory;
 
@@ -56,7 +56,7 @@ public SearchController(
             IUmbracoContextFactory umbracoContextFactory, 
             ILogger<SearchController> logger, 
             IRecordBuilderFactory recordBuilderFactory,
-            AlgoliaGeolocationService algoliaGeolocationService)
+            IAlgoliaGeolocationProvider algoliaGeolocationProvider)
         {
             _indexService = indexService;
 
@@ -78,7 +78,7 @@ public SearchController(
 
             _recordBuilderFactory = recordBuilderFactory;
 
-            _algoliaGeolocationService = algoliaGeolocationService;
+            _algoliaGeolocationProvider = algoliaGeolocationProvider;
         }
 
         [HttpGet]
@@ -147,7 +147,7 @@ public async Task<IActionResult> BuildIndex([FromBody] IndexConfiguration indexC
                                 _algoliaSearchPropertyIndexValueFactory, 
                                 _recordBuilderFactory, 
                                 _umbracoContextFactory,
-                                _algoliaGeolocationService)
+                                _algoliaGeolocationProvider)
                             .BuildFromContent(contentItem, (p) => contentDataItem.Properties.Any(q => q.Alias == p.Alias))
                             .Build();
 

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

@@ -35,7 +35,7 @@ public class AlgoliaContentCacheRefresherHandler : INotificationAsyncHandler<Con
 
         private readonly IAlgoliaSearchPropertyIndexValueFactory _algoliaSearchPropertyIndexValueFactory;
 
-        private readonly AlgoliaGeolocationService _geolocationService;
+        private readonly IAlgoliaGeolocationProvider _algoliaGeolocationProvider;
 
         private readonly IRecordBuilderFactory _recordBuilderFactory;
 
@@ -50,7 +50,7 @@ public AlgoliaContentCacheRefresherHandler(
             IUserService userService,
             IPublishedUrlProvider urlProvider,
             IAlgoliaSearchPropertyIndexValueFactory algoliaSearchPropertyIndexValueFactory, 
-            AlgoliaGeolocationService geolocationService,
+            IAlgoliaGeolocationProvider algoliaGeolocationProvider,
             IRecordBuilderFactory recordBuilderFactory,
             IUmbracoContextFactory umbracoContextFactory)
         {
@@ -62,7 +62,7 @@ public AlgoliaContentCacheRefresherHandler(
             _userService = userService;
             _urlProvider = urlProvider;
             _algoliaSearchPropertyIndexValueFactory = algoliaSearchPropertyIndexValueFactory;
-            _geolocationService = geolocationService;
+            _algoliaGeolocationProvider = algoliaGeolocationProvider;
             _recordBuilderFactory = recordBuilderFactory;
             _umbracoContextFactory = umbracoContextFactory;
         }
@@ -117,7 +117,7 @@ protected async Task RebuildIndex(IEnumerable<IContent> entities)
                                 _algoliaSearchPropertyIndexValueFactory, 
                                 _recordBuilderFactory, 
                                 _umbracoContextFactory,
-                                _geolocationService)
+                                _algoliaGeolocationProvider)
                            .BuildFromContent(entity, (p) => indexConfiguration.Properties.Any(q => q.Alias == p.Alias))
                            .Build();
 

src/Umbraco.Cms.Integrations.Search.Algolia/Models/Record.cs

@@ -7,7 +7,6 @@ public class Record
         public Record()
         {
             Data = new Dictionary<string, object>();
-            GeolocationData = new List<GeolocationEntity>();
         }
 
         public Record(Record record)
@@ -62,8 +61,10 @@ public Record(Record record)
 
         public string Url { get; set; }
 
+#nullable enable
         [JsonProperty("_geoloc")]
-        public List<GeolocationEntity> GeolocationData { get; set; }
+        public List<GeolocationEntity>? GeolocationData { get; set; }
+#nullable disable
 
         public Dictionary<string, object> Data { get; set; }
     }

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

@@ -11,12 +11,12 @@ namespace Umbraco.Cms.Integrations.Search.Algolia.Services
     public class AlgoliaIndexService : IAlgoliaIndexService
     {
         private readonly AlgoliaSettings _settings;
-        private readonly AlgoliaGeolocationService _algoliaGeolocationService;
+        private readonly IAlgoliaGeolocationProvider _algoliaGeolocationProvider;
 
-        public AlgoliaIndexService(IOptions<AlgoliaSettings> options, AlgoliaGeolocationService algoliaGeolocationService)
+        public AlgoliaIndexService(IOptions<AlgoliaSettings> options, IAlgoliaGeolocationProvider algoliaGeolocationProvider)
         {
             _settings = options.Value;
-            _algoliaGeolocationService = algoliaGeolocationService;
+            _algoliaGeolocationProvider = algoliaGeolocationProvider;
         }
 
         public async Task<Result> PushData(string name, List<Record> payload = null)
@@ -32,7 +32,7 @@ await index.SaveObjectsAsync(payload != null
                     : new List<Record> {
                         new Record {
                             ObjectID = Guid.NewGuid().ToString(),
-                            GeolocationData = await _algoliaGeolocationService.GetGeolocationDataAsync(),
+                            GeolocationData = await _algoliaGeolocationProvider.GetGeolocationAsync(),
                             Data = new Dictionary<string, object>()}
                     }, autoGenerateObjectId: false);
 

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

@@ -0,0 +1,9 @@
+using Umbraco.Cms.Integrations.Search.Algolia.Models;
+
+namespace Umbraco.Cms.Integrations.Search.Algolia.Services
+{
+    public class AlgoliaNullGeolocationProvider : IAlgoliaGeolocationProvider
+    {
+        public Task<List<GeolocationEntity>> GetGeolocationAsync() => null;
+    }
+}