From 62bf2620f16aaf32e73172a036a597fb8eaf6939 Mon Sep 17 00:00:00 2001
From: James Agnew <jamesagnew@gmail.com>
Date: Wed, 17 Sep 2014 11:35:57 -0400
Subject: [PATCH] Properly handle bundle entry summary element

---
 hapi-fhir-base/src/changes/changes.xml                    | 4 ++++
 .../src/main/java/ca/uhn/fhir/parser/JsonParser.java      | 4 ++++
 .../src/main/java/ca/uhn/fhir/parser/XmlParser.java       | 8 ++++++++
 .../src/test/java/ca/uhn/fhir/parser/JsonParserTest.java  | 8 ++++++--
 .../src/test/java/ca/uhn/fhir/parser/XmlParserTest.java   | 5 ++++-
 5 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/hapi-fhir-base/src/changes/changes.xml b/hapi-fhir-base/src/changes/changes.xml
index 6efe5e6aa91..d25febb32e0 100644
--- a/hapi-fhir-base/src/changes/changes.xml
+++ b/hapi-fhir-base/src/changes/changes.xml
@@ -28,6 +28,10 @@
 				XHTML (in narratives) containing escapable characters (e.g. &lt; or &quot;) will now always have those characters 
 				escaped properly in encoded messages.
 			</action>
+			<action type="fix">
+				Summary (in the bundle entry) is now encoded by the XML and JSON parsers if supplied. Thanks to David Hay of 
+				Orion Health for reporting this!
+			</action>
 		</release>
 		<release version="0.6" date="2014-Sep-08" description="This release brings a number of new features and bug fixes!">
 			<!-- 
diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/JsonParser.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/JsonParser.java
index fb6ab6aaf1d..2615b866592 100644
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/JsonParser.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/JsonParser.java
@@ -203,6 +203,10 @@ public class JsonParser extends BaseParser implements IParser {
 				encodeResourceToJsonStreamWriter(resDef, resource, eventWriter, "content", false);
 			}
 
+			if (nextEntry.getSummary().isEmpty()==false) {
+				eventWriter.write("summary", nextEntry.getSummary().getValueAsString());
+			}
+			
 			eventWriter.writeEnd(); // entry object
 		}
 		eventWriter.writeEnd(); // entry array
diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/XmlParser.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/XmlParser.java
index aceda2a2b67..379c531efcd 100644
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/XmlParser.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/XmlParser.java
@@ -207,6 +207,14 @@ public class XmlParser extends BaseParser implements IParser {
 				} else {
 					ourLog.debug("Bundle entry contains null resource");
 				}
+				
+				if (!nextEntry.getSummary().isEmpty()) {
+					eventWriter.writeStartElement("summary");
+					eventWriter.writeAttribute("type", "xhtml");
+					encodeXhtml(nextEntry.getSummary(), eventWriter);
+					eventWriter.writeEndElement();
+				}
+				
 
 				eventWriter.writeEndElement(); // entry
 			}
diff --git a/hapi-fhir-base/src/test/java/ca/uhn/fhir/parser/JsonParserTest.java b/hapi-fhir-base/src/test/java/ca/uhn/fhir/parser/JsonParserTest.java
index 04a3a817690..ef5fc985e7b 100644
--- a/hapi-fhir-base/src/test/java/ca/uhn/fhir/parser/JsonParserTest.java
+++ b/hapi-fhir-base/src/test/java/ca/uhn/fhir/parser/JsonParserTest.java
@@ -763,7 +763,9 @@ public class JsonParserTest {
 
 		DiagnosticReport res = (DiagnosticReport) entry.getResource();
 		assertEquals("Complete Blood Count", res.getName().getText().getValue());
-
+		
+		assertThat(entry.getSummary().getValueAsString(), containsString("CBC Report for Wile"));
+		
 	}
 
 	@Test
@@ -874,7 +876,8 @@ public class JsonParserTest {
 		BundleEntry entry = b.addEntry();
 		entry.getId().setValue("1");
 		entry.setResource(p1);
-
+		entry.getSummary().setValueAsString("this is the summary");
+		
 		Patient p2 = new Patient();
 		p2.addName().addFamily("Family2");
 		entry = b.addEntry();
@@ -893,6 +896,7 @@ public class JsonParserTest {
 		List<String> strings = new ArrayList<String>();
 		strings.addAll(Arrays.asList("\"published\":\""+pub.getValueAsString()+"\""));
 		strings.addAll(Arrays.asList("\"id\":\"1\""));
+		strings.addAll(Arrays.asList("this is the summary"));
 		strings.addAll(Arrays.asList("\"id\":\"2\"", "\"rel\":\"alternate\"", "\"href\":\"http://foo/bar\""));
 		strings.addAll(Arrays.asList("\"deleted\":\""+nowDt.getValueAsString()+"\"", "\"id\":\"Patient/3\""));
 		assertThat(bundleString, StringContainsInOrder.stringContainsInOrder(strings));
diff --git a/hapi-fhir-base/src/test/java/ca/uhn/fhir/parser/XmlParserTest.java b/hapi-fhir-base/src/test/java/ca/uhn/fhir/parser/XmlParserTest.java
index c1a1c1ca3d6..abbb29a615b 100644
--- a/hapi-fhir-base/src/test/java/ca/uhn/fhir/parser/XmlParserTest.java
+++ b/hapi-fhir-base/src/test/java/ca/uhn/fhir/parser/XmlParserTest.java
@@ -117,6 +117,7 @@ public class XmlParserTest {
 		BundleEntry entry = b.addEntry();
 		entry.getId().setValue("1");
 		entry.setResource(p1);
+		entry.getSummary().setValueAsString("this is the summary");
 
 		Patient p2 = new Patient();
 		p2.addName().addFamily("Family2");
@@ -136,7 +137,7 @@ public class XmlParserTest {
 		List<String> strings = new ArrayList<String>();
 		strings.addAll(Arrays.asList("<published>", pub.getValueAsString(), "</published>"));
 		strings.add("<category term=\"http://hl7.org/fhir/tag/message\" label=\"Message\" scheme=\"http://hl7.org/fhir/tag\"/>");
-		strings.addAll(Arrays.asList("<entry>", "<id>1</id>", "</entry>"));
+		strings.addAll(Arrays.asList("<entry>", "<id>1</id>", "</Patient>","<summary type=\"xhtml\">", "<div", "</entry>"));
 		strings.addAll(Arrays.asList("<entry>", "<id>2</id>", "<link rel=\"alternate\" href=\"http://foo/bar\"/>", "<link rel=\"search\" href=\"http://foo/bar/search\"/>", "</entry>"));
 		strings.addAll(Arrays.asList("<at:deleted-entry", "ref=\"Patient/3", "/>"));
 		assertThat(bundleString, StringContainsInOrder.stringContainsInOrder(strings));
@@ -941,6 +942,8 @@ public class XmlParserTest {
 		assertEquals("12345", resource.getId().getVersionIdPart());
 		assertEquals("12345", ((IdDt) resource.getResourceMetadata().get(ResourceMetadataKeyEnum.VERSION_ID)).getVersionIdPart());
 
+		assertThat(entry.getSummary().getValueAsString(), containsString("LOINC Codes for Cholesterol"));
+		
 	}
 
 	@SuppressWarnings("deprecation")