add PublisherOptions

lsfera · Jul 17, 2024 · c446721 · c446721
1 parent 8db4187
commit c446721
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/src/Blumchen/Publications/MessageAppender.cs b/src/Blumchen/Publications/MessageAppender.cs
@@ -7,7 +7,7 @@ namespace Blumchen.Publications;
 public static class MessageAppender
 {
     public static async Task AppendAsync<T>(T @input
-        , (TableDescriptorBuilder.MessageTable tableDescriptor, IJsonTypeResolver jsonTypeResolver) resolver
+        , PublisherOptions resolver
         , NpgsqlConnection connection
         , NpgsqlTransaction transaction
         , CancellationToken ct
@@ -18,10 +18,10 @@ public static async Task AppendAsync<T>(T @input
             case null:
                 throw new ArgumentNullException(nameof(@input));
             case IEnumerable inputs:
-                await AppendBatchAsyncOfT(inputs, resolver.tableDescriptor, resolver.jsonTypeResolver, connection, transaction, ct).ConfigureAwait(false);
+                await AppendBatchAsyncOfT(inputs, resolver.TableDescriptor, resolver.JsonTypeResolver, connection, transaction, ct).ConfigureAwait(false);
                 break;
             default:
-                await AppendAsyncOfT(input, resolver.tableDescriptor, resolver.jsonTypeResolver, connection, transaction, ct).ConfigureAwait(false);
+                await AppendAsyncOfT(input, resolver.TableDescriptor, resolver.JsonTypeResolver, connection, transaction, ct).ConfigureAwait(false);
                 break;
         }
     }
@@ -46,20 +46,20 @@ private static async Task AppendAsyncOfT<T>(T input
     }
 
     public static async Task AppendAsync<T>(T input
-        , (TableDescriptorBuilder.MessageTable tableDescriptor, IJsonTypeResolver resolver) options
+        , PublisherOptions options
         , string connectionString
         , CancellationToken ct)
         where T: class
     {
         var type = typeof(T);
-        var (typeName, jsonTypeInfo) = options.resolver.Resolve(type);
+        var (typeName, jsonTypeInfo) = options.JsonTypeResolver.Resolve(type);
         var data = JsonSerialization.ToJson(input, jsonTypeInfo);
 
         await using var connection = new NpgsqlConnection(connectionString);
         await connection.OpenAsync(ct).ConfigureAwait(false);
         await using var command = connection.CreateCommand();
         command.CommandText =
-            $"INSERT INTO {options.tableDescriptor.Name}({options.tableDescriptor.MessageType.Name}, {options.tableDescriptor.Data.Name}) values ('{typeName}', '{data}')";
+            $"INSERT INTO {options.TableDescriptor.Name}({options.TableDescriptor.MessageType.Name}, {options.TableDescriptor.Data.Name}) values ('{typeName}', '{data}')";
         await command.PrepareAsync(ct).ConfigureAwait(false);
         await command.ExecuteNonQueryAsync(ct).ConfigureAwait(false);
     }

diff --git a/src/Blumchen/Publications/PublisherOptions.cs b/src/Blumchen/Publications/PublisherOptions.cs
@@ -0,0 +1,5 @@
+using Blumchen.Serialization;
+
+namespace Blumchen.Publications;
+
+public record PublisherOptions(TableDescriptorBuilder.MessageTable TableDescriptor, IJsonTypeResolver JsonTypeResolver);
diff --git a/src/Blumchen/Publications/PublisherSetupOptionsBuilder.cs b/src/Blumchen/Publications/PublisherSetupOptionsBuilder.cs
@@ -33,7 +33,7 @@ public PublisherSetupOptionsBuilder WithTable(Func<TableDescriptorBuilder, Table
         return this;
     }
 
-    public (MessageTable tableDescriptor, IJsonTypeResolver jsonTypeResolver) Build()
+    public PublisherOptions Build()
     {
         ArgumentNullException.ThrowIfNull(_jsonSerializerContext);
         ArgumentNullException.ThrowIfNull(_namingPolicy);
@@ -48,6 +48,6 @@ public PublisherSetupOptionsBuilder WithTable(Func<TableDescriptorBuilder, Table
         while (typeEnum.MoveNext())
             jsonTypeResolver.WhiteList(typeEnum.Current);
 
-        return (_tableDescriptor,jsonTypeResolver);
+        return new(_tableDescriptor,jsonTypeResolver);
     }
 }