Merge pull request #17 from umbraco/temp-u4-10998

u4-10998 change innerContentConnector to either lookup contenttypes by guids o…

Author: clausjensen

src/Umbraco.Deploy.Contrib.Connectors/ValueConnectors/InnerContentConnector.cs

@@ -60,27 +60,24 @@ public string GetValue(Property property, ICollection<ArtifactDependency> depend
             if (innerContent == null)
                 return null;
 
-            var allContentTypes = innerContent.Select(x => x.IcContentTypeAlias)
-                .Distinct()
-                .ToDictionary(a => a, a => _contentTypeService.GetContentType(a));
-
-            //Ensure all of these content types are found
-            if (allContentTypes.Values.Any(contentType => contentType == null))
-            {
-                throw new InvalidOperationException($"Could not resolve these content types for the Inner Content property: {string.Join(",", allContentTypes.Where(x => x.Value == null).Select(x => x.Key))}");
-            }
-
-            //Ensure that these content types have dependencies added
-            foreach (var contentType in allContentTypes.Values)
-            {
-                dependencies.Add(new ArtifactDependency(contentType.GetUdi(), false, ArtifactDependencyMode.Match));
-            }
-
-            foreach (var row in innerContent)
+            var distinctContentTypes = new Dictionary<GuidUdi, IContentType>();
+            foreach (var innerContentItem in innerContent)
             {
-                var contentType = allContentTypes[row.IcContentTypeAlias];
+                var contentType = _contentTypeService.GetContentType(innerContentItem.IcContentTypeGuid);
+                if (contentType == null)
+                    contentType = _contentTypeService.GetContentType(innerContentItem.IcContentTypeAlias);
+                if (contentType == null)
+                    throw new InvalidOperationException($"Could not resolve these content types for the Inner Content property with key: {innerContentItem.Key}, and name: {innerContentItem.Name}");
+                
+                // ensure the content type is added as a unique dependency
+                var contentTypeUdi = contentType.GetUdi();
+                if (distinctContentTypes.ContainsKey(contentTypeUdi) == false)
+                {
+                    distinctContentTypes.Add(contentTypeUdi,contentType);
+                    dependencies.Add(new ArtifactDependency(contentTypeUdi,false,ArtifactDependencyMode.Match));
+                }
 
-                foreach (var key in row.PropertyValues.Keys.ToArray())
+                foreach (var key in innerContentItem.PropertyValues.Keys.ToArray())
                 {
                     var propertyType = contentType.CompositionPropertyTypes.FirstOrDefault(x => x.Alias == key);
 
@@ -95,7 +92,7 @@ public string GetValue(Property property, ICollection<ArtifactDependency> depend
 
                     // this should be enough for all other value connectors to work with
                     // as all they should need is the value, and the property type infos
-                    var mockProperty = new Property(propertyType, row.PropertyValues[key]);
+                    var mockProperty = new Property(propertyType, innerContentItem.PropertyValues[key]);
 
                     object parsedValue = propValueConnector.GetValue(mockProperty, dependencies);
 
@@ -111,7 +108,7 @@ public string GetValue(Property property, ICollection<ArtifactDependency> depend
                         parsedValue = parsedValue.ToString();
                     }
 
-                    row.PropertyValues[key] = parsedValue;
+                    innerContentItem.PropertyValues[key] = parsedValue;
                 }
             }
 
@@ -147,21 +144,16 @@ public void SetValue(IContentBase content, string alias, string value)
             if (innerContent == null)
                 return;
 
-            var allContentTypes = innerContent.Select(x => x.IcContentTypeAlias)
-                .Distinct()
-                .ToDictionary(a => a, a => _contentTypeService.GetContentType(a));
-
-            //Ensure all of these content types are found
-            if (allContentTypes.Values.Any(contentType => contentType == null))
+            foreach (var innerContentItem in innerContent)
             {
-                throw new InvalidOperationException($"Could not resolve these content types for the Inner Content property: {string.Join(",", allContentTypes.Where(x => x.Value == null).Select(x => x.Key))}");
-            }
+                var contentType = _contentTypeService.GetContentType(innerContentItem.IcContentTypeGuid);
+                if (contentType == null)
+                    contentType = _contentTypeService.GetContentType(innerContentItem.IcContentTypeAlias);
+                if (contentType == null)
+                    throw new InvalidOperationException($"Could not resolve these content types for the Inner Content property with key: {innerContentItem.Key}, and name: {innerContentItem.Name}");
 
-            var mocks = new Dictionary<IContentType, IContent>();
 
-            foreach (var row in innerContent)
-            {
-                var contentType = allContentTypes[row.IcContentTypeAlias];
+                var mocks = new Dictionary<IContentType, IContent>();
 
                 // note
                 // the way we do it here, doing content.SetValue() several time on the same content, reduces
@@ -176,7 +168,7 @@ public void SetValue(IContentBase content, string alias, string value)
                 if (!mocks.TryGetValue(contentType, out mockContent))
                     mockContent = mocks[contentType] = new Content("IC_" + Guid.NewGuid(), -1, contentType);
 
-                foreach (var key in row.PropertyValues.Keys.ToArray())
+                foreach (var key in innerContentItem.PropertyValues.Keys.ToArray())
                 {
                     var propertyType = contentType.CompositionPropertyTypes.FirstOrDefault(x => x.Alias == key);
 
@@ -189,7 +181,7 @@ public void SetValue(IContentBase content, string alias, string value)
                     // throws if not found - no need for a null check
                     var propValueConnector = ValueConnectors.Get(propertyType);
 
-                    var rowValue = row.PropertyValues[key];
+                    var rowValue = innerContentItem.PropertyValues[key];
 
                     if (rowValue != null)
                     {
@@ -198,7 +190,7 @@ public void SetValue(IContentBase content, string alias, string value)
                         // integers needs to be converted into strings
                         if (convertedValue is int)
                         {
-                            row.PropertyValues[key] = convertedValue.ToString();
+                            innerContentItem.PropertyValues[key] = convertedValue.ToString();
                         }
                         else
                         {
@@ -207,17 +199,17 @@ public void SetValue(IContentBase content, string alias, string value)
                             var jtokenValue = convertedValue.ToString().DetectIsJson() ? JToken.Parse(convertedValue.ToString()) : null;
                             if (jtokenValue != null)
                             {
-                                row.PropertyValues[key] = jtokenValue;
+                                innerContentItem.PropertyValues[key] = jtokenValue;
                             }
                             else
                             {
-                                row.PropertyValues[key] = convertedValue;
+                                innerContentItem.PropertyValues[key] = convertedValue;
                             }
                         }
                     }
                     else
                     {
-                        row.PropertyValues[key] = rowValue;
+                        innerContentItem.PropertyValues[key] = rowValue;
                     }
                 }
             }
@@ -250,6 +242,8 @@ public class InnerContentValue
             public string Icon { get; set; }
             [JsonProperty("icContentTypeAlias")]
             public string IcContentTypeAlias { get; set; }
+            [JsonProperty("icContentTypeGuid")]
+            public Guid IcContentTypeGuid { get; set; }
 
             /// <summary>
             /// The remaining properties will be serialized to a dictionary