UserUpdate does not allow updating roles if not admin; HTTP Put now works properly; UserUpdate validates properly

2 files changed, 6 insertions, 12 deletions

diff --git a/src/DevHive.Web/Configurations/Mapping/RoleMappings.cs b/src/DevHive.Web/Configurations/Mapping/RoleMappings.cs
index 2f01f77..2ea2742 100644
--- a/src/DevHive.Web/Configurations/Mapping/RoleMappings.cs
+++ b/src/DevHive.Web/Configurations/Mapping/RoleMappings.cs
@@ -11,11 +11,11 @@ namespace DevHive.Web.Configurations.Mapping
 			CreateMap<CreateRoleWebModel, CreateRoleServiceModel>();
 			CreateMap<UpdateRoleWebModel, UpdateRoleServiceModel>()
 				.ForMember(src => src.Id, dest => dest.Ignore());
-			CreateMap<RoleWebModel, ReadRoleServiceModel>();
+			CreateMap<RoleWebModel, RoleServiceModel>();
 
 			CreateMap<CreateRoleServiceModel, CreateRoleWebModel>();
 			CreateMap<UpdateRoleServiceModel, UpdateRoleWebModel>();
-			CreateMap<ReadRoleServiceModel, RoleWebModel>();
+			CreateMap<RoleServiceModel, RoleWebModel>();
 		}
 	}
 }
diff --git a/src/DevHive.Web/Configurations/Mapping/UserMappings.cs b/src/DevHive.Web/Configurations/Mapping/UserMappings.cs
index e80a69a..1b26cc9 100644
--- a/src/DevHive.Web/Configurations/Mapping/UserMappings.cs
+++ b/src/DevHive.Web/Configurations/Mapping/UserMappings.cs
@@ -2,8 +2,6 @@ using AutoMapper;
 using DevHive.Services.Models.Identity.User;
 using DevHive.Web.Models.Identity.User;
 using DevHive.Common.Models.Identity;
-using DevHive.Web.Models.Language;
-using DevHive.Web.Models.Technology;
 
 namespace DevHive.Web.Configurations.Mapping
 {
@@ -21,16 +19,12 @@ namespace DevHive.Web.Configurations.Mapping
 			CreateMap<TokenModel, TokenWebModel>();
 
 			//Update
-			CreateMap<UpdateUserWebModel, UpdateUserServiceModel>()
-				.ForMember(src => src.Id, dest => dest.Ignore());
-			CreateMap<FriendWebModel, FriendServiceModel>()
-				.ForMember(src => src.Id, dest => dest.Ignore());
-			CreateMap<FriendWebModel, UpdateFriendServiceModel>()
-				.ForMember(src => src.Id, dest => dest.Ignore())
-				.ForMember(src => src.Name, dest => dest.MapFrom(p => p.UserName));
+			CreateMap<UpdateUserWebModel, UpdateUserServiceModel>();
+			CreateMap<UsernameWebModel, FriendServiceModel>();
+			CreateMap<UsernameWebModel, UpdateFriendServiceModel>();
 
 			CreateMap<UpdateUserServiceModel, UpdateUserWebModel>();
-			CreateMap<FriendServiceModel, FriendWebModel>();
+			CreateMap<FriendServiceModel, UsernameWebModel>();
 		}
 	}
 }