From f0398cf1b7e6477bbd184e7509a1030054fc1926 Mon Sep 17 00:00:00 2001
From: transtrike <transtrike@gmail.com>
Date: Sun, 17 Jan 2021 16:26:32 +0200
Subject: Fix lang naming

---
 .../Mapping/UserCollectionMappings.cs              | 21 ++++++++++++++++++++
 .../Configurations/Mapping/UserMappings.cs         |  3 ---
 src/DevHive.Services/Services/UserService.cs       | 23 ++++++++++++++--------
 3 files changed, 36 insertions(+), 11 deletions(-)
 create mode 100644 src/DevHive.Services/Configurations/Mapping/UserCollectionMappings.cs

(limited to 'src/DevHive.Services')

diff --git a/src/DevHive.Services/Configurations/Mapping/UserCollectionMappings.cs b/src/DevHive.Services/Configurations/Mapping/UserCollectionMappings.cs
new file mode 100644
index 0000000..ee505a2
--- /dev/null
+++ b/src/DevHive.Services/Configurations/Mapping/UserCollectionMappings.cs
@@ -0,0 +1,21 @@
+using AutoMapper;
+using DevHive.Data.Models;
+using DevHive.Services.Models.Identity.User;
+
+namespace DevHive.Services.Configurations.Mapping
+{
+	public class UserCollectionMappings : Profile
+	{
+		public UserCollectionMappings()
+		{
+			CreateMap<UpdateUserCollectionServiceModel, User>()
+				.ForMember(up => up.UserName, u => u.MapFrom(src => src.Name));
+			CreateMap<UpdateUserCollectionServiceModel, Role>()
+				.ForMember(r => r.Name, u => u.MapFrom(src => src.Name));
+			CreateMap<UpdateUserCollectionServiceModel, Language>()
+				.ForMember(r => r.Name, u => u.MapFrom(src => src.Name));
+			CreateMap<UpdateUserCollectionServiceModel, Technology>()
+				.ForMember(r => r.Name, u => u.MapFrom(src => src.Name));
+		}
+	}
+}
diff --git a/src/DevHive.Services/Configurations/Mapping/UserMappings.cs b/src/DevHive.Services/Configurations/Mapping/UserMappings.cs
index 97355d6..d57c6ba 100644
--- a/src/DevHive.Services/Configurations/Mapping/UserMappings.cs
+++ b/src/DevHive.Services/Configurations/Mapping/UserMappings.cs
@@ -11,9 +11,6 @@ namespace DevHive.Services.Configurations.Mapping
 			CreateMap<UserServiceModel, User>();
 			CreateMap<RegisterServiceModel, User>();
 			CreateMap<UpdateUserServiceModel, User>();
-			CreateMap<UpdateUserCollectionServiceModel, User>()
-				.ForMember(up => up.UserName, u => u.MapFrom(src => src.Name));
-
 
 			CreateMap<User, UserServiceModel>();
 		}
diff --git a/src/DevHive.Services/Services/UserService.cs b/src/DevHive.Services/Services/UserService.cs
index 3dd030a..b549b1c 100644
--- a/src/DevHive.Services/Services/UserService.cs
+++ b/src/DevHive.Services/Services/UserService.cs
@@ -131,21 +131,28 @@ namespace DevHive.Services.Services
 
 		#region Update
 
-		public async Task<UserServiceModel> UpdateUser(UpdateUserServiceModel updateModel)
+		public async Task<UserServiceModel> UpdateUser(UpdateUserServiceModel updateUserServiceModel)
 		{
-			if (!await this._userRepository.DoesUserExistAsync(updateModel.Id))
+			if (!await this._userRepository.DoesUserExistAsync(updateUserServiceModel.Id))
 				throw new ArgumentException("User does not exist!");
 
-			if (!this._userRepository.DoesUserHaveThisUsername(updateModel.Id, updateModel.UserName)
-					&& await this._userRepository.DoesUsernameExistAsync(updateModel.UserName))
+			if (!this._userRepository.DoesUserHaveThisUsername(updateUserServiceModel.Id, updateUserServiceModel.UserName)
+					&& await this._userRepository.DoesUsernameExistAsync(updateUserServiceModel.UserName))
 				throw new ArgumentException("Username already exists!");
 
-			await this.ValidateUserCollections(updateModel);
+			await this.ValidateUserCollections(updateUserServiceModel);
 
-			User user = this._userMapper.Map<User>(updateModel);
-			bool result = await this._userRepository.EditAsync(user);
+			//Query proper lang, tech and role and insert the full class in updateUserServiceModel
+			List<Language> properLanguages = new();
+			foreach (UpdateUserCollectionServiceModel lang in updateUserServiceModel.Languages)
+				properLanguages.Add(await this._languageRepository.GetByNameAsync(lang.Name));
 
-			if (!result)
+			User user = this._userMapper.Map<User>(updateUserServiceModel);
+			user.Languages = properLanguages;
+
+			bool success = await this._userRepository.EditAsync(user);
+
+			if (!success)
 				throw new InvalidOperationException("Unable to edit user!");
 
 			return this._userMapper.Map<UserServiceModel>(user); ;
-- 
cgit v1.2.3