Moving active attribute change to api.py to correspond to how GET works;

WIP: fixing attributes without active property to be displayed as active

patientsearch/api.py

@@ -309,16 +309,9 @@ def post_resource(resource_type):
     :param request.body: Must include the valid JSON FHIR Resource
 
     """
-    token = validate_auth()
     active_patient_flag = current_app.config.get("ACTIVE_PATIENT_FLAG")
-    reactivate_patient = current_app.config.get("REACTIVATE_PATIENT")
-    params = dict(deepcopy(request.args))  # Necessary on ImmutableMultiDict
-
-    if active_patient_flag and reactivate_patient:
-        create_new_patient = params.pop("create_new", False)
-    else:
-        create_new_patient = False
 
+    token = validate_auth()
     try:
         resource = request.get_json()
         if not resource:
@@ -329,26 +322,24 @@ def post_resource(resource_type):
                 f"{resource['resourceType']} != {resource_type}"
             )
 
-        resource = new_resource_hook(resource, create_new_patient)
+        resource = new_resource_hook(resource)
         method = request.method
         if active_patient_flag:
-            if create_new_patient:
-                # Ensure it is a new active patient
-                method = "POST"
+            # Ensure it is an active patient
             resource["active"] = True
 
         audit_HAPI_change(
             user_info=current_user_info(token),
             method=method,
-            params=params,
+            params=request.args,
             resource=resource,
             resource_type=resource_type,
         )
         return jsonify(
             HAPI_request(
                 token=token,
                 method=method,
-                params=params,
+                params=request.args,
                 resource_type=resource_type,
                 resource=resource,
             )

patientsearch/models/sync.py

@@ -272,15 +272,15 @@ def internal_patient_search(token, patient, active_only=False):
     )
 
 
-def new_resource_hook(resource, create_new_patient=False):
+def new_resource_hook(resource):
     """Return modified version of resourse as per new resource rules
 
     Products occasionally require customization of resources on creation.
     This hook manages such, using environment to specialize.
 
     :returns: modified resource
     """
-    if resource.get("id") and not create_new_patient:
+    if resource.get("id"):
         # not a new resource, bail
         return resource
 

patientsearch/src/js/context/PatientListContextProvider.js

@@ -748,13 +748,13 @@ export default function PatientListContextProvider({ children }) {
           .map((item) => item.resource)
           .sort((a, b) => parseInt(b.id) - parseFloat(a.id));
         const activeEntries = entries.filter((item) => {
-          if (typeof item.active === "undefined") {
+          if (item.hasOwnProperty('active')) {
             return true;
           }
           return String(item.active).toLowerCase() === "true";
         });
         const inactiveEntries = entries.filter((item) => {
-          if (typeof item.active === "undefined") {
+          if (item.hasOwnProperty('active')) {
             return false;
           }
           return String(item.active).toLowerCase() === "false";
@@ -781,7 +781,6 @@ export default function PatientListContextProvider({ children }) {
           : getFirstResourceFromFhirBundle(bundleResult);
         rowData.resource = {
           ...entryToUse,
-          active: true,
         };
         rowData.id = entryToUse.id;
       }