VCST-1454: add relevance score to Member (#253)

Co-authored-by: Oleg Zhuk <zhukoo@gmail.com>
VirtoCommerce · Sep 27, 2024 · df8e60d · df8e60d
1 parent 0da374e
commit df8e60d
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 5 deletions.
diff --git a/src/VirtoCommerce.CustomerModule.Core/Model/Member.cs b/src/VirtoCommerce.CustomerModule.Core/Model/Member.cs
@@ -1,14 +1,14 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using System.Linq;
 using VirtoCommerce.CoreModule.Core.Seo;
 using VirtoCommerce.Platform.Core.Common;
 using VirtoCommerce.Platform.Core.DynamicProperties;
+using VirtoCommerce.SearchModule.Core.Model;
 
 namespace VirtoCommerce.CustomerModule.Core.Model
 {
-    public abstract class Member : AuditableEntity, IHasDynamicProperties, ISeoSupport, IHasOuterId, ICloneable
+    public abstract class Member : AuditableEntity, IHasDynamicProperties, ISeoSupport, IHasOuterId, ICloneable, IHasRelevanceScore
     {
         protected Member()
         {
@@ -28,6 +28,8 @@ protected Member()
         public IList<string> Groups { get; set; }
         public string IconUrl { get; set; }
 
+        public double? RelevanceScore { get; set; }
+
         #region IHasDynamicProperties Members
 
         public virtual string ObjectType => typeof(Member).FullName;

diff --git a/src/VirtoCommerce.CustomerModule.Core/VirtoCommerce.CustomerModule.Core.csproj b/src/VirtoCommerce.CustomerModule.Core/VirtoCommerce.CustomerModule.Core.csproj
@@ -12,6 +12,7 @@
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
     <PackageReference Include="VirtoCommerce.CoreModule.Core" Version="3.800.0" />
     <PackageReference Include="VirtoCommerce.NotificationsModule.Core" Version="3.800.0" />
+    <PackageReference Include="VirtoCommerce.SearchModule.Core" Version="3.803.0" />
     <PackageReference Include="VirtoCommerce.Platform.Core" Version="3.851.0" />
   </ItemGroup>
 </Project>
diff --git a/src/VirtoCommerce.CustomerModule.Data/Search/MemberIndexedSearchService.cs b/src/VirtoCommerce.CustomerModule.Data/Search/MemberIndexedSearchService.cs
@@ -6,6 +6,7 @@
 using VirtoCommerce.CustomerModule.Core.Services;
 using VirtoCommerce.CustomerModule.Core.Services.Indexed;
 using VirtoCommerce.Platform.Core.Common;
+using VirtoCommerce.SearchModule.Core.Extensions;
 using VirtoCommerce.SearchModule.Core.Model;
 using VirtoCommerce.SearchModule.Core.Services;
 
@@ -65,7 +66,17 @@ protected virtual async Task<IList<Member>> ConvertDocumentsAsync(IList<SearchDo
 
                 // Preserve documents order
                 var members = documents
-                    .Select(doc => itemsMap.ContainsKey(doc.Id) ? itemsMap[doc.Id] : null)
+                    .Select(doc =>
+                    {
+                        var member = itemsMap.TryGetValue(doc.Id, out var value) ? value : null;
+
+                        if (member != null)
+                        {
+                            member.RelevanceScore = doc.GetRelevanceScore();
+                        }
+
+                        return member;
+                    })
                     .Where(m => m != null)
                     .ToArray();
 

diff --git a/src/VirtoCommerce.CustomerModule.Data/VirtoCommerce.CustomerModule.Data.csproj b/src/VirtoCommerce.CustomerModule.Data/VirtoCommerce.CustomerModule.Data.csproj
@@ -15,7 +15,6 @@
     <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.Core" Version="3.800.0" />
     <PackageReference Include="VirtoCommerce.StoreModule.Core" Version="3.800.0" />
   </ItemGroup>
   <ItemGroup>

diff --git a/src/VirtoCommerce.CustomerModule.Web/module.manifest b/src/VirtoCommerce.CustomerModule.Web/module.manifest
@@ -8,7 +8,7 @@
   <dependencies>
     <dependency id="VirtoCommerce.Core" version="3.800.0" />
     <dependency id="VirtoCommerce.Notifications" version="3.800.0" />
-    <dependency id="VirtoCommerce.Search" version="3.800.0" />
+    <dependency id="VirtoCommerce.Search" version="3.803.0" />
     <dependency id="VirtoCommerce.Store" version="3.800.0" />
   </dependencies>