Skip to content

Commit 490cd21

Browse files
committed
tidy
1 parent 2622d4f commit 490cd21

File tree

6 files changed

+65
-36
lines changed

6 files changed

+65
-36
lines changed

lambdas/id_sync/src/id_sync.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ def handler(event_data, _):
3030
nhs_numbers=nhs_numbers)
3131

3232
else:
33-
msg = f"Successfully processed {record_count} records"
34-
logger.info(msg)
35-
return {"status": "success", "message": msg, "nhs_numbers": nhs_numbers}
33+
response = {"status": "success",
34+
"message": f"Successfully processed {record_count} records",
35+
"nhs_numbers": nhs_numbers}
3636
else:
37-
logger.info("No records found in event")
38-
return {"status": "success", "message": "No records found in event"}
39-
37+
response = {"status": "success", "message": "No records found in event"}
38+
logger.info("id_sync handler completed: %s", response)
39+
return response
4040
except IdSyncException as e:
4141
logger.exception(f"id_sync error: {e.message}")
4242
raise e

lambdas/id_sync/src/junk.json

Lines changed: 0 additions & 16 deletions
This file was deleted.

lambdas/id_sync/src/pds_details.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,18 @@
1515

1616
def pds_get_patient_details(nhs_number: str) -> dict:
1717
try:
18-
logger.info(f"pds_get_patient_details. nhs_number: {nhs_number}")
18+
logger.info(f"get patient details. nhs_number: {nhs_number}")
1919

20-
logger.info("SAW...1")
2120
cache = Cache(directory=safe_tmp_dir)
22-
logger.info("SAW...2")
2321
authenticator = AppRestrictedAuth(
2422
service=Service.PDS,
2523
secret_manager_client=secrets_manager_client,
2624
environment=pds_env,
2725
cache=cache,
2826
)
29-
logger.info("SAW...3")
3027
pds_service = PdsService(authenticator, pds_env)
31-
logger.info("SAW...4")
3228
patient = pds_service.get_patient_details(nhs_number)
33-
logger.info("SAW...5")
29+
logger.info("get patient details. response: %s", patient)
3430
return patient
3531
except Exception as e:
3632
msg = f"Error getting PDS patient details for {nhs_number}"

lambdas/id_sync/src/record_processor.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@
1212
def process_record(event_record):
1313

1414
logger.info("process_record. Processing record: %s", event_record)
15-
logger.info("process_record...1")
1615
body_text = event_record.get('body', '')
17-
logger.info("process_record. Body text: %s", body_text)
1816
# convert body to json
1917
if isinstance(body_text, str):
2018
try:
@@ -29,14 +27,12 @@ def process_record(event_record):
2927
return {"status": "error", "message": "Invalid body format"}
3028
else:
3129
body = body_text
32-
logger.info("process_record. Parsed body: %s", body)
3330
nhs_number = body.get("subject")
34-
logger.info("process_record. NHS number: %s", nhs_number)
31+
logger.info("process record NHS number: %s", nhs_number)
3532
if nhs_number:
36-
logger.info("process_record. Process NHS number: %s", nhs_number)
3733
return process_nhs_number(nhs_number)
3834
else:
39-
logger.error("process_record. No NHS number found in event record")
35+
logger.info("No NHS number found in event record")
4036
return {"status": "error", "message": "No NHS number found in event record"}
4137

4238

lambdas/id_sync/tests/test_id_sync.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,6 @@ def test_handler_empty_records(self):
174174

175175
# Assertions
176176
self.mock_aws_lambda_event.assert_called_once_with(self.empty_event)
177-
self.mock_logger.info.assert_any_call("No records found in event")
178177
self.mock_process_record.assert_not_called()
179178

180179
self.assertEqual(result["status"], "success")
@@ -192,7 +191,6 @@ def test_handler_no_records_key(self):
192191

193192
# Assertions
194193
self.mock_aws_lambda_event.assert_called_once_with(self.no_records_event)
195-
self.mock_logger.info.assert_any_call("No records found in event")
196194
self.mock_process_record.assert_not_called()
197195

198196
self.assertEqual(result["status"], "success")
Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
{
2+
"address": [
3+
{
4+
"id": "07626C74",
5+
"line": ["44 Rathbone Street", "Ventnor", "Sd", "Sd"],
6+
"period": { "start": "2025-06-04" },
7+
"postalCode": "E14 8AH",
8+
"use": "home"
9+
}
10+
],
11+
"birthDate": "2000-08-11",
12+
"gender": "male",
13+
"id": "9001063152",
14+
"identifier": [
15+
{
16+
"extension": [
17+
{
18+
"url": "https://fhir.hl7.org.uk/StructureDefinition/Extension-UKCore-NHSNumberVerificationStatus",
19+
"valueCodeableConcept": {
20+
"coding": [
21+
{
22+
"code": "01",
23+
"display": "Number present and verified",
24+
"system": "https://fhir.hl7.org.uk/CodeSystem/UKCore-NHSNumberVerificationStatus",
25+
"version": "1.0.0"
26+
}
27+
]
28+
}
29+
}
30+
],
31+
"system": "https://fhir.nhs.uk/Id/nhs-number",
32+
"value": "9001063152"
33+
}
34+
],
35+
"meta": {
36+
"security": [
37+
{
38+
"code": "U",
39+
"display": "unrestricted",
40+
"system": "http://terminology.hl7.org/CodeSystem/v3-Confidentiality"
41+
}
42+
],
43+
"versionId": "1"
44+
},
45+
"name": [
46+
{
47+
"family": "Draper",
48+
"given": ["Oakley"],
49+
"id": "C4A640A1",
50+
"period": { "start": "2025-06-04" },
51+
"use": "usual"
52+
}
53+
],
54+
"resourceType": "Patient"
55+
}

0 commit comments

Comments
 (0)