[ksqlDB.RestApi.Client]: fixed creation of multiple FieldMetadata for primitive field in Base class #102

Author: tomasfabian

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

@@ -57,9 +57,14 @@ public IFieldTypeBuilder<TProperty> Property<TProperty>(Expression<Func<TEntity,
       string path = string.Empty;
       foreach (var (memberName, memberInfo) in members)
       {
+        var memberInfoKey = new MemberInfoKey
+        {
+          Module = memberInfo.Module,
+          MetadataToken = memberInfo.MetadataToken
+        };
         path += memberName;
 
-        if (!Metadata.FieldsMetadataDict.TryGetValue(memberInfo, out var fieldMetadata))
+        if (!Metadata.FieldsMetadataDict.TryGetValue(memberInfoKey, out var fieldMetadata))
         {
           fieldMetadata = new FieldMetadata()
           {
@@ -86,7 +91,7 @@ public IFieldTypeBuilder<TProperty> Property<TProperty>(Expression<Func<TEntity,
             break;
         }
 
-        Metadata.FieldsMetadataDict[memberInfo] = fieldMetadata;
+        Metadata.FieldsMetadataDict[memberInfoKey] = fieldMetadata;
         path += ".";
       }
 
@@ -122,6 +127,12 @@ internal void IgnoreRowTime()
 
     private void AddFieldMetadata(MemberInfo memberInfo, bool ignoreInDDL)
     {
+      var memberInfoKey = new MemberInfoKey
+      {
+        Module = memberInfo.Module,
+        MetadataToken = memberInfo.MetadataToken
+      };
+
       var fieldMetadata = new FieldMetadata
       {
         MemberInfo = memberInfo,
@@ -130,7 +141,7 @@ private void AddFieldMetadata(MemberInfo memberInfo, bool ignoreInDDL)
         IgnoreInDDL = ignoreInDDL
       };
 
-      Metadata.FieldsMetadataDict[memberInfo] = fieldMetadata;
+      Metadata.FieldsMetadataDict[memberInfoKey] = fieldMetadata;
     }
   }
 }

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

@@ -0,0 +1,10 @@
+using System.Reflection;
+
+namespace ksqlDb.RestApi.Client.FluentAPI.Builders
+{
+  internal record MemberInfoKey
+  {
+    internal Module Module { get; set; }
+    internal int MetadataToken { get; set; }
+  }
+}

ksqlDb.RestApi.Client/Metadata/EntityMetadata.cs

@@ -1,5 +1,6 @@
 using System.Linq.Expressions;
 using System.Reflection;
+using ksqlDb.RestApi.Client.FluentAPI.Builders;
 
 namespace ksqlDb.RestApi.Client.Metadata
 {
@@ -9,7 +10,7 @@ internal sealed class EntityMetadata
 
     internal MemberInfo? PrimaryKeyMemberInfo { get; set; }
 
-    internal readonly IDictionary<MemberInfo, FieldMetadata> FieldsMetadataDict = new Dictionary<MemberInfo, FieldMetadata>();
+    internal readonly IDictionary<MemberInfoKey, FieldMetadata> FieldsMetadataDict = new Dictionary<MemberInfoKey, FieldMetadata>();
 
     public IEnumerable<FieldMetadata> FieldsMetadata => FieldsMetadataDict.Values;