Moved Lang&Tech CRUD to Update in User Layer

7 files changed, 15 insertions, 14 deletions

diff --git a/src/DevHive.Services/Interfaces/ILanguageService.cs b/src/DevHive.Services/Interfaces/ILanguageService.cs
index eb45a8d..08b3812 100644
--- a/src/DevHive.Services/Interfaces/ILanguageService.cs
+++ b/src/DevHive.Services/Interfaces/ILanguageService.cs
@@ -10,7 +10,7 @@ namespace DevHive.Services.Interfaces
 
 		Task<LanguageServiceModel> GetLanguageById(Guid languageId);
 
-		Task<bool> UpdateLanguage(Guid languageId, UpdateLanguageServiceModel languageServiceModel);
+		Task<bool> UpdateLanguage(UpdateLanguageServiceModel languageServiceModel);
 
 		Task<bool> DeleteLanguage(Guid languageId);
 	}
diff --git a/src/DevHive.Services/Interfaces/ITechnologyService.cs b/src/DevHive.Services/Interfaces/ITechnologyService.cs
index 0797078..9e1e955 100644
--- a/src/DevHive.Services/Interfaces/ITechnologyService.cs
+++ b/src/DevHive.Services/Interfaces/ITechnologyService.cs
@@ -10,7 +10,7 @@ namespace DevHive.Services.Interfaces
 
 		Task<CreateTechnologyServiceModel> GetTechnologyById(Guid id);
 
-		Task<bool> UpdateTechnology(Guid technologyId, UpdateTechnologyServiceModel updateTechnologyServiceModel);
+		Task<bool> UpdateTechnology(UpdateTechnologyServiceModel updateTechnologyServiceModel);
 
 		Task<bool> DeleteTechnology(Guid id);
 	}
diff --git a/src/DevHive.Services/Interfaces/IUserService.cs b/src/DevHive.Services/Interfaces/IUserService.cs
index 5ef141f..0f834e9 100644
--- a/src/DevHive.Services/Interfaces/IUserService.cs
+++ b/src/DevHive.Services/Interfaces/IUserService.cs
@@ -16,7 +16,7 @@ namespace DevHive.Services.Interfaces
 		Task<bool> AddLanguageToUser(Guid userId, LanguageServiceModel languageServiceModel);
 		Task<bool> AddTechnologyToUser(Guid userId, TechnologyServiceModel technologyServiceModel);
 
-		Task<UserServiceModel> GetFriendById(Guid friendId);
+		Task<UserServiceModel> GetFriend(string username);
 		Task<UserServiceModel> GetUserById(Guid id);
 
 		Task<UserServiceModel> UpdateUser(UpdateUserServiceModel updateModel);
diff --git a/src/DevHive.Services/Models/Identity/User/UserServiceModel.cs b/src/DevHive.Services/Models/Identity/User/UserServiceModel.cs
index 8825f50..ecf8c42 100644
--- a/src/DevHive.Services/Models/Identity/User/UserServiceModel.cs
+++ b/src/DevHive.Services/Models/Identity/User/UserServiceModel.cs
@@ -8,8 +8,11 @@ namespace DevHive.Services.Models.Identity.User
 	public class UserServiceModel : BaseUserServiceModel
 	{
 		public IList<RoleModel> Roles { get; set; } = new List<RoleModel>();
+
 		public IList<UserServiceModel> Friends { get; set; } = new List<UserServiceModel>();
+
 		public IList<LanguageServiceModel> Languages { get; set; } = new List<LanguageServiceModel>();
-		public IList<TechnologyServiceModel> TechnologyServiceModels { get; set; } = new List<TechnologyServiceModel>();
+
+		public IList<TechnologyServiceModel> Technologies { get; set; } = new List<TechnologyServiceModel>();
 	}
 }
diff --git a/src/DevHive.Services/Services/LanguageService.cs b/src/DevHive.Services/Services/LanguageService.cs
index be035c2..5b697cd 100644
--- a/src/DevHive.Services/Services/LanguageService.cs
+++ b/src/DevHive.Services/Services/LanguageService.cs
@@ -48,9 +48,9 @@ namespace DevHive.Services.Services
 
 		#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)
@@ -59,7 +59,6 @@ namespace DevHive.Services.Services
 			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);
 		}
diff --git a/src/DevHive.Services/Services/TechnologyService.cs b/src/DevHive.Services/Services/TechnologyService.cs
index d8b7262..c088281 100644
--- a/src/DevHive.Services/Services/TechnologyService.cs
+++ b/src/DevHive.Services/Services/TechnologyService.cs
@@ -48,15 +48,14 @@ namespace DevHive.Services.Services
 
 		#region Update
 
-		public async Task<bool> UpdateTechnology(Guid technologyId, UpdateTechnologyServiceModel updateTechnologyServiceModel)
+		public async Task<bool> UpdateTechnology(UpdateTechnologyServiceModel updateTechnologyServiceModel)
 		{
-			if (!await this._technologyRepository.DoesTechnologyExistAsync(technologyId))
+			if (!await this._technologyRepository.DoesTechnologyExistAsync(updateTechnologyServiceModel.Id))
 				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);
 
diff --git a/src/DevHive.Services/Services/UserService.cs b/src/DevHive.Services/Services/UserService.cs
index 37dbc7b..d9e87e0 100644
--- a/src/DevHive.Services/Services/UserService.cs
+++ b/src/DevHive.Services/Services/UserService.cs
@@ -160,12 +160,12 @@ namespace DevHive.Services.Services
 			return this._userMapper.Map<UserServiceModel>(user);
 		}
 
-		public async Task<UserServiceModel> GetFriendById(Guid friendId)
+		public async Task<UserServiceModel> GetFriend(string username)
 		{
-			if (!await _userRepository.DoesUserExistAsync(friendId))
-				throw new ArgumentException("User does not exist!");
+			User friend = await this._userRepository.GetByUsernameAsync(username);
 
-			User friend = await this._userRepository.GetByIdAsync(friendId);
+			if (default(User) == friend)
+				throw new ArgumentException("User does not exist!");
 
 			return this._userMapper.Map<UserServiceModel>(friend);
 		}