Refactored getAttributes() logic to return container DataObject

JeremyCaney · JeremyCaney · commit f79f1fff9e72 · 2021-01-28T12:37:09.000-08:00
Updated the `getAttributes()` function so that the root `DataObject` is created by the function itself. This makes it more consistent with the other local functions, and cleans up the calling code.
diff --git a/OnTopic.AspNetCore.Mvc/Controllers/SitemapController.cs b/OnTopic.AspNetCore.Mvc/Controllers/SitemapController.cs
@@ -195,10 +195,7 @@ private IEnumerable<XElement> AddTopic(Topic topic, bool includeMetadata = false
         new XElement(_sitemapNamespace + "lastmod", lastModified.ToString("yyyy-MM-dd", CultureInfo.InvariantCulture)),
         new XElement(_sitemapNamespace + "priority", 1),
         includeMetadata? new XElement(_pagemapNamespace + "PageMap",
-          new XElement(_pagemapNamespace + "DataObject",
-            new XAttribute("type", topic.ContentType?? "Page"),
-            getAttributes()
-          ),
+          getAttributes(),
           getRelationships(),
           getReferences()
         ) : null
@@ -222,14 +219,17 @@ private IEnumerable<XElement> AddTopic(Topic topic, bool includeMetadata = false
       /*------------------------------------------------------------------------------------------------------------------------
       | Get attributes
       \-----------------------------------------------------------------------------------------------------------------------*/
-      IEnumerable<XElement> getAttributes() =>
-        from attribute in topic.Attributes
-        where !ExcludeAttributes.Contains(attribute.Key, StringComparer.OrdinalIgnoreCase)
-        where topic.Attributes.GetValue(attribute.Key)?.Length < 256
-        select new XElement(_pagemapNamespace + "Attribute",
-          new XAttribute("name", attribute.Key),
-          new XText(topic.Attributes.GetValue(attribute.Key))
-        );
+      XElement getAttributes() =>
+        new XElement(_pagemapNamespace + "DataObject",
+          new XAttribute("type", "Attributes"),
+            from attribute in topic.Attributes
+            where !ExcludeAttributes.Contains(attribute.Key, StringComparer.OrdinalIgnoreCase)
+            where topic.Attributes.GetValue(attribute.Key)?.Length < 256
+            select new XElement(_pagemapNamespace + "Attribute",
+              new XAttribute("name", attribute.Key),
+              new XText(topic.Attributes.GetValue(attribute.Key))
+            )
+          );
 
       /*------------------------------------------------------------------------------------------------------------------------
       | Get relationships
