From 5cb049b0b93871771b74c8df3d5470ee52b8c749 Mon Sep 17 00:00:00 2001
From: Adrian Cojocariu <aco@umbraco.dk>
Date: Thu, 19 Sep 2024 14:19:18 +0300
Subject: [PATCH 1/2] Pass content item to geolocation method

---
 .../Builders/ContentRecordBuilder.cs                         | 2 +-
 .../Services/AlgoliaIndexService.cs                          | 2 +-
 .../Services/AlgoliaNullGeolocationProvider.cs               | 5 +++--
 .../Services/IAlgoliaGeolocationProvider.cs                  | 5 +++--
 .../Umbraco.Cms.Integrations.Search.Algolia.csproj           | 2 +-
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/Umbraco.Cms.Integrations.Search.Algolia/Builders/ContentRecordBuilder.cs b/src/Umbraco.Cms.Integrations.Search.Algolia/Builders/ContentRecordBuilder.cs
index 6c6ddf72..6996c017 100644
--- a/src/Umbraco.Cms.Integrations.Search.Algolia/Builders/ContentRecordBuilder.cs
+++ b/src/Umbraco.Cms.Integrations.Search.Algolia/Builders/ContentRecordBuilder.cs
@@ -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 = _algoliaGeolocationProvider.GetGeolocationAsync().ConfigureAwait(false).GetAwaiter().GetResult();
+            _record.GeolocationData = _algoliaGeolocationProvider.GetGeolocationAsync(content).ConfigureAwait(false).GetAwaiter().GetResult();
             _record.Data = new();
 
             if (content.PublishedCultures.Count() > 0)
diff --git a/src/Umbraco.Cms.Integrations.Search.Algolia/Services/AlgoliaIndexService.cs b/src/Umbraco.Cms.Integrations.Search.Algolia/Services/AlgoliaIndexService.cs
index 3e5b39d4..fabcb0e0 100644
--- a/src/Umbraco.Cms.Integrations.Search.Algolia/Services/AlgoliaIndexService.cs
+++ b/src/Umbraco.Cms.Integrations.Search.Algolia/Services/AlgoliaIndexService.cs
@@ -32,7 +32,7 @@ await index.SaveObjectsAsync(payload != null
                     : new List<Record> {
                         new Record {
                             ObjectID = Guid.NewGuid().ToString(),
-                            GeolocationData = await _algoliaGeolocationProvider.GetGeolocationAsync(),
+                            GeolocationData = new List<GeolocationEntity>(),
                             Data = new Dictionary<string, object>()}
                     }, autoGenerateObjectId: false);
 
diff --git a/src/Umbraco.Cms.Integrations.Search.Algolia/Services/AlgoliaNullGeolocationProvider.cs b/src/Umbraco.Cms.Integrations.Search.Algolia/Services/AlgoliaNullGeolocationProvider.cs
index 18400a2d..165966c6 100644
--- a/src/Umbraco.Cms.Integrations.Search.Algolia/Services/AlgoliaNullGeolocationProvider.cs
+++ b/src/Umbraco.Cms.Integrations.Search.Algolia/Services/AlgoliaNullGeolocationProvider.cs
@@ -1,9 +1,10 @@
-using Umbraco.Cms.Integrations.Search.Algolia.Models;
+using Umbraco.Cms.Core.Models;
+using Umbraco.Cms.Integrations.Search.Algolia.Models;
 
 namespace Umbraco.Cms.Integrations.Search.Algolia.Services
 {
     public class AlgoliaNullGeolocationProvider : IAlgoliaGeolocationProvider
     {
-        public async Task<List<GeolocationEntity>> GetGeolocationAsync() => null;
+        public async Task<List<GeolocationEntity>> GetGeolocationAsync(IContent content) => null;
     }
 }
diff --git a/src/Umbraco.Cms.Integrations.Search.Algolia/Services/IAlgoliaGeolocationProvider.cs b/src/Umbraco.Cms.Integrations.Search.Algolia/Services/IAlgoliaGeolocationProvider.cs
index 14f3606e..d6580923 100644
--- a/src/Umbraco.Cms.Integrations.Search.Algolia/Services/IAlgoliaGeolocationProvider.cs
+++ b/src/Umbraco.Cms.Integrations.Search.Algolia/Services/IAlgoliaGeolocationProvider.cs
@@ -1,9 +1,10 @@
-using Umbraco.Cms.Integrations.Search.Algolia.Models;
+using Umbraco.Cms.Core.Models;
+using Umbraco.Cms.Integrations.Search.Algolia.Models;
 
 namespace Umbraco.Cms.Integrations.Search.Algolia.Services
 {
     public interface IAlgoliaGeolocationProvider
     {
-        Task<List<GeolocationEntity>> GetGeolocationAsync();
+        Task<List<GeolocationEntity>> GetGeolocationAsync(IContent content);
     }
 }
diff --git a/src/Umbraco.Cms.Integrations.Search.Algolia/Umbraco.Cms.Integrations.Search.Algolia.csproj b/src/Umbraco.Cms.Integrations.Search.Algolia/Umbraco.Cms.Integrations.Search.Algolia.csproj
index 5fc30904..e44863a8 100644
--- a/src/Umbraco.Cms.Integrations.Search.Algolia/Umbraco.Cms.Integrations.Search.Algolia.csproj
+++ b/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.3.0</Version>
+		<Version>2.3.1</Version>
 		<Authors>Umbraco HQ</Authors>
 		<Company>Umbraco</Company>
 		<PackageTags>Umbraco;Umbraco-Marketplace</PackageTags>

From 6d9174c5afb0a98ff54078017e9c5bf08bac4634 Mon Sep 17 00:00:00 2001
From: Adrian Cojocariu <aco@umbraco.dk>
Date: Thu, 19 Sep 2024 17:00:45 +0300
Subject: [PATCH 2/2] Set geo data to null on initialization

---
 .../Services/AlgoliaIndexService.cs                         | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Cms.Integrations.Search.Algolia/Services/AlgoliaIndexService.cs b/src/Umbraco.Cms.Integrations.Search.Algolia/Services/AlgoliaIndexService.cs
index fabcb0e0..566237b1 100644
--- a/src/Umbraco.Cms.Integrations.Search.Algolia/Services/AlgoliaIndexService.cs
+++ b/src/Umbraco.Cms.Integrations.Search.Algolia/Services/AlgoliaIndexService.cs
@@ -11,12 +11,10 @@ namespace Umbraco.Cms.Integrations.Search.Algolia.Services
     public class AlgoliaIndexService : IAlgoliaIndexService
     {
         private readonly AlgoliaSettings _settings;
-        private readonly IAlgoliaGeolocationProvider _algoliaGeolocationProvider;
 
-        public AlgoliaIndexService(IOptions<AlgoliaSettings> options, IAlgoliaGeolocationProvider algoliaGeolocationProvider)
+        public AlgoliaIndexService(IOptions<AlgoliaSettings> options)
         {
             _settings = options.Value;
-            _algoliaGeolocationProvider = algoliaGeolocationProvider;
         }
 
         public async Task<Result> PushData(string name, List<Record> payload = null)
@@ -32,7 +30,7 @@ await index.SaveObjectsAsync(payload != null
                     : new List<Record> {
                         new Record {
                             ObjectID = Guid.NewGuid().ToString(),
-                            GeolocationData = new List<GeolocationEntity>(),
+                            GeolocationData = null,
                             Data = new Dictionary<string, object>()}
                     }, autoGenerateObjectId: false);