diff options
| author | Danail Dimitrov <danaildimitrov321@gmail.com> | 2021-01-26 15:50:16 +0200 |
|---|---|---|
| committer | Danail Dimitrov <danaildimitrov321@gmail.com> | 2021-01-26 15:50:16 +0200 |
| commit | acf0e2f3908ba45dca1ff04cc1e5a892cc2cdbf0 (patch) | |
| tree | 38c290bd7bad75edfdeb9631948ef654c3a282f0 /src/DevHive.Web/Configurations | |
| parent | f61da9c07ff37cb350528e255539b4ec11181bde (diff) | |
| parent | bddc0b0566bc19e936ccae9d3aa16b6e0116b186 (diff) | |
| download | DevHive-acf0e2f3908ba45dca1ff04cc1e5a892cc2cdbf0.tar DevHive-acf0e2f3908ba45dca1ff04cc1e5a892cc2cdbf0.tar.gz DevHive-acf0e2f3908ba45dca1ff04cc1e5a892cc2cdbf0.zip | |
Merge branch 'dev' of https://github.com/Team-Kaleidoscope/DevHive into dev
Diffstat (limited to 'src/DevHive.Web/Configurations')
| -rw-r--r-- | src/DevHive.Web/Configurations/Mapping/RoleMappings.cs | 4 | ||||
| -rw-r--r-- | src/DevHive.Web/Configurations/Mapping/UserMappings.cs | 14 |
2 files changed, 6 insertions, 12 deletions
diff --git a/src/DevHive.Web/Configurations/Mapping/RoleMappings.cs b/src/DevHive.Web/Configurations/Mapping/RoleMappings.cs index 2f01f77..2ea2742 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, ReadRoleServiceModel>(); + CreateMap<RoleWebModel, RoleServiceModel>(); CreateMap<CreateRoleServiceModel, CreateRoleWebModel>(); CreateMap<UpdateRoleServiceModel, UpdateRoleWebModel>(); - CreateMap<ReadRoleServiceModel, RoleWebModel>(); + CreateMap<RoleServiceModel, RoleWebModel>(); } } } diff --git a/src/DevHive.Web/Configurations/Mapping/UserMappings.cs b/src/DevHive.Web/Configurations/Mapping/UserMappings.cs index e80a69a..1b26cc9 100644 --- a/src/DevHive.Web/Configurations/Mapping/UserMappings.cs +++ b/src/DevHive.Web/Configurations/Mapping/UserMappings.cs @@ -2,8 +2,6 @@ using AutoMapper; using DevHive.Services.Models.Identity.User; using DevHive.Web.Models.Identity.User; using DevHive.Common.Models.Identity; -using DevHive.Web.Models.Language; -using DevHive.Web.Models.Technology; namespace DevHive.Web.Configurations.Mapping { @@ -21,16 +19,12 @@ namespace DevHive.Web.Configurations.Mapping CreateMap<TokenModel, TokenWebModel>(); //Update - CreateMap<UpdateUserWebModel, UpdateUserServiceModel>() - .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<UpdateUserWebModel, UpdateUserServiceModel>(); + CreateMap<UsernameWebModel, FriendServiceModel>(); + CreateMap<UsernameWebModel, UpdateFriendServiceModel>(); CreateMap<UpdateUserServiceModel, UpdateUserWebModel>(); - CreateMap<FriendServiceModel, FriendWebModel>(); + CreateMap<FriendServiceModel, UsernameWebModel>(); } } } |