Merge branch 'dev' into feat/VCST-3534

Author: Aleksandra-Mitricheva

Directory.Build.props

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

src/VirtoCommerce.Xapi.Core/Extensions/IHasLanguageExtensions.cs

@@ -36,9 +36,21 @@ public static T FirstBestMatchForLanguage<T>(this IEnumerable<T> hasLanguages, F
         /// <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>
+        [Obsolete("Use IEnumerable<IHasLanguageCode>.FirstBestMatchForLanguage()", DiagnosticId = "VC0011", UrlFormat = "https://docs.virtocommerce.org/products/products-virto3-versions")]
         public static IHasLanguage FirstBestMatchForLanguage(this IEnumerable<IHasLanguage> hasLanguages, string language)
         {
             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);
+        }
     }
 }

src/VirtoCommerce.Xapi.Core/Services/ILoadUserToEvalContextService.cs

@@ -6,5 +6,7 @@ namespace VirtoCommerce.Xapi.Core.Services
     public interface ILoadUserToEvalContextService
     {
         Task SetShopperDataFromMember(EvaluationContextBase evalContextBase, string customerId);
+
+        Task SetShopperDataFromOrganization(EvaluationContextBase evalContextBase, string organizationId);
     }
 }

src/VirtoCommerce.Xapi.Core/VirtoCommerce.Xapi.Core.csproj

@@ -27,7 +27,7 @@
     <PackageReference Include="PipelineNet" Version="0.9.0" />
     <PackageReference Include="RedLock.net" Version="2.3.2" />
     <PackageReference Include="System.Reactive" Version="6.0.0" />
-    <PackageReference Include="VirtoCommerce.Platform.Core" Version="3.889.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.Seo.Core" Version="3.806.0-alpha.40-vcst-3534" />

src/VirtoCommerce.Xapi.Data/Services/LoadUserToEvalContextService.cs

@@ -43,24 +43,37 @@ public virtual async Task SetShopperDataFromMember(EvaluationContextBase evalCon
 
                 evalContextBase.GeoTimeZone = contact.TimeZone;
 
-                evalContextBase.UserGroups = contact.Groups?.ToArray();
+                var userGroups = new List<string>();
 
-                if (!contact.Organizations.IsNullOrEmpty())
+                if (!evalContextBase.UserGroups.IsNullOrEmpty())
                 {
-                    var userGroups = new List<string>();
-
-                    if (!evalContextBase.UserGroups.IsNullOrEmpty())
-                    {
-                        userGroups.AddRange(evalContextBase.UserGroups);
-                    }
+                    userGroups.AddRange(evalContextBase.UserGroups);
+                }
 
-                    var organizations = await _memberService.GetByIdsAsync(contact.Organizations.ToArray(), MemberResponseGroup.WithGroups.ToString());
-                    userGroups.AddRange(organizations.OfType<Organization>().SelectMany(x => x.Groups));
+                userGroups.AddRange(contact.Groups?.ToArray());
 
-                    evalContextBase.UserGroups = userGroups.Distinct().ToArray();
-                }
+                evalContextBase.UserGroups = userGroups.Distinct().ToArray();
             }
         }
 
+        public async Task SetShopperDataFromOrganization(EvaluationContextBase evalContextBase, string organizationId)
+        {
+            if (organizationId.IsNullOrEmpty())
+            {
+                return;
+            }
+
+            var userGroups = new List<string>();
+
+            if (!evalContextBase.UserGroups.IsNullOrEmpty())
+            {
+                userGroups.AddRange(evalContextBase.UserGroups);
+            }
+
+            var organizations = await _memberService.GetByIdsAsync([organizationId], MemberResponseGroup.WithGroups.ToString());
+            userGroups.AddRange(organizations.OfType<Organization>().SelectMany(x => x.Groups));
+
+            evalContextBase.UserGroups = userGroups.Distinct().ToArray();
+        }
     }
 }

src/VirtoCommerce.Xapi.Data/VirtoCommerce.Xapi.Data.csproj

@@ -10,7 +10,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
-    <PackageReference Include="VirtoCommerce.Platform.Security" Version="3.889.0" />
+    <PackageReference Include="VirtoCommerce.Platform.Security" Version="3.895.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\VirtoCommerce.Xapi.Core\VirtoCommerce.Xapi.Core.csproj" />

src/VirtoCommerce.Xapi.Web/module.manifest

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module>
   <id>VirtoCommerce.Xapi</id>
-  <version>3.917.0</version>
+  <version>3.919.0</version>
   <version-tag></version-tag>
 
-  <platformVersion>3.889.0</platformVersion>
+  <platformVersion>3.895.0</platformVersion>
   <dependencies>
     <dependency id="VirtoCommerce.ApplicationInsights" version="3.804.0" optional="true" />
     <dependency id="VirtoCommerce.Customer" version="3.833.0" />