#168: Handle conversions between simple types wrapped in nullable lik…

…e decimal? -> double
cezarypiatek · Mar 13, 2021 · df1259e · df1259e
1 parent e8b5122
commit df1259e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/...MappingGenerator.Test/MappingGenerator/TestCaseData/036_PureMappingMethodWithNullable.txt b/...MappingGenerator.Test/MappingGenerator/TestCaseData/036_PureMappingMethodWithNullable.txt
@@ -28,6 +28,7 @@ namespace MappingGenerator.Test.MappingGenerator.TestCaseData
         public string? MiddleName { get; set; }
         public string LastName { get; set; }
         public int AgeValue { get; set; }
+        public double Weight { get; set; }
         public AccountDTO? Account { get; set; }
         public AccountDTO Account2 { get; set; }
         public List<AccountDTO>? Debs { get; set; }
@@ -96,6 +97,7 @@ namespace MappingGenerator.Test.MappingGenerator.TestCaseData
         public string LastName { get; set; }
         public string? MiddleName { get; set; }
         public int? Age { get; set; }
+        public decimal? Weight { get; set; }
         public AccountEntity? Account { get; set; }
         public AccountEntity? Account2 { get; set; }
         public List<AccountEntity>? Debs { get; set; }

diff --git a/...gGenerator.Test/MappingGenerator/TestCaseData/036_PureMappingMethodWithNullable_FIXED.txt b/...gGenerator.Test/MappingGenerator/TestCaseData/036_PureMappingMethodWithNullable_FIXED.txt
@@ -19,6 +19,7 @@ namespace MappingGenerator.Test.MappingGenerator.TestCaseData
                 MiddleName = entity.MiddleName,
                 LastName = entity.LastName,
                 AgeValue = entity.Age ?? throw new ArgumentNullException(nameof(entity), "The value of 'entity.Age' should not be null"),
+                Weight = (double)(entity.Weight ?? throw new ArgumentNullException(nameof(entity), "The value of 'entity.Weight' should not be null")),
                 Account = entity.Account != null ? new AccountDTO
                 {
                     BankName = entity.Account.BankName,
@@ -74,6 +75,7 @@ namespace MappingGenerator.Test.MappingGenerator.TestCaseData
         public string? MiddleName { get; set; }
         public string LastName { get; set; }
         public int AgeValue { get; set; }
+        public double Weight { get; set; }
         public AccountDTO? Account { get; set; }
         public AccountDTO Account2 { get; set; }
         public List<AccountDTO>? Debs { get; set; }
@@ -142,6 +144,7 @@ namespace MappingGenerator.Test.MappingGenerator.TestCaseData
         public string LastName { get; set; }
         public string? MiddleName { get; set; }
         public int? Age { get; set; }
+        public decimal? Weight { get; set; }
         public AccountEntity? Account { get; set; }
         public AccountEntity? Account2 { get; set; }
         public List<AccountEntity>? Debs { get; set; }

diff --git a/MappingGenerator/MappingGenerator/MappingGenerator/Mappings/MappingEngine.cs b/MappingGenerator/MappingGenerator/MappingGenerator/Mappings/MappingEngine.cs
@@ -84,13 +84,15 @@ public async Task<MappingElement> MapExpression(MappingElement source, Annotated
             }
 
 
-            if (ObjectHelper.IsSimpleType(targetType.Type) && SymbolHelper.IsNullable(sourceType.Type, out var underlyingType) )
+            if (ObjectHelper.IsSimpleType(targetType.Type) && SymbolHelper.IsNullable(sourceType.Type, out var underlyingType))
             {
-                return new MappingElement
+                var mapping = new MappingElement
                 {
-                    Expression =  OrFailWhenArgumentNull(source.Expression),
+                    Expression = OrFailWhenArgumentNull(source.Expression),
                     ExpressionType = new AnnotatedType(underlyingType, false)
                 };
+
+                return IsConversionToSimpleTypeNeeded(targetType.Type, underlyingType) ? ConvertToSimpleType(targetType, mapping, mappingContext) : mapping;
             }
 
             if (IsConversionToSimpleTypeNeeded(targetType.Type, source.ExpressionType.Type))