Merge pull request #2755 from FirelyTeam/feature/summary-count-selflinks

Preserve self links when a count summary is conducted

src/Hl7.Fhir.Base/ElementModel/MaskingNode.cs

@@ -16,7 +16,6 @@ namespace Hl7.Fhir.ElementModel
 {
  public class MaskingNode : ITypedElement, IAnnotated, IExceptionSource
  {
-
  /// <summary>
  /// Set to true when a complex type property is mandatory so all its children need to be included
  /// </summary>
@@ -59,7 +58,7 @@ public class MaskingNode : ITypedElement, IAnnotated, IExceptionSource
  new MaskingNode(node, new MaskingNodeSettings
  {
  IncludeMandatory = true,
- IncludeElements = new[] { "id", "total" },
+ IncludeElements = new[] { "id", "total", "link" },
  });
 
  public MaskingNode(ITypedElement source, MaskingNodeSettings settings = null)

src/Hl7.Fhir.Base/Serialization/SerializationFilter.cs

@@ -53,6 +53,13 @@ public abstract class SerializationFilter
  IncludeMandatory = true
  }));
 
+ public static SerializationFilter ForCount() => new BundleFilter(new TopLevelFilter(
+ new ElementMetadataFilter()
+ {
+ IncludeMandatory = true,
+ IncludeNames = new[] { "id", "total", "link" }
+ }));
+
  /// <summary>
  /// Construct a new filter that conforms to the `_summary=data` summarized form.
  /// </summary>

src/Hl7.Fhir.Serialization.Shared.Tests/SummaryTests.cs

@@ -1,4 +1,5 @@
-using Hl7.Fhir.ElementModel;
+using FluentAssertions;
+using Hl7.Fhir.ElementModel;
 using Hl7.Fhir.Specification;
 using Hl7.Fhir.Specification.Source;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -74,5 +75,16 @@ public void SummaryCountUsingStructureDefinitionSummaryProvider()
  ITypedElement getXmlNodeSDSP(string xml, FhirXmlParsingSettings s = null) =>
  XmlParsingHelpers.ParseToTypedElement(xml, new StructureDefinitionSummaryProvider(ZipSource.CreateValidationSource()), s);
  }
+
+ [TestMethod]
+ public void TestSummaryCountSelfLinks()
+ {
+ var tpXml = File.ReadAllText(Path.Combine("TestData", "no-namespace.xml"));
+
+ var nav = new ScopedNode(getXmlNode(tpXml));
+ var masker = MaskingNode.ForCount(nav);
+
+ masker.Children("link").Children("relation").First().Value.Should().BeEquivalentTo("self");
+ }
  }
 }

src/Hl7.Fhir.Serialization.Shared.Tests/TestData/no-namespace.xml

@@ -3,6 +3,10 @@
  <meta>
  <lastUpdated value="2014-08-18T01:43:30Z"/>
  </meta>
+ <link>
+ <relation value="self"/>
+ <url value="https://example.com/base/Observation?subject=Patient/347"/>
+ </link>
  <type value="searchset"/>
  <total value="3"/>
  <entry>

src/Hl7.Fhir.Support.Poco.Tests/NewPocoSerializers/SummaryFilterIntegrationTests.cs

@@ -144,6 +144,15 @@ public void SummaryElements()
  traverse(full.StatusElement).Count());
  }
 
+ [TestMethod]
+ public void SummaryCount()
+ {
+ var (full, summarized) = runSummarize<Bundle>("simple-bundle.xml", SerializationFilter.ForCount());
+
+ // check if result contains the link
+ traverse(summarized).Should().ContainKey("link");
+ }
+
  private (T full, T summarized) runSummarize<T>(string filename, SerializationFilter filter) where T : Resource
  {
  var fullXml = File.ReadAllText(Path.Combine("TestData", filename));

src/Hl7.Fhir.Support.Poco.Tests/TestData/simple-bundle.xml

@@ -0,0 +1,12 @@
+<Bundle xmlns="http:https://hl7.org/fhir">
+ <id value="bundle-example"/>
+ <meta>
+ <lastUpdated value="2014-08-18T01:43:30Z"/>
+ </meta>
+ <type value="searchset"/>
+ <total value="0"/>
+ <link>
+ <relation value="self"/>
+ <url value="https://example.com/base/Observation?subject=Patient/347"/>
+ </link>
+</Bundle>