Merge pull request #20951 from abpframework/ExtraPropertiesValueConve…

…rter Add a `Type` parameter to `ExtraPropertiesValueConverter`.
abpframework · Oct 2, 2024 · b21e79a · b21e79a
2 parents 0a35076 + b54263d
commit b21e79a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/...tityFrameworkCore/Volo/Abp/EntityFrameworkCore/Modeling/AbpEntityTypeBuilderExtensions.cs b/...tityFrameworkCore/Volo/Abp/EntityFrameworkCore/Modeling/AbpEntityTypeBuilderExtensions.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 using Volo.Abp.Auditing;
 using Volo.Abp.Data;
 using Volo.Abp.Domain.Entities;
@@ -60,9 +61,11 @@ public static void TryConfigureExtraProperties(this EntityTypeBuilder b)
  return;
  }
 
+ var type = typeof(ExtraPropertiesValueConverter<>).MakeGenericType(b.Metadata.ClrType);
+ var extraPropertiesValueConverter = Activator.CreateInstance(type)!.As<ValueConverter<ExtraPropertyDictionary, string>>();
  b.Property<ExtraPropertyDictionary>(nameof(IHasExtraProperties.ExtraProperties))
  .HasColumnName(nameof(IHasExtraProperties.ExtraProperties))
- .HasConversion(new ExtraPropertiesValueConverter(b.Metadata.ClrType))
+ .HasConversion(extraPropertiesValueConverter)
  .Metadata.SetValueComparer(new ExtraPropertyDictionaryValueComparer());
 
  b.TryConfigureObjectExtensions();

diff --git a/...ameworkCore/Volo/Abp/EntityFrameworkCore/ValueConverters/ExtraPropertiesValueConverter.cs b/...ameworkCore/Volo/Abp/EntityFrameworkCore/ValueConverters/ExtraPropertiesValueConverter.cs
@@ -8,22 +8,23 @@
 
 namespace Volo.Abp.EntityFrameworkCore.ValueConverters;
 
-public class ExtraPropertiesValueConverter : ValueConverter<ExtraPropertyDictionary, string>
+public class ExtraPropertiesValueConverter<TEntityType> : ValueConverter<ExtraPropertyDictionary, string>
 {
- public ExtraPropertiesValueConverter(Type entityType)
+ public ExtraPropertiesValueConverter()
  : base(
- d => SerializeObject(d, entityType),
- s => DeserializeObject(s, entityType))
+ d => SerializeObject(d),
+ s => DeserializeObject(s))
  {
 
  }
 
  public readonly static JsonSerializerOptions SerializeOptions = new JsonSerializerOptions();
 
- private static string SerializeObject(ExtraPropertyDictionary extraProperties, Type? entityType)
+ private static string SerializeObject(ExtraPropertyDictionary extraProperties)
  {
  var copyDictionary = new Dictionary<string, object?>(extraProperties);
 
+ var entityType = typeof(TEntityType);
  if (entityType != null)
  {
  var objectExtension = ObjectExtensionManager.Instance.GetOrNull(entityType);
@@ -50,7 +51,7 @@ private static string SerializeObject(ExtraPropertyDictionary extraProperties, T
  }
  };
 
- private static ExtraPropertyDictionary DeserializeObject(string extraPropertiesAsJson, Type? entityType)
+ private static ExtraPropertyDictionary DeserializeObject(string extraPropertiesAsJson)
  {
  if (extraPropertiesAsJson.IsNullOrEmpty() || extraPropertiesAsJson == "{}")
  {
@@ -60,6 +61,7 @@ private static ExtraPropertyDictionary DeserializeObject(string extraPropertiesA
  var dictionary = JsonSerializer.Deserialize<ExtraPropertyDictionary>(extraPropertiesAsJson, DeserializeOptions) ??
  new ExtraPropertyDictionary();
 
+ var entityType = typeof(TEntityType);
  if (entityType != null)
  {
  var objectExtension = ObjectExtensionManager.Instance.GetOrNull(entityType);