feat: enumeration support (complex type)

Author: yv989c

src/QueryableValues.SqlServer/EntityPropertyMapping.cs

@@ -17,6 +17,7 @@ internal sealed class EntityPropertyMapping
         public PropertyInfo Target { get; }
         public Type NormalizedType { get; }
         public EntityPropertyTypeName TypeName { get; }
+        public bool IsSourceEnum { get; }
 
         static EntityPropertyMapping()
         {
@@ -38,12 +39,13 @@ static EntityPropertyMapping()
             };
         }
 
-        private EntityPropertyMapping(PropertyInfo source, PropertyInfo target, Type normalizedType)
+        private EntityPropertyMapping(PropertyInfo source, PropertyInfo target, Type normalizedType, bool isSourceEnum)
         {
             Source = source;
             Target = target;
             NormalizedType = normalizedType;
             TypeName = GetTypeName(normalizedType);
+            IsSourceEnum = isSourceEnum;
 
             if (TypeName == EntityPropertyTypeName.Unknown)
             {
@@ -63,7 +65,21 @@ public static EntityPropertyTypeName GetTypeName(Type type)
             }
         }
 
-        public static Type GetNormalizedType(Type type) => Nullable.GetUnderlyingType(type) ?? type;
+        public static Type GetNormalizedType(Type type, out bool isEnum)
+        {
+            type = Nullable.GetUnderlyingType(type) ?? type;
+
+            isEnum = type.IsEnum;
+
+            if (isEnum)
+            {
+                type = Enum.GetUnderlyingType(type);
+            }
+
+            return type;
+        }
+
+        public static Type GetNormalizedType(Type type) => GetNormalizedType(type, out _);
 
         public static bool IsSimpleType(Type type)
         {
@@ -96,9 +112,9 @@ select g
 
             foreach (var sourceProperty in sourceProperties)
             {
-                var propertyType = GetNormalizedType(sourceProperty.PropertyType);
+                var sourcePropertyNormalizedType = GetNormalizedType(sourceProperty.PropertyType, out var isSourceEnum);
 
-                if (targetPropertiesByType.TryGetValue(propertyType, out Queue<PropertyInfo>? targetProperties))
+                if (targetPropertiesByType.TryGetValue(sourcePropertyNormalizedType, out Queue<PropertyInfo>? targetProperties))
                 {
                     if (targetProperties.Count == 0)
                     {
@@ -108,7 +124,8 @@ select g
                     var mapping = new EntityPropertyMapping(
                         sourceProperty,
                         targetProperties.Dequeue(),
-                        propertyType
+                        sourcePropertyNormalizedType,
+                        isSourceEnum
                         );
 
                     mappings.Add(mapping);
@@ -128,5 +145,38 @@ public static IReadOnlyList<EntityPropertyMapping> GetMappings<T>()
         {
             return GetMappings(typeof(T));
         }
+
+        public object? GetSourceNormalizedValue(object objectInstance)
+        {
+            var value = Source.GetValue(objectInstance);
+
+            if (value is null)
+            {
+                return null;
+            }
+
+            if (IsSourceEnum)
+            {
+                switch (TypeName)
+                {
+                    case EntityPropertyTypeName.Int32:
+                        value = (int)value;
+                        break;
+                    case EntityPropertyTypeName.Byte:
+                        value = (byte)value;
+                        break;
+                    case EntityPropertyTypeName.Int16:
+                        value = (short)value;
+                        break;
+                    case EntityPropertyTypeName.Int64:
+                        value = (long)value;
+                        break;
+                    default:
+                        throw new NotSupportedException($"The underlying type of {NormalizedType.FullName} ({Enum.GetUnderlyingType(NormalizedType).FullName}) is not supported.");
+                }
+            }
+
+            return value;
+        }
     }
 }

src/QueryableValues.SqlServer/Serializers/JsonSerializer.cs

@@ -166,7 +166,13 @@ public void WriteValue(Utf8JsonWriter writer, object entity)
             {
                 if (_writeValue != null)
                 {
-                    var value = Mapping.Source.GetValue(entity);
+                    var value = Mapping.GetSourceNormalizedValue(entity);
+
+                    if (value is null)
+                    {
+                        return;
+                    }
+
                     _writeValue.Invoke(writer, value);
                 }
             }

src/QueryableValues.SqlServer/Serializers/XmlSerializer.cs

@@ -242,7 +242,13 @@ public void WriteValue(XmlWriter writer, object entity)
             {
                 if (_writeValue != null)
                 {
-                    var value = Mapping.Source.GetValue(entity);
+                    var value = Mapping.GetSourceNormalizedValue(entity);
+
+                    if (value is null)
+                    {
+                        return;
+                    }
+
                     _writeValue.Invoke(writer, value);
                 }
             }

src/QueryableValues.SqlServer/SqlServer/QueryableFactory.cs

@@ -390,7 +390,7 @@ public IQueryable<TEnum> Create<TEnum>(DbContext dbContext, IEnumerable<TEnum> v
             where TEnum : struct, Enum
         {
             var enumType = typeof(TEnum);
-            var normalizedType = EntityPropertyMapping.GetNormalizedType(Enum.GetUnderlyingType(enumType));
+            var normalizedType = EntityPropertyMapping.GetNormalizedType(enumType);
 
             return EntityPropertyMapping.GetTypeName(normalizedType) switch
             {