Skip to content

fix: ProjectToType nullable navigation to record DTO ctor (#898) #971

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

Open
leno23 wants to merge 1 commit into
base: development
Choose a base branch
from
+28 −16
Open

fix: ProjectToType nullable navigation to record DTO ctor (#898) #971

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 18 additions & 7 deletions src/Mapster.Tests/WhenAddCtorNullablePropagation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using Mapster.Tests.Classes;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Shouldly;
using System.Collections.Generic;
using System.Linq;

Expand All @@ -15,14 +15,25 @@ public class WhenAddCtorNullablePropagation
[TestMethod]
public void NullablePropagationFromCtorWorking()
{
var source = new List<OrderEntity898>();
var source = new List<OrderEntity898>
{
new() { Id = 1, Cod = new OrderCodEntity898 { Value = 42L } },
new() { Id = 2, Cod = null },
};

source.Add(new OrderEntity898() { Id = 1, Cod = new OrderCodEntity898 { Value = 42L } });
source.Add(new OrderEntity898() { Id = 2, Cod = null });

var str = new OrderEntity898() { Id = 1, Cod = new OrderCodEntity898 { Value = 42L } }.BuildAdapter().CreateProjectionExpression<OrderDto898>();
Should.NotThrow(() =>
{
source.AsQueryable().BuildAdapter().CreateProjectionExpression<OrderDto898>();
});

var result = source.AsQueryable().ProjectToType<OrderDto898>().ToList();

result.Count.ShouldBe(2);
result[0].Id.ShouldBe(1);
result[0].Cod.ShouldNotBeNull();
result[0].Cod!.Value.ShouldBe(42L);
result[1].Id.ShouldBe(2);
result[1].Cod.ShouldBeNull();
}

}
Expand Down
9 changes: 5 additions & 4 deletions src/Mapster/Adapters/BaseClassAdapter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,9 +218,9 @@ protected Expression CreateInstantiationExpression(Expression source, ClassMappi
var members = classConverter.Members;

var arguments = new List<Expression>();
arg.Context.NullChecks.UnionWith(members.Where(x => x.Getter != null).Select(x => (x.Getter, arg)));
foreach (var member in members)
{
arg.Context.NullChecks.UnionWith(members.Where(x=>x.Getter != null).Select(x=>(x.Getter,arg)));
var parameterInfo = (ParameterInfo)member.DestinationMember.Info!;
Expression defaultConst;
Expression getter;
Expand Down Expand Up @@ -253,12 +253,13 @@ protected Expression CreateInstantiationExpression(Expression source, ClassMappi
else
{

if (member.Getter.CanBeNull() && member.DestinationMember.Type.IsAbstractOrNotPublicCtor()
&& member.Ignore.Condition == null)
if (member.Getter.CanBeNull() && member.Ignore.Condition == null
&& (member.DestinationMember.Type.IsAbstractOrNotPublicCtor()
|| member.DestinationMember.Type.UnwrapNullable().IsRecordType()))
{
var compareNull = Expression.Equal(member.Getter, Expression.Constant(null, member.Getter.Type));
getter = Expression.Condition(ExpressionEx.Not(compareNull),
CreateAdaptExpression(member.Getter, member.DestinationMember.Type, arg, member),
CreateAdaptExpressionCore(member.Getter, member.DestinationMember.Type, arg, member),
defaultConst);
}
else
Expand Down
10 changes: 5 additions & 5 deletions src/Mapster/Utils/ExpressionEx.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,18 +453,18 @@ public static Expression ApplyNullPropagationFromCtor(this Expression getter, Ex
Expression? condition = null;
var current = getter;
var checks = arg.Context.NullChecks
.Where(x=> !object.ReferenceEquals(x.arg,arg))
.Select(x=>x.param?.Type);
.Where(x => !object.ReferenceEquals(x.arg, arg))
.Select(x => x.param);

while (current != null)
{
Expression? compareNull = null;

if (current.CanBeNull() && current is not ParameterExpression)
compareNull = Expression.NotEqual(current, Expression.Constant(null, current.Type));
else if (current.CanBeNull() && current is ParameterExpression
&& !checks.Contains(current.Type))
compareNull = Expression.NotEqual(current, Expression.Constant(null, current.Type));
else if (current.CanBeNull() && current is ParameterExpression param
&& !checks.Contains(param))
compareNull = Expression.NotEqual(param, Expression.Constant(null, param.Type));

if (compareNull != null)
{
Expand Down