NamedEntity.GetEntityName()

aravindgnair · Sep 28, 2022 · 6990b24 · 6990b24
1 parent 9c6f4ee
commit 6990b24
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 7 deletions.
diff --git a/src/Smartstore.Core/Platform/Localization/Domain/LocalizedEntityDescriptor.cs b/src/Smartstore.Core/Platform/Localization/Domain/LocalizedEntityDescriptor.cs
@@ -1,4 +1,5 @@
 using System.Reflection;
+using Smartstore.Core.Seo;
 
 namespace Smartstore.Core.Localization
 {
@@ -16,7 +17,7 @@ public class LocalizedEntityDescriptor
 
         public string KeyGroup 
         {
-            get => _keyGroup ?? EntityType.Name;
+            get => _keyGroup ?? NamedEntity.GetEntityName(EntityType);
             init => _keyGroup = value;
         }
 

diff --git a/src/Smartstore.Core/Platform/Security/Extensions/IAclRestrictedQueryExtensions.cs b/src/Smartstore.Core/Platform/Security/Extensions/IAclRestrictedQueryExtensions.cs
@@ -1,6 +1,7 @@
 using System.Runtime.CompilerServices;
 using Smartstore.Core.Data;
 using Smartstore.Core.Identity;
+using Smartstore.Core.Seo;
 
 namespace Smartstore.Core.Security
 {
@@ -38,7 +39,7 @@ public static IQueryable<T> ApplyAclFilter<T>(this IQueryable<T> query, int[] cu
                 return query;
             }
 
-            var entityName = new T().GetEntityName();
+            var entityName = NamedEntity.GetEntityName<T>();
 
             var subQuery = db.AclRecords
                 .Where(x => x.EntityName == entityName && customerRoleIds.Contains(x.CustomerRoleId))

diff --git a/src/Smartstore.Core/Platform/Seo/Domain/NamedEntity.cs b/src/Smartstore.Core/Platform/Seo/Domain/NamedEntity.cs
@@ -16,5 +16,23 @@ public string GetDisplayNameMemberName()
 
         public override string GetEntityName()
             => EntityName;
+
+        public static string GetEntityName<T>() 
+            where T : INamedEntity, new()
+        {
+            return new T().GetEntityName();
+        }
+
+        public static string GetEntityName(Type entityType)
+        {
+            Guard.NotNull(entityType, nameof(entityType));
+
+            if (entityType.HasDefaultConstructor() && typeof(INamedEntity).IsAssignableFrom(entityType))
+            {
+                return (Activator.CreateInstance(entityType) as INamedEntity).GetEntityName();
+            }
+
+            return entityType.Name;
+        }
     }
 }
diff --git a/src/Smartstore.Core/Platform/Stores/Extensions/IStoreRestrictedQueryExtensions.cs b/src/Smartstore.Core/Platform/Stores/Extensions/IStoreRestrictedQueryExtensions.cs
@@ -1,4 +1,5 @@
 using Smartstore.Core.Data;
+using Smartstore.Core.Seo;
 
 namespace Smartstore.Core.Stores
 {
@@ -24,7 +25,7 @@ public static IQueryable<T> ApplyStoreFilter<T>(this IQueryable<T> query, int st
                 return query;
             }
 
-            var entityName = new T().GetEntityName();
+            var entityName = NamedEntity.GetEntityName<T>();
 
             var subQuery = db.StoreMappings
                 .Where(x => x.EntityName == entityName && x.StoreId == storeId)

diff --git a/test/Smartstore.Core.Tests/Catalog/Brands/ManufacturerQueryExtensionsTests.cs b/test/Smartstore.Core.Tests/Catalog/Brands/ManufacturerQueryExtensionsTests.cs
@@ -6,6 +6,7 @@
 using Smartstore.Core.Catalog.Brands;
 using Smartstore.Core.Catalog.Products;
 using Smartstore.Core.Security;
+using Smartstore.Core.Seo;
 using Smartstore.Core.Stores;
 
 namespace Smartstore.Core.Tests.Catalog.Brands
@@ -15,8 +16,8 @@ public class ManufacturerQueryExtensionsTests : ServiceTestBase
     {
         #region Test data
 
-        private readonly static string _manufacturerEntityName = new Manufacturer().GetEntityName();
-        private readonly static string _productEntityName = new Product().GetEntityName();
+        private readonly static string _manufacturerEntityName = NamedEntity.GetEntityName<Manufacturer>();
+        private readonly static string _productEntityName = NamedEntity.GetEntityName<Product>();
 
         private readonly List<Manufacturer> _manufacturers = new()
         {

diff --git a/test/Smartstore.Core.Tests/Content/Menus/MenuQueryExtensionsTests.cs b/test/Smartstore.Core.Tests/Content/Menus/MenuQueryExtensionsTests.cs
@@ -6,6 +6,7 @@
 using Smartstore.Core.Catalog.Products;
 using Smartstore.Core.Content.Menus;
 using Smartstore.Core.Security;
+using Smartstore.Core.Seo;
 using Smartstore.Core.Stores;
 
 namespace Smartstore.Core.Tests.Content.Menus
@@ -15,8 +16,8 @@ public class MenuQueryExtensionsTests : ServiceTestBase
     {
         #region Test data
 
-        private readonly static string _menuEntityName = new MenuEntity().GetEntityName();
-        private readonly static string _menuItemEntityName = new MenuItemEntity().GetEntityName();
+        private readonly static string _menuEntityName = NamedEntity.GetEntityName<MenuEntity>();
+        private readonly static string _menuItemEntityName = NamedEntity.GetEntityName<MenuItemEntity>();
 
         private readonly List<MenuEntity> _menus = new()
         {