From 81b3fc43a900857443c3c763f52e0a54719c2fae Mon Sep 17 00:00:00 2001
From: transtrike <transtrike@gmail.com>
Date: Wed, 3 Feb 2021 02:59:21 +0200
Subject: User-Friends Relation Fixed

---
 .../Configurations/Mapping/UserMappings.cs                | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'src/DevHive.Services/Configurations/Mapping/UserMappings.cs')

diff --git a/src/DevHive.Services/Configurations/Mapping/UserMappings.cs b/src/DevHive.Services/Configurations/Mapping/UserMappings.cs
index 68a81e8..5223d84 100644
--- a/src/DevHive.Services/Configurations/Mapping/UserMappings.cs
+++ b/src/DevHive.Services/Configurations/Mapping/UserMappings.cs
@@ -12,20 +12,25 @@ namespace DevHive.Services.Configurations.Mapping
 		{
 			CreateMap<UserServiceModel, User>();
 			CreateMap<RegisterServiceModel, User>();
-			CreateMap<FriendServiceModel, User>()
-				.ForMember(dest => dest.Friends, src => src.Ignore());
-			CreateMap<UserFriends, FriendServiceModel>()
+			CreateMap<FriendServiceModel, User>();
+				// .ForMember(dest => dest.Friends, src => src.Ignore());
+			CreateMap<UserFriend, FriendServiceModel>()
 				.ForMember(dest => dest.UserName, src => src.MapFrom(p => p.Friend.UserName));
 			CreateMap<UpdateUserServiceModel, User>()
-				.ForMember(dest => dest.Friends, src => src.Ignore())
+				// .ForMember(dest => dest.Friends, src => src.Ignore())
 				.AfterMap((src, dest) => dest.PasswordHash = PasswordModifications.GeneratePasswordHash(src.Password));
 			CreateMap<UpdateFriendServiceModel, User>();
 
 			CreateMap<User, UserServiceModel>()
-				.ForMember(dest => dest.Friends, src => src.MapFrom(p => p.Friends));
+				.ForMember(dest => dest.Friends, src => src.MapFrom(p => p.MyFriends));
+				// .ForMember(dest => dest.Friends, src => src.MapFrom(p => p.Friends));
 			CreateMap<User, UpdateUserServiceModel>()
 				.ForMember(x => x.Password, opt => opt.Ignore());
 			CreateMap<User, FriendServiceModel>();
+
+			CreateMap<UserFriend, FriendServiceModel>()
+				.ForMember(dest => dest.UserName, src => src.MapFrom(p => p.Friend.UserName))
+				.ForMember(dest => dest.Id, src => src.MapFrom(p => p.FriendId));
 		}
 	}
 }
-- 
cgit v1.2.3