Fixed null reference exception

VirtoCommerce · Oct 27, 2017 · 2449d77 · 2449d77
1 parent e86804f
commit 2449d77
Showing 1 changed file with 8 additions and 11 deletions.
diff --git a/VirtoCommerce.Storefront/Domain/Catalog/CatalogConverter.cs b/VirtoCommerce.Storefront/Domain/Catalog/CatalogConverter.cs
@@ -254,18 +254,15 @@ public virtual catalogDto.ProductSearchCriteria ToProductSearchCriteriaDto(Produ
                 result.Terms.Add(string.Concat("vendor:", criteria.VendorId));
             }
             // Add user groups to terms
-            if (workContext.CurrentUser.Contact != null)
+            var contact = workContext.CurrentUser?.Contact?.Value;
+            if (contact != null && !contact.UserGroups.IsNullOrEmpty())
             {
-                var contact = workContext.CurrentUser.Contact.Value;
-                if (contact != null && !contact.UserGroups.IsNullOrEmpty())
+                if (result.UserGroups == null)
                 {
-                    if (result.UserGroups == null)
-                    {
-                        result.UserGroups = new List<string>();
-                    }
-                    //search products with user_groups defined in customer
-                    result.UserGroups.Add("user_groups:" + string.Join(",", contact.UserGroups));
+                    result.UserGroups = new List<string>();
                 }
+                //search products with user_groups defined in customer
+                result.UserGroups.AddRange(contact.UserGroups);
             }
 
             return result;
@@ -296,15 +293,15 @@ public virtual catalogDto.CategorySearchCriteria ToCategorySearchCriteriaDto(Cat
                 Take = criteria.PageSize,
                 ResponseGroup = ((int)criteria.ResponseGroup).ToString(),
             };
-            var contact = workContext.CurrentUser.Contact.Value;
+            var contact = workContext.CurrentUser?.Contact?.Value;
             if (contact != null && !contact.UserGroups.IsNullOrEmpty())
             {
                 if (result.UserGroups == null)
                 {
                     result.UserGroups = new List<string>();
                 }
                 //search categories with user_groups defined in customer
-                result.UserGroups.Add("user_groups:" + string.Join(",", contact.UserGroups));
+                result.UserGroups.AddRange(contact.UserGroups);
             }
 
             return result;