Website Summary Files Commits Branches @commit @diff @stats
path: root / src / DevHive.Services / Configurations
diff options
context:
space:
mode:
Commitacf0e2f3908ba45dca1ff04cc1e5a892cc2cdbf0 (patch)
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
Files38c290bd7bad75edfdeb9631948ef654c3a282f0 /src/DevHive.Services/Configurations
DevHive-acf0e2f3908ba45dca1ff04cc1e5a892cc2cdbf0.tar
DevHive-acf0e2f3908ba45dca1ff04cc1e5a892cc2cdbf0.tar.gz
DevHive-acf0e2f3908ba45dca1ff04cc1e5a892cc2cdbf0.zip
Parentf61da9c07ff37cb350528e255539b4ec11181bde (diff)
Parentbddc0b0566bc19e936ccae9d3aa16b6e0116b186 (diff)
Merge branch 'dev' of https://github.com/Team-Kaleidoscope/DevHive into dev
diff --git a/src/DevHive.Services/Configurations/Mapping/RoleMapings.cs b/src/DevHive.Services/Configurations/Mapping/RoleMapings.cs
index 23bd46f..e61a107 100644
--- a/src/DevHive.Services/Configurations/Mapping/RoleMapings.cs
+++ b/src/DevHive.Services/Configurations/Mapping/RoleMapings.cs
@@ -9,10 +9,10 @@ namespace DevHive.Services.Configurations.Mapping
public RoleMappings()
{
CreateMap<CreateRoleServiceModel, Role>();
- CreateMap<ReadRoleServiceModel, Role>();
+ CreateMap<RoleServiceModel, Role>();
CreateMap<UpdateRoleServiceModel, Role>();
- CreateMap<Role, ReadRoleServiceModel>();
+ CreateMap<Role, RoleServiceModel>();
CreateMap<Role, UpdateRoleServiceModel>();
}
}
diff --git a/src/DevHive.Services/Configurations/Mapping/TechnologyMappings.cs b/src/DevHive.Services/Configurations/Mapping/TechnologyMappings.cs
index 0103ccf..85b57f1 100644
--- a/src/DevHive.Services/Configurations/Mapping/TechnologyMappings.cs
+++ b/src/DevHive.Services/Configurations/Mapping/TechnologyMappings.cs
@@ -14,6 +14,7 @@ namespace DevHive.Services.Configurations.Mapping
CreateMap<Technology, CreateTechnologyServiceModel>();
CreateMap<Technology, TechnologyServiceModel>();
+ CreateMap<Technology, ReadTechnologyServiceModel>();
CreateMap<Technology, UpdateTechnologyServiceModel>();
}
}
diff --git a/src/DevHive.Services/Configurations/Mapping/UserMappings.cs b/src/DevHive.Services/Configurations/Mapping/UserMappings.cs
index 6797ce1..096af38 100644
--- a/src/DevHive.Services/Configurations/Mapping/UserMappings.cs
+++ b/src/DevHive.Services/Configurations/Mapping/UserMappings.cs
@@ -11,11 +11,10 @@ namespace DevHive.Services.Configurations.Mapping
{
CreateMap<UserServiceModel, User>();
CreateMap<RegisterServiceModel, User>();
+ CreateMap<FriendServiceModel, User>();
CreateMap<UpdateUserServiceModel, User>()
.AfterMap((src, dest) => dest.PasswordHash = PasswordModifications.GeneratePasswordHash(src.Password));
- CreateMap<FriendServiceModel, User>();
- CreateMap<UpdateFriendServiceModel, User>()
- .ForMember(dest => dest.UserName, src => src.MapFrom(p => p.Name));
+ CreateMap<UpdateFriendServiceModel, User>();
CreateMap<User, UserServiceModel>();
CreateMap<User, UpdateUserServiceModel>()