Fixing black and flake8

patientsearch/api.py

@@ -24,7 +24,7 @@
     internal_patient_search,
     new_resource_hook,
     sync_bundle,
-    restore_patient
+    restore_patient,
 )
 from patientsearch.extensions import oidc
 from patientsearch.jsonify_abort import jsonify_abort
@@ -505,7 +505,9 @@ def external_search(resource_type):
         # See if local match already exists
         patient = resource_from_args(resource_type, request.args)
         try:
-            internal_bundle = internal_patient_search(token, patient, not reinstate_patient)
+            internal_bundle = internal_patient_search(
+                token, patient, not reinstate_patient
+            )
         except (RuntimeError, ValueError) as error:
             return jsonify_abort(status_code=400, message=str(error))
         local_fhir_patient = None
@@ -535,7 +537,8 @@ def external_search(resource_type):
             )
             patient["active"] = True
             local_fhir_patient = HAPI_request(
-                token=token, method=method, resource_type="Patient", resource=patient)
+                token=token, method=method, resource_type="Patient", resource=patient
+            )
         except (RuntimeError, ValueError) as error:
             return jsonify_abort(status_code=400, message=str(error))
         audit_entry(

patientsearch/models/__init__.py

@@ -17,5 +17,5 @@
     "internal_patient_search",
     "new_resource_hook",
     "sync_bundle",
-    "restore_patient"
+    "restore_patient",
 ]

patientsearch/models/sync.py

@@ -197,9 +197,9 @@ def different(src, dest):
 
     if not different(src_patient, internal_patient):
         # If patient is active, proceed. If not, re-activate
-        if internal_patient.get("active") != True:
+        if internal_patient.get("active") is not True:
             return internal_patient
-        
+
         params = patient_as_search_params(internal_patient)
         # Ensure it is active
         internal_patient["active"] = True
@@ -226,7 +226,7 @@ def different(src, dest):
         )
 
 
-def patient_as_search_params(patient, active_only = False):
+def patient_as_search_params(patient, active_only=False):
     """Generate HAPI search params from patient resource"""
 
     # Use same parameters sent to external src looking for existing Patient
@@ -249,7 +249,7 @@ def patient_as_search_params(patient, active_only = False):
             ("birthDate", "birthdate", "eq"),
             ("active", True, "eq"),
         )
-        
+
     search_params = {}
 
     for path, queryterm, compstr in search_map:
@@ -259,12 +259,15 @@ def patient_as_search_params(patient, active_only = False):
     return search_params
 
 
-def internal_patient_search(token, patient, active_only = False):
+def internal_patient_search(token, patient, active_only=False):
     """Look up given patient from "internal" HAPI store, returns bundle"""
     params = patient_as_search_params(patient, active_only)
 
     return HAPI_request(
-        token=token, method="GET", resource_type="Patient", params=params
+        token=token,
+        method="GET",
+        resource_type="Patient",
+        params=params
     )
 
 
@@ -303,7 +306,6 @@ def sync_patient(token, patient):
             )
 
         internal_patient = internal_search["entry"][0]["resource"]
-        #TODO: ask whether they prefer to merge and update active value or to start a new Patient for each sync attempt toward a non-active patient. 
         merged_patient = _merge_patient(
             src_patient=patient, internal_patient=internal_patient, token=token
         )

tests/test_sync.py

@@ -87,14 +87,15 @@ def internal_patient_duplicate_mismatch(datadir):
 def internal_patient_duplicate_inactive_match(datadir):
     return load_json(datadir, "internal_patient_duplicate_inactive_match.json")
 
+
 def test_new_upsert(
     client,
     mocker,
     faux_token,
     external_patient_search,
     internal_patient_miss,
     new_patient,
-    ):
+):
     """Without finding a matching patient, should insert new and return"""
 
     # Mock HAPI search failing to find a matching patient
@@ -119,8 +120,8 @@ def test_new_upsert_active(
     faux_token,
     external_patient_search_active,
     internal_patient_miss,
-    new_patient_active
-    ):
+    new_patient_active,
+):
     """Without finding a matching patient, should insert new and return"""
 
     # Mock HAPI search failing to find a matching patient
@@ -146,7 +147,7 @@ def test_upsert_inactive(
     external_patient_search_active,
     internal_patient_miss,
     new_patient_active
-    ):
+):
     """Finding a matching inactive patient, user chose to generate new patient"""
 
     # Mock HAPI search finding a matching inactive
@@ -176,11 +177,11 @@ def test_adding_identifier(external_patient_search):
 
 
 def test_existing(
-    client, 
-    mocker, 
-    faux_token, 
-    external_patient_search, 
-    internal_patient_match, 
+    client,
+    mocker,
+    faux_token,
+    external_patient_search,
+    internal_patient_match,
 ):
     """Finding a matching patient, return existing"""
 
@@ -195,11 +196,11 @@ def test_existing(
 
 
 def test_existing_active(
-    client, 
-    mocker, 
-    faux_token, 
+    client,
+    mocker,
+    faux_token,
     external_patient_search_active,
-    internal_patient_active_match, 
+    internal_patient_active_match,
 ):
     """Finding a matching active patient from active external search, return existing"""
 
@@ -211,14 +212,14 @@ def test_existing_active(
 
     result = sync_bundle(faux_token, external_patient_search_active)
     assert result != internal_patient_active_match["entry"][0]["resource"]
-
+ 
 
 def test_existing_inactive(
-    client, 
-    mocker, 
-    faux_token, 
+    client,
+    mocker,
+    faux_token,
     external_patient_search_active,
-    internal_patient_inactive_match
+    internal_patient_inactive_match,
 ):
     """Finding a matching inactive patient from active external search, return existing restored"""
 
@@ -234,11 +235,7 @@ def test_existing_inactive(
 
 
 def test_existing_modified(
-    client,
-    mocker, 
-    faux_token, 
-    external_patient_search, 
-    internal_patient_match
+    client, mocker, faux_token, external_patient_search, internal_patient_match
 ):
     """Confirm modified external details get synchronized"""
 
@@ -270,6 +267,7 @@ def test_existing_modified(
     assert result == identified_internal
     assert result["identifier"] == [found_identifier]
 
+
 def test_duplicate(
     client,
     mocker,
@@ -328,4 +326,3 @@ def test_duplicate_inactive(
     # Shouldn't kill the process, but return the first
     result = sync_bundle(faux_token, external_patient_search_active)
     assert result == internal_patient_duplicate_inactive_match["entry"][0]["resource"]
-