diff options
Diffstat (limited to 'src/DevHive.Services/Configurations')
3 files changed, 17 insertions, 9 deletions
diff --git a/src/DevHive.Services/Configurations/Mapping/RoleMapings.cs b/src/DevHive.Services/Configurations/Mapping/RoleMapings.cs index 4ddd253..b5541f9 100644 --- a/src/DevHive.Services/Configurations/Mapping/RoleMapings.cs +++ b/src/DevHive.Services/Configurations/Mapping/RoleMapings.cs @@ -9,6 +9,9 @@ namespace DevHive.Services.Configurations.Mapping public RoleMappings() { CreateMap<RoleServiceModel, Role>(); + CreateMap<UpdateRoleServiceModel, Role>(); + + CreateMap<Role, RoleServiceModel>(); CreateMap<Role, RoleServiceModel>(); } } diff --git a/src/DevHive.Services/Configurations/Mapping/UserCollectionMappings.cs b/src/DevHive.Services/Configurations/Mapping/UserCollectionMappings.cs index ee505a2..7a773e8 100644 --- a/src/DevHive.Services/Configurations/Mapping/UserCollectionMappings.cs +++ b/src/DevHive.Services/Configurations/Mapping/UserCollectionMappings.cs @@ -8,14 +8,15 @@ namespace DevHive.Services.Configurations.Mapping { public UserCollectionMappings() { - CreateMap<UpdateUserCollectionServiceModel, User>() - .ForMember(up => up.UserName, u => u.MapFrom(src => src.Name)); - CreateMap<UpdateUserCollectionServiceModel, Role>() - .ForMember(r => r.Name, u => u.MapFrom(src => src.Name)); - CreateMap<UpdateUserCollectionServiceModel, Language>() - .ForMember(r => r.Name, u => u.MapFrom(src => src.Name)); - CreateMap<UpdateUserCollectionServiceModel, Technology>() - .ForMember(r => r.Name, u => u.MapFrom(src => src.Name)); + CreateMap<UpdateUserCollectionServiceModel, User>(); + CreateMap<UpdateUserCollectionServiceModel, Role>(); + CreateMap<UpdateUserCollectionServiceModel, Language>(); + CreateMap<UpdateUserCollectionServiceModel, Technology>(); + + CreateMap<User, UpdateUserCollectionServiceModel>(); + CreateMap<Role, UpdateUserCollectionServiceModel>(); + CreateMap<Language, UpdateUserCollectionServiceModel>(); + CreateMap<Technology, UpdateUserCollectionServiceModel>(); } } } diff --git a/src/DevHive.Services/Configurations/Mapping/UserMappings.cs b/src/DevHive.Services/Configurations/Mapping/UserMappings.cs index 541e16e..5d9e41c 100644 --- a/src/DevHive.Services/Configurations/Mapping/UserMappings.cs +++ b/src/DevHive.Services/Configurations/Mapping/UserMappings.cs @@ -1,6 +1,7 @@ using DevHive.Data.Models; using AutoMapper; using DevHive.Services.Models.Identity.User; +using DevHive.Common.Models.Misc; namespace DevHive.Services.Configurations.Mapping { @@ -10,10 +11,13 @@ namespace DevHive.Services.Configurations.Mapping { CreateMap<UserServiceModel, User>(); CreateMap<RegisterServiceModel, User>(); - CreateMap<UpdateUserServiceModel, User>(); + CreateMap<UpdateUserServiceModel, User>() + .AfterMap((src, dest) => dest.PasswordHash = PasswordModifications.GeneratePasswordHash(src.Password)); CreateMap<FriendServiceModel, User>(); CreateMap<User, UserServiceModel>(); + CreateMap<User, UpdateUserServiceModel>() + .ForMember(x => x.Password, opt => opt.Ignore()); CreateMap<User, FriendServiceModel>(); } } |