P0
/
MapTo
3
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x

This commit is contained in:
Wvader 2021-12-11 14:09:11 +00:00
parent 31ac58f274
commit 18f4ff408a
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/MapTo/Extensions/CommonSource.cs
View File

@ -3,6 +3,7 @@ using static MapTo.Sources.Constants;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Text; using System.Text;
using System.Collections.Immutable;
namespace MapTo.Extensions namespace MapTo.Extensions
{ {
@ -64,12 +65,15 @@ namespace MapTo.Extensions
var stringBuilder = new StringBuilder(); var stringBuilder = new StringBuilder();
var otherProperties = new List<MappedProperty>();
foreach (var property in model.TypeProperties) foreach (var property in model.TypeProperties)
{ {
if (!model.TypeProperties.IsMappedProperty(property)) if (!model.TypeProperties.IsMappedProperty(property) || !model.SourceProperties.IsMappedProperty(property))
{ {
stringBuilder.Append(", "); stringBuilder.Append(", ");
stringBuilder.Append($"{property.FullyQualifiedType} {property.SourcePropertyName.ToCamelCase()}"); stringBuilder.Append($"{property.FullyQualifiedType} {property.SourcePropertyName.ToCamelCase()}");
otherProperties.Add(property);
} }
} }
@ -78,7 +82,7 @@ namespace MapTo.Extensions
builder builder
.WriteLine($"public {model.TypeIdentifierName}({model.SourceType} {sourceClassParameterName}{readOnlyPropertiesArguments}){baseConstructor}") .WriteLine($"public {model.TypeIdentifierName}({model.SourceType} {sourceClassParameterName}{readOnlyPropertiesArguments}){baseConstructor}")
.WriteOpeningBracket() .WriteOpeningBracket()
.TryWriteProperties(model.SourceProperties, model.TypeProperties, sourceClassParameterName, mappingContextParameterName, false); .TryWriteProperties(model.SourceProperties, otherProperties.ToArray().ToImmutableArray(), sourceClassParameterName, mappingContextParameterName, false);
// End constructor declaration // End constructor declaration
return builder.WriteClosingBracket(); return builder.WriteClosingBracket();
@ -137,7 +141,6 @@ namespace MapTo.Extensions
foreach (var property in otherProperties) foreach (var property in otherProperties)
{ {
if(!properties.IsMappedProperty(property))
builder.WriteLine(property.MappedSourcePropertyTypeName is null builder.WriteLine(property.MappedSourcePropertyTypeName is null
? $"{property.Name} = {property.SourcePropertyName.ToCamelCase()};" ? $"{property.Name} = {property.SourcePropertyName.ToCamelCase()};"
: ""); : "");