Merge pull request #25 from atc-net/release/v1.5

Release of new minor version v1.5
atc-net · Jul 5, 2022 · 8bea3cd · 8bea3cd
2 parents cd5a254 + ff1afe6
commit 8bea3cd
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+- Introduced configuration of custom json converters (#23)
+
 ## [1.4.5] - 2022-03-18
 
 ### Changed

diff --git a/src/Atc.Cosmos.EventStore/Cosmos/CosmosEventSerializer.cs b/src/Atc.Cosmos.EventStore/Cosmos/CosmosEventSerializer.cs
@@ -6,6 +6,7 @@
 using Atc.Cosmos.EventStore.Converters;
 using Atc.Cosmos.EventStore.Events;
 using Microsoft.Azure.Cosmos;
+using Microsoft.Extensions.Options;
 
 namespace Atc.Cosmos.EventStore.Cosmos
 {
@@ -16,7 +17,9 @@ internal class CosmosEventSerializer : CosmosSerializer
     {
         private readonly JsonSerializerOptions jsonSerializerOptions;
 
-        public CosmosEventSerializer(IEventTypeProvider typeProvider)
+        public CosmosEventSerializer(
+            IOptions<EventStoreClientOptions> options,
+            IEventTypeProvider typeProvider)
         {
             jsonSerializerOptions = new JsonSerializerOptions
             {
@@ -30,6 +33,11 @@ public CosmosEventSerializer(IEventTypeProvider typeProvider)
             jsonSerializerOptions.Converters.Add(new JsonStringEnumConverter());
             jsonSerializerOptions.Converters.Add(new StreamIdConverter());
             jsonSerializerOptions.Converters.Add(new StreamVersionConverter());
+
+            foreach (var converter in options.Value.CustomJsonConverter)
+            {
+                jsonSerializerOptions.Converters.Add(converter);
+            }
         }
 
         [return: MaybeNull]

diff --git a/src/Atc.Cosmos.EventStore/EventStoreClientOptions.cs b/src/Atc.Cosmos.EventStore/EventStoreClientOptions.cs
@@ -1,4 +1,6 @@
 using System;
+using System.Collections.Generic;
+using System.Text.Json.Serialization;
 using Azure.Core;
 using Microsoft.Azure.Cosmos;
 
@@ -43,6 +45,11 @@ public string? ConnectionString
 
         public CosmosClientOptions CosmosClientOptions { get; set; } = new CosmosClientOptions();
 
+        /// <summary>
+        /// Gets collections of custom <seealso cref="JsonConverter"/>.
+        /// </summary>
+        public ICollection<JsonConverter> CustomJsonConverter { get; } = new List<JsonConverter>();
+
         public string? Endpoint { get; private set; }
 
         public string? AuthKey { get; private set; }

diff --git a/version.json b/version.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "1.4",
+  "version": "1.5",
   "assemblyVersion": {
     "precision": "revision"
   },