Correctly handle when we can't find a GP by ODS code or postcode

I had ported across the unit tests from my other branch but hadn't changed the behaviour of the helper functions:

- Manually check for a 404 when looking up by ODS code
- Raise exceptions for anything else

project/npda/general_functions/csv_upload.py

@@ -170,7 +170,6 @@ def validate_patient_using_form(row):
                 "death_date": "Death Date",
             },
         )
-        # TODO MRB: check we Validate gp practice ods code
         form = PatientForm(fields)
         assign_original_row_indices_to_errors(form, row)
         return form

project/npda/general_functions/nhs_ods_requests.py

@@ -24,14 +24,11 @@ def gp_ods_code_for_postcode(postcode: str):
         f"{url}/organisations/?PostCode={postcode}&Status=Active&PrimaryRoleId=RO177"
     )
 
-    try:
-        response = requests.get(
-            url=request_url,
-            timeout=10,  # times out after 10 seconds
-        )
-        response.raise_for_status()
-    except HTTPError:
-        raise Exception(f"{postcode} not found")
+    response = requests.get(
+        url=request_url,
+        timeout=10,  # times out after 10 seconds
+    )
+    response.raise_for_status()
 
     organisations = response.json()["Organisations"]
 
@@ -46,14 +43,14 @@ def gp_details_for_ods_code(ods_code: str):
 
     url = f"{settings.NHS_SPINE_SERVICES_URL}/organisations/{ods_code}"
 
-    try:
-        response = requests.get(
-            url=url,
-            timeout=10,  # times out after 10 seconds
-        )
-        response.raise_for_status()
-    except HTTPError as e:
-        return {"error": e}
+    response = requests.get(
+        url=url,
+        timeout=10,  # times out after 10 seconds
+    )
+
+    if response.status_code == 404:
+        return None
+
+    response.raise_for_status()
 
-    logger.warning(response.json())
     return response.json()["Organisation"]