Address PR feedback: use parse_qs, remove parse_string function/tests

Author: JamesDemeryNava

apps/fhir/bluebutton/tests/test_utils.py

@@ -18,7 +18,6 @@
     crosswalk_patient_id,
     get_resourcerouter,
     build_oauth_resource,
-    parse_string,
     valid_patient_read_or_search_call,
 )
 
@@ -71,16 +70,6 @@ def test_notNone(self):
         response = notNone(listing, "number")
         self.assertEqual(response, listing)
 
-    def test_parse_string(self):
-        result = parse_string('PatientId:-20140000008326', ':')
-        assert result == '-20140000008326'
-
-        result = parse_string('?_lastUpdated=lt2024-06-15&startIndex=0&cursor=0&_id=-99000010256546', '_id=')
-        assert result == '-99000010256546'
-
-        result = parse_string('?_lastUpdated=lt2024-06-15&startIndex=0&cursor=0&_id=-99000010256546', '_id==')
-        assert result is None
-
     def test_valid_patient_read_or_search_call_valid_read_calls(self):
         result = valid_patient_read_or_search_call('PatientId:-20140000008329', '-20140000008329', '')
         assert result is True

apps/fhir/bluebutton/utils.py

@@ -11,6 +11,7 @@
 from datetime import datetime
 from pytz import timezone
 from typing import Optional
+from urllib.parse import parse_qs
 
 from django.conf import settings
 from django.contrib import messages
@@ -746,19 +747,6 @@ def get_patient_by_mbi_hash(mbi_hash, request):
     return response.json()
 
 
-def parse_string(string_to_parse: str, split_char: str) -> str:
-    """_summary_
-    Args:
-        string_to_parse (str): _description_
-        split_char (str): _description_
-    Returns:
-        str: _description_
-    """
-    parts = string_to_parse.split(split_char, 1)
-    parsed_string = parts[1] if len(parts) > 1 else None
-    return parsed_string
-
-
 def valid_patient_read_or_search_call(beneficiary_id: str, resource_id: Optional[str], query_param: str) -> bool:
     """Determine if a read or search Patient call is valid, based on what was passed for the resource_id (read call)
     or the query_parameter (search call)
@@ -772,16 +760,18 @@ def valid_patient_read_or_search_call(beneficiary_id: str, resource_id: Optional
     Returns:
         bool: Whether or not the call is valid
     """
-    beneficiary_id = parse_string(beneficiary_id, ':')
+    bene_split = beneficiary_id.split(':', 1)
+    beneficiary_id = bene_split[1] if len(bene_split) > 1 else None
     # Handles the case where it is a read call, but what is passed does not match the beneficiary_id
     # which is constructed using the patient id for the current session in generate_info_headers.
-    if resource_id and resource_id != beneficiary_id:
+    if resource_id and beneficiary_id and resource_id != beneficiary_id:
         return False
 
     # Handles the case where it is a search call, but what is passed does not match the beneficiary_id
     # so a 404 Not found will be thrown before reaching out to BFD
-    patient_id = parse_string(query_param, '_id=')
-    if patient_id and patient_id != beneficiary_id:
+    query_dict = parse_qs(query_param)
+    passed_identifier = query_dict.get('_id', [None])
+    if passed_identifier[0] and passed_identifier[0] != beneficiary_id:
         return False
 
     return True