Implement StringValueTypeJsonConverter.

Resolve #4337

modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo/Abp/FeatureManagement/StringValueTypeJsonConverter.cs

@@ -1,4 +1,7 @@
 using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using Volo.Abp.DependencyInjection;
@@ -22,8 +25,66 @@ namespace Volo.Abp.FeatureManagement
 
         public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
         {
-            //TODO: Deserialize!
-            return null;
+            if (reader.TokenType != JsonToken.StartObject)
+            {
+                return null;
+            }
+
+            var jsonObject = JObject.Load(reader);
+
+            var stringValue = CreateStringValueTypeByName(jsonObject, jsonObject["name"].ToString());
+            foreach (var o in serializer.Deserialize<Dictionary<string, object>>(
+                new JsonTextReader(new StringReader(jsonObject["properties"].ToString()))))
+            {
+                stringValue[o.Key] = o.Value;
+            }
+
+            stringValue.Validator = CreateValueValidatorByName(jsonObject["validator"], jsonObject["validator"]["name"].ToString());
+            foreach (var o in serializer.Deserialize<Dictionary<string, object>>(
+                new JsonTextReader(new StringReader(jsonObject["validator"]["properties"].ToString()))))
+            {
+                stringValue.Validator[o.Key] = o.Value;
+            }
+
+            return stringValue;
+        }
+
+        protected virtual IStringValueType CreateStringValueTypeByName(JObject jObject, string name)
+        {
+            if (name == "SelectionStringValueType")
+            {
+                var selectionStringValueType = new SelectionStringValueType();
+                if (jObject["itemSource"].HasValues)
+                {
+                    selectionStringValueType.ItemSource = new StaticSelectionStringValueItemSource(jObject["itemSource"]["items"]
+                        .Select(item => new LocalizableSelectionStringValueItem()
+                        {
+                            Value = item["value"].ToString(),
+                            DisplayText = new LocalizableStringInfo(item["displayText"]["resourceName"].ToString(), item["displayText"]["name"].ToString())
+                        }).ToArray());
+                }
+
+                return selectionStringValueType;
+            }
+
+            return name switch
+            {
+                "FreeTextStringValueType" => new FreeTextStringValueType(),
+                "ToggleStringValueType" => new ToggleStringValueType(),
+                _ => throw new ArgumentException($"{nameof(IStringValueType)} named {name} was not found!")
+            };
+        }
+
+        protected virtual IValueValidator CreateValueValidatorByName(JToken jObject, string name)
+        {
+            return name switch
+            {
+                "NULL" => new AlwaysValidValueValidator(),
+                "BOOLEAN" => new BooleanValueValidator(),
+                "NUMERIC" => new NumericValueValidator(),
+                "STRING" => new StringValueValidator(),
+                _ => throw new ArgumentException($"{nameof(IValueValidator)} named {name} was not found!")
+            };
         }
     }
 }

modules/feature-management/test/Volo.Abp.FeatureManagement.Application.Tests/Volo/Abp/FeatureManagement/StringValueJsonConverter_Tests.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using Newtonsoft.Json;
 using Shouldly;
 using Volo.Abp.Json;
@@ -16,7 +17,7 @@ namespace Volo.Abp.FeatureManagement
             _jsonSerializer = GetRequiredService<IJsonSerializer>();
         }
 
-        [Fact(Skip = "StringValueTypeJsonConverter is not implemented yet!")]
+        [Fact]
         public void Should_Serialize_And_Deserialize()
         {
             var featureListDto = new FeatureListDto
@@ -29,18 +30,51 @@ namespace Volo.Abp.FeatureManagement
                         {
                             Validator = new BooleanValueValidator()
                         }
+                    },
+                    new FeatureDto
+                    {
+                        ValueType = new SelectionStringValueType
+                        {
+                            ItemSource = new StaticSelectionStringValueItemSource(
+                                new LocalizableSelectionStringValueItem
+                                {
+                                    Value = "TestValue",
+                                    DisplayText = new LocalizableStringInfo("TestResourceName", "TestName")
+                                }),
+                            Validator = new AlwaysValidValueValidator()
+                        }
+                    },
+                    new FeatureDto
+                    {
+                        ValueType = new ToggleStringValueType
+                        {
+                            Validator = new NumericValueValidator
+                            {
+                                MaxValue = 1000,
+                                MinValue = 10
+                            }
+                        }
                     }
-
-                    //TODO: Add more to test
                 }
             };
 
-            var serialized = _jsonSerializer.Serialize(featureListDto);
-
+            var serialized = _jsonSerializer.Serialize(featureListDto, indented: true);
             var featureListDto2 = _jsonSerializer.Deserialize<FeatureListDto>(serialized);
 
             featureListDto2.Features[0].ValueType.ShouldBeOfType<FreeTextStringValueType>();
             featureListDto2.Features[0].ValueType.Validator.ShouldBeOfType<BooleanValueValidator>();
+
+            featureListDto2.Features[1].ValueType.ShouldBeOfType<SelectionStringValueType>();
+            featureListDto2.Features[1].ValueType.Validator.ShouldBeOfType<AlwaysValidValueValidator>();
+            featureListDto2.Features[1].ValueType.As<SelectionStringValueType>().ItemSource.Items.ShouldBeOfType<LocalizableSelectionStringValueItem[]>();
+            featureListDto2.Features[1].ValueType.As<SelectionStringValueType>().ItemSource.Items.ShouldContain(x =>
+                x.Value == "TestValue" && x.DisplayText.ResourceName == "TestResourceName" &&
+                x.DisplayText.Name == "TestName");
+
+            featureListDto2.Features[2].ValueType.ShouldBeOfType<ToggleStringValueType>();
+            featureListDto2.Features[2].ValueType.Validator.ShouldBeOfType<NumericValueValidator>();
+            featureListDto2.Features[2].ValueType.Validator.As<NumericValueValidator>().MaxValue.ShouldBe(1000);
+            featureListDto2.Features[2].ValueType.Validator.As<NumericValueValidator>().MinValue.ShouldBe(10);
         }
     }
 }