From 1ca0cd353aa48f0afd54a66edea73bf516b7ecbd Mon Sep 17 00:00:00 2001
From: "NCG\\oyvind.tanum" <oyvind.tanum@epinova.no>
Date: Thu, 2 Feb 2023 18:14:22 +0100
Subject: [PATCH] Removed ParentLink and ContentReference. Breaking for
 commerce content. Id and ParentId should be sufficient.

---
 .../Extensions/ContentExtensions.cs                    | 10 +---------
 src/Epinova.ElasticSearch.Core/DefaultFields.cs        |  2 --
 src/Epinova.ElasticSearch.Core/Engine/QueryBuilder.cs  |  2 --
 src/Epinova.ElasticSearch.Core/WellKnownProperties.cs  |  4 ++--
 .../Extensions/ContentExtensionsTests.cs               |  6 +++---
 5 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/src/Epinova.ElasticSearch.Core.EPiServer/Extensions/ContentExtensions.cs b/src/Epinova.ElasticSearch.Core.EPiServer/Extensions/ContentExtensions.cs
index a3e38b8..29aa20b 100644
--- a/src/Epinova.ElasticSearch.Core.EPiServer/Extensions/ContentExtensions.cs
+++ b/src/Epinova.ElasticSearch.Core.EPiServer/Extensions/ContentExtensions.cs
@@ -409,16 +409,8 @@ private static void AppendDefaultFields(IContent content, IDictionary<string, ob
             dictionary.Add(DefaultFields.Id, content.ContentLink.ID);
             dictionary.Add(DefaultFields.Indexed, DateTime.Now);
 
-            if(content.ContentLink != null)
-            {
-                dictionary.Add(DefaultFields.ContentLink, content.ContentLink);
-            }
-
-            if(content.ParentLink != null)
-            {
+            if(content.ParentLink != null) 
                 dictionary.Add(DefaultFields.ParentId, content.ParentLink.ID);
-                dictionary.Add(DefaultFields.ParentLink, content.ParentLink);
-            }
 
             dictionary.Add(DefaultFields.Name, content.Name);
             dictionary.Add(DefaultFields.Type, typeName);
diff --git a/src/Epinova.ElasticSearch.Core/DefaultFields.cs b/src/Epinova.ElasticSearch.Core/DefaultFields.cs
index c1b9144..6b5b036 100644
--- a/src/Epinova.ElasticSearch.Core/DefaultFields.cs
+++ b/src/Epinova.ElasticSearch.Core/DefaultFields.cs
@@ -7,8 +7,6 @@ public static class DefaultFields
         public const string Id = "Id";
         public const string Indexed = "Indexed";
         public const string ParentId = "ParentId";
-        public const string ContentLink = "ContentLink";
-        public const string ParentLink = "ParentLink";
         public const string Name = "Name";
         public const string Type = "Type";
         public const string Types = "Types";
diff --git a/src/Epinova.ElasticSearch.Core/Engine/QueryBuilder.cs b/src/Epinova.ElasticSearch.Core/Engine/QueryBuilder.cs
index 9061e3f..38c4324 100644
--- a/src/Epinova.ElasticSearch.Core/Engine/QueryBuilder.cs
+++ b/src/Epinova.ElasticSearch.Core/Engine/QueryBuilder.cs
@@ -242,8 +242,6 @@ private void SetupSourceFields(QueryRequest request, QuerySetup setup)
 
             fields.Add(DefaultFields.Id);
             fields.Add(DefaultFields.Indexed);
-            fields.Add(DefaultFields.ContentLink);
-            fields.Add(DefaultFields.ParentLink);
             fields.Add(DefaultFields.ParentId);
             fields.Add(DefaultFields.Name);
             fields.Add(DefaultFields.Type);
diff --git a/src/Epinova.ElasticSearch.Core/WellKnownProperties.cs b/src/Epinova.ElasticSearch.Core/WellKnownProperties.cs
index b19e8ca..d7bf86b 100644
--- a/src/Epinova.ElasticSearch.Core/WellKnownProperties.cs
+++ b/src/Epinova.ElasticSearch.Core/WellKnownProperties.cs
@@ -19,8 +19,6 @@ internal static class WellKnownProperties
             DefaultFields.Id,
             DefaultFields.BestBets,
             DefaultFields.ParentId,
-            DefaultFields.ContentLink,
-            DefaultFields.ParentLink,
             DefaultFields.Path,
             DefaultFields.Name,
             DefaultFields.Lang,
@@ -35,10 +33,12 @@ internal static class WellKnownProperties
         {
             "CreatedBy",
             "ChangedBy",
+            "ContentLink",
             "DeletedBy",
             "URLSegment",
             "ExternalURL",
             "PageName",
+            "ParentLink",
             "RouteSegment",
             "LinkURL",
             "StaticLinkURL",
diff --git a/tests/Core.Episerver.Tests/Extensions/ContentExtensionsTests.cs b/tests/Core.Episerver.Tests/Extensions/ContentExtensionsTests.cs
index 9576408..3b0c4e0 100644
--- a/tests/Core.Episerver.Tests/Extensions/ContentExtensionsTests.cs
+++ b/tests/Core.Episerver.Tests/Extensions/ContentExtensionsTests.cs
@@ -46,12 +46,12 @@ public void AsIndexItem_SetsStandardFields(string propName, object expectedValue
         }
 
         [Fact]
-        public void AsIndexItem_SetsStandardFields_ParentLink()
+        public void AsIndexItem_SetsStandardFields_ParentId()
         {
             dynamic result = _content.AsIndexItem();
             var dictionary = (IDictionary<string, object>)result;
 
-            Assert.Equal(new PageReference(200), dictionary[DefaultFields.ParentLink]);
+            Assert.Equal(200, dictionary[DefaultFields.ParentId]);
         }
 
         [Fact]
@@ -80,7 +80,7 @@ public void AsIndexItem_SetsTypeHierarchy()
         [InlineData(DefaultFields.Name)]
         [InlineData(DefaultFields.Type)]
         [InlineData(DefaultFields.Types)]
-        [InlineData(DefaultFields.ParentLink)]
+        [InlineData(DefaultFields.ParentId)]
         [InlineData(DefaultFields.StartPublish)]
         [InlineData(DefaultFields.StopPublish)]
         [InlineData(DefaultFields.Path)]