Skip to content
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
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
30 changes: 16 additions & 14 deletions src/VirtoCommerce.Xapi.Core/Extensions/IHasLanguageExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,17 @@ namespace VirtoCommerce.Xapi.Core.Extensions
{
public static class IHasLanguageExtensions
{
/// <summary>
/// Looking for first best-match language-specific value in the enumerable
/// </summary>
/// <param name="hasLanguages">An enumerable with values to search</param>
/// <param name="language">Language to search</param>
/// <returns>First matching item to the specified language</returns>
public static IHasLanguageCode FirstBestMatchForLanguage(this IEnumerable<IHasLanguageCode> hasLanguages, string language)
{
return hasLanguages.FirstBestMatchForLanguage(x => x.LanguageCode, language);
}

/// <summary>
/// Looking for first best-match language-specific value in the enumerable, based on specified language value selector function
/// </summary>
Expand All @@ -20,12 +31,14 @@ public static T FirstBestMatchForLanguage<T>(this IEnumerable<T> hasLanguages, F
{
ArgumentNullException.ThrowIfNull(hasLanguages);

//Try find object for passed language event if it null
var result = hasLanguages.FirstOrDefault(x => langSelector(x)?.EqualsIgnoreCase(language) ?? langSelector(x) == language);
var hasLanguagesCollection = hasLanguages as ICollection<T> ?? hasLanguages.ToList();

//Try to find object for passed language event if it is null
var result = hasLanguagesCollection.FirstOrDefault(x => langSelector(x)?.EqualsIgnoreCase(language) ?? langSelector(x) == language);
if (result == null)
{
//find the first with no language set
result = hasLanguages.FirstOrDefault(x => langSelector(x) == null);
result = hasLanguagesCollection.FirstOrDefault(x => langSelector(x) == null);
}
return result;
}
Expand All @@ -41,16 +54,5 @@ public static IHasLanguage FirstBestMatchForLanguage(this IEnumerable<IHasLangua
{
return hasLanguages.FirstBestMatchForLanguage(x => x.LanguageCode, language);
}

/// <summary>
/// Looking for first best-match language-specific value in the enumerable
/// </summary>
/// <param name="hasLanguages">An enumerable with values to search</param>
/// <param name="language">Language to search</param>
/// <returns>First matching item to the specified language</returns>
public static IHasLanguageCode FirstBestMatchForLanguage(this IEnumerable<IHasLanguageCode> hasLanguages, string language)
{
return hasLanguages.FirstBestMatchForLanguage(x => x.LanguageCode, language);
}
}
}
2 changes: 2 additions & 0 deletions src/VirtoCommerce.Xapi.Core/Models/Facets/RangeFacetResult.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,7 @@ public RangeFacetResult()
}

public IList<FacetRange> Ranges { get; set; } = new List<FacetRange>();

public RangeFacetStatistics Statistics { get; set; }
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
namespace VirtoCommerce.Xapi.Core.Models.Facets;

public class RangeFacetStatistics
{
public double? Max { get; set; }
public double? Min { get; set; }
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,18 @@ public RangeFacetResultType()

Field(d => d.Name, nullable: false).Description("The key/name of the facet.");
Field(d => d.Label, nullable: false).Description("Localized name of the facet.");

Field<NonNullGraphType<FacetTypeEnum>>("FacetType")
.Description("The three types of facets. Terms, Range, Filter");

Field<NonNullGraphType<ListGraphType<NonNullGraphType<FacetRangeType>>>>("Ranges")
.Description("Ranges")
.Resolve(context => context.Source.Ranges);

Field<RangeFacetStatisticsType>("Statistics")
.Description("Statistics for the facet, such as min and max values across ranges.")
.Resolve(context => context.Source.Statistics);

IsTypeOf = obj => obj is RangeFacetResult;
Interface<FacetInterface>();
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
using VirtoCommerce.Xapi.Core.Models.Facets;

namespace VirtoCommerce.Xapi.Core.Schemas.Facets
{
public class RangeFacetStatisticsType : ExtendableGraphType<RangeFacetStatistics>
{
public RangeFacetStatisticsType()
{
Name = "RangeFacetStatistics";

Field(d => d.Max, nullable: true).Description("The maximum value in the range or across ranges.");
Field(d => d.Min, nullable: true).Description("The minimum value in the range or across ranges.");
}
}
}
2 changes: 1 addition & 1 deletion src/VirtoCommerce.Xapi.Core/VirtoCommerce.Xapi.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<PackageReference Include="System.Reactive" Version="6.0.0" />
<PackageReference Include="VirtoCommerce.Platform.Core" Version="3.895.0" />
<PackageReference Include="VirtoCommerce.CustomerModule.Core" Version="3.833.0" />
<PackageReference Include="VirtoCommerce.SearchModule.Core" Version="3.804.0" />
<PackageReference Include="VirtoCommerce.SearchModule.Core" Version="3.816.0-alpha.789-vcst-3596" />
<PackageReference Include="VirtoCommerce.Seo.Core" Version="3.802.0" />
<PackageReference Include="VirtoCommerce.StoreModule.Core" Version="3.818.0" />
<PackageReference Include="VirtoCommerce.TaxModule.Core" Version="3.802.0" />
Expand Down
2 changes: 1 addition & 1 deletion src/VirtoCommerce.Xapi.Web/module.manifest
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<dependencies>
<dependency id="VirtoCommerce.ApplicationInsights" version="3.804.0" optional="true" />
<dependency id="VirtoCommerce.Customer" version="3.833.0" />
<dependency id="VirtoCommerce.Search" version="3.804.0" />
<dependency id="VirtoCommerce.Search" version="3.816.0-alpha.789-vcst-3596" />
<dependency id="VirtoCommerce.Seo" version="3.801.0" />
<dependency id="VirtoCommerce.Store" version="3.818.0" />
<dependency id="VirtoCommerce.Tax" version="3.802.0" optional="true" />
Expand Down
Loading