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

7 files changed, 14 insertions, 18 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>();
 		}
 	}
 }
diff --git a/src/DevHive.Web/Controllers/RoleController.cs b/src/DevHive.Web/Controllers/RoleController.cs
index d8bb60c..c68a32b 100644
--- a/src/DevHive.Web/Controllers/RoleController.cs
+++ b/src/DevHive.Web/Controllers/RoleController.cs
@@ -40,7 +40,7 @@ namespace DevHive.Web.Controllers
 		[Authorize(Policy = "User")]
 		public async Task<IActionResult> GetById(Guid id)
 		{
-			ReadRoleServiceModel roleServiceModel = await this._roleService.GetRoleById(id);
+			RoleServiceModel roleServiceModel = await this._roleService.GetRoleById(id);
 			RoleWebModel roleWebModel = this._roleMapper.Map<RoleWebModel>(roleServiceModel);
 
 			return new OkObjectResult(roleWebModel);
diff --git a/src/DevHive.Web/Models/Identity/Role/UpdateRoleWebModel.cs b/src/DevHive.Web/Models/Identity/Role/UpdateRoleWebModel.cs
index 254affc..3870481 100644
--- a/src/DevHive.Web/Models/Identity/Role/UpdateRoleWebModel.cs
+++ b/src/DevHive.Web/Models/Identity/Role/UpdateRoleWebModel.cs
@@ -4,10 +4,12 @@ using System.Diagnostics.CodeAnalysis;
 
 namespace DevHive.Web.Models.Identity.Role
 {
-	public class UpdateRoleWebModel : RoleWebModel
+	public class UpdateRoleWebModel
 	{
 		[NotNull]
 		[Required]
-		public Guid Id { get; set; }
+		[MinLength(3)]
+		[MaxLength(50)]
+		public string Name { get; set; }
 	}
 }
diff --git a/src/DevHive.Web/Models/Identity/User/UpdateUserWebModel.cs b/src/DevHive.Web/Models/Identity/User/UpdateUserWebModel.cs
index 30c66fb..62901f6 100644
--- a/src/DevHive.Web/Models/Identity/User/UpdateUserWebModel.cs
+++ b/src/DevHive.Web/Models/Identity/User/UpdateUserWebModel.cs
@@ -17,7 +17,7 @@ namespace DevHive.Web.Models.Identity.User
 
 		[NotNull]
 		[Required]
-		public HashSet<FriendWebModel> Friends { get; set; }
+		public HashSet<UsernameWebModel> Friends { get; set; }
 
 		[NotNull]
 		[Required]
diff --git a/src/DevHive.Web/Models/Identity/User/UserWebModel.cs b/src/DevHive.Web/Models/Identity/User/UserWebModel.cs
index 5b80ba3..4097901 100644
--- a/src/DevHive.Web/Models/Identity/User/UserWebModel.cs
+++ b/src/DevHive.Web/Models/Identity/User/UserWebModel.cs
@@ -15,7 +15,7 @@ namespace DevHive.Web.Models.Identity.User
 
 		[NotNull]
 		[Required]
-		public HashSet<FriendWebModel> Friends { get; set; } = new HashSet<FriendWebModel>();
+		public HashSet<UsernameWebModel> Friends { get; set; } = new HashSet<UsernameWebModel>();
 
 		[NotNull]
 		[Required]
diff --git a/src/DevHive.Web/Models/Identity/User/FriendWebModel.cs b/src/DevHive.Web/Models/Identity/User/UsernameWebModel.cs
index d59bff5..a20c1bf 100644
--- a/src/DevHive.Web/Models/Identity/User/FriendWebModel.cs
+++ b/src/DevHive.Web/Models/Identity/User/UsernameWebModel.cs
@@ -4,7 +4,7 @@ using DevHive.Web.Attributes;
 
 namespace DevHive.Web.Models.Identity.User
 {
-	public class FriendWebModel
+	public class UsernameWebModel
 	{
 		[NotNull]
 		[Required]