Merge pull request #95 from exiled78/master

Automapper config change

Author: ismcagdas

aspnet-core/src/AbpCompanyName.AbpProjectName.Application/AbpProjectNameApplicationModule.cs

@@ -30,33 +30,13 @@ public override void PreInitialize()
 
         public override void Initialize()
         {
-            IocManager.RegisterAssemblyByConvention(typeof(AbpProjectNameApplicationModule).GetAssembly());
+            Assembly thisAssembly = typeof(AbpProjectNameApplicationModule).GetAssembly();
+            IocManager.RegisterAssemblyByConvention(thisAssembly);
 
-            // TODO: Is there somewhere else to store these, with the dto classes
             Configuration.Modules.AbpAutoMapper().Configurators.Add(cfg =>
             {
-                // Role and permission
-                cfg.CreateMap<Permission, string>().ConvertUsing(r => r.Name);
-                cfg.CreateMap<RolePermissionSetting, string>().ConvertUsing(r => r.Name);    
-
-                cfg.CreateMap<CreateRoleDto, Role>().ForMember(x => x.Permissions, opt => opt.Ignore());
-                cfg.CreateMap<RoleDto, Role>().ForMember(x => x.Permissions, opt => opt.Ignore());
-
-                IRepository<Role, int> repository = IocManager.Resolve<IRepository<Role, int>>();
-                // User and role
-                cfg.CreateMap<UserRole, string>().ConvertUsing(  (r) =>  {
-                    //TODO: Fix, this seems hacky
-                    Role role = repository.FirstOrDefault(r.RoleId);
-                    return role.DisplayName;
-                });
-
-                IocManager.Release(repository);
-                
-                cfg.CreateMap<UserDto, User>();
-                cfg.CreateMap<UserDto, User>().ForMember(x => x.Roles, opt => opt.Ignore());
-
-                cfg.CreateMap<CreateUserDto, User>();
-                cfg.CreateMap<CreateUserDto, User>().ForMember(x => x.Roles, opt => opt.Ignore());
+                //Scan the assembly for classes which inherit from AutoMapper.Profile
+                cfg.AddProfiles(thisAssembly);
             });
         }
     }

aspnet-core/src/AbpCompanyName.AbpProjectName.Application/Roles/Dto/RoleMapProfile.cs

@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Abp.Authorization;
+using Abp.Authorization.Roles;
+using Abp.Authorization.Users;
+using Abp.Dependency;
+using Abp.Domain.Repositories;
+using AbpCompanyName.AbpProjectName.Authorization.Roles;
+using AutoMapper;
+
+namespace AbpCompanyName.AbpProjectName.Roles.Dto
+{
+    public class RoleMapProfile : Profile
+    {
+        public RoleMapProfile()
+        {
+            // Role and permission
+            CreateMap<Permission, string>().ConvertUsing(r => r.Name);
+            CreateMap<RolePermissionSetting, string>().ConvertUsing(r => r.Name);
+
+            CreateMap<CreateRoleDto, Role>().ForMember(x => x.Permissions, opt => opt.Ignore());
+           CreateMap<RoleDto, Role>().ForMember(x => x.Permissions, opt => opt.Ignore());
+
+            IRepository<Role, int> repository = IocManager.Instance.Resolve<IRepository<Role, int>>();
+            // User and role
+            CreateMap<UserRole, string>().ConvertUsing((r) => {
+                //TODO: Fix, this seems hacky
+                Role role = repository.FirstOrDefault(r.RoleId);
+                return role.DisplayName;
+            });
+
+            IocManager.Instance.Release(repository);
+        }
+    }
+}

aspnet-core/src/AbpCompanyName.AbpProjectName.Application/Users/Dto/UserMapProfile.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using AbpCompanyName.AbpProjectName.Authorization.Users;
+using AutoMapper;
+
+namespace AbpCompanyName.AbpProjectName.Users.Dto
+{
+    public class UserMapProfile : Profile
+    {
+        public UserMapProfile()
+        {
+
+            CreateMap<UserDto, User>();
+            CreateMap<UserDto, User>().ForMember(x => x.Roles, opt => opt.Ignore());
+
+            CreateMap<CreateUserDto, User>();
+            CreateMap<CreateUserDto, User>().ForMember(x => x.Roles, opt => opt.Ignore());
+        }
+    }
+}