Moves UserGroup and UserGroupExtensions to core

src/Umbraco.Core/Models/Membership/UserGroupExtensions.cs

@@ -1,7 +1,4 @@
-using System.Linq;
-using Umbraco.Core.Persistence.Dtos;
-
-namespace Umbraco.Core.Models.Membership
+namespace Umbraco.Core.Models.Membership
 {
     public static class UserGroupExtensions
     {
@@ -21,14 +18,6 @@ namespace Umbraco.Core.Models.Membership
         public static bool IsSystemUserGroup(this IReadOnlyUserGroup group) =>
             IsSystemUserGroup(group.Alias);
 
-        public static IReadOnlyUserGroup ToReadOnlyGroup(this UserGroupDto group)
-        {
-            return new ReadOnlyUserGroup(group.Id, group.Name, group.Icon,
-                group.StartContentId, group.StartMediaId, group.Alias,
-                group.UserGroup2AppDtos.Select(x => x.AppAlias).ToArray(),
-                group.DefaultPermissions == null ? Enumerable.Empty<string>() : group.DefaultPermissions.ToCharArray().Select(x => x.ToString()));
-        }
-
         private static bool IsSystemUserGroup(this string groupAlias)
         {
             return groupAlias == Constants.Security.AdminGroupAlias

src/Umbraco.Infrastructure/Models/Mapping/UserMapDefinition.cs

@@ -17,6 +17,7 @@ using Umbraco.Core.Strings;
 using Umbraco.Web.Actions;
 using Umbraco.Web.Services;
 using Umbraco.Core.Media;
+using Umbraco.Core.Persistence.Dtos;
 
 namespace Umbraco.Web.Models.Mapping
 {
@@ -444,6 +445,6 @@ namespace Umbraco.Web.Models.Mapping
                 Trashed = false,
                 ParentId = -1
             };
-        }
+        }       
     }
 }

src/Umbraco.Infrastructure/Persistence/Factories/UserFactory.cs

@@ -3,7 +3,6 @@ using System.Linq;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Models.Membership;
 using Umbraco.Core.Persistence.Dtos;
-using Umbraco.Core.Strings;
 
 namespace Umbraco.Core.Persistence.Factories
 {
@@ -14,7 +13,7 @@ namespace Umbraco.Core.Persistence.Factories
             var guidId = dto.Id.ToGuid();
 
             var user = new User(globalSettings, dto.Id, dto.UserName, dto.Email, dto.Login,dto.Password,
-                dto.UserGroupDtos.Select(x => x.ToReadOnlyGroup()).ToArray(),
+                dto.UserGroupDtos.Select(x => ToReadOnlyGroup(x)).ToArray(),
                 dto.UserStartNodeDtos.Where(x => x.StartNodeType == (int)UserStartNodeDto.StartNodeTypeValue.Content).Select(x => x.StartNode).ToArray(),
                 dto.UserStartNodeDtos.Where(x => x.StartNodeType == (int)UserStartNodeDto.StartNodeTypeValue.Media).Select(x => x.StartNode).ToArray());
 
@@ -107,5 +106,13 @@ namespace Umbraco.Core.Persistence.Factories
 
             return dto;
         }
+
+        private static IReadOnlyUserGroup ToReadOnlyGroup(UserGroupDto group)
+        {
+            return new ReadOnlyUserGroup(group.Id, group.Name, group.Icon,
+                group.StartContentId, group.StartMediaId, group.Alias,
+                group.UserGroup2AppDtos.Select(x => x.AppAlias).ToArray(),
+                group.DefaultPermissions == null ? Enumerable.Empty<string>() : group.DefaultPermissions.ToCharArray().Select(x => x.ToString()));
+        }
     }
 }