From 5ac1a65e9074c3af943dd8fe8f648af7d02edf79 Mon Sep 17 00:00:00 2001 From: Joaquin Ossa Date: Fri, 20 Sep 2024 14:53:43 +0200 Subject: [PATCH] Financial rate metrics --- .../cross/int_mtd_aggregated_metrics.sql | 16 ++++++++-------- models/intermediate/cross/schema.yml | 8 +++++++- .../general/daily_currency_exchange_rates.sql | 2 +- .../reporting/general/mtd_aggregated_metrics.sql | 9 +++------ models/reporting/general/schema.yml | 8 +++++++- 5 files changed, 26 insertions(+), 17 deletions(-) diff --git a/models/intermediate/cross/int_mtd_aggregated_metrics.sql b/models/intermediate/cross/int_mtd_aggregated_metrics.sql index ff0be03..2e39fa5 100644 --- a/models/intermediate/cross/int_mtd_aggregated_metrics.sql +++ b/models/intermediate/cross/int_mtd_aggregated_metrics.sql @@ -239,7 +239,7 @@ "value": "total_revenue_per_created_booking", "previous_year_value": "previous_year_total_revenue_per_created_booking", "relative_increment": "relative_increment_total_revenue_per_created_booking", - "number_format": "currency_gbp", + "number_format": "converted_metric_currency_gbp", "increment_sign_format": "positive", }, { @@ -248,7 +248,7 @@ "value": "total_revenue_per_created_guest_journey", "previous_year_value": "previous_year_total_revenue_per_created_guest_journey", "relative_increment": "relative_increment_total_revenue_per_created_guest_journey", - "number_format": "currency_gbp", + "number_format": "converted_metric_currency_gbp", "increment_sign_format": "positive", }, { @@ -257,7 +257,7 @@ "value": "total_revenue_per_deals_booked_in_month", "previous_year_value": "previous_year_total_revenue_per_deals_booked_in_month", "relative_increment": "relative_increment_total_revenue_per_deals_booked_in_month", - "number_format": "currency_gbp", + "number_format": "converted_metric_currency_gbp", "increment_sign_format": "positive", }, { @@ -266,7 +266,7 @@ "value": "total_revenue_per_listings_booked_in_month", "previous_year_value": "previous_year_total_revenue_per_listings_booked_in_month", "relative_increment": "relative_increment_total_revenue_per_listings_booked_in_month", - "number_format": "currency_gbp", + "number_format": "converted_metric_currency_gbp", "increment_sign_format": "positive", }, { @@ -347,7 +347,7 @@ "value": "guest_revenue_per_completed_guest_journey", "previous_year_value": "previous_year_guest_revenue_per_completed_guest_journey", "relative_increment": "relative_increment_guest_revenue_per_completed_guest_journey", - "number_format": "currency_gbp", + "number_format": "converted_metric_currency_gbp", "increment_sign_format": "positive", }, { @@ -356,7 +356,7 @@ "value": "guest_revenue_per_paid_guest_journey", "previous_year_value": "previous_year_guest_revenue_per_paid_guest_journey", "relative_increment": "relative_increment_guest_revenue_per_paid_guest_journey", - "number_format": "currency_gbp", + "number_format": "converted_metric_currency_gbp", "increment_sign_format": "positive", }, { @@ -428,7 +428,7 @@ "value": "guest_payments_per_completed_guest_journey", "previous_year_value": "previous_year_guest_payments_per_completed_guest_journey", "relative_increment": "relative_increment_guest_payments_per_completed_guest_journey", - "number_format": "currency_gbp", + "number_format": "converted_metric_currency_gbp", "increment_sign_format": "positive", }, { @@ -437,7 +437,7 @@ "value": "guest_payments_per_paid_guest_journey", "previous_year_value": "previous_year_guest_payments_per_paid_guest_journey", "relative_increment": "relative_increment_guest_payments_per_paid_guest_journey", - "number_format": "currency_gbp", + "number_format": "converted_metric_currency_gbp", "increment_sign_format": "positive", }, ] %} diff --git a/models/intermediate/cross/schema.yml b/models/intermediate/cross/schema.yml index bec865c..953020b 100644 --- a/models/intermediate/cross/schema.yml +++ b/models/intermediate/cross/schema.yml @@ -421,7 +421,13 @@ models: description: allows for grouping and formatting for displaying purposes. tests: - accepted_values: - values: ["integer", "percentage", "currency_gbp"] + values: + [ + "integer", + "percentage", + "currency_gbp", + "converted_metric_currency_gbp", + ] - name: value data_type: numeric diff --git a/models/reporting/general/daily_currency_exchange_rates.sql b/models/reporting/general/daily_currency_exchange_rates.sql index 65235b8..9926506 100644 --- a/models/reporting/general/daily_currency_exchange_rates.sql +++ b/models/reporting/general/daily_currency_exchange_rates.sql @@ -4,7 +4,7 @@ with ) select id_exchange_rate as id_exchange_rate, - from_currency as from_currency, + from_currency collate "en_US.utf8" as from_currency, to_currency as to_currency, rate as rate, rate_date_utc as rate_date_utc, diff --git a/models/reporting/general/mtd_aggregated_metrics.sql b/models/reporting/general/mtd_aggregated_metrics.sql index b55ebb3..5f55e57 100644 --- a/models/reporting/general/mtd_aggregated_metrics.sql +++ b/models/reporting/general/mtd_aggregated_metrics.sql @@ -3,7 +3,7 @@ with dimensions as ( {% for dimension in production_dimensions %} - select + select {{ dimension.dimension }} as dimension, {{ dimension.dimension_display }} as dimension_display {% if not loop.last %} @@ -12,15 +12,12 @@ with {% endfor %} ), int_mtd_aggregated_metrics as ( - select - m.*, - d.dimension_display + select m.*, d.dimension_display from {{ ref("int_mtd_aggregated_metrics") }} m -- The following clause limits the display execution -- to only include those dimensions configured to -- appear for production purposes - inner join dimensions d - on m.dimension = d.dimension + inner join dimensions d on m.dimension = d.dimension ) select diff --git a/models/reporting/general/schema.yml b/models/reporting/general/schema.yml index 9fd376a..1f17a47 100644 --- a/models/reporting/general/schema.yml +++ b/models/reporting/general/schema.yml @@ -405,7 +405,13 @@ models: description: Allows for grouping and formatting for displaying purposes. tests: - accepted_values: - values: ["integer", "percentage", "currency_gbp"] + values: + [ + "integer", + "percentage", + "currency_gbp", + "converted_metric_currency_gbp", + ] - name: value data_type: numeric