get cpm filter directly

Author: jaklinger

docker/sds-api/spine-directory-service/sds/request/accredited_system_handler.py

@@ -32,14 +32,14 @@ async def get(self):
 
         manufacturing_organization = self.get_optional_query_param(MANUFACTURING_ORGANIZATION_QUERY_PARAMETER_NAME, MANUFACTURING_ORGANIZATION_FHIR_IDENTIFIER)
         party_key = self.get_optional_query_param(IDENTIFIER_QUERY_PARAMETER_NAME, PARTY_KEY_FHIR_IDENTIFIER)
-        cpm_filter = self.get_optional_query_param(CPM_FILTER, CPM_FILTER_IDENTIFIER)
+        cpm_filter = self.get_query_argument(name=CPM_FILTER, default=None)
 
         accept_type = get_valid_accept_type(self.request.headers)
 
         logger.info("Looking up accredited system information for {org_code}, {service_id}, {manufacturing_organization}, {party_key}",
                     fparams={"org_code": org_code, "service_id": service_id, 'manufacturing_organization': manufacturing_organization, 'party_key': party_key})
 
-        if cpm_filter and cpm_filter[0] == CPM_FILTER_IDENTIFIER:
+        if cpm_filter == CPM_FILTER_IDENTIFIER:
             ldap_result = await get_device_from_cpm(org_code=org_code, interaction_id=service_id, manufacturing_organization=manufacturing_organization, party_key=party_key, tracking_id_headers=tracking_id_headers)
             if 'resourceType' in ldap_result and ldap_result['resourceType'] == 'OperationOutcome':
                 self.write(json.dumps(ldap_result, indent=2, sort_keys=False))

docker/sds-api/spine-directory-service/sds/request/base_handler.py

@@ -42,15 +42,11 @@ def get_required_query_param(self, query_param_name: str, fhir_identifier: str)
         return value
 
     def get_optional_query_param(self, query_param_name: str, fhir_identifier: str) -> Optional[str]:
-        if query_param_name != CPM_FILTER:
-            values = list(filter(lambda value: "|" in value and value.split("|")[0] == fhir_identifier and value[value.index("|") + 1:].strip(), self.get_query_arguments(query_param_name)))
+        values = list(filter(lambda value: "|" in value and value.split("|")[0] == fhir_identifier and value[value.index("|") + 1:].strip(), self.get_query_arguments(query_param_name)))
 
-            last_value = values and values[-1]
-            result_value = (last_value and last_value[last_value.index("|") + 1:]) or None
-            return result_value
-        else:
-            value = self.get_query_arguments(query_param_name)
-            return value
+        last_value = values and values[-1]
+        result_value = (last_value and last_value[last_value.index("|") + 1:]) or None
+        return result_value
 
     def _raise_invalid_query_param_error(self, query_param_name, fhir_identifier):
         raise tornado.web.HTTPError(

docker/sds-api/spine-directory-service/sds/request/routing_reliability_handler.py

@@ -38,7 +38,7 @@ async def get(self):
         org_code = self.get_optional_query_param(ORG_CODE_QUERY_PARAMETER_NAME, ORG_CODE_FHIR_IDENTIFIER)
         service_id = self.get_optional_query_param(IDENTIFIER_QUERY_PARAMETER_NAME, SERVICE_ID_FHIR_IDENTIFIER)
         party_key = self.get_optional_query_param(IDENTIFIER_QUERY_PARAMETER_NAME, PARTY_KEY_FHIR_IDENTIFIER)
-        cpm_filter = self.get_optional_query_param(CPM_FILTER, CPM_FILTER_IDENTIFIER)
+        cpm_filter = self.get_query_argument(name=CPM_FILTER, default=None)
 
         if (org_code and not service_id and not party_key) or (not org_code and (not service_id or not party_key)):
             self._raise_invalid_query_params_error()
@@ -48,7 +48,7 @@ async def get(self):
         logger.info("Looking up routing and reliability information. {org_code}, {service_id}, {party_key}",
                     fparams={"org_code": org_code, "service_id": service_id, "party_key": party_key})
 
-        if cpm_filter and cpm_filter[0] == CPM_FILTER_IDENTIFIER:
+        if cpm_filter == CPM_FILTER_IDENTIFIER:
             ldap_results = await get_endpoint_from_cpm(
                 org_code=org_code,
                 interaction_id=service_id,