Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
33 changes: 31 additions & 2 deletions src/Mapster.Tests/WhenFlattening.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using System;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Shouldly;
using System;
using System.Collections.Generic;
using Assert = Microsoft.VisualStudio.TestTools.UnitTesting.Assert;

namespace Mapster.Tests
Expand Down Expand Up @@ -78,12 +79,40 @@ public class ModelDto
public string SubSubSubCoolProperty { get; set; }
}

public class Source915
{
public ICollection<Case> Cases { get; set; } = new List<Case>
{
new Case(),
new Case(),
new Case()
};
}

public class Destination915
{
public int CasesCount { get; set; }
}

#endregion


[TestClass]
public class WhenFlattening
{

/// <summary>
/// https://github.com/MapsterMapper/Mapster/issues/915
/// </summary>
[TestMethod]
public void FlatteningUsingSourceInterface()
{
var source = new Source915();
var result = source.Adapt<Destination915>();

result.CasesCount.ShouldBe(source.Cases.Count);
}

[TestMethod]
public void GetMethodTest()
{
Expand Down
3 changes: 1 addition & 2 deletions src/Mapster/Settings/ValueAccessingStrategy.cs
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,7 @@ public static class ValueAccessingStrategy
return member.GetExpression(source);

var propertyType = member.Type;
if (propertyName.StartsWith(sourceMemberName) &&
(propertyType.IsPoco() || propertyType.IsRecordType()))
if (propertyName.StartsWith(sourceMemberName) && !propertyType.IsMapsterPrimitive())
{
var exp = member.GetExpression(source);
var ifTrue = GetDeepFlattening(exp, propertyName.Substring(sourceMemberName.Length).TrimStart('_'), arg);
Expand Down
Loading