Granular permissions: removing old permission code (in progress)

mgesing · mgesing · commit 7fd87b892084 · 2019-10-02T15:23:20.000+02:00
diff --git a/src/Libraries/SmartStore.Data/Utilities/DataMigrator.cs b/src/Libraries/SmartStore.Data/Utilities/DataMigrator.cs
@@ -20,7 +20,6 @@
 using SmartStore.Core.Infrastructure;
 using SmartStore.Core.IO;
 using SmartStore.Core.Security;
-using SmartStore.Data.Setup;
 using SmartStore.Utilities;
 using EfState = System.Data.Entity.EntityState;
 
@@ -935,17 +934,30 @@ public static void AddGranularPermissions(IDbContext context)
                 throw new ArgumentException("Passed context must be an instance of type '{0}'.".FormatInvariant(typeof(SmartObjectContext)), nameof(context));
             }
 
-            var permissionSet = ctx.Set<PermissionRecord>();
             var mappingSet = ctx.Set<PermissionRoleMapping>();
-            var allRoles = ctx.Set<CustomerRole>().ToList();
-            var allPermissions = permissionSet.Expand(x => x.CustomerRoles).ToList();
+            var permissionSet = ctx.Set<PermissionRecord>();
+            var allPermissions = permissionSet.ToList();
             var newPermissions = new Dictionary<string, PermissionRecord>();
+            var allRoles = ctx.Set<CustomerRole>().ToList();
             var adminRole = allRoles.FirstOrDefault(x => x.SystemName.IsCaseInsensitiveEqual("Administrators"));
 
+            // No entity, no navigation property -> use SQL.
+            var oldMappings = new Multimap<int, int>();
+            if (((DbContext)context).TableExists("PermissionRecord_Role_Mapping"))
+            {
+                oldMappings = context.SqlQuery<OldPermissionRoleMapping>("select * from [dbo].[PermissionRecord_Role_Mapping]")
+                    .ToList()
+                    .ToMultimap(x => x.PermissionRecord_Id, x => x.CustomerRole_Id);
+            }
+
             var permissionToRoles = new Multimap<string, int>(StringComparer.OrdinalIgnoreCase);
             foreach (var permission in allPermissions)
             {
-                permissionToRoles.AddRange(permission.SystemName, permission.CustomerRoles.Select(x => x.Id));
+                var roleIds = oldMappings.ContainsKey(permission.Id)
+                    ? oldMappings[permission.Id]
+                    : Enumerable.Empty<int>();
+
+                permissionToRoles.AddRange(permission.SystemName, roleIds);
             }
 
             var oldPermissions = GetOldPermissions();
@@ -1174,6 +1186,12 @@ Multimap<string, string> GetOldPermissions()
             }
         }
 
+        public class OldPermissionRoleMapping
+        {
+            public int PermissionRecord_Id { get; set; }
+            public int CustomerRole_Id { get; set; }
+        }
+
         #endregion
     }
 }
diff --git a/src/Tests/SmartStore.Data.Tests/Security/PermissionRecordPersistenceTests.cs b/src/Tests/SmartStore.Data.Tests/Security/PermissionRecordPersistenceTests.cs
@@ -10,23 +10,14 @@ public class PermissionRecordPersistenceTests : PersistenceTest
         [Test]
         public void Can_save_and_load_permissionRecord()
         {
-            var permissionRecord = GetTestPermissionRecord();
+            var permissionRecord = new PermissionRecord
+            {
+                SystemName = "SystemName 2"
+            };
 
             var fromDb = SaveAndLoadEntity(permissionRecord);
             fromDb.ShouldNotBeNull();
-            fromDb.Name.ShouldEqual("Name 1");
             fromDb.SystemName.ShouldEqual("SystemName 2");
-            fromDb.Category.ShouldEqual("Category 4");
-        }
-
-        protected PermissionRecord GetTestPermissionRecord()
-        {
-            return new PermissionRecord
-            {
-                Name = "Name 1",
-                SystemName = "SystemName 2",
-                Category = "Category 4",
-            };
         }
     }
 }
