Skip to content
Open
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
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ 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_plan_completed_summary_all",
"arn:aws:glue:${var.region}:${var.aws_account_id}:table/${var.project}-*-reporting-database/request_item_status_summary_all",
"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_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",
"arn:aws:glue:${var.region}:${var.aws_account_id}:table/${var.project}-*-reporting-database/letters_invoice_units_weekly",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,9 @@ 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_plan_completed_summary_all",
"arn:aws:glue:${var.region}:${local.this_account}:table/${aws_glue_catalog_database.reporting.name}/request_item_status_summary_all",
"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_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",
"arn:aws:glue:${var.region}:${local.this_account}:table/${aws_glue_catalog_database.reporting.name}/letters_invoice_units_weekly",
Expand Down
2 changes: 2 additions & 0 deletions infrastructure/terraform/components/reporting/locals.tf
Original file line number Diff line number Diff line change
Expand Up @@ -84,5 +84,7 @@ locals {
]
]) : []

sms_nudge_client_id = format("'%s'", var.sms_nudge_client_id)

log_destination_arn = "arn:aws:logs:${var.region}:${var.shared_infra_account_id}:destination:nhs-main-obs-firehose-logs"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
resource "null_resource" "request_item_plan_status_smsnudge_view" {
triggers = {
sql = filesha256("${path.module}/scripts/sql/views/request_item_plan_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_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,19 @@
resource "null_resource" "request_item_status_smsnudge_staging_view" {
triggers = {
sql = filesha256("${path.module}/scripts/sql/views/request_item_status_smsnudge_staging.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_status_smsnudge_staging \
sms_nudge_client_id "${local.sms_nudge_client_id}"
EOT
}

depends_on = [
null_resource.request_item_status_table
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
resource "null_resource" "request_item_status_smsnudge_view" {
triggers = {
sql = filesha256("${path.module}/scripts/sql/views/request_item_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_status_smsnudge
EOT
}

depends_on = [
null_resource.request_item_status_smsnudge_staging_view,
null_resource.request_item_plan_status_smsnudge_view
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
CREATE OR REPLACE VIEW ${view_name} AS
SELECT
rip.*,
ris.originatingclientid,
ris.originatingcampaignid,
ris.originatingbillingrefid,
ris.originatingrequestitemid,
ris.originatingrequestitemplanid,
original_ri.sendinggroupid AS originalsendinggroupid
FROM request_item_plan_status rip
LEFT JOIN request_item_status_smsnudge_staging ris
ON rip.requestitemid = ris.requestitemid
LEFT JOIN request_item_status original_ri
ON original_ri.requestitemid = ris.originatingrequestitemid
WHERE rip.clientid = ${sms_nudge_client_id}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
CREATE OR REPLACE VIEW ${view_name} AS
SELECT
ris.*,
rips.originalsendinggroupid
FROM request_item_status_smsnudge_staging ris
LEFT JOIN request_item_plan_status_smsnudge rips
ON ris.requestitemid = rips.requestitemid
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
CREATE OR REPLACE VIEW ${view_name} AS
SELECT
ris.*,
NULLIF(split_part(ris.billingref, '|', 1), '') AS originatingclientid,
NULLIF(split_part(ris.billingref, '|', 2), '') AS originatingcampaignid,
NULLIF(split_part(ris.billingref, '|', 3), '') AS originatingbillingrefid,
NULLIF(split_part(ris.requestitemrefid, '_', 1), '') AS originatingrequestitemid,
NULLIF(split_part(ris.requestitemrefid, '_', 2), '') AS originatingrequestitemplanid
FROM request_item_status ris
WHERE ris.clientid = ${sms_nudge_client_id}
6 changes: 6 additions & 0 deletions infrastructure/terraform/components/reporting/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,12 @@ variable "email_filter_client_ids" {
default = ["NULL"]
}

variable "sms_nudge_client_id" {
description = "Client id for the SMS Nudge umbrella client used to filter smsnudge views"
type = string
default = "NULL"
}

variable "enable_s3_backup" {
type = bool
description = "Enable AWS S3 Backup of the data bucket"
Expand Down
Loading