Fixed Language & Technology Update methods

2 files changed, 21 insertions, 21 deletions

diff --git a/src/DevHive.Services/Services/LanguageService.cs b/src/DevHive.Services/Services/LanguageService.cs
index ac7652b..c34537f 100644
--- a/src/DevHive.Services/Services/LanguageService.cs
+++ b/src/DevHive.Services/Services/LanguageService.cs
@@ -35,9 +35,9 @@ namespace DevHive.Services.Services
 
 		#region Read
 
-		public async Task<LanguageServiceModel> GetLanguageById(Guid id)
+		public async Task<LanguageServiceModel> GetLanguageById(Guid languageId)
 		{
-			Language language = await this._languageRepository.GetByIdAsync(id);
+			Language language = await this._languageRepository.GetByIdAsync(languageId);
 
 			if (language == null)
 				throw new ArgumentException("The language does not exist");
@@ -48,19 +48,18 @@ namespace DevHive.Services.Services
 
 		#region Update
 
-		public async Task<bool> UpdateLanguage(UpdateLanguageServiceModel languageServiceModel)
+		public async Task<bool> UpdateLanguage(Guid languageId, UpdateLanguageServiceModel languageServiceModel)
 		{
-			Task<bool> langExist = this._languageRepository.DoesLanguageExistAsync(languageServiceModel.Id);
-			Task<bool> newLangNameExists = this._languageRepository.DoesLanguageNameExistAsync(languageServiceModel.Name);
+			bool langExists = await this._languageRepository.DoesLanguageExistAsync(languageId);
+			bool newLangNameExists = await this._languageRepository.DoesLanguageNameExistAsync(languageServiceModel.Name);
 
-			await Task.WhenAny(langExist, newLangNameExists);
-
-			if (!langExist.Result)
-				throw new ArgumentException("Language already exists!");
+			if (!langExists)
+				throw new ArgumentException("Language does not exist!");
 
-			if (newLangNameExists.Result)
+			if (newLangNameExists)
 				throw new ArgumentException("This name is already in our datbase!");
 
+			languageServiceModel.Id = languageId;
 			Language lang = this._languageMapper.Map<Language>(languageServiceModel);
 			return await this._languageRepository.EditAsync(lang);
 		}
@@ -68,14 +67,14 @@ namespace DevHive.Services.Services
 
 		#region Delete
 
-		public async Task<bool> DeleteLanguage(Guid id)
+		public async Task<bool> DeleteLanguage(Guid languageId)
 		{
-			if (!await this._languageRepository.DoesLanguageExistAsync(id))
+			if (!await this._languageRepository.DoesLanguageExistAsync(languageId))
 				throw new ArgumentException("Language does not exist!");
 
-			Language language = await this._languageRepository.GetByIdAsync(id);
+			Language language = await this._languageRepository.GetByIdAsync(languageId);
 			return await this._languageRepository.DeleteAsync(language);
 		}
 		#endregion
 	}
-}
\ No newline at end of file
+}
diff --git a/src/DevHive.Services/Services/TechnologyService.cs b/src/DevHive.Services/Services/TechnologyService.cs
index 2b24ed6..3cc0861 100644
--- a/src/DevHive.Services/Services/TechnologyService.cs
+++ b/src/DevHive.Services/Services/TechnologyService.cs
@@ -35,9 +35,9 @@ namespace DevHive.Services.Services
 
 		#region Read
 
-		public async Task<TechnologyServiceModel> GetTechnologyById(Guid id)
+		public async Task<TechnologyServiceModel> GetTechnologyById(Guid technologyId)
 		{
-			Technology technology = await this._technologyRepository.GetByIdAsync(id);
+			Technology technology = await this._technologyRepository.GetByIdAsync(technologyId);
 
 			if (technology == null)
 				throw new ArgumentException("The technology does not exist");
@@ -48,14 +48,15 @@ namespace DevHive.Services.Services
 
 		#region Update
 
-		public async Task<bool> UpdateTechnology(UpdateTechnologyServiceModel updateTechnologyServiceModel)
+		public async Task<bool> UpdateTechnology(Guid technologyId, UpdateTechnologyServiceModel updateTechnologyServiceModel)
 		{
-			if (!await this._technologyRepository.DoesTechnologyExistAsync(updateTechnologyServiceModel.Id))
+			if (!await this._technologyRepository.DoesTechnologyExistAsync(technologyId))
 				throw new ArgumentException("Technology does not exist!");
 
 			if (await this._technologyRepository.DoesTechnologyNameExistAsync(updateTechnologyServiceModel.Name))
 				throw new ArgumentException("Technology name already exists!");
 
+			updateTechnologyServiceModel.Id = technologyId;
 			Technology technology = this._technologyMapper.Map<Technology>(updateTechnologyServiceModel);
 			bool result = await this._technologyRepository.EditAsync(technology);
 
@@ -65,12 +66,12 @@ namespace DevHive.Services.Services
 
 		#region Delete
 
-		public async Task<bool> DeleteTechnology(Guid id)
+		public async Task<bool> DeleteTechnology(Guid technologyId)
 		{
-			if (!await this._technologyRepository.DoesTechnologyExistAsync(id))
+			if (!await this._technologyRepository.DoesTechnologyExistAsync(technologyId))
 				throw new ArgumentException("Technology does not exist!");
 
-			Technology technology = await this._technologyRepository.GetByIdAsync(id);
+			Technology technology = await this._technologyRepository.GetByIdAsync(technologyId);
 			bool result = await this._technologyRepository.DeleteAsync(technology);
 
 			return result;