[ksqlDb.RestApi.Client]: fixed multiple column mappings in model builder #93

Author: tomasfabian

Tests/ksqlDB.RestApi.Client.Tests/FluentAPI/Builders/ModelBuilderTests.cs

@@ -185,6 +185,32 @@ public void MultipleMappingsForSameProperty()
       fieldMetadata.IgnoreInDML.Should().BeTrue();
     }
 
+
+    [Test]
+    public void MultipleMappingsForSameProperty_Decimal()
+    {
+      //Arrange
+      string columnName = "alter";
+      short precision = 2;
+      short scale = 3;
+
+      //Act
+      builder.Entity<Payment>()
+        .Property(b => b.Amount)
+        .Decimal(precision, scale);
+
+      builder.Entity<Payment>()
+        .Property(b => b.Amount)
+        .HasColumnName(columnName);
+
+      //Assert
+      var entityMetadata = ((IMetadataProvider)builder).GetEntities().FirstOrDefault(c => c.Type == typeof(Payment));
+      entityMetadata.Should().NotBeNull();
+      var fieldMetadata = entityMetadata!.FieldsMetadata.First(c => c.MemberInfo.Name == nameof(Payment.Amount));
+      fieldMetadata.ColumnName.Should().Be(columnName);
+      ((DecimalFieldMetadata)fieldMetadata).Precision.Should().Be(precision);
+    }
+
     [Test]
     public void Property_IgnoreNestedField()
     {

ksqlDb.RestApi.Client/FluentAPI/Builders/EntityTypeBuilder.cs

@@ -72,12 +72,12 @@ public IFieldTypeBuilder<TProperty> Property<TProperty>(Expression<Func<TEntity,
         switch (typeof(TProperty))
         {
           case { } type when type == typeof(decimal):
-            var decimalFieldMetadata = new DecimalFieldMetadata(fieldMetadata);
+            var decimalFieldMetadata = fieldMetadata as DecimalFieldMetadata ?? new DecimalFieldMetadata(fieldMetadata);
             builder = new DecimalFieldTypeBuilder<TProperty>(decimalFieldMetadata);
             fieldMetadata = decimalFieldMetadata;
             break;
           case { } type when type == typeof(byte[]):
-            var bytesArrayFieldMetadata = new BytesArrayFieldMetadata(fieldMetadata);
+            var bytesArrayFieldMetadata = fieldMetadata as BytesArrayFieldMetadata ?? new BytesArrayFieldMetadata(fieldMetadata);
             builder = new BytesArrayFieldTypeBuilder<TProperty>(bytesArrayFieldMetadata);
             fieldMetadata = bytesArrayFieldMetadata;
             break;
@@ -105,7 +105,7 @@ internal void IgnoreRowTime()
       MemberInfo? propertyInfo = props.FirstOrDefault();
       if (propertyInfo != null)
       {
-        AddFieldMetadata(propertyInfo);
+        AddFieldMetadata(propertyInfo, ignoreInDDL: true);
         return;
       }
 
@@ -116,18 +116,18 @@ internal void IgnoreRowTime()
 
       if (fieldInfo != null)
       {
-        AddFieldMetadata(fieldInfo);
+        AddFieldMetadata(fieldInfo, ignoreInDDL: true);
       }
     }
 
-    private void AddFieldMetadata(MemberInfo memberInfo)
+    private void AddFieldMetadata(MemberInfo memberInfo, bool ignoreInDDL)
     {
       var fieldMetadata = new FieldMetadata
       {
         MemberInfo = memberInfo,
         Path = memberInfo.Name,
         FullPath = memberInfo.Name,
-        IgnoreInDDL = true
+        IgnoreInDDL = ignoreInDDL
       };
 
       Metadata.FieldsMetadataDict[memberInfo] = fieldMetadata;