Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions .gitleaksignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,7 @@ e2fd9d99d561c274cfd11b85a99a0cb1ae00f97d:infrastructure/terraform/components/rep
9b7b5b4539e13109e15c474684911b5a349c1b6d:infrastructure/terraform/components/reporting/scripts/sql/views/request_item_status_summary_all_emailfilter.sql:generic-api-key:12
ca243cb73d3804a14f3eeefa8073c96802420c52:infrastructure/terraform/etc/env_eu-west-2_int.tfvars:generic-api-key:29
ca243cb73d3804a14f3eeefa8073c96802420c52:infrastructure/terraform/etc/env_eu-west-2_prod.tfvars:generic-api-key:43
bb20e9d078e09d242ade5deaa6dcb84f1755b347:infrastructure/terraform/components/reporting/README.md:ipv4:16
82e47104e889b81a3c5fb27355072229eb671181:infrastructure/terraform/components/reporting/variables.tf:ipv4:109
9ffd6b1c4e6a8723e4fbc84d33e797f14a0504c1:infrastructure/terraform/components/reporting/README.md:ipv4:16
9ffd6b1c4e6a8723e4fbc84d33e797f14a0504c1:infrastructure/terraform/components/reporting/variables.tf:ipv4:109
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ nodejs 18.18.2
pre-commit 3.6.0
terraform 1.10.1
terraform-docs 0.19.0
trivy 0.61.0
trivy 0.69.3
# python 3.13.2

# ==============================================================================
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ data "aws_iam_policy_document" "sso_read_only_table_access" {
"arn:aws:glue:${var.region}:${var.aws_account_id}:table/${var.project}-*-reporting-database/request_item_status_summary_all_email_filter",
"arn:aws:glue:${var.region}:${var.aws_account_id}:table/${var.project}-*-reporting-database/request_item_status_smsnudge_staging",
"arn:aws:glue:${var.region}:${var.aws_account_id}:table/${var.project}-*-reporting-database/request_item_plan_status_smsnudge",
"arn:aws:glue:${var.region}:${var.aws_account_id}:table/${var.project}-*-reporting-database/request_item_plan_read_status_smsnudge",
"arn:aws:glue:${var.region}:${var.aws_account_id}:table/${var.project}-*-reporting-database/request_item_status_smsnudge",
"arn:aws:glue:${var.region}:${var.aws_account_id}:table/${var.project}-*-reporting-database/dates",
"arn:aws:glue:${var.region}:${var.aws_account_id}:table/${var.project}-*-reporting-database/letters_invoice_units_monthly",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,7 @@ data "aws_iam_policy_document" "powerbi_gateway_permissions_policy" {
"arn:aws:glue:${var.region}:${local.this_account}:table/${aws_glue_catalog_database.reporting.name}/request_item_status_summary_all_email_filter",
"arn:aws:glue:${var.region}:${local.this_account}:table/${aws_glue_catalog_database.reporting.name}/request_item_status_smsnudge_staging",
"arn:aws:glue:${var.region}:${local.this_account}:table/${aws_glue_catalog_database.reporting.name}/request_item_plan_status_smsnudge",
"arn:aws:glue:${var.region}:${local.this_account}:table/${aws_glue_catalog_database.reporting.name}/request_item_plan_read_status_smsnudge",
"arn:aws:glue:${var.region}:${local.this_account}:table/${aws_glue_catalog_database.reporting.name}/request_item_status_smsnudge",
"arn:aws:glue:${var.region}:${local.this_account}:table/${aws_glue_catalog_database.reporting.name}/dates",
"arn:aws:glue:${var.region}:${local.this_account}:table/${aws_glue_catalog_database.reporting.name}/letters_invoice_units_monthly",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
resource "null_resource" "request_item_plan_read_status_smsnudge" {
triggers = {
sql = filesha256("${path.module}/scripts/sql/views/request_item_plan_read_status_smsnudge.sql")
}

provisioner "local-exec" {
command = <<EOT
${path.module}/scripts/create_replace_view.sh \
${aws_athena_workgroup.setup.name} \
${aws_glue_catalog_database.reporting.name} \
request_item_plan_read_status_smsnudge \
sms_nudge_client_id "${local.sms_nudge_client_id}"
EOT
}

depends_on = [
null_resource.request_item_plan_status_table,
null_resource.request_item_status_smsnudge_staging_view
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
CREATE OR REPLACE VIEW ${view_name} AS
SELECT
DATE(nudge.createdtime) createddate,
nudge.clientid,
nudge.requestitemplanid,
originatingclientid,
originatingcampaignid,
originatingbillingref,
originatingsendinggroupid,
originatingrequestitemplanid,
app.status AS originalStatus,
CASE
WHEN nudge.status = 'DELIVERED'
AND app.status = 'DELIVERED' THEN DATE_DIFF('second', nudge.createdtime, app.completedtime) / 3600.0 ELSE NULL
END hrsToRead
FROM
request_item_plan_status_smsnudge nudge
LEFT JOIN
request_item_plan_status app
ON (
nudge.originatingrequestitemplanid = app.requestitemplanid
AND nudge.originatingclientid = app.clientid
AND app.communicationtype = 'NHSAPP'
)
Loading