BB2-2063 Update FHIR error handling to return new 400s from BFD w/ diagnostics (#1088)

* Update FHIR error handling to return new 400s from BFD w/ diagnostics

* Fix minor Linting error

* BB2-2063 Fix integration tests assertion

Author: ajshred

apps/fhir/bluebutton/exceptions.py

@@ -1,17 +1,18 @@
 from rest_framework.exceptions import NotFound, APIException
 from rest_framework import status
 from requests import Response
+from requests.exceptions import JSONDecodeError
 from .models import Fhir_Response
 
 
 def process_error_response(response: Fhir_Response) -> APIException:
     """
-    TODO: This should be more specific (original comment before BB2-128)
-    BB2-128: check FHIR response: if error is "IllegalArgumentException: Unsupported ID pattern..."
-    then append the error to the general error message: 'An error occurred contacting the upstream server'
-    As of BB2-291 in support BFD v2, it's a good time to map BFD 500 (server error) response where diagnostics contains
-    java.lang.IllegalArgumentException to 'client error' 400 Bad Request, this will reduce large number of 500 (server error)
-    alerts at runtime
+    Process errors coming from FHIR endpoints.
+    All status codes in 400s except 404 get wrapped in
+    BadRequestError with diagnostics message attached if found.
+    If not found, Generic UpstreamServerException will be returned.
+    404 returns NotFound error.
+    500 messages will return generic message with no diagnostics.
     """
     err: APIException = None
     r: Response = response.backend_response
@@ -21,18 +22,16 @@ def process_error_response(response: Fhir_Response) -> APIException:
         else:
             msg = 'An error occurred contacting the upstream server'
             err = UpstreamServerException(msg)
-            if response.status_code in [400, 500]:
+            if response.status_code in range(400, 500):
                 try:
                     json = r.json()
                     if json is not None:
                         issues = json.get('issue')
                         issue = issues[0] if issues else None
                         diagnostics = issue.get('diagnostics') if issue else None
-                        if diagnostics is not None and "Unsupported ID pattern" in diagnostics:
+                        if diagnostics is not None:
                             err = BadRequestToBackendError("{}:{}".format(msg, diagnostics))
-                        else:
-                            err = UpstreamServerException("{}:{}".format(msg, diagnostics))
-                except Exception:
+                except JSONDecodeError:
                     pass
     return err
 

apps/fhir/bluebutton/tests/test_fhir_resources_read_search_w_validation.py

@@ -508,21 +508,17 @@ def catchall(url, req):
             self.assertEqual(response.status_code, 200)
             self.assertEqual(response.json()["sub"], response.json()["patient"])
 
-    def test_err_response_caused_by_illegalarguments(self):
-        self._err_response_caused_by_illegalarguments(False)
+    def test_err_response_status_will_return_400_for_40x(self):
+        # 401 will also return 400
+        self._err_response_caused_by_illegalarguments(False, 401)
 
-    def test_err_response_caused_by_illegalarguments_bfd400(self):
-        # BB2-1965 for 400 or 500 BFD response compatibility.
-        self._err_response_caused_by_illegalarguments(False, 400)
+    def test_err_response_404_will_return_4o4(self):
+        self._err_response_caused_by_illegalarguments(False, 404, 404)
 
-    def test_err_response_caused_by_illegalarguments_v2(self):
-        self._err_response_caused_by_illegalarguments(True)
+    def test_err_response_500_will_return_502(self):
+        self._err_response_caused_by_illegalarguments(False, 500, 502)
 
-    def test_err_response_caused_by_illegalarguments_v2_bfd400(self):
-        # BB2-1965 for 400 or 500 BFD response compatibility.
-        self._err_response_caused_by_illegalarguments(True, 400)
-
-    def _err_response_caused_by_illegalarguments(self, v2=False, bfd_status_code=500):
+    def _err_response_caused_by_illegalarguments(self, v2=False, bfd_status_code=500, expected_code=400):
         # create the user
         first_access_token = self.create_token('John', 'Smith')
 
@@ -543,4 +539,4 @@ def catchall(url, req):
                 {'hello': 'world'},
                 Authorization="Bearer %s" % (first_access_token))
 
-            self.assertEqual(response.status_code, 400)
+            self.assertEqual(response.status_code, expected_code)

apps/integration_tests/integration_test_fhir_resources.py

@@ -744,8 +744,6 @@ def _err_response_caused_by_illegalarguments(self, v2=False):
         # Authenticate
         self._setup_apiclient(client)
         response = client.get(self._get_fhir_url(FHIR_RES_TYPE_COVERAGE, "part-d___--20140000008325", v2))
-        # check that bfd error response 500 with root cause 'IllegalArgument'
-        # mapped to 502 bad request (client error) currently.
-        # NOTE: This will change back to 400 after BB2-2063 work.
+        # This now returns 400 after BB2-2063 work.
         # for both v1 and v2
-        self.assertEqual(response.status_code, 502)
+        self.assertEqual(response.status_code, 400)