From 67cced4dd62f82e09f84249f1292bf12c12a9084 Mon Sep 17 00:00:00 2001
From: Scott Rosseter <scott.rosseter@mentordigital.co.uk>
Date: Fri, 15 May 2020 15:04:25 +0100
Subject: [PATCH] bug fix for nested content v8

---
 src/Mimic.Web/Web.config                      |  2 +-
 src/Mimic/Context/MapperContext.cs            |  1 +
 src/Mimic/Helpers/UmbracoPropertyLocator.cs   |  5 ++
 src/Mimic/IPublishedElementExtensions.cs      | 72 +++++++++++++++++++
 src/Mimic/Mimic.csproj                        |  1 +
 .../PropertyMapperAttributes/Children.cs      |  2 +-
 src/Mimic/PropertyMapperAttributes/Ignore.cs  |  2 +-
 .../PropertyMapperAttribute.cs                | 10 ++-
 src/Mimic/PropertyMapperAttributes/Self.cs    |  2 +-
 .../PropertyMapperAttributes/SimpleType.cs    | 42 +++++++++--
 10 files changed, 128 insertions(+), 11 deletions(-)
 create mode 100644 src/Mimic/IPublishedElementExtensions.cs

diff --git a/src/Mimic.Web/Web.config b/src/Mimic.Web/Web.config
index 4c52029..d52a68c 100644
--- a/src/Mimic.Web/Web.config
+++ b/src/Mimic.Web/Web.config
@@ -37,7 +37,7 @@
     <add key="autoFormsAuthentication" value="false" />
     <add key="dataAnnotations:dataTypeAttribute:disableRegEx" value="false" />
     <add key="owin:appStartup" value="UmbracoDefaultOwinStartup" />
-    <add key="Umbraco.ModelsBuilder.Enable" value="true" />
+    <add key="Umbraco.ModelsBuilder.Enable" value="false" />
     <add key="Umbraco.ModelsBuilder.ModelsMode" value="PureLive" />
   </appSettings>
   <!--
diff --git a/src/Mimic/Context/MapperContext.cs b/src/Mimic/Context/MapperContext.cs
index 333e9fc..fb0ed4a 100644
--- a/src/Mimic/Context/MapperContext.cs
+++ b/src/Mimic/Context/MapperContext.cs
@@ -13,5 +13,6 @@ public class MapperContext
     {
         public PropertyInfo Property { get; internal set; }
         public IPublishedContent Content { get; set; }
+        public IPublishedElement Element { get; set; }
     }
 }
diff --git a/src/Mimic/Helpers/UmbracoPropertyLocator.cs b/src/Mimic/Helpers/UmbracoPropertyLocator.cs
index f14fccb..3a66df4 100644
--- a/src/Mimic/Helpers/UmbracoPropertyLocator.cs
+++ b/src/Mimic/Helpers/UmbracoPropertyLocator.cs
@@ -14,5 +14,10 @@ public IPublishedProperty GetClosestProperty(IPublishedContent content, string p
         {
             return content.Properties.FirstOrDefault(property => property.Alias.ToLower() == propertyName.ToLower());
         }
+
+        public IPublishedProperty GetClosestProperty(IPublishedElement element, string propertyName = "")
+        {
+            return element.Properties.FirstOrDefault(property => property.Alias.ToLower() == propertyName.ToLower());
+        }
     }
 }
diff --git a/src/Mimic/IPublishedElementExtensions.cs b/src/Mimic/IPublishedElementExtensions.cs
new file mode 100644
index 0000000..ba8c494
--- /dev/null
+++ b/src/Mimic/IPublishedElementExtensions.cs
@@ -0,0 +1,72 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+using Mimic.Context;
+using Mimic.PropertyMapperAttributes;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.PublishedContent;
+using Umbraco.Core.Persistence.Mappers;
+
+namespace Mimic
+{
+    public static class IPublishedElementExtensions
+    {
+        public static T As<T>(this IPublishedElement content)
+        {
+            var type = typeof(T);
+
+            return (T)As(content, type);
+        }
+
+        public static List<T> As<T>(this IEnumerable<IPublishedElement> elements)
+        {
+            var type = typeof(T);
+
+            return elements.Select(element => (T)As(element, type)).ToList();
+        }
+
+        public static object As(this IPublishedElement element, Type type)
+        {
+            if (element == null)
+                return null;
+
+            var context = new MapperContext { Element = element };
+
+            var instance = Activator.CreateInstance(type);
+
+            foreach (var property in type.GetProperties(BindingFlags.Public | BindingFlags.Instance).Where(p => p.CanWrite))
+            {
+                context.Property = property;
+
+                var mapper = ResolveMapper(element, type, property);
+
+                if (mapper is Ignore)
+                    continue;
+
+                mapper.Context = context;
+
+                var value = mapper.ProcessValue(true);
+
+                property.SetValue(instance, value);
+            }
+
+            return instance;
+        }
+
+        private static PropertyMapperAttribute ResolveMapper(IPublishedElement element, Type type, PropertyInfo property)
+        {
+            //resolve by attribute
+            var attribute = property.GetCustomAttributes().FirstOrDefault(a => a is PropertyMapperAttribute);
+            if (attribute != null)
+            {
+                return (PropertyMapperAttribute)attribute;
+            }
+
+            return new SimpleType();
+        }
+    }
+}
diff --git a/src/Mimic/Mimic.csproj b/src/Mimic/Mimic.csproj
index 7d1d848..da2b345 100644
--- a/src/Mimic/Mimic.csproj
+++ b/src/Mimic/Mimic.csproj
@@ -243,6 +243,7 @@
     <Compile Include="Extentions\StringExtentions.cs" />
     <Compile Include="Extentions\UmbracoHelperExtensions.cs" />
     <Compile Include="Helpers\UmbracoPropertyLocator.cs" />
+    <Compile Include="IPublishedElementExtensions.cs" />
     <Compile Include="IPublishedContentExtensions.cs" />
     <Compile Include="Models\MimicNestedContent.cs" />
     <Compile Include="Models\MimicPropertyClass.cs" />
diff --git a/src/Mimic/PropertyMapperAttributes/Children.cs b/src/Mimic/PropertyMapperAttributes/Children.cs
index 05f7f29..83a12d1 100644
--- a/src/Mimic/PropertyMapperAttributes/Children.cs
+++ b/src/Mimic/PropertyMapperAttributes/Children.cs
@@ -10,7 +10,7 @@ namespace Mimic.PropertyMapperAttributes
 {
     public class Children : PropertyMapperAttribute
     {
-        public override object ProcessValue()
+        public override object ProcessValue(bool isElement = false)
         {
             if (Context.Property.PropertyType.GenericTypeArguments[0] == typeof (IPublishedContent))
             {
diff --git a/src/Mimic/PropertyMapperAttributes/Ignore.cs b/src/Mimic/PropertyMapperAttributes/Ignore.cs
index 1f735f1..2c88be7 100644
--- a/src/Mimic/PropertyMapperAttributes/Ignore.cs
+++ b/src/Mimic/PropertyMapperAttributes/Ignore.cs
@@ -10,7 +10,7 @@ namespace Mimic.PropertyMapperAttributes
 {
     public class Ignore : PropertyMapperAttribute
     {
-        public override object ProcessValue()
+        public override object ProcessValue(bool isElement = false)
         {
             return null;
         }
diff --git a/src/Mimic/PropertyMapperAttributes/PropertyMapperAttribute.cs b/src/Mimic/PropertyMapperAttributes/PropertyMapperAttribute.cs
index 784ae9c..f7b2623 100644
--- a/src/Mimic/PropertyMapperAttributes/PropertyMapperAttribute.cs
+++ b/src/Mimic/PropertyMapperAttributes/PropertyMapperAttribute.cs
@@ -13,6 +13,7 @@ public abstract class PropertyMapperAttribute : Attribute
     {
         public MapperContext Context { get; set; }
         public IPublishedContent Content => Context.Content;
+        public IPublishedElement Element => Context.Element;
 
         protected IPublishedProperty GetClosestProperty(string propertyName = "")
         {
@@ -21,6 +22,13 @@ protected IPublishedProperty GetClosestProperty(string propertyName = "")
             return new UmbracoPropertyLocator().GetClosestProperty(Content, propertyName);
         }
 
-        public abstract object ProcessValue();
+        protected IPublishedProperty GetClosestElement(string propertyName = "")
+        {
+            propertyName = !string.IsNullOrEmpty(propertyName) ? propertyName : Context.Property.Name;
+
+            return new UmbracoPropertyLocator().GetClosestProperty(Element, propertyName);
+        }
+
+        public abstract object ProcessValue(bool isElement = false);
     }
 }
diff --git a/src/Mimic/PropertyMapperAttributes/Self.cs b/src/Mimic/PropertyMapperAttributes/Self.cs
index d236bcc..d1c59b4 100644
--- a/src/Mimic/PropertyMapperAttributes/Self.cs
+++ b/src/Mimic/PropertyMapperAttributes/Self.cs
@@ -8,7 +8,7 @@ namespace Mimic.PropertyMapperAttributes
 {
     public class Self : PropertyMapperAttribute
     {
-        public override object ProcessValue()
+        public override object ProcessValue(bool isElement = false)
         {
             return Content.As(Context.Property.PropertyType);
         }
diff --git a/src/Mimic/PropertyMapperAttributes/SimpleType.cs b/src/Mimic/PropertyMapperAttributes/SimpleType.cs
index 8cbfe4c..203a1c7 100644
--- a/src/Mimic/PropertyMapperAttributes/SimpleType.cs
+++ b/src/Mimic/PropertyMapperAttributes/SimpleType.cs
@@ -16,11 +16,11 @@ namespace Mimic.PropertyMapperAttributes
 {
     public class SimpleType : PropertyMapperAttribute
     {
-        public override object ProcessValue()
+        public override object ProcessValue(bool isElement = false)
         {
             var value = ResolveStictProperty();
 
-            return value ?? ResolveUmbracoProperty();
+            return value ?? ResolveUmbracoProperty(isElement);
         }
 
         protected object ResolveStictProperty()
@@ -38,9 +38,18 @@ protected object ResolveStictProperty()
             return null;
         }
 
-        protected object ResolveUmbracoProperty()
+        protected object ResolveUmbracoProperty(bool isElement = false)
         {
-            var property = GetClosestProperty();
+            IPublishedProperty property = null;
+
+            if (isElement)
+            {
+                property = GetClosestElement();
+            }
+            else
+            {
+                property = GetClosestProperty();
+            }
 
             if (property == null)
                 return null;
@@ -83,8 +92,6 @@ protected object ResolveUmbracoProperty()
                     var typedItem = item.As(arg);
 
                     value.Add(typedItem);
-
-                    //value.Add(item.As(Context.Property.PropertyType.GenericTypeArguments[0]));
                 }
                 return value;
             }
@@ -98,6 +105,29 @@ protected object ResolveUmbracoProperty()
             {
                 return propertyValue.ToString();
             }
+            else if (propertyValue is IEnumerable<IPublishedElement> &&
+               (Context.Property.PropertyType.GenericTypeArguments.Length > 0 && Context.Property.PropertyType.GenericTypeArguments[0] != typeof(IPublishedElement))
+               &&
+               !(propertyValue is IEnumerable<IPublishedContent>)
+               )
+            {
+                var propertyValueEnumerable = (IEnumerable<IPublishedElement>)propertyValue;
+                var value = (IList)Activator.CreateInstance(typeof(List<>).MakeGenericType(Context.Property.PropertyType.GenericTypeArguments[0]));
+
+                var listType = typeof(List<>).MakeGenericType(Context.Property.PropertyType);
+                var list = (IList)Activator.CreateInstance(listType);
+
+
+                foreach (IPublishedElement item in propertyValueEnumerable)
+                {
+                    var arg = Context.Property.PropertyType.GenericTypeArguments[0];
+
+                    var typedItem = item.As(arg);
+
+                    value.Add(typedItem);
+                }
+                return value;
+            }
 
             if (propertyValue != null)
             {