fix _format param, but raise additional question

Author: clewellyn-nava

apps/fhir/bluebutton/tests/test_read_and_search.py

@@ -26,7 +26,7 @@
 def get_expected_read_request(version: int):
     return {
         'method': 'GET',
-        'url': f'{FHIR_SERVER["FHIR_URL"]}/v{version}/fhir/Patient/{FHIR_ID_V2}/?_format=json&_id={FHIR_ID_V2}',
+        'url': f'{FHIR_SERVER["FHIR_URL"]}/v{version}/fhir/Patient/{FHIR_ID_V2}/?_format=application/json+fhir&_id={FHIR_ID_V2}',
         'headers': {
             # 'User-Agent': 'python-requests/2.20.0',
             'Accept-Encoding': 'gzip, deflate',

apps/fhir/bluebutton/views/viewsets_base.py

@@ -68,6 +68,12 @@ def filter_parameters(self, request):
         schema = Schema(self.get_query_schema(), extra=REMOVE_EXTRA)
         return schema(params)
 
-    # TODO - investigate if this is needed, or if we can assume application/json+fhir everywhere
+    # TODO - investigate a better way to structure this
     def build_parameters(self, request):
-        return {'_format': 'application/json'}
+        if getattr(self, 'action', None) != 'list':
+            return {
+                '_format': 'application/json+fhir',
+            }
+        return {
+            '_format': 'application/json+fhir',
+        }

apps/testclient/constants.py

@@ -31,6 +31,8 @@ class EndpointUrl:
     coverage = "coverage"
     nav = "nav"
 
+    # TODO - theses are all format=json, not format=application/json+fhir, is this good?
+    @staticmethod
     def fmt(name: str, uri: str, version: int, patient: str = BAD_PATIENT_ID):
         version_as_string = Versions.as_str(version)
         match name:
@@ -52,6 +54,7 @@ def fmt(name: str, uri: str, version: int, patient: str = BAD_PATIENT_ID):
         # never occur, and therefore we want something to break.
         raise EndpointFormatException(f'Could not format URI name[{name}] uri[{uri}] version[{version_as_string}]')
 
+    @staticmethod
     def nav_uri(uri, count, start_index, id_type=None, id=None):
         return f'{uri}&_count={count}&startIndex={start_index}&{id_type}={id}'