counterweight/data-dwh-dbt-project
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Addressed comments

Browse source
This commit is contained in:
Joaquin 2025-04-16 16:18:14 +02:00
parent 2c7e396c2c
commit e8cab61787
11 changed files with 42 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

2
models/intermediate/cross/int_monthly_aggregated_metrics_history_by_deal.sql
View file

@ -177,8 +177,6 @@ select
-- APIs REVENUE -- -- APIs REVENUE --
invoiced_revenue.xero_apis_net_fees_in_gbp, invoiced_revenue.xero_apis_net_fees_in_gbp,
invoiced_revenue.xero_e_deposit_net_fees_in_gbp, invoiced_revenue.xero_e_deposit_net_fees_in_gbp,
invoiced_revenue.xero_check_in_hero_api_net_fees_in_gbp,
invoiced_revenue.xero_screen_and_protect_api_net_fees_in_gbp,
invoiced_revenue.xero_guesty_net_fees_in_gbp, invoiced_revenue.xero_guesty_net_fees_in_gbp,
-- HOST RESOLUTIONS -- -- HOST RESOLUTIONS --

8
models/intermediate/cross/int_mtd_aggregated_metrics.sql
View file

@ -683,10 +683,10 @@
}, },
{ {
"order_by": 248, "order_by": 248,
"metric": "Invoiced Screen & Protect API Revenue", "metric": "Invoiced Screen & Protect Revenue",
"value": "xero_screen_and_protect_api_net_fees_in_gbp", "value": "xero_screen_and_protect_net_fees_in_gbp",
"previous_year_value": "previous_year_xero_screen_and_protect_api_net_fees_in_gbp", "previous_year_value": "previous_year_xero_screen_and_protect_net_fees_in_gbp",
"relative_increment": "relative_increment_xero_screen_and_protect_api_net_fees_in_gbp", "relative_increment": "relative_increment_xero_screen_and_protect_net_fees_in_gbp",
"number_format": "currency_gbp", "number_format": "currency_gbp",
"increment_sign_format": "positive", "increment_sign_format": "positive",
"display_exclusion": "INVOICING", "display_exclusion": "INVOICING",

8
models/intermediate/cross/int_mtd_vs_previous_year_metrics.sql
View file

@ -232,7 +232,7 @@ with
invoiced_revenue.xero_apis_net_fees_in_gbp, invoiced_revenue.xero_apis_net_fees_in_gbp,
invoiced_revenue.xero_e_deposit_net_fees_in_gbp, invoiced_revenue.xero_e_deposit_net_fees_in_gbp,
invoiced_revenue.xero_check_in_hero_api_net_fees_in_gbp, invoiced_revenue.xero_check_in_hero_api_net_fees_in_gbp,
invoiced_revenue.xero_screen_and_protect_api_net_fees_in_gbp, invoiced_revenue.xero_screen_and_protect_net_fees_in_gbp,
invoiced_revenue.xero_guesty_net_fees_in_gbp, invoiced_revenue.xero_guesty_net_fees_in_gbp,
-- HOST RESOLUTIONS -- -- HOST RESOLUTIONS --
@ -486,11 +486,7 @@ select
{{ calculate_safe_relative_increment("xero_apis_net_fees_in_gbp") }}, {{ calculate_safe_relative_increment("xero_apis_net_fees_in_gbp") }},
{{ calculate_safe_relative_increment("xero_e_deposit_net_fees_in_gbp") }}, {{ calculate_safe_relative_increment("xero_e_deposit_net_fees_in_gbp") }},
{{ calculate_safe_relative_increment("xero_check_in_hero_api_net_fees_in_gbp") }}, {{ calculate_safe_relative_increment("xero_check_in_hero_api_net_fees_in_gbp") }},
{{ {{ calculate_safe_relative_increment("xero_screen_and_protect_net_fees_in_gbp") }},
calculate_safe_relative_increment(
"xero_screen_and_protect_api_net_fees_in_gbp"
)
}},
{{ calculate_safe_relative_increment("xero_guesty_net_fees_in_gbp") }}, {{ calculate_safe_relative_increment("xero_guesty_net_fees_in_gbp") }},
-- HOST RESOLUTIONS -- -- HOST RESOLUTIONS --

4
models/intermediate/kpis/int_kpis__agg_monthly_invoiced_revenue.sql
View file

@ -49,8 +49,8 @@
xero_check_in_hero_api_net_fees_in_gbp xero_check_in_hero_api_net_fees_in_gbp
) as xero_check_in_hero_api_net_fees_in_gbp, ) as xero_check_in_hero_api_net_fees_in_gbp,
sum( sum(
xero_screen_and_protect_api_net_fees_in_gbp xero_screen_and_protect_net_fees_in_gbp
) as xero_screen_and_protect_api_net_fees_in_gbp, ) as xero_screen_and_protect_net_fees_in_gbp,
sum(xero_guesty_net_fees_in_gbp) as xero_guesty_net_fees_in_gbp, sum(xero_guesty_net_fees_in_gbp) as xero_guesty_net_fees_in_gbp,
sum(xero_apis_net_fees_in_gbp) as xero_apis_net_fees_in_gbp, sum(xero_apis_net_fees_in_gbp) as xero_apis_net_fees_in_gbp,
sum( sum(

4
models/intermediate/kpis/int_kpis__agg_mtd_invoiced_revenue.sql
View file

@ -49,8 +49,8 @@
xero_check_in_hero_api_net_fees_in_gbp xero_check_in_hero_api_net_fees_in_gbp
) as xero_check_in_hero_api_net_fees_in_gbp, ) as xero_check_in_hero_api_net_fees_in_gbp,
sum( sum(
xero_screen_and_protect_api_net_fees_in_gbp xero_screen_and_protect_net_fees_in_gbp
) as xero_screen_and_protect_api_net_fees_in_gbp, ) as xero_screen_and_protect_net_fees_in_gbp,
sum(xero_guesty_net_fees_in_gbp) as xero_guesty_net_fees_in_gbp, sum(xero_guesty_net_fees_in_gbp) as xero_guesty_net_fees_in_gbp,
sum(xero_apis_net_fees_in_gbp) as xero_apis_net_fees_in_gbp, sum(xero_apis_net_fees_in_gbp) as xero_apis_net_fees_in_gbp,
sum( sum(

2
models/intermediate/kpis/int_kpis__metric_daily_invoiced_revenue.sql
View file

@ -187,7 +187,7 @@ select
then ixsdm.line_amount_wo_taxes_in_gbp then ixsdm.line_amount_wo_taxes_in_gbp
else 0 else 0
end end
) as xero_screen_and_protect_api_net_fees_in_gbp, ) as xero_screen_and_protect_net_fees_in_gbp,
sum( sum(
case case
when ixsdm.accounting_root_aggregation = 'Guesty Resolutions' when ixsdm.accounting_root_aggregation = 'Guesty Resolutions'

4
models/intermediate/kpis/int_kpis__metric_monthly_invoiced_revenue.sql
View file

@ -54,8 +54,8 @@ select
ir.xero_check_in_hero_api_net_fees_in_gbp ir.xero_check_in_hero_api_net_fees_in_gbp
) as xero_check_in_hero_api_net_fees_in_gbp, ) as xero_check_in_hero_api_net_fees_in_gbp,
sum( sum(
ir.xero_screen_and_protect_api_net_fees_in_gbp ir.xero_screen_and_protect_net_fees_in_gbp
) as xero_screen_and_protect_api_net_fees_in_gbp, ) as xero_screen_and_protect_net_fees_in_gbp,
sum(ir.xero_guesty_net_fees_in_gbp) as xero_guesty_net_fees_in_gbp, sum(ir.xero_guesty_net_fees_in_gbp) as xero_guesty_net_fees_in_gbp,
sum(ir.xero_apis_net_fees_in_gbp) as xero_apis_net_fees_in_gbp, sum(ir.xero_apis_net_fees_in_gbp) as xero_apis_net_fees_in_gbp,
sum( sum(

4
models/intermediate/kpis/int_kpis__metric_mtd_invoiced_revenue.sql
View file

@ -54,8 +54,8 @@ select
ir.xero_check_in_hero_api_net_fees_in_gbp ir.xero_check_in_hero_api_net_fees_in_gbp
) as xero_check_in_hero_api_net_fees_in_gbp, ) as xero_check_in_hero_api_net_fees_in_gbp,
sum( sum(
ir.xero_screen_and_protect_api_net_fees_in_gbp ir.xero_screen_and_protect_net_fees_in_gbp
) as xero_screen_and_protect_api_net_fees_in_gbp, ) as xero_screen_and_protect_net_fees_in_gbp,
sum(ir.xero_guesty_net_fees_in_gbp) as xero_guesty_net_fees_in_gbp, sum(ir.xero_guesty_net_fees_in_gbp) as xero_guesty_net_fees_in_gbp,
sum(ir.xero_apis_net_fees_in_gbp) as xero_apis_net_fees_in_gbp, sum(ir.xero_apis_net_fees_in_gbp) as xero_apis_net_fees_in_gbp,
sum( sum(

42
models/intermediate/kpis/schema.yml
View file

@ -4449,7 +4449,7 @@ models:
in a given date and per specified dimension. This is an in a given date and per specified dimension. This is an
API service. API service.
- name: xero_screen_and_protect_api_net_fees_in_gbp - name: xero_screen_and_protect_net_fees_in_gbp
data_type: decimal data_type: decimal
description: | description: |
Sum of daily Screen & Protect API Net Fees, in GBP, without taxes Sum of daily Screen & Protect API Net Fees, in GBP, without taxes
@ -4669,14 +4669,14 @@ models:
data_type: decimal data_type: decimal
description: | description: |
Sum of accummulated Check-In Hero API Net Fees, in GBP, without taxes Sum of accummulated Check-In Hero API Net Fees, in GBP, without taxes
in a given date and per specified dimension. This is an in a given month and per specified dimension. This is an
API service. API service.
- name: xero_screen_and_protect_api_net_fees_in_gbp - name: xero_screen_and_protect_net_fees_in_gbp
data_type: decimal data_type: decimal
description: | description: |
Sum of accummulated Screen & Protect API Net Fees, in GBP, without taxes Sum of accummulated Screen & Protect API Net Fees, in GBP, without taxes
in a given date and per specified dimension. This is an in a given month and per specified dimension. This is an
API service. API service.
- name: xero_athena_net_fees_in_gbp - name: xero_athena_net_fees_in_gbp
@ -4886,15 +4886,15 @@ models:
data_type: decimal data_type: decimal
description: | description: |
Sum of accummulated Check-In Hero API Net Fees, in GBP, without taxes Sum of accummulated Check-In Hero API Net Fees, in GBP, without taxes
in a given date and per specified dimension. This is an in a given month up to the given date and per specified dimension.
API service. This is an API service.
- name: xero_screen_and_protect_api_net_fees_in_gbp - name: xero_screen_and_protect_net_fees_in_gbp
data_type: decimal data_type: decimal
description: | description: |
Sum of accummulated Screen & Protect API Net Fees, in GBP, without taxes Sum of accummulated Screen & Protect API Net Fees, in GBP, without taxes
in a given date and per specified dimension. This is an in a given month up to the given date and per specified dimension.
API service. This is an API service.
- name: xero_athena_net_fees_in_gbp - name: xero_athena_net_fees_in_gbp
data_type: decimal data_type: decimal
@ -4974,7 +4974,7 @@ models:
- xero_operator_net_fees_in_gbp - xero_operator_net_fees_in_gbp
- xero_e_deposit_net_fees_in_gbp - xero_e_deposit_net_fees_in_gbp
- xero_check_in_hero_api_net_fees_in_gbp - xero_check_in_hero_api_net_fees_in_gbp
- xero_screen_and_protect_api_net_fees_in_gbp - xero_screen_and_protect_net_fees_in_gbp
- xero_athena_net_fees_in_gbp - xero_athena_net_fees_in_gbp
- xero_guesty_resolutions_net_fees_in_gbp - xero_guesty_resolutions_net_fees_in_gbp
- xero_guesty_net_fees_in_gbp - xero_guesty_net_fees_in_gbp
@ -5089,15 +5089,15 @@ models:
data_type: decimal data_type: decimal
description: | description: |
The monthly Check-In Hero API Net Fees, in GBP, without taxes The monthly Check-In Hero API Net Fees, in GBP, without taxes
in a given date and per specified dimension. This is an for a given date, dimension and value.
API service. This is an API service.
- name: xero_screen_and_protect_api_net_fees_in_gbp - name: xero_screen_and_protect_net_fees_in_gbp
data_type: decimal data_type: decimal
description: | description: |
The monthly Screen & Protect API Net Fees, in GBP, without taxes The monthly Screen & Protect API Net Fees, in GBP, without taxes
in a given date and per specified dimension. This is an for a given date, dimension and value.
API service. This is an API service.
- name: xero_athena_net_fees_in_gbp - name: xero_athena_net_fees_in_gbp
data_type: decimal data_type: decimal
@ -5175,7 +5175,7 @@ models:
- xero_operator_net_fees_in_gbp - xero_operator_net_fees_in_gbp
- xero_e_deposit_net_fees_in_gbp - xero_e_deposit_net_fees_in_gbp
- xero_check_in_hero_api_net_fees_in_gbp - xero_check_in_hero_api_net_fees_in_gbp
- xero_screen_and_protect_api_net_fees_in_gbp - xero_screen_and_protect_net_fees_in_gbp
- xero_athena_net_fees_in_gbp - xero_athena_net_fees_in_gbp
- xero_guesty_resolutions_net_fees_in_gbp - xero_guesty_resolutions_net_fees_in_gbp
- xero_guesty_net_fees_in_gbp - xero_guesty_net_fees_in_gbp
@ -5291,15 +5291,15 @@ models:
data_type: decimal data_type: decimal
description: | description: |
The month-to-date Check-In Hero API Net Fees, in GBP, without taxes The month-to-date Check-In Hero API Net Fees, in GBP, without taxes
in a given date and per specified dimension. This is an for a given date, dimension and value.
API service. This is an API service.
- name: xero_screen_and_protect_api_net_fees_in_gbp - name: xero_screen_and_protect_net_fees_in_gbp
data_type: decimal data_type: decimal
description: | description: |
The month-to-date Screen & Protect API Net Fees, in GBP, without taxes The month-to-date Screen & Protect API Net Fees, in GBP, without taxes
in a given date and per specified dimension. This is an for a given date, dimension and value.
API service. This is an API service.
- name: xero_athena_net_fees_in_gbp - name: xero_athena_net_fees_in_gbp
data_type: decimal data_type: decimal

10
models/reporting/general/monthly_aggregated_metrics_history_by_deal.sql
View file

@ -158,16 +158,6 @@ select
then xero_e_deposit_net_fees_in_gbp then xero_e_deposit_net_fees_in_gbp
else null else null
end as xero_e_deposit_net_fees_in_gbp, end as xero_e_deposit_net_fees_in_gbp,
case
when {{ is_date_before_20th_of_previous_month("date") }}
then xero_check_in_hero_api_net_fees_in_gbp
else null
end as xero_check_in_hero_api_net_fees_in_gbp,
case
when {{ is_date_before_20th_of_previous_month("date") }}
then xero_screen_and_protect_api_net_fees_in_gbp
else null
end as xero_screen_and_protect_api_net_fees_in_gbp,
case case
when {{ is_date_before_20th_of_previous_month("date") }} when {{ is_date_before_20th_of_previous_month("date") }}
then xero_waiver_paid_back_to_host_in_gbp then xero_waiver_paid_back_to_host_in_gbp

6
seeds/schema.yml
View file

@ -211,6 +211,8 @@ seeds:
- Old Dashboard Booking Fees - Old Dashboard Booking Fees
- Athena API - Athena API
- E-Deposit API - E-Deposit API
- Check in Hero API
- Screen and Protect API
- Guesty Resolutions - Guesty Resolutions
- Basic Protection - Basic Protection
- Waiver Pro - Waiver Pro
@ -281,6 +283,8 @@ seeds:
- 15-E-Deposit API - 15-E-Deposit API
- 41-Guesty Resolutions - 41-Guesty Resolutions
- 31-Check In Cover - 31-Check In Cover
- 32-Check in Hero API
- 18-Screen and Protect API
- 17-Protection Services - 17-Protection Services
- 16-Screening Services - 16-Screening Services
- 51-Damage Host-Waiver Payments - 51-Damage Host-Waiver Payments
@ -303,6 +307,8 @@ seeds:
- 111-Booking Fees - 111-Booking Fees
- 141-Athena API - 141-Athena API
- 151-E-Deposit API - 151-E-Deposit API
- 321-Check in Hero API
- 181-Screen and Protect API
- 411-Guesty Resolutions - 411-Guesty Resolutions
- 311-Check In Cover - 311-Check In Cover
- 171-Basic Protection - 171-Basic Protection