Fixed problem with dictionaries in Ext.SystemTextJson

Author: mjuen

Enum.Ext/Enum.Ext.SystemTextJson.Tests/ConvertTests.cs

@@ -2,6 +2,8 @@
 using Enum.Ext.Tests.Shared;
 using FluentAssertions;
 using NUnit.Framework;
+using System.Collections.Generic;
+using System.Linq;
 using System.Text.Json;
 
 namespace Enum.Ext.SystemTextJson.Tests
@@ -81,5 +83,49 @@ public void Test_ConvertToNullFromJsonValueWithAnnotation()
 
             tempClass.Item.Should().Be(null);
         }
+
+        [Test]
+        public void Test_ConvertDictonaryKeyToJsonWithAnnotation()
+        {
+            var tempClass = new Dictionary<WeekdayWithAnnotation, string>
+            {
+                { WeekdayWithAnnotation.Monday, "value"  }
+            };
+
+            var json = JsonSerializer.Serialize(tempClass);
+
+            json.Should().Be("{\"1\":\"value\"}");
+        }
+
+        [Test]
+        public void Test_ConvertDictonaryKeyFormJsonWithAnnotation()
+        {
+            var tempClass = JsonSerializer.Deserialize<Dictionary<WeekdayWithAnnotation, string>>("{\"1\":\"value\"}");
+
+            tempClass.Keys.First().Should().Be(WeekdayWithAnnotation.Monday);
+            tempClass[WeekdayWithAnnotation.Monday].Should().Be("value");
+        }
+
+        [Test]
+        public void Test_ConvertDictonaryValueToJsonWithAnnotation()
+        {
+            var tempClass = new Dictionary<string, WeekdayWithAnnotation>
+            {
+                { "value", WeekdayWithAnnotation.Monday }
+            };
+
+            var json = JsonSerializer.Serialize(tempClass);
+
+            json.Should().Be("{\"value\":1}");
+        }
+
+        [Test]
+        public void Test_ConvertDictonaryValueFormJsonWithAnnotation()
+        {
+            var tempClass = JsonSerializer.Deserialize<Dictionary<string, WeekdayWithAnnotation>>("{\"value\":1}");
+
+            tempClass.Keys.First().Should().Be("value");
+            tempClass["value"].Should().Be(WeekdayWithAnnotation.Monday);
+        }
     }
 }

Enum.Ext/Enum.Ext.SystemTextJson/Enum.Ext.SystemTextJson.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>1.0.7</Version>
+    <Version>1.0.8</Version>
     <Authors>Mauracher Simon, Juen Marcel</Authors>
     <PackageProjectUrl>https://github.com/simonmau/enum_ext</PackageProjectUrl>
     <RepositoryUrl>https://github.com/simonmau/enum_ext</RepositoryUrl>
@@ -26,7 +26,7 @@
 
   <ItemGroup>
     <PackageReference Include="Enum.Ext" Version="1.0.7" />
-    <PackageReference Include="System.Text.Json" Version="6.0.0" />
+    <PackageReference Include="System.Text.Json" Version="7.0.0" />
   </ItemGroup>
 
 </Project>

Enum.Ext/Enum.Ext.SystemTextJson/JsonTypeSafeEnumConverter.cs

@@ -59,6 +59,26 @@ public override void Write(Utf8JsonWriter writer, TypeSafeEnum<TValue, TKey> val
             JsonSerializer.Serialize(writer, value.Id, options);
         }
 
+        public override void WriteAsPropertyName(Utf8JsonWriter writer, TypeSafeEnum<TValue, TKey> value, JsonSerializerOptions options)
+        {
+            writer.WritePropertyName(value.Id.ToString());
+        }
+
+        public override TypeSafeEnum<TValue, TKey> ReadAsPropertyName(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            var item = reader.GetString();
+
+            if (int.TryParse(item, out var id))
+            {
+                var keyType = GetKeyType(typeToConvert);
+                var method = GetBaseMethod(typeToConvert);
+
+                return (TypeSafeEnum<TValue, TKey>)method.Invoke(null, new[] { Convert.ChangeType(id, keyType) });
+            }
+
+            throw new NotImplementedException();
+        }
+
         public bool CanRead => true;
     }
 }