From f3a7ada586ce0942510b8384cfbb4945a7cd1905 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Thu, 22 Dec 2016 11:10:45 +0100
Subject: [PATCH] U4-9250 - add keys to ctors

---
 src/Umbraco.Core/Models/Macro.cs                       | 6 ++++--
 src/Umbraco.Core/Models/MacroProperty.cs               | 5 +++--
 src/Umbraco.Core/Persistence/Factories/MacroFactory.cs | 9 ++++-----
 src/Umbraco.Tests/Models/MacroTests.cs                 | 7 ++++---
 4 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/Umbraco.Core/Models/Macro.cs b/src/Umbraco.Core/Models/Macro.cs
index e32e5b5ab9..58ee94bdc9 100644
--- a/src/Umbraco.Core/Models/Macro.cs
+++ b/src/Umbraco.Core/Models/Macro.cs
@@ -24,11 +24,12 @@ namespace Umbraco.Core.Models
             _addedProperties = new List<string>();
             _removedProperties = new List<string>();
         }
-        
+
         /// <summary>
         /// Creates an item with pre-filled properties
         /// </summary>
         /// <param name="id"></param>
+        /// <param name="key"></param>
         /// <param name="useInEditor"></param>
         /// <param name="cacheDuration"></param>
         /// <param name="alias"></param>
@@ -40,10 +41,11 @@ namespace Umbraco.Core.Models
         /// <param name="cacheByMember"></param>
         /// <param name="dontRender"></param>
         /// <param name="scriptPath"></param>
-        public Macro(int id, bool useInEditor, int cacheDuration, string @alias, string name, string controlType, string controlAssembly, string xsltPath, bool cacheByPage, bool cacheByMember, bool dontRender, string scriptPath)
+        public Macro(int id, Guid key, bool useInEditor, int cacheDuration, string @alias, string name, string controlType, string controlAssembly, string xsltPath, bool cacheByPage, bool cacheByMember, bool dontRender, string scriptPath)
             : this()
         {
             Id = id;
+            Key = key;
             UseInEditor = useInEditor;
             CacheDuration = cacheDuration;
             Alias = alias.ToCleanString(CleanStringType.Alias);
diff --git a/src/Umbraco.Core/Models/MacroProperty.cs b/src/Umbraco.Core/Models/MacroProperty.cs
index 605160c124..d3d82d10ad 100644
--- a/src/Umbraco.Core/Models/MacroProperty.cs
+++ b/src/Umbraco.Core/Models/MacroProperty.cs
@@ -46,17 +46,18 @@ namespace Umbraco.Core.Models
         /// Ctor for creating an existing property
         /// </summary>
         /// <param name="id"></param>
+        /// <param name="key"></param>
         /// <param name="alias"></param>
         /// <param name="name"></param>
         /// <param name="sortOrder"></param>
         /// <param name="editorAlias"></param>
-        internal MacroProperty(int id, string @alias, string name, int sortOrder, string editorAlias)
+        internal MacroProperty(int id, Guid key, string @alias, string name, int sortOrder, string editorAlias)
         {
             _id = id;
             _alias = alias;
             _name = name;
             _sortOrder = sortOrder;
-            _key = Guid.NewGuid();
+            _key = key;
 
             //try to get the new mapped parameter editor
             var mapped = LegacyParameterEditorAliasConverter.GetNewAliasFromLegacyAlias(editorAlias, false);
diff --git a/src/Umbraco.Core/Persistence/Factories/MacroFactory.cs b/src/Umbraco.Core/Persistence/Factories/MacroFactory.cs
index 6a59ec1d58..02d95b3776 100644
--- a/src/Umbraco.Core/Persistence/Factories/MacroFactory.cs
+++ b/src/Umbraco.Core/Persistence/Factories/MacroFactory.cs
@@ -9,8 +9,7 @@ namespace Umbraco.Core.Persistence.Factories
     {
         public IMacro BuildEntity(MacroDto dto)
         {
-            var model = new Macro(dto.Id, dto.UseInEditor, dto.RefreshRate, dto.Alias, dto.Name, dto.ScriptType, dto.ScriptAssembly, dto.Xslt, dto.CacheByPage, dto.CachePersonalized, dto.DontRender, dto.Python);
-            model.Key = dto.UniqueId;
+            var model = new Macro(dto.Id, dto.UniqueId, dto.UseInEditor, dto.RefreshRate, dto.Alias, dto.Name, dto.ScriptType, dto.ScriptAssembly, dto.Xslt, dto.CacheByPage, dto.CachePersonalized, dto.DontRender, dto.Python);
 
             try
             {
@@ -18,7 +17,7 @@ namespace Umbraco.Core.Persistence.Factories
 
                 foreach (var p in dto.MacroPropertyDtos)
                 {
-                    model.Properties.Add(new MacroProperty(p.Id, p.Alias, p.Name, p.SortOrder, p.EditorAlias) { Key = p.UniqueId });
+                    model.Properties.Add(new MacroProperty(p.Id, p.UniqueId, p.Alias, p.Name, p.SortOrder, p.EditorAlias));
                 }
 
                 //on initial construction we don't want to have dirty properties tracked
@@ -34,8 +33,8 @@ namespace Umbraco.Core.Persistence.Factories
 
         public MacroDto BuildDto(IMacro entity)
         {
-            var dto = new MacroDto()
-                {
+            var dto = new MacroDto
+            {
                     UniqueId = entity.Key,
                     Alias = entity.Alias,
                     CacheByPage = entity.CacheByPage,
diff --git a/src/Umbraco.Tests/Models/MacroTests.cs b/src/Umbraco.Tests/Models/MacroTests.cs
index b11814d622..f9e37454cb 100644
--- a/src/Umbraco.Tests/Models/MacroTests.cs
+++ b/src/Umbraco.Tests/Models/MacroTests.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Linq;
 using NUnit.Framework;
 using Umbraco.Core.Models;
@@ -19,8 +20,8 @@ namespace Umbraco.Tests.Models
         [Test]
         public void Can_Deep_Clone()
         {
-            var macro = new Macro(1, true, 3, "test", "Test", "blah", "blah", "xslt", false, true, true, "script");
-            macro.Properties.Add(new MacroProperty(6, "rewq", "REWQ", 1, "asdfasdf"));
+            var macro = new Macro(1, Guid.NewGuid(), true, 3, "test", "Test", "blah", "blah", "xslt", false, true, true, "script");
+            macro.Properties.Add(new MacroProperty(6, Guid.NewGuid(), "rewq", "REWQ", 1, "asdfasdf"));
 
             var clone = (Macro)macro.DeepClone();
 
@@ -52,7 +53,7 @@ namespace Umbraco.Tests.Models
             var asDirty = (ICanBeDirty)clone;
 
             Assert.IsFalse(asDirty.IsPropertyDirty("Properties"));
-            clone.Properties.Add(new MacroProperty(3, "asdf", "SDF", 3, "asdfasdf"));
+            clone.Properties.Add(new MacroProperty(3, Guid.NewGuid(), "asdf", "SDF", 3, "asdfasdf"));
             Assert.IsTrue(asDirty.IsPropertyDirty("Properties"));
             Assert.AreEqual(1, clone.AddedProperties.Count());
             clone.Properties.Remove("rewq");