WIP: reinstating abilities

uwcirg · Dec 1, 2023 · d33de4f · d33de4f
1 parent 56dd2c9
commit d33de4f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/patientsearch/api.py b/patientsearch/api.py
@@ -280,7 +280,7 @@ def post_resource(resource_type):
         resource = new_resource_hook(resource)
         method = request.method
         params = request.args
-        # params["active"] = True
+
         audit_HAPI_change(
             user_info=current_user_info(token),
             method=method,
@@ -533,10 +533,9 @@ def external_search(resource_type):
                 resource_type=resource_type,
                 resource=patient,
             )
+            patient["active"] = True
             local_fhir_patient = HAPI_request(
-                token=token, method=method, resource_type="Patient", resource=patient, params={
-            "active": True
-            })
+                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(

diff --git a/patientsearch/models/sync.py b/patientsearch/models/sync.py
@@ -202,7 +202,7 @@ def different(src, dest):
 
         params = patient_as_search_params(internal_patient)
         # Ensure it is active
-        params["active"] = True
+        internal_patient["active"] = True
         return HAPI_request(
             token=token,
             method="PUT",
@@ -215,7 +215,7 @@ def different(src, dest):
         internal_patient["identifier"] = src_patient["identifier"]
         params = patient_as_search_params(internal_patient)
         # Ensure it is active
-        params["active"] = True
+        internal_patient["active"] = True
         return HAPI_request(
             token=token,
             method="PUT",
@@ -311,20 +311,20 @@ def sync_patient(token, patient):
 
     # No match, insert and return
     patient = new_resource_hook(resource=patient)
+    patient["active"] = True
     return HAPI_request(
-        token=token, method="POST", resource_type="Patient", resource=patient, params={
-            "active": True
-        }
+        token=token, method="POST", resource_type="Patient", resource=patient,
     )
 
 
 def restore_patient(token, patient):
     """Restore single internal patient resource"""
+    # Set patient to active
+    patient["active"] = True
 
     return HAPI_request(
         token=token,
         method="PUT",
-        params={"active": True},
         resource_type="Patient",
         resource=patient,
         resource_id=patient["id"],