Skip to content

Reverse the string based MapFrom #3336

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jbogard merged 4 commits into from
Mar 9, 2020
Merged

Reverse the string based MapFrom #3336

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
abfd0d6
Added failing tests.
timmi-on-rails Feb 25, 2020
c90380c
Fixed reverse mapping with MapFrom property of field name overload.
timmi-on-rails Feb 25, 2020
a3d5010
cosmetics
lbargaoanu Feb 26, 2020
40e8fd8
cosmetic
lbargaoanu Feb 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
cosmetic
  • Loading branch information
@lbargaoanu
lbargaoanu committed Feb 26, 2020
commit 40e8fd8443d34c16c53748b4c2edb4a44e7d8f2d
18 changes: 8 additions & 10 deletions src/AutoMapper/Configuration/MemberConfigurationExpression.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ namespace AutoMapper.Configuration

public class MemberConfigurationExpression<TSource, TDestination, TMember> : IMemberConfigurationExpression<TSource, TDestination, TMember>, IPropertyMapConfiguration
{
private LambdaExpression _sourceMember;
private string _sourceMemberName;
private LambdaExpression _sourceExpression;
private MemberInfo _sourceMember;
private readonly Type _sourceType;
protected List<Action<PropertyMap>> PropertyMapActions { get; } = new List<Action<PropertyMap>>();

Expand Down Expand Up @@ -117,14 +117,13 @@ public void MapFrom<TSourceMember>(Expression<Func<TSource, TSourceMember>> mapE

internal void MapFromUntyped(LambdaExpression sourceExpression)
{
_sourceMember = sourceExpression;
_sourceExpression = sourceExpression;
PropertyMapActions.Add(pm => pm.MapFrom(sourceExpression));
}

public void MapFrom(string sourceMemberName)
{
_sourceType.GetFieldOrProperty(sourceMemberName);
_sourceMemberName = sourceMemberName;
_sourceMember = _sourceType.GetFieldOrProperty(sourceMemberName);
PropertyMapActions.Add(pm => pm.MapFrom(sourceMemberName));
}

Expand Down Expand Up @@ -339,24 +338,23 @@ private void Apply(PropertyMap propertyMap)
propertyMap.CheckMappedReadonly();
}

public LambdaExpression SourceExpression => _sourceMember;
public LambdaExpression SourceExpression => _sourceExpression;
public LambdaExpression GetDestinationExpression() => MemberAccessLambda(DestinationMember);

public IPropertyMapConfiguration Reverse()
{
var destinationType = DestinationMember.DeclaringType;
if (_sourceMemberName != null)
if (_sourceMember != null)
{
var sourceMember = _sourceType.GetFieldOrProperty(_sourceMemberName);
var reversedMemberConfiguration = new MemberConfigurationExpression<TDestination, TSource, object>(sourceMember, destinationType);
var reversedMemberConfiguration = new MemberConfigurationExpression<TDestination, TSource, object>(_sourceMember, destinationType);
reversedMemberConfiguration.MapFrom(DestinationMember.Name);
return reversedMemberConfiguration;
}
if (destinationType.IsGenericTypeDefinition) // .ForMember("InnerSource", o => o.MapFrom(s => s))
{
return null;
}
return PathConfigurationExpression<TDestination, TSource, object>.Create(_sourceMember, GetDestinationExpression());
return PathConfigurationExpression<TDestination, TSource, object>.Create(_sourceExpression, GetDestinationExpression());
}

public void DontUseDestinationValue() => SetUseDestinationValue(false);
Expand Down