Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
b67010e
[PRMP-1505] added created and last_updated column to ods report
PedroSoaresNHS Feb 25, 2026
410bcb1
[PRMP-1505] small fixes
PedroSoaresNHS Feb 25, 2026
a4cb5ed
[PRMP-1505] small fixes
PedroSoaresNHS Feb 25, 2026
fb88c62
Merge remote-tracking branch 'origin/main' into PRMP-1505
PedroSoaresNHS Feb 26, 2026
2aad23a
[PRMP-1505] added extra unit tests
PedroSoaresNHS Feb 26, 2026
4c9474b
[PRMP-1505] format
PedroSoaresNHS Feb 26, 2026
8665645
Merge remote-tracking branch 'origin/main' into PRMP-1505
PedroSoaresNHS Feb 26, 2026
056466a
[PRMP-1505] fixed comment
PedroSoaresNHS Mar 2, 2026
69ccd5a
[PRMP-1505] formatting
PedroSoaresNHS Mar 2, 2026
a4da531
Merge remote-tracking branch 'origin/main' into PRMP-1505
PedroSoaresNHS Mar 2, 2026
4908754
[PRMP-1505] formatting
PedroSoaresNHS Mar 2, 2026
276b745
[PRMP-1505] updated the way created day is calculated
PedroSoaresNHS Mar 3, 2026
555784b
Merge remote-tracking branch 'origin/main' into PRMP-1505
PedroSoaresNHS Mar 3, 2026
26f996d
[PRMP-1505] updated header row name
PedroSoaresNHS Mar 4, 2026
0c95f35
Merge remote-tracking branch 'origin/main' into PRMP-1505
PedroSoaresNHS Mar 4, 2026
89f5c90
Merge remote-tracking branch 'origin/main' into PRMP-1505
PedroSoaresNHS Mar 4, 2026
1e5a75f
Update lambdas/services/ods_report_service.py
PedroSoaresNHS Mar 4, 2026
839b708
[PRMP-1505] updated comments
PedroSoaresNHS Mar 5, 2026
731b025
Merge remote-tracking branch 'origin/PRMP-1505' into PRMP-1505
PedroSoaresNHS Mar 5, 2026
6ed16e0
[PRMP-1505] lint
PedroSoaresNHS Mar 5, 2026
83170a9
[PRMP-1505] fixed tests
PedroSoaresNHS Mar 5, 2026
416ed3a
[PRMP-1505] removed a bit of duplicated code
PedroSoaresNHS Mar 5, 2026
6fdaebf
Merge remote-tracking branch 'origin/main' into PRMP-1505
PedroSoaresNHS Mar 16, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 14 additions & 9 deletions lambdas/handlers/get_report_by_ods_handler.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"PRESIGNED_ASSUME_ROLE",
"LLOYD_GEORGE_DYNAMODB_NAME",
"STATISTICAL_REPORTS_BUCKET",
]
],
)
@override_error_check
@handle_lambda_exceptions
Expand All @@ -31,13 +31,12 @@ def lambda_handler(event, context):

if "httpMethod" in event:
return handle_api_gateway_request(event)
else:
return handle_manual_trigger(event)
return handle_manual_trigger(event)


def handle_api_gateway_request(event):
ods_code = request_context.authorization.get("selected_organisation", {}).get(
"org_ods_code"
"org_ods_code",
)
if not ods_code:
raise OdsErrorException("No ODS code provided")
Expand All @@ -58,7 +57,9 @@ def handle_api_gateway_request(event):
pre_signed_url = create_report(ods_code, file_type, report_type)
logger.info("A report has been successfully created.")
return ApiGatewayResponse(
200, json.dumps({"url": pre_signed_url}), "GET"
200,
json.dumps({"url": pre_signed_url}),
"GET",
).create_api_gateway_response()


Expand All @@ -72,7 +73,7 @@ def create_report(ods_code: str, file_type: FileType, report_type: str):

def create_patient_report(ods_code: str, file_type: FileType):
service = OdsReportService()
return service.get_nhs_numbers_by_ods(
return service.generate_ods_report(
ods_code=ods_code,
is_pre_signed_needed=True,
is_upload_to_s3_needed=True,
Expand All @@ -94,9 +95,13 @@ def handle_manual_trigger(event):
service = OdsReportService()
for ods_code in ods_codes:
logger.info(f"Starting process for ods code: {ods_code}")
service.get_nhs_numbers_by_ods(
ods_code=ods_code, is_upload_to_s3_needed=True, file_type_output=file_type
service.generate_ods_report(
ods_code=ods_code,
is_upload_to_s3_needed=True,
file_type_output=file_type,
)
return ApiGatewayResponse(
200, "Successfully created report", "GET"
200,
"Successfully created report",
"GET",
).create_api_gateway_response()
Loading
Loading