Merge branch 'release/3.807.0'

Directory.Build.props

@@ -2,7 +2,7 @@
 <Project>
   <!-- These properties will be shared for all projects -->
   <PropertyGroup>
-    <VersionPrefix>3.806.0</VersionPrefix>
+    <VersionPrefix>3.807.0</VersionPrefix>
     <VersionSuffix>
     </VersionSuffix>
     <VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>

src/VirtoCommerce.CoreModule.Core/Seo/CompositeSeoResolver.cs

@@ -0,0 +1,26 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace VirtoCommerce.CoreModule.Core.Seo;
+
+public class CompositeSeoResolver : ISeoResolver
+{
+    private readonly IEnumerable<ISeoResolver> _resolvers;
+    private readonly CompositeSeoBySlugResolver _seoBySlugResolver;
+
+    public CompositeSeoResolver(IEnumerable<ISeoResolver> resolvers, CompositeSeoBySlugResolver seoBySlugResolver)
+    {
+        _resolvers = resolvers;
+        _seoBySlugResolver = seoBySlugResolver;
+    }
+
+    public async Task<IList<SeoInfo>> FindSeoAsync(SeoSearchCriteria criteria)
+    {
+        var tasks = _resolvers.Select(x => x.FindSeoAsync(criteria)).ToArray();
+        var result = (await Task.WhenAll(tasks)).SelectMany(x => x).Where(x => x.ObjectId != null && x.ObjectType != null).Distinct();
+        var fallbackResults = await _seoBySlugResolver.FindSeoBySlugAsync(criteria.Slug);
+        return result.Union(fallbackResults).ToList();
+    }
+}
+

src/VirtoCommerce.CoreModule.Core/Seo/ISeoResolver.cs

@@ -0,0 +1,9 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace VirtoCommerce.CoreModule.Core.Seo;
+
+public interface ISeoResolver
+{
+    Task<IList<SeoInfo>> FindSeoAsync(SeoSearchCriteria criteria);
+}

src/VirtoCommerce.CoreModule.Core/Seo/SeoSearchCriteria.cs

@@ -0,0 +1,11 @@
+using VirtoCommerce.Platform.Core.Common;
+
+namespace VirtoCommerce.CoreModule.Core.Seo
+{
+    public class SeoSearchCriteria : SearchCriteriaBase
+    {
+        public string Slug { get; set; }
+        public string StoreId { get; set; }
+        public string Permalink { get; set; }
+    }
+}

src/VirtoCommerce.CoreModule.Web/Module.cs

@@ -72,6 +72,7 @@ public void Initialize(IServiceCollection serviceCollection)
             serviceCollection.AddTransient<ITenantUniqueNumberGenerator, SequenceNumberGeneratorService>();
 
             serviceCollection.AddTransient<CompositeSeoBySlugResolver>();
+            serviceCollection.AddTransient<CompositeSeoResolver>();
 
             // Money rounding
             serviceCollection.AddTransient<IMoneyRoundingPolicy, DefaultMoneyRoundingPolicy>();

src/VirtoCommerce.CoreModule.Web/module.manifest

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <id>VirtoCommerce.Core</id>
-  <version>3.806.0</version>
+  <version>3.807.0</version>
   <version-tag />
   <platformVersion>3.825.0</platformVersion>
   <title>Commerce core module</title>