Merge branch 'refactor_user_updating' into dev

1 files changed, 19 insertions, 14 deletions

diff --git a/src/DevHive.Services/Services/LanguageService.cs b/src/DevHive.Services/Services/LanguageService.cs
index be035c2..89df654 100644
--- a/src/DevHive.Services/Services/LanguageService.cs
+++ b/src/DevHive.Services/Services/LanguageService.cs
@@ -21,45 +21,50 @@ namespace DevHive.Services.Services
 
 		#region Create
 
-		public async Task<bool> CreateLanguage(CreateLanguageServiceModel createLanguageServiceModel)
+		public async Task<Guid> CreateLanguage(CreateLanguageServiceModel createLanguageServiceModel)
 		{
 			if (await this._languageRepository.DoesLanguageNameExistAsync(createLanguageServiceModel.Name))
 				throw new ArgumentException("Language already exists!");
 
 			Language language = this._languageMapper.Map<Language>(createLanguageServiceModel);
-			bool result = await this._languageRepository.AddAsync(language);
-
-			return result;
+			bool success = await this._languageRepository.AddAsync(language);
+
+			if (success)
+			{
+				Language newLanguage = await this._languageRepository.GetByNameAsync(createLanguageServiceModel.Name);
+				return newLanguage.Id;
+			}
+			else
+				return Guid.Empty;
 		}
 		#endregion
 
 		#region Read
 
-		public async Task<LanguageServiceModel> GetLanguageById(Guid languageId)
+		public async Task<ReadLanguageServiceModel> GetLanguageById(Guid id)
 		{
-			Language language = await this._languageRepository.GetByIdAsync(languageId);
+			Language language = await this._languageRepository.GetByIdAsync(id);
 
 			if (language == null)
 				throw new ArgumentException("The language does not exist");
 
-			return this._languageMapper.Map<LanguageServiceModel>(language);
+			return this._languageMapper.Map<ReadLanguageServiceModel>(language);
 		}
 		#endregion
 
 		#region Update
 
-		public async Task<bool> UpdateLanguage(Guid languageId, UpdateLanguageServiceModel languageServiceModel)
+		public async Task<bool> UpdateLanguage(UpdateLanguageServiceModel languageServiceModel)
 		{
-			bool langExists = await this._languageRepository.DoesLanguageExistAsync(languageId);
+			bool langExists = await this._languageRepository.DoesLanguageExistAsync(languageServiceModel.Id);
 			bool newLangNameExists = await this._languageRepository.DoesLanguageNameExistAsync(languageServiceModel.Name);
 
 			if (!langExists)
 				throw new ArgumentException("Language does not exist!");
 
 			if (newLangNameExists)
-				throw new ArgumentException("This name is already in our datbase!");
+				throw new ArgumentException("Language name already exists in our data base!");
 
-			languageServiceModel.Id = languageId;
 			Language lang = this._languageMapper.Map<Language>(languageServiceModel);
 			return await this._languageRepository.EditAsync(lang);
 		}
@@ -67,12 +72,12 @@ namespace DevHive.Services.Services
 
 		#region Delete
 
-		public async Task<bool> DeleteLanguage(Guid languageId)
+		public async Task<bool> DeleteLanguage(Guid id)
 		{
-			if (!await this._languageRepository.DoesLanguageExistAsync(languageId))
+			if (!await this._languageRepository.DoesLanguageExistAsync(id))
 				throw new ArgumentException("Language does not exist!");
 
-			Language language = await this._languageRepository.GetByIdAsync(languageId);
+			Language language = await this._languageRepository.GetByIdAsync(id);
 			return await this._languageRepository.DeleteAsync(language);
 		}
 		#endregion