3 files changed, 23 insertions, 2 deletions
diff --git a/src/DevHive.Web/Configurations/Mapping/FeedMappings.cs b/src/DevHive.Web/Configurations/Mapping/FeedMappings.cs
new file mode 100644
index 0000000..159582d
--- /dev/null
+++ b/src/DevHive.Web/Configurations/Mapping/FeedMappings.cs
@@ -0,0 +1,18 @@
+using AutoMapper;
+using DevHive.Services.Models;
+using DevHive.Web.Controllers;
+using DevHive.Web.Models.Feed;
+
+namespace DevHive.Web.Configurations.Mapping
+{
+	public class FeedMappings : Profile
+	{
+		public FeedMappings()
+		{
+			CreateMap<GetPageWebModel, GetPageServiceModel>()
+				.ForMember(dest => dest.FirstRequestIssued, src => src.MapFrom(p => p.FirstPageTimeIssued));
+
+			CreateMap<ReadPageServiceModel, ReadPageWebModel>();
+		}
+	}
+}
diff --git a/src/DevHive.Web/Configurations/Mapping/RoleMappings.cs b/src/DevHive.Web/Configurations/Mapping/RoleMappings.cs
index 2ea2742..2f01f77 100644
--- a/src/DevHive.Web/Configurations/Mapping/RoleMappings.cs
+++ b/src/DevHive.Web/Configurations/Mapping/RoleMappings.cs
@@ -11,11 +11,11 @@ namespace DevHive.Web.Configurations.Mapping
 			CreateMap<CreateRoleWebModel, CreateRoleServiceModel>();
 			CreateMap<UpdateRoleWebModel, UpdateRoleServiceModel>()
 				.ForMember(src => src.Id, dest => dest.Ignore());
-			CreateMap<RoleWebModel, RoleServiceModel>();
+			CreateMap<RoleWebModel, ReadRoleServiceModel>();
 
 			CreateMap<CreateRoleServiceModel, CreateRoleWebModel>();
 			CreateMap<UpdateRoleServiceModel, UpdateRoleWebModel>();
-			CreateMap<RoleServiceModel, RoleWebModel>();
+			CreateMap<ReadRoleServiceModel, RoleWebModel>();
 		}
 	}
 }
diff --git a/src/DevHive.Web/Configurations/Mapping/UserMappings.cs b/src/DevHive.Web/Configurations/Mapping/UserMappings.cs
index 9dbf613..e80a69a 100644
--- a/src/DevHive.Web/Configurations/Mapping/UserMappings.cs
+++ b/src/DevHive.Web/Configurations/Mapping/UserMappings.cs
@@ -25,6 +25,9 @@ namespace DevHive.Web.Configurations.Mapping
 				.ForMember(src => src.Id, dest => dest.Ignore());
 			CreateMap<FriendWebModel, FriendServiceModel>()
 				.ForMember(src => src.Id, dest => dest.Ignore());
+			CreateMap<FriendWebModel, UpdateFriendServiceModel>()
+				.ForMember(src => src.Id, dest => dest.Ignore())
+				.ForMember(src => src.Name, dest => dest.MapFrom(p => p.UserName));
 
 			CreateMap<UpdateUserServiceModel, UpdateUserWebModel>();
 			CreateMap<FriendServiceModel, FriendWebModel>();