Tryed implementing the http patch

3 files changed, 22 insertions, 13 deletions

diff --git a/src/DevHive.Web/Configurations/Mapping/TechnologyMappings.cs b/src/DevHive.Web/Configurations/Mapping/TechnologyMappings.cs
index 828dac1..4ecd5f3 100644
--- a/src/DevHive.Web/Configurations/Mapping/TechnologyMappings.cs
+++ b/src/DevHive.Web/Configurations/Mapping/TechnologyMappings.cs
@@ -9,10 +9,12 @@ namespace DevHive.Web.Configurations.Mapping
 		public TechnologyMappings()
 		{
 			CreateMap<CreateTechnologyWebModel, CreateTechnologyServiceModel>();
+			CreateMap<ReadTechnologyWebModel, ReadTechnologyServiceModel>();
 			CreateMap<UpdateTechnologyWebModel, UpdateTechnologyServiceModel>();
 			CreateMap<TechnologyWebModel, TechnologyServiceModel>();
 
 			CreateMap<CreateTechnologyServiceModel, CreateTechnologyWebModel>();
+			CreateMap<ReadTechnologyServiceModel, ReadTechnologyWebModel>();
 			CreateMap<UpdateTechnologyServiceModel, UpdateTechnologyWebModel>();
 			CreateMap<TechnologyServiceModel, TechnologyWebModel>();
 		}
diff --git a/src/DevHive.Web/Controllers/UserController.cs b/src/DevHive.Web/Controllers/UserController.cs
index 471d2bb..7121ac8 100644
--- a/src/DevHive.Web/Controllers/UserController.cs
+++ b/src/DevHive.Web/Controllers/UserController.cs
@@ -6,14 +6,10 @@ using DevHive.Web.Models.Identity.User;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using DevHive.Common.Models.Identity;
-using DevHive.Common.Models.Misc;
-using DevHive.Web.Models.Language;
-using DevHive.Services.Models.Language;
-using DevHive.Web.Models.Technology;
-using DevHive.Services.Models.Technology;
 using DevHive.Services.Interfaces;
-using DevHive.Data.Models;
 using Microsoft.AspNetCore.JsonPatch;
+using DevHive.Common.Models.Misc;
+using System.Collections.Generic;
 
 namespace DevHive.Web.Controllers
 {
@@ -87,15 +83,12 @@ namespace DevHive.Web.Controllers
 
 		#region Update
 		[HttpPut]
-		public async Task<IActionResult> Update(Guid id, [FromBody] UpdateUserWebModel updateModel, [FromHeader] string authorization)
+		public async Task<IActionResult> Update(Guid id, [FromBody] UpdateUserWebModel updateUserWebModel, [FromHeader] string authorization)
 		{
 			if (!await this._userService.ValidJWT(id, authorization))
 				return new UnauthorizedResult();
 
-			// if (!ModelState.IsValid)
-			// 	return BadRequest("Not a valid model!");
-
-			UpdateUserServiceModel updateUserServiceModel = this._userMapper.Map<UpdateUserServiceModel>(updateModel);
+			UpdateUserServiceModel updateUserServiceModel = this._userMapper.Map<UpdateUserServiceModel>(updateUserWebModel);
 			updateUserServiceModel.Id = id;
 
 			UserServiceModel userServiceModel = await this._userService.UpdateUser(updateUserServiceModel);
@@ -105,12 +98,12 @@ namespace DevHive.Web.Controllers
 		}
 
 		[HttpPatch]
-		public async Task<IActionResult> Patch(Guid id, [FromBody] JsonPatchDocument<User> jsonPatch, [FromHeader] string authorization)
+		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, jsonPatch);
+			UserServiceModel userServiceModel = await this._userService.PatchUser(id, patch);
 
 			if (userServiceModel == null)
 				return new BadRequestObjectResult("Wrong patch properties");
diff --git a/src/DevHive.Web/Models/Technology/ReadTechnologyWebModel.cs b/src/DevHive.Web/Models/Technology/ReadTechnologyWebModel.cs
new file mode 100644
index 0000000..edaaaef
--- /dev/null
+++ b/src/DevHive.Web/Models/Technology/ReadTechnologyWebModel.cs
@@ -0,0 +1,14 @@
+using System.ComponentModel.DataAnnotations;
+using System.Diagnostics.CodeAnalysis;
+
+namespace DevHive.Web.Models.Technology
+{
+	public class ReadTechnologyWebModel
+	{
+		[NotNull]
+		[Required]
+		[MinLength(3)]
+		[MaxLength(50)]
+		public string Name { get; set; }
+	}
+}