From 9e86699c9b3aff17e0c4d19850b41b792a9625ef Mon Sep 17 00:00:00 2001
From: transtrike <transtrike@gmail.com>
Date: Thu, 21 Jan 2021 19:12:04 +0200
Subject: Removed HTTP Patch; Refactored HTTP Put; Fixed Update bug

---
 src/DevHive.Web/Configurations/Mapping/LanguageMappings.cs |  7 ++++---
 src/DevHive.Web/Configurations/Mapping/RoleMappings.cs     |  9 ++++++---
 .../Configurations/Mapping/TechnologyMappings.cs           |  3 ++-
 src/DevHive.Web/Configurations/Mapping/UserMappings.cs     | 13 +++++++------
 src/DevHive.Web/Controllers/UserController.cs              | 14 --------------
 src/DevHive.Web/Models/Identity/User/UpdateUserWebModel.cs |  5 +++++
 6 files changed, 24 insertions(+), 27 deletions(-)

(limited to 'src/DevHive.Web')

diff --git a/src/DevHive.Web/Configurations/Mapping/LanguageMappings.cs b/src/DevHive.Web/Configurations/Mapping/LanguageMappings.cs
index 8cac3ca..eca0d1a 100644
--- a/src/DevHive.Web/Configurations/Mapping/LanguageMappings.cs
+++ b/src/DevHive.Web/Configurations/Mapping/LanguageMappings.cs
@@ -8,10 +8,11 @@ namespace DevHive.Web.Configurations.Mapping
 	{
 		public LanguageMappings()
 		{
-			CreateMap<LanguageWebModel, LanguageServiceModel>();
-			CreateMap<ReadLanguageWebModel, ReadLanguageServiceModel>();
 			CreateMap<CreateLanguageWebModel, CreateLanguageServiceModel>();
-			CreateMap<UpdateLanguageWebModel, UpdateLanguageServiceModel>();
+			CreateMap<ReadLanguageWebModel, ReadLanguageServiceModel>();
+			CreateMap<UpdateLanguageWebModel, UpdateLanguageServiceModel>()
+				.ForMember(src => src.Id, dest => dest.Ignore());
+			CreateMap<LanguageWebModel, LanguageServiceModel>();
 
 			CreateMap<LanguageServiceModel, LanguageWebModel>();
 			CreateMap<ReadLanguageServiceModel, ReadLanguageWebModel>();
diff --git a/src/DevHive.Web/Configurations/Mapping/RoleMappings.cs b/src/DevHive.Web/Configurations/Mapping/RoleMappings.cs
index 66ae8e3..2ea2742 100644
--- a/src/DevHive.Web/Configurations/Mapping/RoleMappings.cs
+++ b/src/DevHive.Web/Configurations/Mapping/RoleMappings.cs
@@ -8,11 +8,14 @@ namespace DevHive.Web.Configurations.Mapping
 	{
 		public RoleMappings()
 		{
-			CreateMap<CreateRoleWebModel, RoleServiceModel>();
-			CreateMap<UpdateRoleWebModel, RoleServiceModel>();
+			CreateMap<CreateRoleWebModel, CreateRoleServiceModel>();
+			CreateMap<UpdateRoleWebModel, UpdateRoleServiceModel>()
+				.ForMember(src => src.Id, dest => dest.Ignore());
+			CreateMap<RoleWebModel, RoleServiceModel>();
 
+			CreateMap<CreateRoleServiceModel, CreateRoleWebModel>();
+			CreateMap<UpdateRoleServiceModel, UpdateRoleWebModel>();
 			CreateMap<RoleServiceModel, RoleWebModel>();
-			CreateMap<RoleWebModel, RoleServiceModel>();
 		}
 	}
 }
diff --git a/src/DevHive.Web/Configurations/Mapping/TechnologyMappings.cs b/src/DevHive.Web/Configurations/Mapping/TechnologyMappings.cs
index 4ecd5f3..708b6ac 100644
--- a/src/DevHive.Web/Configurations/Mapping/TechnologyMappings.cs
+++ b/src/DevHive.Web/Configurations/Mapping/TechnologyMappings.cs
@@ -10,7 +10,8 @@ namespace DevHive.Web.Configurations.Mapping
 		{
 			CreateMap<CreateTechnologyWebModel, CreateTechnologyServiceModel>();
 			CreateMap<ReadTechnologyWebModel, ReadTechnologyServiceModel>();
-			CreateMap<UpdateTechnologyWebModel, UpdateTechnologyServiceModel>();
+			CreateMap<UpdateTechnologyWebModel, UpdateTechnologyServiceModel>()
+				.ForMember(src => src.Id, dest => dest.Ignore());
 			CreateMap<TechnologyWebModel, TechnologyServiceModel>();
 
 			CreateMap<CreateTechnologyServiceModel, CreateTechnologyWebModel>();
diff --git a/src/DevHive.Web/Configurations/Mapping/UserMappings.cs b/src/DevHive.Web/Configurations/Mapping/UserMappings.cs
index 5faf4b5..9dbf613 100644
--- a/src/DevHive.Web/Configurations/Mapping/UserMappings.cs
+++ b/src/DevHive.Web/Configurations/Mapping/UserMappings.cs
@@ -20,13 +20,14 @@ namespace DevHive.Web.Configurations.Mapping
 
 			CreateMap<TokenModel, TokenWebModel>();
 
-			CreateMap<FriendWebModel, FriendServiceModel>();
-			CreateMap<FriendServiceModel, FriendWebModel>();
+			//Update
+			CreateMap<UpdateUserWebModel, UpdateUserServiceModel>()
+				.ForMember(src => src.Id, dest => dest.Ignore());
+			CreateMap<FriendWebModel, FriendServiceModel>()
+				.ForMember(src => src.Id, dest => dest.Ignore());
 
-			CreateMap<FriendWebModel, UpdateUserCollectionServiceModel>()
-				.ForMember(f => f.Name, u => u.MapFrom(src => src.UserName));
-			CreateMap<UpdateLanguageWebModel, UpdateUserCollectionServiceModel>();
-			CreateMap<UpdateTechnologyWebModel, UpdateUserCollectionServiceModel>();
+			CreateMap<UpdateUserServiceModel, UpdateUserWebModel>();
+			CreateMap<FriendServiceModel, FriendWebModel>();
 		}
 	}
 }
diff --git a/src/DevHive.Web/Controllers/UserController.cs b/src/DevHive.Web/Controllers/UserController.cs
index 7121ac8..fbbbbff 100644
--- a/src/DevHive.Web/Controllers/UserController.cs
+++ b/src/DevHive.Web/Controllers/UserController.cs
@@ -96,20 +96,6 @@ namespace DevHive.Web.Controllers
 
 			return new AcceptedResult("UpdateUser", userWebModel);
 		}
-
-		[HttpPatch]
-		public async Task<IActionResult> Patch(Guid id, [FromBody] List<Patch> patch, [FromHeader] string authorization)
-		{
-			if (!await this._userService.ValidJWT(id, authorization))
-				return new UnauthorizedResult();
-
-			UserServiceModel userServiceModel = await this._userService.PatchUser(id, patch);
-
-			if (userServiceModel == null)
-				return new BadRequestObjectResult("Wrong patch properties");
-			else
-				return new OkObjectResult(this._userMapper.Map<UserWebModel>(userServiceModel));
-		}
 		#endregion
 
 		#region Delete
diff --git a/src/DevHive.Web/Models/Identity/User/UpdateUserWebModel.cs b/src/DevHive.Web/Models/Identity/User/UpdateUserWebModel.cs
index 3c38ab6..30c66fb 100644
--- a/src/DevHive.Web/Models/Identity/User/UpdateUserWebModel.cs
+++ b/src/DevHive.Web/Models/Identity/User/UpdateUserWebModel.cs
@@ -2,6 +2,7 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Diagnostics.CodeAnalysis;
 using DevHive.Web.Attributes;
+using DevHive.Web.Models.Identity.Role;
 using DevHive.Web.Models.Language;
 using DevHive.Web.Models.Technology;
 
@@ -18,6 +19,10 @@ namespace DevHive.Web.Models.Identity.User
 		[Required]
 		public HashSet<FriendWebModel> Friends { get; set; }
 
+		[NotNull]
+		[Required]
+		public HashSet<UpdateRoleWebModel> Roles { get; set; }
+
 		[NotNull]
 		[Required]
 		public HashSet<UpdateLanguageWebModel> Languages { get; set; }
-- 
cgit v1.2.3