Merge branch 'dev' into feat/VCST-3596

Author: artem-dudarev

Directory.Build.props

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

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.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.Web/module.manifest

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module>
   <id>VirtoCommerce.Xapi</id>
-  <version>3.918.0</version>
+  <version>3.919.0</version>
   <version-tag></version-tag>
 
   <platformVersion>3.895.0</platformVersion>