Add folderkeys to package xml. (#11172)

bergmania · AndyButland · web-flow · commit d007fa001270 · 2021-09-22T23:52:09.000+02:00
* Add folderkeys to package xml.

* Cleanup

* Use folderKeys to find child

* Fix potential issue with when no folder

* Fixed logic issue.

Co-authored-by: Andy Butland &lt;abutland73@gmail.com&gt;
diff --git a/src/Umbraco.Core/Services/IContentTypeServiceBase.cs b/src/Umbraco.Core/Services/IContentTypeServiceBase.cs
@@ -78,7 +78,7 @@ public interface IContentTypeBaseService<TItem> : IContentTypeBaseService, IServ
         /// <returns></returns>
         bool HasContainerInPath(params int[] ids);
 
-        Attempt<OperationResult<OperationResultType, EntityContainer>> CreateContainer(int parentContainerId, string name, int userId = Constants.Security.SuperUserId);
+        Attempt<OperationResult<OperationResultType, EntityContainer>> CreateContainer(int parentContainerId, Guid key, string name, int userId = Constants.Security.SuperUserId);
         Attempt<OperationResult> SaveContainer(EntityContainer container, int userId = Constants.Security.SuperUserId);
         EntityContainer GetContainer(int containerId);
         EntityContainer GetContainer(Guid containerId);
diff --git a/src/Umbraco.Core/Services/IDataTypeService.cs b/src/Umbraco.Core/Services/IDataTypeService.cs
@@ -17,7 +17,7 @@ public interface IDataTypeService : IService
         /// <returns></returns>
         IReadOnlyDictionary<Udi, IEnumerable<string>> GetReferences(int id);
 
-        Attempt<OperationResult<OperationResultType, EntityContainer>> CreateContainer(int parentId, string name, int userId = Constants.Security.SuperUserId);
+        Attempt<OperationResult<OperationResultType, EntityContainer>> CreateContainer(int parentId, Guid key, string name, int userId = Constants.Security.SuperUserId);
         Attempt<OperationResult> SaveContainer(EntityContainer container, int userId = Constants.Security.SuperUserId);
         EntityContainer GetContainer(int containerId);
         EntityContainer GetContainer(Guid containerId);
@@ -68,7 +68,7 @@ public interface IDataTypeService : IService
         /// <param name="dataTypeDefinitions"><see cref="IDataType"/> to save</param>
         /// <param name="userId">Id of the user issuing the save</param>
         void Save(IEnumerable<IDataType> dataTypeDefinitions, int userId = Constants.Security.SuperUserId);
-        
+
         /// <summary>
         /// Deletes an <see cref="IDataType"/>
         /// </summary>
diff --git a/src/Umbraco.Infrastructure/Packaging/PackageDataInstallation.cs b/src/Umbraco.Infrastructure/Packaging/PackageDataInstallation.cs
@@ -546,13 +546,33 @@ private Dictionary<string, int> CreateContentTypeFolderStructure(IEnumerable<XEl
                 {
                     var alias = documentType.Element("Info").Element("Alias").Value;
                     var folders = foldersAttribute.Value.Split(Constants.CharArrays.ForwardSlash);
+
+                    var folderKeysAttribute = documentType.Attribute("FolderKeys");
+
+                    var folderKeys = Array.Empty<Guid>();
+                    if (folderKeysAttribute != null)
+                    {
+                        folderKeys = folderKeysAttribute.Value.Split(Constants.CharArrays.ForwardSlash).Select(x=>Guid.Parse(x)).ToArray();
+                    }
+
                     var rootFolder = WebUtility.UrlDecode(folders[0]);
-                    //level 1 = root level folders, there can only be one with the same name
-                    var current = _contentTypeService.GetContainers(rootFolder, 1).FirstOrDefault();
+
+                    EntityContainer current;
+                    Guid? rootFolderKey = null;
+                    if (folderKeys.Length == folders.Length && folderKeys.Length > 0)
+                    {
+                        rootFolderKey = folderKeys[0];
+                        current = _contentTypeService.GetContainer(rootFolderKey.Value);
+                    }
+                    else
+                    {
+                        //level 1 = root level folders, there can only be one with the same name
+                        current = _contentTypeService.GetContainers(rootFolder, 1).FirstOrDefault();
+                    }
 
                     if (current == null)
                     {
-                        var tryCreateFolder = _contentTypeService.CreateContainer(-1, rootFolder);
+                        var tryCreateFolder = _contentTypeService.CreateContainer(-1, rootFolderKey ?? Guid.NewGuid(), rootFolder);
                         if (tryCreateFolder == false)
                         {
                             _logger.LogError(tryCreateFolder.Exception, "Could not create folder: {FolderName}", rootFolder);
@@ -567,7 +587,8 @@ private Dictionary<string, int> CreateContentTypeFolderStructure(IEnumerable<XEl
                     for (var i = 1; i < folders.Length; i++)
                     {
                         var folderName = WebUtility.UrlDecode(folders[i]);
-                        current = CreateContentTypeChildFolder(folderName, current);
+                        Guid? folderKey = (folderKeys.Length == folders.Length) ? folderKeys[i] : null;
+                        current = CreateContentTypeChildFolder(folderName, folderKey ?? Guid.NewGuid(), current);
                         importedFolders[alias] = current.Id;
                     }
                 }
@@ -576,17 +597,17 @@ private Dictionary<string, int> CreateContentTypeFolderStructure(IEnumerable<XEl
             return importedFolders;
         }
 
-        private EntityContainer CreateContentTypeChildFolder(string folderName, IUmbracoEntity current)
+        private EntityContainer CreateContentTypeChildFolder(string folderName, Guid folderKey, IUmbracoEntity current)
         {
             var children = _entityService.GetChildren(current.Id).ToArray();
-            var found = children.Any(x => x.Name.InvariantEquals(folderName));
+            var found = children.Any(x => x.Name.InvariantEquals(folderName) ||x.Key.Equals(folderKey));
             if (found)
             {
                 var containerId = children.Single(x => x.Name.InvariantEquals(folderName)).Id;
                 return _contentTypeService.GetContainer(containerId);
             }
 
-            var tryCreateFolder = _contentTypeService.CreateContainer(current.Id, folderName);
+            var tryCreateFolder = _contentTypeService.CreateContainer(current.Id, folderKey, folderName);
             if (tryCreateFolder == false)
             {
                 _logger.LogError(tryCreateFolder.Exception, "Could not create folder: {FolderName}", folderName);
@@ -1057,17 +1078,26 @@ private Dictionary<string, int> CreateDataTypeFolderStructure(IEnumerable<XEleme
             foreach (var datatypeElement in datatypeElements)
             {
                 var foldersAttribute = datatypeElement.Attribute("Folders");
+
                 if (foldersAttribute != null)
                 {
                     var name = datatypeElement.Attribute("Name").Value;
                     var folders = foldersAttribute.Value.Split(Constants.CharArrays.ForwardSlash);
+                    var folderKeysAttribute = datatypeElement.Attribute("FolderKeys");
+
+                    var folderKeys = Array.Empty<Guid>();
+                    if (folderKeysAttribute != null)
+                    {
+                        folderKeys = folderKeysAttribute.Value.Split(Constants.CharArrays.ForwardSlash).Select(x=>Guid.Parse(x)).ToArray();
+                    }
                     var rootFolder = WebUtility.UrlDecode(folders[0]);
+                    var rootFolderKey = folderKeys.Length > 0 ? folderKeys[0] : Guid.NewGuid();
                     //there will only be a single result by name for level 1 (root) containers
                     var current = _dataTypeService.GetContainers(rootFolder, 1).FirstOrDefault();
 
                     if (current == null)
                     {
-                        var tryCreateFolder = _dataTypeService.CreateContainer(-1, rootFolder);
+                        var tryCreateFolder = _dataTypeService.CreateContainer(-1, rootFolderKey, rootFolder);
                         if (tryCreateFolder == false)
                         {
                             _logger.LogError(tryCreateFolder.Exception, "Could not create folder: {FolderName}", rootFolder);
@@ -1081,7 +1111,8 @@ private Dictionary<string, int> CreateDataTypeFolderStructure(IEnumerable<XEleme
                     for (var i = 1; i < folders.Length; i++)
                     {
                         var folderName = WebUtility.UrlDecode(folders[i]);
-                        current = CreateDataTypeChildFolder(folderName, current);
+                        Guid? folderKey = (folderKeys.Length == folders.Length) ? folderKeys[i] : null;
+                        current = CreateDataTypeChildFolder(folderName, folderKey ?? Guid.NewGuid(), current);
                         importedFolders[name] = current.Id;
                     }
                 }
@@ -1090,17 +1121,17 @@ private Dictionary<string, int> CreateDataTypeFolderStructure(IEnumerable<XEleme
             return importedFolders;
         }
 
-        private EntityContainer CreateDataTypeChildFolder(string folderName, IUmbracoEntity current)
+        private EntityContainer CreateDataTypeChildFolder(string folderName, Guid folderKey, IUmbracoEntity current)
         {
             var children = _entityService.GetChildren(current.Id).ToArray();
-            var found = children.Any(x => x.Name.InvariantEquals(folderName));
+            var found = children.Any(x => x.Name.InvariantEquals(folderName) ||x.Key.Equals(folderKey));
             if (found)
             {
                 var containerId = children.Single(x => x.Name.InvariantEquals(folderName)).Id;
                 return _dataTypeService.GetContainer(containerId);
             }
 
-            var tryCreateFolder = _dataTypeService.CreateContainer(current.Id, folderName);
+            var tryCreateFolder = _dataTypeService.CreateContainer(current.Id, folderKey,folderName);
             if (tryCreateFolder == false)
             {
                 _logger.LogError(tryCreateFolder.Exception, "Could not create folder: {FolderName}", folderName);
diff --git a/src/Umbraco.Infrastructure/Services/Implement/ContentTypeServiceBaseOfTRepositoryTItemTService.cs b/src/Umbraco.Infrastructure/Services/Implement/ContentTypeServiceBaseOfTRepositoryTItemTService.cs
@@ -830,7 +830,7 @@ public Attempt<OperationResult<MoveOperationStatusType>> Move(TItem moving, int
 
         protected Guid ContainerObjectType => EntityContainer.GetContainerObjectType(ContainedObjectType);
 
-        public Attempt<OperationResult<OperationResultType, EntityContainer>> CreateContainer(int parentId, string name, int userId = Cms.Core.Constants.Security.SuperUserId)
+        public Attempt<OperationResult<OperationResultType, EntityContainer>> CreateContainer(int parentId, Guid key, string name, int userId = Cms.Core.Constants.Security.SuperUserId)
         {
             EventMessages eventMessages = EventMessagesFactory.Get();
             using (IScope scope = ScopeProvider.CreateScope())
@@ -843,7 +843,8 @@ public Attempt<OperationResult<OperationResultType, EntityContainer>> CreateCont
                     {
                         Name = name,
                         ParentId = parentId,
-                        CreatorId = userId
+                        CreatorId = userId,
+                        Key = key
                     };
 
                     var savingNotification = new EntityContainerSavingNotification(container, eventMessages);
diff --git a/src/Umbraco.Infrastructure/Services/Implement/DataTypeService.cs b/src/Umbraco.Infrastructure/Services/Implement/DataTypeService.cs
@@ -59,7 +59,7 @@ public DataTypeService(
 
         #region Containers
 
-        public Attempt<OperationResult<OperationResultType, EntityContainer>> CreateContainer(int parentId, string name, int userId = Cms.Core.Constants.Security.SuperUserId)
+        public Attempt<OperationResult<OperationResultType, EntityContainer>> CreateContainer(int parentId, Guid key, string name, int userId = Cms.Core.Constants.Security.SuperUserId)
         {
             var evtMsgs = EventMessagesFactory.Get();
             using (var scope = ScopeProvider.CreateScope())
@@ -70,7 +70,8 @@ public Attempt<OperationResult<OperationResultType, EntityContainer>> CreateCont
                     {
                         Name = name,
                         ParentId = parentId,
-                        CreatorId = userId
+                        CreatorId = userId,
+                        Key = key
                     };
 
                     var savingEntityContainerNotification = new EntityContainerSavingNotification(container, evtMsgs);
diff --git a/src/Umbraco.Infrastructure/Services/Implement/EntityXmlSerializer.cs b/src/Umbraco.Infrastructure/Services/Implement/EntityXmlSerializer.cs
@@ -191,18 +191,23 @@ public XElement Serialize(IDataType dataType)
             xml.Add(new XAttribute("Configuration", _configurationEditorJsonSerializer.Serialize(dataType.Configuration)));
 
             var folderNames = string.Empty;
+            var folderKeys = string.Empty;
             if (dataType.Level != 1)
             {
                 //get URL encoded folder names
                 var folders = _dataTypeService.GetContainers(dataType)
-                    .OrderBy(x => x.Level)
-                    .Select(x => WebUtility.UrlEncode(x.Name));
+                    .OrderBy(x => x.Level);
 
-                folderNames = string.Join("/", folders.ToArray());
+                folderNames = string.Join("/", folders.Select(x => WebUtility.UrlEncode(x.Name)).ToArray());
+                folderKeys = string.Join("/", folders.Select(x => x.Key).ToArray());
             }
 
             if (string.IsNullOrWhiteSpace(folderNames) == false)
+            {
                 xml.Add(new XAttribute("Folders", folderNames));
+                xml.Add(new XAttribute("FolderKeys", folderKeys));
+            }
+
 
             return xml;
         }
@@ -490,19 +495,24 @@ public XElement Serialize(IContentType contentType)
                 tabs);
 
             var folderNames = string.Empty;
+            var folderKeys = string.Empty;
             //don't add folders if this is a child doc type
             if (contentType.Level != 1 && masterContentType == null)
             {
                 //get URL encoded folder names
                 var folders = _contentTypeService.GetContainers(contentType)
-                    .OrderBy(x => x.Level)
-                    .Select(x => WebUtility.UrlEncode(x.Name));
+                    .OrderBy(x => x.Level);
 
-                folderNames = string.Join("/", folders.ToArray());
+                folderNames = string.Join("/", folders.Select(x => WebUtility.UrlEncode(x.Name)).ToArray());
+                folderKeys = string.Join("/", folders.Select(x => x.Key).ToArray());
             }
 
             if (string.IsNullOrWhiteSpace(folderNames) == false)
+            {
                 xml.Add(new XAttribute("Folders", folderNames));
+                xml.Add(new XAttribute("FolderKeys", folderKeys));
+            }
+
 
             return xml;
         }
diff --git a/src/Umbraco.Web.BackOffice/Controllers/ContentTypeController.cs b/src/Umbraco.Web.BackOffice/Controllers/ContentTypeController.cs
@@ -292,7 +292,7 @@ public IActionResult DeleteContainer(int id)
         [Authorize(Policy = AuthorizationPolicies.TreeAccessDocumentTypes)]
         public IActionResult PostCreateContainer(int parentId, string name)
         {
-            var result = _contentTypeService.CreateContainer(parentId, name, _backofficeSecurityAccessor.BackOfficeSecurity.CurrentUser.Id);
+            var result = _contentTypeService.CreateContainer(parentId, Guid.NewGuid(), name, _backofficeSecurityAccessor.BackOfficeSecurity.CurrentUser.Id);
 
             if (result.Success)
                 return Ok(result.Result); //return the id
diff --git a/src/Umbraco.Web.BackOffice/Controllers/DataTypeController.cs b/src/Umbraco.Web.BackOffice/Controllers/DataTypeController.cs
@@ -260,7 +260,7 @@ public IActionResult DeleteContainer(int id)
         public IActionResult PostCreateContainer(int parentId, string name)
         {
             var currentUser = _backOfficeSecurityAccessor.BackOfficeSecurity.CurrentUser;
-            var result = _dataTypeService.CreateContainer(parentId, name, currentUser.Id);
+            var result = _dataTypeService.CreateContainer(parentId, Guid.NewGuid(), name, currentUser.Id);
 
             if (result.Success)
                 return Ok(result.Result); //return the id
diff --git a/src/Umbraco.Web.BackOffice/Controllers/MediaTypeController.cs b/src/Umbraco.Web.BackOffice/Controllers/MediaTypeController.cs
@@ -261,7 +261,7 @@ public IActionResult DeleteContainer(int id)
         [Authorize(Policy = AuthorizationPolicies.TreeAccessMediaTypes)]
         public IActionResult PostCreateContainer(int parentId, string name)
         {
-            var result = _mediaTypeService.CreateContainer(parentId, name, _backofficeSecurityAccessor.BackOfficeSecurity.CurrentUser.Id);
+            var result = _mediaTypeService.CreateContainer(parentId, Guid.NewGuid(), name, _backofficeSecurityAccessor.BackOfficeSecurity.CurrentUser.Id);
 
             if (result.Success)
                 return Ok(result.Result); //return the id

Original file line number	Diff line number	Diff line change
`@@ -546,13 +546,33 @@ private Dictionary<string, int> CreateContentTypeFolderStructure(IEnumerable<XEl`
`546`	`546`	`{`
`547`	`547`	`var alias = documentType.Element("Info").Element("Alias").Value;`
`548`	`548`	`var folders = foldersAttribute.Value.Split(Constants.CharArrays.ForwardSlash);`
	`549`	`+`
	`550`	`+ var folderKeysAttribute = documentType.Attribute("FolderKeys");`
	`551`	`+`
	`552`	`+ var folderKeys = Array.Empty<Guid>();`
	`553`	`+ if (folderKeysAttribute != null)`
	`554`	`+ {`
	`555`	`+ folderKeys = folderKeysAttribute.Value.Split(Constants.CharArrays.ForwardSlash).Select(x=>Guid.Parse(x)).ToArray();`
	`556`	`+ }`
	`557`	`+`
`549`	`558`	`var rootFolder = WebUtility.UrlDecode(folders[0]);`
`550`		`- //level 1 = root level folders, there can only be one with the same name`
`551`		`- var current = _contentTypeService.GetContainers(rootFolder, 1).FirstOrDefault();`
	`559`	`+`
	`560`	`+ EntityContainer current;`
	`561`	`+ Guid? rootFolderKey = null;`
	`562`	`+ if (folderKeys.Length == folders.Length && folderKeys.Length > 0)`
	`563`	`+ {`
	`564`	`+ rootFolderKey = folderKeys[0];`
	`565`	`+ current = _contentTypeService.GetContainer(rootFolderKey.Value);`
	`566`	`+ }`
	`567`	`+ else`
	`568`	`+ {`
	`569`	`+ //level 1 = root level folders, there can only be one with the same name`
	`570`	`+ current = _contentTypeService.GetContainers(rootFolder, 1).FirstOrDefault();`
	`571`	`+ }`
`552`	`572`
`553`	`573`	`if (current == null)`
`554`	`574`	`{`
`555`		`- var tryCreateFolder = _contentTypeService.CreateContainer(-1, rootFolder);`
	`575`	`+ var tryCreateFolder = _contentTypeService.CreateContainer(-1, rootFolderKey ?? Guid.NewGuid(), rootFolder);`
`556`	`576`	`if (tryCreateFolder == false)`
`557`	`577`	`{`
`558`	`578`	`_logger.LogError(tryCreateFolder.Exception, "Could not create folder: {FolderName}", rootFolder);`
`@@ -567,7 +587,8 @@ private Dictionary<string, int> CreateContentTypeFolderStructure(IEnumerable<XEl`
`567`	`587`	`for (var i = 1; i < folders.Length; i++)`
`568`	`588`	`{`
`569`	`589`	`var folderName = WebUtility.UrlDecode(folders[i]);`
`570`		`- current = CreateContentTypeChildFolder(folderName, current);`
	`590`	`+ Guid? folderKey = (folderKeys.Length == folders.Length) ? folderKeys[i] : null;`
	`591`	`+ current = CreateContentTypeChildFolder(folderName, folderKey ?? Guid.NewGuid(), current);`
`571`	`592`	`importedFolders[alias] = current.Id;`
`572`	`593`	`}`
`573`	`594`	`}`
`@@ -576,17 +597,17 @@ private Dictionary<string, int> CreateContentTypeFolderStructure(IEnumerable<XEl`
`576`	`597`	`return importedFolders;`
`577`	`598`	`}`
`578`	`599`
`579`		`- private EntityContainer CreateContentTypeChildFolder(string folderName, IUmbracoEntity current)`
	`600`	`+ private EntityContainer CreateContentTypeChildFolder(string folderName, Guid folderKey, IUmbracoEntity current)`
`580`	`601`	`{`
`581`	`602`	`var children = _entityService.GetChildren(current.Id).ToArray();`
`582`		`- var found = children.Any(x => x.Name.InvariantEquals(folderName));`
	`603`	`+ var found = children.Any(x => x.Name.InvariantEquals(folderName) \|\|x.Key.Equals(folderKey));`
`583`	`604`	`if (found)`
`584`	`605`	`{`
`585`	`606`	`var containerId = children.Single(x => x.Name.InvariantEquals(folderName)).Id;`
`586`	`607`	`return _contentTypeService.GetContainer(containerId);`
`587`	`608`	`}`
`588`	`609`
`589`		`- var tryCreateFolder = _contentTypeService.CreateContainer(current.Id, folderName);`
	`610`	`+ var tryCreateFolder = _contentTypeService.CreateContainer(current.Id, folderKey, folderName);`
`590`	`611`	`if (tryCreateFolder == false)`
`591`	`612`	`{`
`592`	`613`	`_logger.LogError(tryCreateFolder.Exception, "Could not create folder: {FolderName}", folderName);`
`@@ -1057,17 +1078,26 @@ private Dictionary<string, int> CreateDataTypeFolderStructure(IEnumerable<XEleme`
`1057`	`1078`	`foreach (var datatypeElement in datatypeElements)`
`1058`	`1079`	`{`
`1059`	`1080`	`var foldersAttribute = datatypeElement.Attribute("Folders");`
	`1081`	`+`
`1060`	`1082`	`if (foldersAttribute != null)`
`1061`	`1083`	`{`
`1062`	`1084`	`var name = datatypeElement.Attribute("Name").Value;`
`1063`	`1085`	`var folders = foldersAttribute.Value.Split(Constants.CharArrays.ForwardSlash);`
	`1086`	`+ var folderKeysAttribute = datatypeElement.Attribute("FolderKeys");`
	`1087`	`+`
	`1088`	`+ var folderKeys = Array.Empty<Guid>();`
	`1089`	`+ if (folderKeysAttribute != null)`
	`1090`	`+ {`
	`1091`	`+ folderKeys = folderKeysAttribute.Value.Split(Constants.CharArrays.ForwardSlash).Select(x=>Guid.Parse(x)).ToArray();`
	`1092`	`+ }`
`1064`	`1093`	`var rootFolder = WebUtility.UrlDecode(folders[0]);`
	`1094`	`+ var rootFolderKey = folderKeys.Length > 0 ? folderKeys[0] : Guid.NewGuid();`
`1065`	`1095`	`//there will only be a single result by name for level 1 (root) containers`
`1066`	`1096`	`var current = _dataTypeService.GetContainers(rootFolder, 1).FirstOrDefault();`
`1067`	`1097`
`1068`	`1098`	`if (current == null)`
`1069`	`1099`	`{`
`1070`		`- var tryCreateFolder = _dataTypeService.CreateContainer(-1, rootFolder);`
	`1100`	`+ var tryCreateFolder = _dataTypeService.CreateContainer(-1, rootFolderKey, rootFolder);`
`1071`	`1101`	`if (tryCreateFolder == false)`
`1072`	`1102`	`{`
`1073`	`1103`	`_logger.LogError(tryCreateFolder.Exception, "Could not create folder: {FolderName}", rootFolder);`
`@@ -1081,7 +1111,8 @@ private Dictionary<string, int> CreateDataTypeFolderStructure(IEnumerable<XEleme`
`1081`	`1111`	`for (var i = 1; i < folders.Length; i++)`
`1082`	`1112`	`{`
`1083`	`1113`	`var folderName = WebUtility.UrlDecode(folders[i]);`
`1084`		`- current = CreateDataTypeChildFolder(folderName, current);`
	`1114`	`+ Guid? folderKey = (folderKeys.Length == folders.Length) ? folderKeys[i] : null;`
	`1115`	`+ current = CreateDataTypeChildFolder(folderName, folderKey ?? Guid.NewGuid(), current);`
`1085`	`1116`	`importedFolders[name] = current.Id;`
`1086`	`1117`	`}`
`1087`	`1118`	`}`
`@@ -1090,17 +1121,17 @@ private Dictionary<string, int> CreateDataTypeFolderStructure(IEnumerable<XEleme`
`1090`	`1121`	`return importedFolders;`
`1091`	`1122`	`}`
`1092`	`1123`
`1093`		`- private EntityContainer CreateDataTypeChildFolder(string folderName, IUmbracoEntity current)`
	`1124`	`+ private EntityContainer CreateDataTypeChildFolder(string folderName, Guid folderKey, IUmbracoEntity current)`
`1094`	`1125`	`{`
`1095`	`1126`	`var children = _entityService.GetChildren(current.Id).ToArray();`
`1096`		`- var found = children.Any(x => x.Name.InvariantEquals(folderName));`
	`1127`	`+ var found = children.Any(x => x.Name.InvariantEquals(folderName) \|\|x.Key.Equals(folderKey));`
`1097`	`1128`	`if (found)`
`1098`	`1129`	`{`
`1099`	`1130`	`var containerId = children.Single(x => x.Name.InvariantEquals(folderName)).Id;`
`1100`	`1131`	`return _dataTypeService.GetContainer(containerId);`
`1101`	`1132`	`}`
`1102`	`1133`
`1103`		`- var tryCreateFolder = _dataTypeService.CreateContainer(current.Id, folderName);`
	`1134`	`+ var tryCreateFolder = _dataTypeService.CreateContainer(current.Id, folderKey,folderName);`
`1104`	`1135`	`if (tryCreateFolder == false)`
`1105`	`1136`	`{`
`1106`	`1137`	`_logger.LogError(tryCreateFolder.Exception, "Could not create folder: {FolderName}", folderName);`
Original file line number	Diff line number	Diff line change
`@@ -292,7 +292,7 @@ public IActionResult DeleteContainer(int id)`
`292`	`292`	`[Authorize(Policy = AuthorizationPolicies.TreeAccessDocumentTypes)]`
`293`	`293`	`public IActionResult PostCreateContainer(int parentId, string name)`
`294`	`294`	`{`
`295`		`- var result = _contentTypeService.CreateContainer(parentId, name, _backofficeSecurityAccessor.BackOfficeSecurity.CurrentUser.Id);`
	`295`	`+ var result = _contentTypeService.CreateContainer(parentId, Guid.NewGuid(), name, _backofficeSecurityAccessor.BackOfficeSecurity.CurrentUser.Id);`
`296`	`296`
`297`	`297`	`if (result.Success)`
`298`	`298`	`return Ok(result.Result); //return the id`
Original file line number	Diff line number	Diff line change
`@@ -260,7 +260,7 @@ public IActionResult DeleteContainer(int id)`
`260`	`260`	`public IActionResult PostCreateContainer(int parentId, string name)`
`261`	`261`	`{`
`262`	`262`	`var currentUser = _backOfficeSecurityAccessor.BackOfficeSecurity.CurrentUser;`
`263`		`- var result = _dataTypeService.CreateContainer(parentId, name, currentUser.Id);`
	`263`	`+ var result = _dataTypeService.CreateContainer(parentId, Guid.NewGuid(), name, currentUser.Id);`
`264`	`264`
`265`	`265`	`if (result.Success)`
`266`	`266`	`return Ok(result.Result); //return the id`
Original file line number	Diff line number	Diff line change
`@@ -261,7 +261,7 @@ public IActionResult DeleteContainer(int id)`
`261`	`261`	`[Authorize(Policy = AuthorizationPolicies.TreeAccessMediaTypes)]`
`262`	`262`	`public IActionResult PostCreateContainer(int parentId, string name)`
`263`	`263`	`{`
`264`		`- var result = _mediaTypeService.CreateContainer(parentId, name, _backofficeSecurityAccessor.BackOfficeSecurity.CurrentUser.Id);`
	`264`	`+ var result = _mediaTypeService.CreateContainer(parentId, Guid.NewGuid(), name, _backofficeSecurityAccessor.BackOfficeSecurity.CurrentUser.Id);`
`265`	`265`
`266`	`266`	`if (result.Success)`
`267`	`267`	`return Ok(result.Result); //return the id`