join Quicksight notification_history table to services (#947)

* join notification_history to services * few more tweaks * field cleanup * add a few more fields to notifications --------- Co-authored-by: Jimmy Royer <[email protected]>
cds-snc · Sep 29, 2023 · a3dc3b6 · a3dc3b6
1 parent cf2aca7
commit a3dc3b6
Show file tree

Hide file tree

Showing 2 changed files with 153 additions and 0 deletions.
diff --git a/aws/quicksight/dataset_notification_history.tf b/aws/quicksight/dataset_notification_history.tf
@@ -38,6 +38,14 @@ resource "aws_quicksight_data_set" "notification_history" {
         name = "notification_status"
         type = "STRING"
       }
+      input_columns {
+        name = "queue_name"
+        type = "STRING"
+      }
+      input_columns {
+        name = "billable_units"
+        type = "INTEGER"
+      }
       input_columns {
         name = "created_at"
         type = "DATETIME"
@@ -50,6 +58,135 @@ resource "aws_quicksight_data_set" "notification_history" {
         name = "updated_at"
         type = "DATETIME"
       }
+      input_columns {
+        name = "feedback_type"
+        type = "STRING"
+      }
+      input_columns {
+        name = "feedback_subtype"
+        type = "STRING"
+      }
+    }
+  }
+
+  logical_table_map {
+    logical_table_map_id = "nh-services"
+    alias                = "Services"
+    data_transforms {
+      rename_column_operation {
+        column_name     = "id"
+        new_column_name = "id[Services]"
+      }
+    }
+    data_transforms {
+      rename_column_operation {
+        column_name     = "updated_at"
+        new_column_name = "service_updated_at"
+      }
+    }
+    data_transforms {
+      rename_column_operation {
+        column_name     = "created_at"
+        new_column_name = "service_created_at"
+      }
+    }
+    data_transforms {
+      rename_column_operation {
+        column_name     = "active"
+        new_column_name = "service_active"
+      }
+    }
+    data_transforms {
+      rename_column_operation {
+        column_name     = "count_as_live"
+        new_column_name = "service_count_as_live"
+      }
+    }
+    data_transforms {
+      rename_column_operation {
+        column_name     = "go_live_at"
+        new_column_name = "service_go_live_at"
+      }
+    }
+    data_transforms {
+      rename_column_operation {
+        column_name     = "name"
+        new_column_name = "service_name"
+      }
+    }
+    data_transforms {
+      rename_column_operation {
+        column_name     = "message_limit"
+        new_column_name = "service_message_limit"
+      }
+    }
+    data_transforms {
+      rename_column_operation {
+        column_name     = "rate_limit"
+        new_column_name = "service_rate_limit"
+      }
+    }
+    data_transforms {
+      rename_column_operation {
+        column_name     = "sms_daily_limit"
+        new_column_name = "service_sms_daily_limit"
+      }
+    }
+    source {
+      data_set_arn = aws_quicksight_data_set.services.arn
+    }
+  }
+
+  logical_table_map {
+    logical_table_map_id = "nh-services-joined"
+    alias                = "Intermediate Table"
+    data_transforms {
+      project_operation {
+        projected_columns = [
+          "id",
+          "job_id",
+          "job_row_number",
+          "service_id",
+          "template_id",
+          "template_version",
+          "api_key_id",
+          "key_type",
+          "notification_type",
+          "created_at",
+          "sent_at",
+          "sent_by",
+          "updated_at",
+          "billable_units",
+          "notification_status",
+          "queue_name",
+          "feedback_type",
+          "feedback_subtype",
+          "created_at[Services]",
+          "service_active",
+          "service_count_as_live",
+          "service_go_live_at",
+          "service_name",
+          "service_message_limit",
+          "service_rate_limit",
+          "service_sms_daily_limit"
+        ]
+      }
+    }
+    source {
+      join_instruction {
+        left_operand  = "notification-history"
+        right_operand = "nh-services"
+        type          = "INNER"
+        on_clause     = "{service_id} = {id[Services]}"
+      }
+    }
+  }
+
+  logical_table_map {
+    logical_table_map_id = "notification-history"
+    alias                = "notification_history"
+    source {
+      physical_table_id = "notification-history"
     }
   }
   permissions {

diff --git a/aws/quicksight/dataset_notifications.tf b/aws/quicksight/dataset_notifications.tf
@@ -38,6 +38,14 @@ resource "aws_quicksight_data_set" "notifications" {
         name = "notification_status"
         type = "STRING"
       }
+      input_columns {
+        name = "queue_name"
+        type = "STRING"
+      }
+      input_columns {
+        name = "billable_units"
+        type = "INTEGER"
+      }
       input_columns {
         name = "created_at"
         type = "DATETIME"
@@ -50,6 +58,14 @@ resource "aws_quicksight_data_set" "notifications" {
         name = "updated_at"
         type = "DATETIME"
       }
+      input_columns {
+        name = "feedback_type"
+        type = "STRING"
+      }
+      input_columns {
+        name = "feedback_subtype"
+        type = "STRING"
+      }
     }
   }
   permissions {