From c43a7665b9febe890eb6dac143b62c36464cc94d Mon Sep 17 00:00:00 2001
From: transtrike <transtrike@gmail.com>
Date: Sun, 17 Jan 2021 12:24:17 +0200
Subject: Moved Lang&Tech CRUD to Update in User Layer

---
 src/DevHive.Web/Controllers/LanguageController.cs  |  3 +-
 .../Controllers/TechnologyController.cs            |  5 +-
 src/DevHive.Web/Controllers/UserController.cs      | 70 +---------------------
 3 files changed, 8 insertions(+), 70 deletions(-)

(limited to 'src/DevHive.Web/Controllers')

diff --git a/src/DevHive.Web/Controllers/LanguageController.cs b/src/DevHive.Web/Controllers/LanguageController.cs
index 5202f16..c503a47 100644
--- a/src/DevHive.Web/Controllers/LanguageController.cs
+++ b/src/DevHive.Web/Controllers/LanguageController.cs
@@ -47,8 +47,9 @@ namespace DevHive.Web.Controllers
 		public async Task<IActionResult> Update(Guid languageId, [FromBody] UpdateLanguageWebModel updateModel)
 		{
 			UpdateLanguageServiceModel updatelanguageServiceModel = this._languageMapper.Map<UpdateLanguageServiceModel>(updateModel);
+			updatelanguageServiceModel.Id = languageId;
 
-			bool result = await this._languageService.UpdateLanguage(languageId, updatelanguageServiceModel);
+			bool result = await this._languageService.UpdateLanguage(updatelanguageServiceModel);
 
 			if (!result)
 				return new BadRequestObjectResult("Could not update Language");
diff --git a/src/DevHive.Web/Controllers/TechnologyController.cs b/src/DevHive.Web/Controllers/TechnologyController.cs
index 3be3b8a..7f2f400 100644
--- a/src/DevHive.Web/Controllers/TechnologyController.cs
+++ b/src/DevHive.Web/Controllers/TechnologyController.cs
@@ -46,9 +46,10 @@ namespace DevHive.Web.Controllers
 		[HttpPut]
 		public async Task<IActionResult> Update(Guid technologyId, [FromBody] UpdateTechnologyWebModel updateModel)
 		{
-			UpdateTechnologyServiceModel updateTechnologyWebModel = this._technologyMapper.Map<UpdateTechnologyServiceModel>(updateModel);
+			UpdateTechnologyServiceModel updateTechnologyServiceModel = this._technologyMapper.Map<UpdateTechnologyServiceModel>(updateModel);
+			updateTechnologyServiceModel.Id = technologyId;
 
-			bool result = await this._technologyService.UpdateTechnology(technologyId, updateTechnologyWebModel);
+			bool result = await this._technologyService.UpdateTechnology(updateTechnologyServiceModel);
 
 			if (!result)
 				return new BadRequestObjectResult("Could not update Technology");
diff --git a/src/DevHive.Web/Controllers/UserController.cs b/src/DevHive.Web/Controllers/UserController.cs
index b33c3b9..8d48705 100644
--- a/src/DevHive.Web/Controllers/UserController.cs
+++ b/src/DevHive.Web/Controllers/UserController.cs
@@ -57,40 +57,6 @@ namespace DevHive.Web.Controllers
 		}
 		#endregion
 
-		#region Create
-
-		[HttpPost]
-		[Route("AddAFriend")]
-		public async Task<IActionResult> AddAFriend(Guid userId, [FromBody] IdModel friendIdModel)
-		{
-			return await this._userService.AddFriend(userId, friendIdModel.Id) ?
-				new OkResult() :
-				new BadRequestResult();
-		}
-
-		[HttpPost]
-		[Route("AddLanguageToUser")]
-		public async Task<IActionResult> AddLanguageToUser(Guid userId, [FromBody] LanguageWebModel languageWebModel)
-		{
-			LanguageServiceModel languageServiceModel = this._userMapper.Map<LanguageServiceModel>(languageWebModel);
-
-			return await this._userService.AddLanguageToUser(userId, languageServiceModel) ?
-				new OkResult() :
-				new BadRequestResult();
-		}
-
-		[HttpPost]
-		[Route("AddTechnologyToUser")]
-		public async Task<IActionResult> AddTechnologyToUser(Guid userId, [FromBody] TechnologyWebModel technologyWebModel)
-		{
-			TechnologyServiceModel technologyServiceModel = this._userMapper.Map<TechnologyServiceModel>(technologyWebModel);
-
-			return await this._userService.AddTechnologyToUser(userId, technologyServiceModel) ?
-				new OkResult() :
-				new BadRequestResult();
-		}
-		#endregion
-
 		#region Read
 
 		[HttpGet]
@@ -107,9 +73,10 @@ namespace DevHive.Web.Controllers
 
 		[HttpGet]
 		[Route("GetAFriend")]
-		public async Task<IActionResult> GetAFriend(Guid friendId)
+		[AllowAnonymous]
+		public async Task<IActionResult> GetAFriend(string username)
 		{
-			UserServiceModel friendServiceModel = await this._userService.GetFriendById(friendId);
+			UserServiceModel friendServiceModel = await this._userService.GetFriend(username);
 			UserWebModel friend = this._userMapper.Map<UserWebModel>(friendServiceModel);
 
 			return new OkObjectResult(friend);
@@ -134,7 +101,6 @@ namespace DevHive.Web.Controllers
 		#endregion
 
 		#region Delete
-
 		[HttpDelete]
 		public async Task<IActionResult> Delete(Guid id, [FromHeader] string authorization)
 		{
@@ -144,36 +110,6 @@ namespace DevHive.Web.Controllers
 			await this._userService.DeleteUser(id);
 			return new OkResult();
 		}
-
-		[HttpDelete]
-		[Route("RemoveAFriend")]
-		public async Task<IActionResult> RemoveAFriend(Guid userId, Guid friendId)
-		{
-			await this._userService.RemoveFriend(userId, friendId);
-			return new OkResult();
-		}
-
-		[HttpDelete]
-		[Route("RemoveLanguageFromUser")]
-		public async Task<IActionResult> RemoveLanguageFromUser(Guid userId, [FromBody] LanguageWebModel languageWebModel)
-		{
-			LanguageServiceModel languageServiceModel = this._userMapper.Map<LanguageServiceModel>(languageWebModel);
-
-			return await this._userService.RemoveLanguageFromUser(userId, languageServiceModel) ?
-				new OkResult() :
-				new BadRequestResult();
-		}
-
-		[HttpDelete]
-		[Route("RemoveTechnologyFromUser")]
-		public async Task<IActionResult> RemoveTechnologyFromUser(Guid userId, [FromBody] TechnologyWebModel technologyWebModel)
-		{
-			TechnologyServiceModel technologyServiceModel = this._userMapper.Map<TechnologyServiceModel>(technologyWebModel);
-
-			return await this._userService.RemoveTechnologyFromUser(userId, technologyServiceModel) ?
-				new OkResult() :
-				new BadRequestResult();
-		}
 		#endregion
 	}
 }
-- 
cgit v1.2.3