Fix exception if CategoryPath is map and Category Path is empty for s…

…ome product at same time.
VirtoCommerce · May 18, 2022 · 81b11b2 · 81b11b2
1 parent 4d54901
commit 81b11b2
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/src/VirtoCommerce.CatalogCsvImportModule.Data/Services/CsvCatalogImporter.cs b/src/VirtoCommerce.CatalogCsvImportModule.Data/Services/CsvCatalogImporter.cs
@@ -699,7 +699,7 @@ private async Task LoadProductDependencies(IEnumerable<CsvProduct> csvProducts,
                     csvProduct.Code = _skuGenerator.GenerateSku(csvProduct);
                 }
                 //Properties inheritance
-                var inheritedProperties = (csvProduct.Category != null ? csvProduct.Category.Properties : csvProduct.Catalog.Properties).OrderBy(x => x.Name).ToList();
+                var inheritedProperties = GetInheritedProperties(csvProduct);
 
                 foreach (var property in csvProduct.Properties.ToArray())
                 {
@@ -740,8 +740,15 @@ private async Task LoadProductDependencies(IEnumerable<CsvProduct> csvProducts,
                     }
                 }
             }
-        }
-
+        }
+
+        private static List<Property> GetInheritedProperties(CsvProduct csvProduct)
+        {
+            if (csvProduct.Category != null && csvProduct.Category.Properties!=null)
+                return csvProduct.Category.Properties.OrderBy(x => x.Name).ToList();
+            return csvProduct.Catalog.Properties.OrderBy(x => x.Name).ToList();
+        }
+
         private static List<PropertyValue> ParseValuesFromMultivalueString(PropertyValue firstPropertyValue, string additionalDelimiter)
         {
             var result = new List<PropertyValue>();