From 6dca39d1d406a5a4154c6c0547fea75c31592cca Mon Sep 17 00:00:00 2001
From: Nikolaj <nikolajlauridsen@protonmail.ch>
Date: Thu, 24 Nov 2022 10:09:04 +0100
Subject: [PATCH] Ensure that all automatic relation types are updated

---
 src/Umbraco.Core/Constants-Conventions.cs     |  1 -
 .../PropertyEditors/IDataValueReference.cs    |  6 ++++
 .../Implement/ContentRepositoryBase.cs        | 30 ++++++++++++++++---
 3 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Core/Constants-Conventions.cs b/src/Umbraco.Core/Constants-Conventions.cs
index 09942ff49534..7047e1643717 100644
--- a/src/Umbraco.Core/Constants-Conventions.cs
+++ b/src/Umbraco.Core/Constants-Conventions.cs
@@ -282,7 +282,6 @@ public static class RelationTypes
             ///     Developers should not manually use these relation types since they will all be cleared whenever an entity
             ///     (content, media or member) is saved since they are auto-populated based on property values.
             /// </remarks>
-            [Obsolete("This is no longer used, and will be removed in v12")]
             public static string[] AutomaticRelationTypes { get; } = { RelatedMediaAlias, RelatedDocumentAlias };
 
             // TODO: return a list of built in types so we can use that to prevent deletion in the UI
diff --git a/src/Umbraco.Core/PropertyEditors/IDataValueReference.cs b/src/Umbraco.Core/PropertyEditors/IDataValueReference.cs
index 39d7d7e1309a..6c863d66ffec 100644
--- a/src/Umbraco.Core/PropertyEditors/IDataValueReference.cs
+++ b/src/Umbraco.Core/PropertyEditors/IDataValueReference.cs
@@ -14,4 +14,10 @@ public interface IDataValueReference
     /// <param name="value"></param>
     /// <returns></returns>
     IEnumerable<UmbracoEntityReference> GetReferences(object? value);
+
+    /// <summary>
+    ///     Returns all reference types that are automatically tracked.
+    /// </summary>
+    /// <returns></returns>
+    IEnumerable<string> GetAutomaticRelationTypesAliases() => Enumerable.Empty<string>();
 }
diff --git a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/ContentRepositoryBase.cs b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/ContentRepositoryBase.cs
index ded99bf8bfd1..4632dc568aba 100644
--- a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/ContentRepositoryBase.cs
+++ b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/ContentRepositoryBase.cs
@@ -1042,10 +1042,7 @@ protected void PersistRelations(TEntity entity)
             var trackedRelations = new List<UmbracoEntityReference>();
             trackedRelations.AddRange(_dataValueReferenceFactories.GetAllReferences(entity.Properties, PropertyEditors));
 
-            var relationTypeAliases = trackedRelations
-                .Select(x => x.RelationTypeAlias)
-                .Distinct()
-                .ToArray();
+            var relationTypeAliases = GetAutomaticRelationTypesAliases(entity.Properties, PropertyEditors).ToArray();
 
             // First delete all auto-relations for this entity
             RelationRepository.DeleteByParent(entity.Id, relationTypeAliases);
@@ -1093,6 +1090,31 @@ protected void PersistRelations(TEntity entity)
             RelationRepository.SaveBulk(toSave);
         }
 
+        private IEnumerable<string> GetAutomaticRelationTypesAliases(
+            IPropertyCollection properties,
+            PropertyEditorCollection propertyEditors)
+        {
+            var automaticRelationTypesAliases = new HashSet<string>(Constants.Conventions.RelationTypes.AutomaticRelationTypes);
+
+            foreach (IProperty property in properties)
+            {
+                if (propertyEditors.TryGet(property.PropertyType.PropertyEditorAlias, out IDataEditor? editor) is false )
+                {
+                    continue;
+                }
+
+                if (editor.GetValueEditor() is IDataValueReference reference)
+                {
+                    foreach (var alias in reference.GetAutomaticRelationTypesAliases())
+                    {
+                        automaticRelationTypesAliases.Add(alias);
+                    }
+                }
+            }
+
+            return automaticRelationTypesAliases;
+        }
+
         /// <summary>
         /// Inserts property values for the content entity
         /// </summary>