fixing Hl7 configs

Signed-off-by: Neil South <[email protected]>

Author: neildsouth

src/Api/Hl7ApplicationConfigEntity.cs

@@ -128,6 +128,12 @@ public static implicit operator StringKeyValuePair(KeyValuePair<string, string>
         public static List<StringKeyValuePair> FromDictionary(Dictionary<string, string> dictionary) =>
             dictionary.Select(kvp => new StringKeyValuePair { Key = kvp.Key, Value = kvp.Value }).ToList();
 
+        public override bool Equals(object? obj) => Equals(obj as StringKeyValuePair);
+
+        public bool Equals(StringKeyValuePair? other) => other != null && Key == other.Key && Value == other.Value;
+
+        public override int GetHashCode() => HashCode.Combine(Key, Value);
+
     }
 
     public class DataKeyValuePair : IKeyValuePair<string, DataLinkType>
@@ -140,6 +146,12 @@ public static implicit operator DataKeyValuePair(KeyValuePair<string, DataLinkTy
         {
             return new DataKeyValuePair { Key = kvp.Key, Value = kvp.Value };
         }
+
+        public override bool Equals(object? obj) => Equals(obj as DataKeyValuePair);
+
+        public bool Equals(DataKeyValuePair? other) => other != null && Key == other.Key && Value == other.Value;
+
+        public override int GetHashCode() => HashCode.Combine(Key, Value);
     }
 
     public interface IKeyValuePair<TKey, TValue>

src/Database/EntityFramework/Configuration/Hl7ApplicationConfigConfiguration.cs

@@ -37,14 +37,50 @@ public void Configure(EntityTypeBuilder<Hl7ApplicationConfigEntity> builder)
                 DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
             };
 
-            builder.HasKey(j => j.Id);
+            builder.HasKey(j => j.Name);
+            builder.Property(j => j.SendingId).HasConversion(
+                        v => JsonSerializer.Serialize(v, jsonSerializerSettings),
+                        v => JsonSerializer.Deserialize<StringKeyValuePair>(v, jsonSerializerSettings)!)
+                .IsRequired()
+                .Metadata
+                .SetValueComparer(
+                    new ValueComparer<StringKeyValuePair>(
+                        (c1, c2) => c1 == c2,
+                        c => c.GetHashCode(),
+                        c => c));
+
+            builder.Property(j => j.DataLink).HasConversion(
+                        v => JsonSerializer.Serialize(v, jsonSerializerSettings),
+                        v => JsonSerializer.Deserialize<DataKeyValuePair>(v, jsonSerializerSettings)!)
+                .IsRequired()
+                .Metadata
+                .SetValueComparer(
+                    new ValueComparer<DataKeyValuePair>(
+                        (c1, c2) => c1 == c2,
+                        c => c.GetHashCode(),
+                        c => c));
+
+            builder.Property(j => j.DateTimeCreated).IsRequired();
             builder.Property(j => j.PlugInAssemblies)
                 .HasConversion(
                         v => JsonSerializer.Serialize(v, jsonSerializerSettings),
                         v => JsonSerializer.Deserialize<List<string>>(v, jsonSerializerSettings)!)
                 .Metadata.SetValueComparer(valueComparer);
 
+            builder.Property(j => j.DataMapping)
+                .HasConversion(
+                        v => JsonSerializer.Serialize(v, jsonSerializerSettings),
+                        v => JsonSerializer.Deserialize<List<StringKeyValuePair>>(v, jsonSerializerSettings)!)
+                .Metadata
+                .SetValueComparer(
+                    new ValueComparer<List<StringKeyValuePair>>(
+                        (c1, c2) => c1!.SequenceEqual(c2!),
+                        c => c.Aggregate(0, (a, v) => HashCode.Combine(a, v.GetHashCode())),
+                        c => c.ToList()));
+
             builder.HasIndex(p => p.Name, "idx_hl7_name").IsUnique();
+
+            builder.Ignore(p => p.Id);
         }
     }
 }

src/Database/EntityFramework/InformaticsGatewayContext.cs

@@ -60,6 +60,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
             modelBuilder.ApplyConfiguration(new StorageMetadataWrapperEntityConfiguration());
             modelBuilder.ApplyConfiguration(new DicomAssociationInfoConfiguration());
             modelBuilder.ApplyConfiguration(new VirtualApplicationEntityConfiguration());
+            modelBuilder.ApplyConfiguration(new Hl7ApplicationConfigConfiguration());
         }
 
         protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)