Skip to content

Pass content item to geolocation method #218

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
acoumb merged 2 commits into from
Sep 19, 2024
Merged

Pass content item to geolocation method #218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5cb049b
Pass content item to geolocation method
acoumb Sep 19, 2024
6d9174c
Set geo data to null on initialization
acoumb Sep 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Umbraco.Cms.Integrations.Search.Algolia/Builders/ContentRecordBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 2 additions & 4 deletions src/Umbraco.Cms.Integrations.Search.Algolia/Services/AlgoliaIndexService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -32,7 +30,7 @@ await index.SaveObjectsAsync(payload != null
: new List<Record> {
new Record {
ObjectID = Guid.NewGuid().ToString(),
GeolocationData = await _algoliaGeolocationProvider.GetGeolocationAsync(),
GeolocationData = null,
Data = new Dictionary<string, object>()}
}, autoGenerateObjectId: false);

Expand Down
5 changes: 3 additions & 2 deletions src/Umbraco.Cms.Integrations.Search.Algolia/Services/AlgoliaNullGeolocationProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
}
}
5 changes: 3 additions & 2 deletions src/Umbraco.Cms.Integrations.Search.Algolia/Services/IAlgoliaGeolocationProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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);
}
}
2 changes: 1 addition & 1 deletion src/Umbraco.Cms.Integrations.Search.Algolia/Umbraco.Cms.Integrations.Search.Algolia.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down