From ea56f65501e9c4eb080b7313b9182f67f20c4653 Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Thu, 4 Aug 2022 21:53:29 +0800
Subject: [PATCH] Support `enum` as dictionary keys.

Resolve #13552
---
 .../JsonConverters/AbpStringToEnumConverter.cs | 11 ++++++++++-
 .../Volo/Abp/Json/AbpStringToEnum_Tests.cs     | 18 ++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/framework/src/Volo.Abp.Json/Volo/Abp/Json/SystemTextJson/JsonConverters/AbpStringToEnumConverter.cs b/framework/src/Volo.Abp.Json/Volo/Abp/Json/SystemTextJson/JsonConverters/AbpStringToEnumConverter.cs
index c4720c92db..6b7f32807e 100644
--- a/framework/src/Volo.Abp.Json/Volo/Abp/Json/SystemTextJson/JsonConverters/AbpStringToEnumConverter.cs
+++ b/framework/src/Volo.Abp.Json/Volo/Abp/Json/SystemTextJson/JsonConverters/AbpStringToEnumConverter.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
@@ -48,4 +47,14 @@ public class AbpStringToEnumConverter<T> : JsonConverter<T>
 
         JsonSerializer.Serialize(writer, value, _writeJsonSerializerOptions);
     }
+
+    public override T ReadAsPropertyName(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    {
+        return (T)Enum.Parse(typeToConvert, reader.GetString());
+    }
+
+    public override void WriteAsPropertyName(Utf8JsonWriter writer, T value, JsonSerializerOptions options)
+    {
+        writer.WritePropertyName(Enum.GetName(typeof(T), value));
+    }
 }
diff --git a/framework/test/Volo.Abp.Json.Tests/Volo/Abp/Json/AbpStringToEnum_Tests.cs b/framework/test/Volo.Abp.Json.Tests/Volo/Abp/Json/AbpStringToEnum_Tests.cs
index d3bba36534..8336b4ce7d 100644
--- a/framework/test/Volo.Abp.Json.Tests/Volo/Abp/Json/AbpStringToEnum_Tests.cs
+++ b/framework/test/Volo.Abp.Json.Tests/Volo/Abp/Json/AbpStringToEnum_Tests.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Text.Json;
 using Shouldly;
 using Volo.Abp.Json.SystemTextJson.JsonConverters;
@@ -26,6 +27,16 @@ namespace Volo.Abp.Json
             testClass = JsonSerializer.Deserialize<TestClass>("{\"Day\": 1}", options);
             testClass.ShouldNotBeNull();
             testClass.Day.ShouldBe(DayOfWeek.Monday);
+
+            var dictionary = JsonSerializer.Deserialize<Dictionary<DayOfWeek, string>>("{\"Monday\":\"Mo\"}", options);
+            dictionary.ShouldNotBeNull();
+            dictionary.Keys.ShouldContain(DayOfWeek.Monday);
+            dictionary.Values.ShouldContain("Mo");
+
+            dictionary = JsonSerializer.Deserialize<Dictionary<DayOfWeek, string>>("{\"1\":\"Mo\"}", options);
+            dictionary.ShouldNotBeNull();
+            dictionary.Keys.ShouldContain(DayOfWeek.Monday);
+            dictionary.Values.ShouldContain("Mo");
         }
 
         [Fact]
@@ -45,6 +56,13 @@ namespace Volo.Abp.Json
             });
 
             testClassJson.ShouldBe("{\"Day\":1}");
+
+            testClassJson = JsonSerializer.Serialize(new Dictionary<DayOfWeek, string>
+            {
+                {DayOfWeek.Monday, "Mo"}
+            }, options);
+
+            testClassJson.ShouldBe("{\"Monday\":\"Mo\"}");
         }
 
         class TestClass