Added enum description attribute to lookup table #6

Author: pergerch

samples/SpatialFocus.EntityFrameworkCore.Extensions.SQLiteDemo/Entities/SpecialOccasion.cs

@@ -5,16 +5,23 @@
 
 namespace SpatialFocus.EntityFrameworkCore.Extensions.SQLiteDemo.Entities
 {
+	using System.ComponentModel;
+
 	public enum SpecialOccasion
 	{
+		[Description("Your birth anniversary")]
 		Birthday = 1,
 
+		[Description("Jesus' birth anniversary")]
 		Christmas,
 
+		[Description("Jesus' resurrection anniversary")]
 		Easter,
 
+		[Description("Florist holiday")]
 		Valentines,
 
+		[Description("Marriage anniversary")]
 		Wedding,
 	}
 }

src/SpatialFocus.EntityFrameworkCore.Extensions/EnumLookupExtension.cs

@@ -7,7 +7,9 @@ namespace SpatialFocus.EntityFrameworkCore.Extensions
 {
 	using System;
 	using System.Collections.Generic;
+	using System.ComponentModel;
 	using System.Linq;
+	using System.Reflection;
 	using Microsoft.EntityFrameworkCore;
 	using Microsoft.EntityFrameworkCore.Metadata;
 	using Microsoft.EntityFrameworkCore.Metadata.Builders;
@@ -71,6 +73,10 @@ public static void ConfigureEnumLookup(this ModelBuilder modelBuilder, EnumLooku
 
 				ConcreteTypeSeededList.Add(concreteType);
 
+				Dictionary<int, string> enumValueDescriptions = Enum.GetValues(propertyType.GetEnumOrNullableEnumType())
+					.Cast<Enum>()
+					.ToDictionary(Convert.ToInt32, GetEnumDescription);
+
 				// TODO: Check status of https://github.com/aspnet/EntityFrameworkCore/issues/12194 before using migrations
 				object[] data = Enum.GetValues(propertyType.GetEnumOrNullableEnumType())
 					.OfType<object>()
@@ -82,10 +88,14 @@ public static void ConfigureEnumLookup(this ModelBuilder modelBuilder, EnumLooku
 						{
 							concreteType.GetProperty(nameof(EnumWithNumberLookup<object>.Id)).SetValue(instance, x);
 							concreteType.GetProperty(nameof(EnumWithNumberLookup<object>.Name)).SetValue(instance, x.ToString());
+							concreteType.GetProperty(nameof(EnumWithNumberLookup<object>.Description))
+								.SetValue(instance, enumValueDescriptions[(int)x]);
 						}
 						else
 						{
 							concreteType.GetProperty(nameof(EnumWithStringLookup<object>.Id)).SetValue(instance, x);
+							concreteType.GetProperty(nameof(EnumWithNumberLookup<object>.Description))
+								.SetValue(instance, enumValueDescriptions[(int)x]);
 						}
 
 						return instance;
@@ -96,6 +106,15 @@ public static void ConfigureEnumLookup(this ModelBuilder modelBuilder, EnumLooku
 			}
 		}
 
+		public static string GetEnumDescription(Enum value)
+		{
+			FieldInfo fi = value.GetType().GetField(value.ToString());
+
+			DescriptionAttribute attribute = (DescriptionAttribute)fi.GetCustomAttribute(typeof(DescriptionAttribute), true);
+
+			return attribute?.Description;
+		}
+
 		private static Type GetEnumOrNullableEnumType(this Type propertyType)
 		{
 			if (!propertyType.IsEnumOrNullableEnumType())

src/SpatialFocus.EntityFrameworkCore.Extensions/EnumWithNumberLookup.cs

@@ -19,6 +19,8 @@ public EnumWithNumberLookup(T value)
 			Name = value.ToString();
 		}
 
+		public string Description { get; set; }
+
 		[DatabaseGenerated(DatabaseGeneratedOption.None)]
 		public T Id { get; set; }
 

src/SpatialFocus.EntityFrameworkCore.Extensions/EnumWithStringLookup.cs

@@ -18,6 +18,8 @@ public EnumWithStringLookup(T value)
 			Id = value;
 		}
 
+		public string Description { get; set; }
+
 		[DatabaseGenerated(DatabaseGeneratedOption.None)]
 		public T Id { get; set; }
 	}