Merge branch 'release/3.829.0'

VirtoCommerce · Sep 27, 2024 · c8c11b8 · c8c11b8
2 parents a3ae0ea + da05d27
commit c8c11b8
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 6 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -2,7 +2,7 @@
 <Project>
   <!-- These properties will be shared for all projects -->
   <PropertyGroup>
-    <VersionPrefix>3.828.0</VersionPrefix>
+    <VersionPrefix>3.829.0</VersionPrefix>
     <VersionSuffix>
     </VersionSuffix>
     <VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>

diff --git a/src/VirtoCommerce.OrdersModule.Core/Model/CustomerOrder.cs b/src/VirtoCommerce.OrdersModule.Core/Model/CustomerOrder.cs
@@ -6,10 +6,11 @@
 using VirtoCommerce.Platform.Core.Common;
 using VirtoCommerce.Platform.Core.Domain;
 using VirtoCommerce.Platform.Core.Security;
+using VirtoCommerce.SearchModule.Core.Model;
 
 namespace VirtoCommerce.OrdersModule.Core.Model
 {
-    public class CustomerOrder : OrderOperation, IHasTaxDetalization, ISupportSecurityScopes, ITaxable, IHasLanguage, IHasDiscounts, ICloneable, IHasFeesDetalization
+    public class CustomerOrder : OrderOperation, IHasTaxDetalization, ISupportSecurityScopes, ITaxable, IHasLanguage, IHasDiscounts, ICloneable, IHasFeesDetalization, IHasRelevanceScore
     {
         public byte[] RowVersion { get; set; }
 
@@ -65,6 +66,8 @@ public class CustomerOrder : OrderOperation, IHasTaxDetalization, ISupportSecuri
 
         public ICollection<FeeDetail> FeeDetails { get; set; }
 
+        public double? RelevanceScore { get; set; }
+
         #region IHasDiscounts
         public ICollection<Discount> Discounts { get; set; }
         #endregion

diff --git a/src/VirtoCommerce.OrdersModule.Core/VirtoCommerce.OrdersModule.Core.csproj b/src/VirtoCommerce.OrdersModule.Core/VirtoCommerce.OrdersModule.Core.csproj
@@ -23,5 +23,6 @@
     <PackageReference Include="VirtoCommerce.Platform.Core" Version="3.851.0" />
     <PackageReference Include="VirtoCommerce.ShippingModule.Core" Version="3.800.0" />
     <PackageReference Include="VirtoCommerce.StoreModule.Core" Version="3.800.0" />
+    <PackageReference Include="VirtoCommerce.SearchModule.Core" Version="3.803.0" />
   </ItemGroup>
 </Project>
diff --git a/src/VirtoCommerce.OrdersModule.Data/Search/Indexed/IndexedCustomerOrderSearchService.cs b/src/VirtoCommerce.OrdersModule.Data/Search/Indexed/IndexedCustomerOrderSearchService.cs
@@ -12,6 +12,7 @@
 using VirtoCommerce.Platform.Core.Common;
 using VirtoCommerce.Platform.Core.Settings;
 using VirtoCommerce.SearchModule.Core.Exceptions;
+using VirtoCommerce.SearchModule.Core.Extensions;
 using VirtoCommerce.SearchModule.Core.Model;
 using VirtoCommerce.SearchModule.Core.Services;
 
@@ -89,7 +90,17 @@ protected virtual async Task<IList<CustomerOrder>> ConvertDocumentsAsync(IList<S
 
             // Preserve documents order
             var orders = documents
-                .Select(x => itemsMap.TryGetValue(x.Id, out var item) ? item : null)
+                .Select(doc =>
+                {
+                    var order = itemsMap.TryGetValue(doc.Id, out var value) ? value : null;
+
+                    if (order != null)
+                    {
+                        order.RelevanceScore = doc.GetRelevanceScore();
+                    }
+
+                    return order;
+                })
                 .Where(x => x != null)
                 .ToArray();
 

diff --git a/src/VirtoCommerce.OrdersModule.Data/VirtoCommerce.OrdersModule.Data.csproj b/src/VirtoCommerce.OrdersModule.Data/VirtoCommerce.OrdersModule.Data.csproj
@@ -19,8 +19,8 @@
     <PackageReference Include="VirtoCommerce.CatalogModule.Core" Version="3.800.0" />
     <PackageReference Include="VirtoCommerce.InventoryModule.Core" Version="3.800.0" />
     <PackageReference Include="VirtoCommerce.Platform.Data" Version="3.851.0" />
+    <PackageReference Include="VirtoCommerce.Platform.Hangfire" Version="3.851.0" />
     <PackageReference Include="VirtoCommerce.Platform.Security" Version="3.851.0" />
-    <PackageReference Include="VirtoCommerce.SearchModule.Data" Version="3.800.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\VirtoCommerce.OrdersModule.Core\VirtoCommerce.OrdersModule.Core.csproj" />

diff --git a/src/VirtoCommerce.OrdersModule.Web/module.manifest b/src/VirtoCommerce.OrdersModule.Web/module.manifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module>
   <id>VirtoCommerce.Orders</id>
-  <version>3.828.0</version>
+  <version>3.829.0</version>
   <version-tag />
 
   <platformVersion>3.851.0</platformVersion>
@@ -13,7 +13,7 @@
     <dependency id="VirtoCommerce.Inventory" version="3.800.0" />
     <dependency id="VirtoCommerce.Notifications" version="3.800.0" />
     <dependency id="VirtoCommerce.Payment" version="3.800.0" />
-    <dependency id="VirtoCommerce.Search" version="3.800.0" />
+    <dependency id="VirtoCommerce.Search" version="3.803.0" />
     <dependency id="VirtoCommerce.Shipping" version="3.800.0" />
     <dependency id="VirtoCommerce.Store" version="3.800.0" />
   </dependencies>