CCM-12034: Added new sms nudge views

.github/workflows/cicd-3-deploy.yaml

@@ -15,7 +15,7 @@ on:
         default: apply
         type: string
       tag:
-        description: "This is the tag that is oging to be deployed"
+        description: "This is the tag that is going to be deployed"
         required: true
         default: "latest"
 

.gitleaksignore

@@ -6,4 +6,5 @@ cd9c0efec38c5d63053dd865e5d4e207c0760d91:docs/guides/Perform_static_analysis.md:
 e2fd9d99d561c274cfd11b85a99a0cb1ae00f97d:infrastructure/terraform/components/reporting/templates/cloudinit_config.ps1:ipv4:28
 8cd75c04961cd6ce8477b7dad9c6daa67f03cd19:infrastructure/terraform/components/reporting/templates/cloudinit_config.tmpl:ipv4:32
 9b7b5b4539e13109e15c474684911b5a349c1b6d:infrastructure/terraform/components/reporting/scripts/sql/views/request_item_status_summary_all_emailfilter.sql:generic-api-key:12
-
+e4f41f458ca66d94f1fcebdff9579e2ce81d1d5e:infrastructure/terraform/etc/env_eu-west-2_int.tfvars:generic-api-key:29
+e4f41f458ca66d94f1fcebdff9579e2ce81d1d5e:infrastructure/terraform/etc/env_eu-west-2_prod.tfvars:generic-api-key:43

infrastructure/terraform/components/reporting/README.md

@@ -50,6 +50,7 @@ No requirements.
 | <a name="input_scale_in_recurrence_schedule"></a> [scale\_in\_recurrence\_schedule](#input\_scale\_in\_recurrence\_schedule) | The cron expression for the scale in schedule. Set to null if no recurrence is needed. | `string` | `null` | no |
 | <a name="input_scale_out_recurrence_schedule"></a> [scale\_out\_recurrence\_schedule](#input\_scale\_out\_recurrence\_schedule) | The cron expression for the scale out schedule. Set to null if no recurrence is needed. | `string` | `null` | no |
 | <a name="input_shared_infra_account_id"></a> [shared\_infra\_account\_id](#input\_shared\_infra\_account\_id) | The AWS Account ID of the shared infrastructure account | `string` | `"000000000000"` | no |
+| <a name="input_sms_nudge_client_id"></a> [sms\_nudge\_client\_id](#input\_sms\_nudge\_client\_id) | Client id for the SMS Nudge umbrella client used to filter smsnudge views | `string` | `"NULL"` | no |
 | <a name="input_spot_max_price"></a> [spot\_max\_price](#input\_spot\_max\_price) | max spot price for Power BI On-Premises Gateway instances | `string` | `"0.3"` | no |
 | <a name="input_superuser_role_name"></a> [superuser\_role\_name](#input\_superuser\_role\_name) | Name of the superuser role that is allowed to create other IAM roles | `string` | n/a | yes |
 ## Modules

infrastructure/terraform/components/reporting/data_iam_policy_document_sso_read_only_table_access.tf

@@ -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",

infrastructure/terraform/components/reporting/iam_instance_profile_powerbi_gateway.tf

@@ -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",

infrastructure/terraform/components/reporting/locals.tf

@@ -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"
 }

infrastructure/terraform/components/reporting/null_resource_request_item_plan_status_smsnudge_view.tf

@@ -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
+  ]
+}

infrastructure/terraform/components/reporting/null_resource_request_item_status_smsnudge_staging_view.tf

@@ -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
+  ]
+}

infrastructure/terraform/components/reporting/null_resource_request_item_status_smsnudge_view.tf

@@ -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
+  ]
+}

infrastructure/terraform/components/reporting/scripts/sql/views/request_item_plan_status_smsnudge.sql

@@ -0,0 +1,16 @@
+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
+  AND original_ri.clientid = ris.originatingclientid
+WHERE rip.clientid = ${sms_nudge_client_id}

infrastructure/terraform/components/reporting/scripts/sql/views/request_item_status_smsnudge.sql

@@ -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

infrastructure/terraform/components/reporting/scripts/sql/views/request_item_status_smsnudge_staging.sql

@@ -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}

infrastructure/terraform/components/reporting/variables.tf

@@ -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"

infrastructure/terraform/etc/env_eu-west-2_int.tfvars

@@ -25,3 +25,5 @@ private_subnet_cidrs = [
 enable_s3_backup = false
 
 shared_infra_account_id  = "099709604300"
+
+sms_nudge_client_id = "fb3c1b53-b74a-4143-bfbc-5260821d1848"

infrastructure/terraform/etc/env_eu-west-2_prod.tfvars

@@ -40,4 +40,6 @@ enable_vault_lock_configuration = true
 
 shared_infra_account_id  = "142549683766"
 
+sms_nudge_client_id = "fb3c1b53-b74a-4143-bfbc-5260821d1848"
+
 destination_backup_vault_arn = "arn:aws:backup:eu-west-2:369399915558:backup-vault:nhs-notify-reporting-prod-backup-vault"