From b6885aafa5711c9455edc7b3666668c3014f9195 Mon Sep 17 00:00:00 2001
From: Syndamia <kamen.d.mladenov@protonmail.com>
Date: Wed, 16 Dec 2020 20:53:50 +0200
Subject: Fixed EditAsync from UserRepository

---
 src/DevHive.Data/Repositories/UserRepository.cs | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/DevHive.Data/Repositories/UserRepository.cs b/src/DevHive.Data/Repositories/UserRepository.cs
index 13ee2bc..86cdb6d 100644
--- a/src/DevHive.Data/Repositories/UserRepository.cs
+++ b/src/DevHive.Data/Repositories/UserRepository.cs
@@ -53,9 +53,15 @@ namespace DevHive.Data.Repositories
 		//Update
 		public async Task EditAsync(User newEntity)
 		{
-			this._context
-				.Set<User>()
-				.Update(newEntity);
+			User user = await this.GetByIdAsync(newEntity.Id);
+
+			user.UserName = newEntity.UserName;
+			user.FirstName = newEntity.FirstName;
+			user.LastName = newEntity.LastName;
+			user.ProfilePicture = newEntity.ProfilePicture;
+			user.Role = newEntity.Role;
+
+			this._context.Update(user);
 
 			await this._context.SaveChangesAsync();
 		}
-- 
cgit v1.2.3


From 2fb06dc848076803252ace340d9e5bbe47bec350 Mon Sep 17 00:00:00 2001
From: Danail Dimitrov <danaildimitrov321@gmail.com>
Date: Wed, 16 Dec 2020 21:13:34 +0200
Subject: Changed LanguageService's methods' return types to
 Task<LanguageServiceModel>

---
 src/DevHive.Services/Services/LanguageService.cs | 26 ++++++++++++------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'src')

diff --git a/src/DevHive.Services/Services/LanguageService.cs b/src/DevHive.Services/Services/LanguageService.cs
index dff9115..69e123b 100644
--- a/src/DevHive.Services/Services/LanguageService.cs
+++ b/src/DevHive.Services/Services/LanguageService.cs
@@ -19,51 +19,51 @@ namespace DevHive.Services.Services
 			this._languageMapper = mapper;
 		}
 
-		public async Task<IActionResult> CreateLanguage(LanguageServiceModel languageServiceModel)
+		public async Task<LanguageServiceModel> CreateLanguage(LanguageServiceModel languageServiceModel)
 		{
 			if (!await this._languageRepository.DoesLanguageNameExist(languageServiceModel.Name))
-				return new BadRequestObjectResult("Language already exists!");
+				throw new ArgumentException("Language already exists!");
 
 			Language language = this._languageMapper.Map<Language>(languageServiceModel);
 
 			await this._languageRepository.AddAsync(language);
 
-			return new CreatedResult("CreateLanguage", language);
+			return this._languageMapper.Map<LanguageServiceModel>(language);
 		}
 
-		public async Task<IActionResult> GetLanguageById(Guid id)
+		public async Task<LanguageServiceModel> GetLanguageById(Guid id)
 		{
 			Language language = await this._languageRepository.GetByIdAsync(id);
 
 			if(language == null)
-				return new NotFoundObjectResult("The language does not exist");
+				throw new ArgumentException("The language does not exist");
 
-			return new ObjectResult(language);
+			return this._languageMapper.Map<LanguageServiceModel>(language);
 		}
 
-		public async Task<IActionResult> UpdateLanguage(LanguageServiceModel languageServiceModel)
+		public async Task<LanguageServiceModel> UpdateLanguage(LanguageServiceModel languageServiceModel)
 		{
 			if (!await this._languageRepository.DoesLanguageExist(languageServiceModel.Id))
-				return new NotFoundObjectResult("Language does not exist!");
+				throw new ArgumentException("Language does not exist!");
 
 			if (!await this._languageRepository.DoesLanguageNameExist(languageServiceModel.Name))
-				return new BadRequestObjectResult("Language name already exists!");
+				throw new ArgumentException("Language name already exists!");
 
 			Language language = this._languageMapper.Map<Language>(languageServiceModel);
 			await this._languageRepository.EditAsync(language);
 
-			return new AcceptedResult("UpdateLanguage", language);
+			return this._languageMapper.Map<LanguageServiceModel>(language);
 		}
 	
-		public async Task<IActionResult> DeleteLanguage(Guid id)
+		public async Task<LanguageServiceModel> DeleteLanguage(Guid id)
 		{
 			if (!await this._languageRepository.DoesLanguageExist(id))
-				return new NotFoundObjectResult("Language does not exist!");
+				throw new ArgumentException("Language does not exist!");
 
 			Language language = await this._languageRepository.GetByIdAsync(id);
 			await this._languageRepository.DeleteAsync(language);
 
-			return new OkResult();
+			return this._languageMapper.Map<LanguageServiceModel>(language);
 		}
 	}
 }
\ No newline at end of file
-- 
cgit v1.2.3