Provided handling of potentially null topic references

JeremyCaney · JeremyCaney · commit e7a552014f64 · 2021-02-02T14:16:24.000-08:00
Now that `TopicReference.Value` is `null`, iterations over `Topic.References` must account for that possibility. That has always been done when calling `GetTopic()` (now `GetValue()`), but not when iterating over the collection.
diff --git a/OnTopic.AspNetCore.Mvc/Controllers/SitemapController.cs b/OnTopic.AspNetCore.Mvc/Controllers/SitemapController.cs
@@ -282,7 +282,7 @@ topic.References.Count is 0?
               from reference in topic.References
               select new XElement(_pagemapNamespace + "Attribute",
                 new XAttribute("name", reference.Key),
-                new XText(reference.Value.GetUniqueKey().Replace("Root:", "", StringComparison.OrdinalIgnoreCase))
+                new XText(reference.Value?.GetUniqueKey().Replace("Root:", "", StringComparison.OrdinalIgnoreCase))
               )
             );
 
diff --git a/OnTopic.Data.Sql/SqlTopicRepository.cs b/OnTopic.Data.Sql/SqlTopicRepository.cs
@@ -710,8 +710,8 @@ private static void PersistReferences(Topic topic, DateTime version, SqlConnecti
           CommandType           = CommandType.StoredProcedure
         };
 
-        foreach (var relatedTopic in topic.References.Where(t => !t.Value.IsNew)) {
-          references.AddRow(relatedTopic.Key, relatedTopic.Value.Id);
+        foreach (var relatedTopic in topic.References.Where(t => !t.Value?.IsNew?? false)) {
+          references.AddRow(relatedTopic.Key, relatedTopic.Value!.Id);
         }
 
         // Add Parameters
diff --git a/OnTopic/Repositories/TopicRepository.cs b/OnTopic/Repositories/TopicRepository.cs
@@ -349,7 +349,7 @@ private void Save([NotNull]Topic topic, bool isRecursive, TopicCollection unreso
       \-----------------------------------------------------------------------------------------------------------------------*/
       if (
         topic.Relationships.Any(r => r.Values.Any(t => t.Id < 0)) ||
-        topic.References.Values.Any(t => t.Id < 0)
+        topic.References.Any(t => t.Value?.Id < 0)
       ) {
         unresolvedTopics.Add(topic);
       }

Original file line number	Diff line number	Diff line change
`@@ -282,7 +282,7 @@ topic.References.Count is 0?`
`282`	`282`	`from reference in topic.References`
`283`	`283`	`select new XElement(_pagemapNamespace + "Attribute",`
`284`	`284`	`new XAttribute("name", reference.Key),`
`285`		`- new XText(reference.Value.GetUniqueKey().Replace("Root:", "", StringComparison.OrdinalIgnoreCase))`
	`285`	`+ new XText(reference.Value?.GetUniqueKey().Replace("Root:", "", StringComparison.OrdinalIgnoreCase))`
`286`	`286`	`)`
`287`	`287`	`);`
`288`	`288`
Original file line number	Diff line number	Diff line change
`@@ -710,8 +710,8 @@ private static void PersistReferences(Topic topic, DateTime version, SqlConnecti`
`710`	`710`	`CommandType = CommandType.StoredProcedure`
`711`	`711`	`};`
`712`	`712`
`713`		`- foreach (var relatedTopic in topic.References.Where(t => !t.Value.IsNew)) {`
`714`		`- references.AddRow(relatedTopic.Key, relatedTopic.Value.Id);`
	`713`	`+ foreach (var relatedTopic in topic.References.Where(t => !t.Value?.IsNew?? false)) {`
	`714`	`+ references.AddRow(relatedTopic.Key, relatedTopic.Value!.Id);`
`715`	`715`	`}`
`716`	`716`
`717`	`717`	`// Add Parameters`
Original file line number	Diff line number	Diff line change
`@@ -349,7 +349,7 @@ private void Save([NotNull]Topic topic, bool isRecursive, TopicCollection unreso`
`349`	`349`	`\-----------------------------------------------------------------------------------------------------------------------*/`
`350`	`350`	`if (`
`351`	`351`	`topic.Relationships.Any(r => r.Values.Any(t => t.Id < 0)) \|\|`
`352`		`- topic.References.Values.Any(t => t.Id < 0)`
	`352`	`+ topic.References.Any(t => t.Value?.Id < 0)`
`353`	`353`	`) {`
`354`	`354`	`unresolvedTopics.Add(topic);`
`355`	`355`	`}`