Update to FHIR 4.0.0 (#67)

Updates Data models to R4 and closes #59.

Author: raheelsayeed

.bumpversion.cfg

@@ -1,4 +1,4 @@
 [bumpversion]
-current_version = 3.2.0
+current_version = 4.0.0
 files = fhirclient/client.py
 

.gitignore

@@ -12,3 +12,4 @@ session_data
 # IDE files
 *.sublime-*
 
+.DS_Store

AUTHORS.md

@@ -13,6 +13,7 @@ The following wonderful people contributed directly or indirectly to this projec
 - Josh Mandel <https://github.com/jmandel>
 - Nikolai Schwertner <https://github.com/nschwertner>
 - Pascal Pfiffner <https://github.com/p2>
+- Raheel Sayeed <https://github.com/raheelsayeed> 
 - Trinadh Baranika <https://github.com/bktrinadh>
 
 Please add yourself here alphabetically when you submit your first pull request.

Doxyfile

@@ -38,7 +38,7 @@ PROJECT_NAME           = "SMART on FHIR Python Client"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 3.2.0
+PROJECT_NUMBER         = 4.0.0
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

README.md

@@ -10,6 +10,7 @@ The `develop` branch should be on recent freezes, and the `feature/latest-ci` br
 
    Version |          FHIR |  
 -----------|---------------|---------
+ **4.0.0** |       `4.0.0` | (R4)
  **3.0.0** |       `3.0.0` | (STU-3)
    **x.x** |       `1.8.0` | (STU-3 Ballot, Jan 2017)
    **x.x** |       `1.6.0` | (STU-3 Ballot, Sep 2016)

fhir-parser

@@ -5,7 +5,7 @@
 from Default.settings import *
 
 # Base URL for where to load specification data from
-specification_url = 'http://hl7.org/fhir/STU3'
+specification_url = 'http://hl7.org/fhir/R4'
 
 # In which directory to find the templates. See below for settings that start with `tpl_`: these are the template names.
 tpl_base = '../fhir-parser-resources'

fhir-parser-resources/settings.py

@@ -36,7 +36,7 @@ def test{{ class.name }}{{ loop.index }}(self):
     def impl{{ class.name }}{{ loop.index }}(self, inst):
     {%- for onetest in tcase.tests %}
     {%- if "str" == onetest.klass.name %}
-        self.assertEqual(inst.{{ onetest.path }}, "{{ onetest.value|replace('"', '\\"') }}")
+        self.assertEqual(inst.{{ onetest.path }}, "{{ onetest.value|replace('\\n', '\\\\n')|replace('"', '\\"') }}")
     {%- else %}{% if "int" == onetest.klass.name or "float" == onetest.klass.name or "NSDecimalNumber" == onetest.klass.name %}
         self.assertEqual(inst.{{ onetest.path }}, {{ onetest.value }})
     {%- else %}{% if "bool" == onetest.klass.name %}

fhir-parser-resources/template-unittest.py

@@ -4,7 +4,7 @@
 
 from server import FHIRServer, FHIRUnauthorizedException, FHIRNotFoundException
 
-__version__ = '3.2.0'
+__version__ = '4.0.0'
 __author__ = 'SMART Platforms Team'
 __license__ = 'APACHE2'
 __copyright__ = "Copyright 2017 Boston Children's Hospital"

fhirclient/client.py

@@ -30,24 +30,24 @@ def testContainedResourceDetection(self):
         self.assertEqual('Observation.subject', group.linkId)
         question = group.item[0]
         self.assertEqual('Observation.subject._type', question.linkId)
-        self.assertIsNotNone(question.options)
+        self.assertIsNotNone(question.answerOption)
         with self.assertRaises(Exception):
-            question.options.resolved()
-        
+            question.answerOption[0].valueReference.resolved()
+        reference = question.answerOption[0].valueReference
         # 1st resolve, extracting from contained resources
-        contained = question.options.resolved(medication.Medication)
+        contained = reference.resolved(medication.Medication)
         self.assertIsNone(contained, "Must not resolve on resource type mismatch")
-        contained = question.options.resolved(valueset.ValueSet)
+        contained = reference.resolved(valueset.ValueSet)
         self.assertIsNotNone(contained, "Must resolve contained ValueSet")
         self.assertEqual('ValueSet', contained.resource_type)
         self.assertEqual('Type options for Observation.subject', contained.name)
 
         # 2nd resolve, should pull from cache
-        contained = question.options.resolved(medication.Medication)
+        contained = reference.resolved(medication.Medication)
         self.assertIsNone(contained, "Must not resolve on resource type mismatch")
-        contained = question.options.resolved(resource.Resource)
+        contained = reference.resolved(resource.Resource)
         self.assertIsNotNone(contained, "Must resolve contained ValueSet even if requesting `Resource`")
-        contained = question.options.resolved(valueset.ValueSet)
+        contained = reference.resolved(valueset.ValueSet)
         self.assertIsNotNone(contained, "Must resolve contained ValueSet")
         self.assertEqual('ValueSet', contained.resource_type)
 
@@ -63,20 +63,21 @@ def testRelativeReference(self):
         self.assertEqual('Observation.subject', group.linkId)
         question = group.item[0]
         self.assertEqual('Observation.subject._type', question.linkId)
-        self.assertIsNotNone(question.options)
+        self.assertIsNotNone(question.answerOption)
         with self.assertRaises(Exception):
-            question.options.resolved()
+            question.answerOption[0].valueReference.resolved()
+        reference = question.answerOption[0].valueReference
 
         # resolve relative resource
-        relative = question.options.resolved(valueset.ValueSet)
+        relative = reference.resolved(valueset.ValueSet)
         self.assertIsNotNone(relative, "Must resolve relative ValueSet")
         self.assertEqual('ValueSet', relative.resource_type)
         self.assertEqual('Type options for Observation.subject', relative.name)
 
         # 2nd resolve, should pull from cache
-        relative = question.options.resolved(medication.Medication)
+        relative = reference.resolved(medication.Medication)
         self.assertIsNone(relative, "Must not resolve on resource type mismatch")
-        relative = question.options.resolved(resource.Resource)
+        relative = reference.resolved(resource.Resource)
         self.assertIsNotNone(relative, "Must resolve relative ValueSet even if requesting `Resource`")
 
     def testBundleReferences(self):