Merged PR 4104: Refactor Invoiced Revenue from Account Code + New Revenue Streams

# Description

Changes:
* Major changes on int_kpis__metric_daily_invoiced_revenue. Now data is retrieved from the account codes, following the previous analysis. This actually reads from a work done on Accounting Codes, with the default aggregations set as a seed. I've also included here new revenue streams for new dash, and the split of guesty fees between resolutions and real API fees. However, New Dash services are still not visible as final metrics. I'll do this separately.
* Propagation of changes in intermediate models. This will affect currently displayed metrics, but not show any new metric.

Since this is quite dense, let's discuss.

# Checklist

- [X] The edited models and dependants run properly with production data.
- [X] The edited models are sufficiently documented.
- [X] The edited models contain PK tests, and I've ran and passed them.
- [X] I have checked for DRY opportunities with other models and docs.
- [X] I've picked the right materialization for the affected models.

# Other

- [ ] Check if a full-refresh is required after this PR is merged.

Related work items: #26531

models/intermediate/kpis/int_kpis__agg_monthly_invoiced_revenue.sql

@@ -15,6 +15,24 @@
         {{ dimension.dimension }} as dimension,
         {{ dimension.dimension_value }} as dimension_value,
         -- Metrics --
+        sum(
+            xero_basic_protection_net_fees_in_gbp
+        ) as xero_basic_protection_net_fees_in_gbp,
+        sum(xero_waiver_pro_net_fees_in_gbp) as xero_waiver_pro_net_fees_in_gbp,
+        sum(
+            xero_id_verification_net_fees_in_gbp
+        ) as xero_id_verification_net_fees_in_gbp,
+        sum(
+            xero_protection_plus_net_fees_in_gbp
+        ) as xero_protection_plus_net_fees_in_gbp,
+        sum(xero_screening_plus_net_fees_in_gbp) as xero_screening_plus_net_fees_in_gbp,
+        sum(
+            xero_sex_offenders_check_net_fees_in_gbp
+        ) as xero_sex_offenders_check_net_fees_in_gbp,
+        sum(xero_protection_pro_net_fees_in_gbp) as xero_protection_pro_net_fees_in_gbp,
+        sum(
+            xero_basic_screening_net_fees_in_gbp
+        ) as xero_basic_screening_net_fees_in_gbp,
         sum(xero_booking_net_fees_in_gbp) as xero_booking_net_fees_in_gbp,
         sum(xero_listing_net_fees_in_gbp) as xero_listing_net_fees_in_gbp,
         sum(xero_verification_net_fees_in_gbp) as xero_verification_net_fees_in_gbp,
@@ -23,8 +41,12 @@
             xero_waiver_paid_back_to_host_in_gbp
         ) as xero_waiver_paid_back_to_host_in_gbp,
         sum(xero_e_deposit_net_fees_in_gbp) as xero_e_deposit_net_fees_in_gbp,
+        sum(xero_athena_net_fees_in_gbp) as xero_athena_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(
+            xero_guesty_resolutions_net_fees_in_gbp
+        ) as xero_guesty_resolutions_net_fees_in_gbp
     from {{ ref("int_kpis__metric_monthly_invoiced_revenue") }}
     group by 1, 2, 3, 4
     {% if not loop.last %}

models/intermediate/kpis/int_kpis__agg_mtd_invoiced_revenue.sql

@@ -15,6 +15,24 @@
         {{ dimension.dimension }} as dimension,
         {{ dimension.dimension_value }} as dimension_value,
         -- Metrics --
+        sum(
+            xero_basic_protection_net_fees_in_gbp
+        ) as xero_basic_protection_net_fees_in_gbp,
+        sum(xero_waiver_pro_net_fees_in_gbp) as xero_waiver_pro_net_fees_in_gbp,
+        sum(
+            xero_id_verification_net_fees_in_gbp
+        ) as xero_id_verification_net_fees_in_gbp,
+        sum(
+            xero_protection_plus_net_fees_in_gbp
+        ) as xero_protection_plus_net_fees_in_gbp,
+        sum(xero_screening_plus_net_fees_in_gbp) as xero_screening_plus_net_fees_in_gbp,
+        sum(
+            xero_sex_offenders_check_net_fees_in_gbp
+        ) as xero_sex_offenders_check_net_fees_in_gbp,
+        sum(xero_protection_pro_net_fees_in_gbp) as xero_protection_pro_net_fees_in_gbp,
+        sum(
+            xero_basic_screening_net_fees_in_gbp
+        ) as xero_basic_screening_net_fees_in_gbp,
         sum(xero_booking_net_fees_in_gbp) as xero_booking_net_fees_in_gbp,
         sum(xero_listing_net_fees_in_gbp) as xero_listing_net_fees_in_gbp,
         sum(xero_verification_net_fees_in_gbp) as xero_verification_net_fees_in_gbp,
@@ -23,8 +41,12 @@
             xero_waiver_paid_back_to_host_in_gbp
         ) as xero_waiver_paid_back_to_host_in_gbp,
         sum(xero_e_deposit_net_fees_in_gbp) as xero_e_deposit_net_fees_in_gbp,
+        sum(xero_athena_net_fees_in_gbp) as xero_athena_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(
+            xero_guesty_resolutions_net_fees_in_gbp
+        ) as xero_guesty_resolutions_net_fees_in_gbp
     from {{ ref("int_kpis__metric_mtd_invoiced_revenue") }}
     group by 1, 2, 3, 4
     {% if not loop.last %}

models/intermediate/kpis/int_kpis__metric_daily_invoiced_revenue.sql

@@ -1,10 +1,5 @@
+-- Document Status --
 {% set relevant_document_statuses = "('PAID', 'AUTHORISED')" %}
-{% set booking_fee_items = "('EU BOOKING FEE','ZAR BOOKINGS','BOOKING FEE - NON-UK','USD BOOKINGS','CAD BOOKINGS','BOOKING FEE - UK','AUD BOOKINGS')" %}
-{% set listing_fee_items = "('USD LISTINGS','LISTING FEE - NON UK','ZAR LISTINGS','CAD LISTINGS','LISTING FEE - UK','AUD LISTINGS','EU LISTINGS')" %}
-{% set waiver_items = "('DAMAGE WAVER', 'DAMAGE WAIVER')" %}
-{% set verification_fee_items = "('VERIFICATION FEE')" %}
-{% set e_deposit_account_name = "('E-DEPOSIT FEES')" %}
-{% set guesty_account_name = "('GUESTY FEES', 'GUESTY ADMINISTRATION FEE')" %}
 
 {{ config(materialized="table", unique_key=["date", "id_deal"]) }}
 select
@@ -21,79 +16,147 @@ select
     -- Metrics --
     sum(
         case
-            when upper(ixsdm.item_code) in {{ booking_fee_items }}
+            when ixsdm.accounting_root_aggregation = 'Basic Protection'
             then ixsdm.line_amount_wo_taxes_in_gbp
-            else null
+            else 0
+        end
+    ) as xero_basic_protection_net_fees_in_gbp,
+    sum(
+        case
+            when ixsdm.accounting_root_aggregation = 'Waiver Pro'
+            then ixsdm.line_amount_wo_taxes_in_gbp
+            else 0
+        end
+    ) as xero_waiver_pro_net_fees_in_gbp,
+    sum(
+        case
+            when ixsdm.accounting_root_aggregation = 'Id Verification'
+            then ixsdm.line_amount_wo_taxes_in_gbp
+            else 0
+        end
+    ) as xero_id_verification_net_fees_in_gbp,
+    sum(
+        case
+            when ixsdm.accounting_root_aggregation = 'Protection Plus'
+            then ixsdm.line_amount_wo_taxes_in_gbp
+            else 0
+        end
+    ) as xero_protection_plus_net_fees_in_gbp,
+    sum(
+        case
+            when ixsdm.accounting_root_aggregation = 'Screening Plus'
+            then ixsdm.line_amount_wo_taxes_in_gbp
+            else 0
+        end
+    ) as xero_screening_plus_net_fees_in_gbp,
+    sum(
+        case
+            when ixsdm.accounting_root_aggregation = 'Sex Offenders Check'
+            then ixsdm.line_amount_wo_taxes_in_gbp
+            else 0
+        end
+    ) as xero_sex_offenders_check_net_fees_in_gbp,
+    sum(
+        case
+            when ixsdm.accounting_root_aggregation = 'Protection Pro'
+            then ixsdm.line_amount_wo_taxes_in_gbp
+            else 0
+        end
+    ) as xero_protection_pro_net_fees_in_gbp,
+    sum(
+        case
+            when ixsdm.accounting_root_aggregation = 'Basic Screening'
+            then ixsdm.line_amount_wo_taxes_in_gbp
+            else 0
+        end
+    ) as xero_basic_screening_net_fees_in_gbp,
+    sum(
+        case
+            when ixsdm.accounting_root_aggregation = 'Booking Fees'
+            then ixsdm.line_amount_wo_taxes_in_gbp
+            else 0
         end
     ) as xero_booking_net_fees_in_gbp,
     sum(
         case
-            when upper(ixsdm.item_code) in {{ listing_fee_items }}
+            when ixsdm.accounting_root_aggregation = 'Listing Fees'
             then ixsdm.line_amount_wo_taxes_in_gbp
-            else null
+            else 0
         end
     ) as xero_listing_net_fees_in_gbp,
     sum(
         case
-            when upper(ixsdm.item_code) in {{ verification_fee_items }}
+            when ixsdm.accounting_root_aggregation = 'Verification Fees'
             then ixsdm.line_amount_wo_taxes_in_gbp
-            else null
+            else 0
         end
     ) as xero_verification_net_fees_in_gbp,
     sum(
         case
             when
-                upper(ixsdm.item_code) in {{ booking_fee_items }}
+                -- New Dash
-                or upper(ixsdm.item_code) in {{ listing_fee_items }}
+                ixsdm.accounting_kpis_aggregation = 'Invoiced Operator Revenue'
-                or upper(ixsdm.item_code) in {{ verification_fee_items }}
+                -- Prior to 1st January 2023 we didn't have the split of Booking
+                -- Fees, Listing Fees and Verification Fees. Everything is considered
+                -- as Other Invoiced Revenue.
+                or (
+                    ixsdm.accounting_root_aggregation = 'Other Invoiced Revenue'
+                    and date_trunc('year', ixsdm.document_issued_date_utc)::date
+                    = '2022-01-01'::date
+                )
             then ixsdm.line_amount_wo_taxes_in_gbp
-            else null
+            else 0
         end
     ) as xero_operator_net_fees_in_gbp,
     sum(
         case
-            when upper(ixsdm.item_code) in {{ waiver_items }}
+            when ixsdm.accounting_root_aggregation = 'Damage Host-Waiver Payments'
             then ixsdm.line_amount_wo_taxes_in_gbp
-            else null
+            else 0
         end
     ) as xero_waiver_paid_back_to_host_in_gbp,
     sum(
         case
-            when upper(ixsdm.account_name) in {{ e_deposit_account_name }}
+            when ixsdm.accounting_root_aggregation = 'E-Deposit API'
             then ixsdm.line_amount_wo_taxes_in_gbp
-            else null
+            else 0
         end
     ) as xero_e_deposit_net_fees_in_gbp,
     sum(
         case
-            when upper(ixsdm.account_name) in {{ guesty_account_name }}
+            when ixsdm.accounting_root_aggregation = 'Athena API'
             then ixsdm.line_amount_wo_taxes_in_gbp
-            else null
+            else 0
         end
-    ) as xero_guesty_net_fees_in_gbp,
+    ) as xero_athena_net_fees_in_gbp,
+    sum(
+        case
+            when ixsdm.accounting_root_aggregation = 'Guesty Resolutions'
+            then ixsdm.line_amount_wo_taxes_in_gbp
+            else 0
+        end
+    ) as xero_guesty_resolutions_net_fees_in_gbp,
+    sum(
+        case
+            when ixsdm.accounting_kpis_aggregation = 'Invoiced API Revenue'
+            then ixsdm.line_amount_wo_taxes_in_gbp
+            else 0
+        end
+    ) as xero_apis_net_fees_in_gbp,
     sum(
         case
             when
-                upper(ixsdm.account_name) in {{ e_deposit_account_name }}
+                ixsdm.accounting_root_aggregation = 'Guesty Resolutions'
-                or upper(ixsdm.account_name) in {{ guesty_account_name }}
+                or ixsdm.accounting_root_aggregation = 'Athena API'
             then ixsdm.line_amount_wo_taxes_in_gbp
-            else null
+            else 0
         end
-    ) as xero_apis_net_fees_in_gbp
+    ) as xero_guesty_net_fees_in_gbp
 from {{ ref("int_xero__sales_denom_mart") }} as ixsdm
 left join {{ ref("int_core__deal") }} as icd on ixsdm.id_deal = icd.id_deal
 left join
     {{ ref("int_kpis__dimension_daily_accommodation") }} as icmas
     on ixsdm.id_deal = icmas.id_deal
     and ixsdm.document_issued_date_utc = icmas.date
-where
+where upper(ixsdm.document_status) in {{ relevant_document_statuses }}
-    upper(ixsdm.document_status) in {{ relevant_document_statuses }}
-    and (
-        upper(ixsdm.item_code) in {{ booking_fee_items }}
-        or upper(ixsdm.item_code) in {{ listing_fee_items }}
-        or upper(ixsdm.item_code) in {{ verification_fee_items }}
-        or upper(ixsdm.item_code) in {{ waiver_items }}
-        or upper(ixsdm.account_name) in {{ e_deposit_account_name }}
-        or upper(ixsdm.account_name) in {{ guesty_account_name }}
-    )
 group by 1, 2, 3, 4

models/intermediate/kpis/int_kpis__metric_monthly_invoiced_revenue.sql

@@ -18,6 +18,24 @@ select
     -- Dimensions --
     ir.main_billing_country_iso_3_per_deal,
     -- Metrics --
+    sum(
+        ir.xero_basic_protection_net_fees_in_gbp
+    ) as xero_basic_protection_net_fees_in_gbp,
+    sum(ir.xero_waiver_pro_net_fees_in_gbp) as xero_waiver_pro_net_fees_in_gbp,
+    sum(
+        ir.xero_id_verification_net_fees_in_gbp
+    ) as xero_id_verification_net_fees_in_gbp,
+    sum(
+        ir.xero_protection_plus_net_fees_in_gbp
+    ) as xero_protection_plus_net_fees_in_gbp,
+    sum(ir.xero_screening_plus_net_fees_in_gbp) as xero_screening_plus_net_fees_in_gbp,
+    sum(
+        ir.xero_sex_offenders_check_net_fees_in_gbp
+    ) as xero_sex_offenders_check_net_fees_in_gbp,
+    sum(ir.xero_protection_pro_net_fees_in_gbp) as xero_protection_pro_net_fees_in_gbp,
+    sum(
+        ir.xero_basic_screening_net_fees_in_gbp
+    ) as xero_basic_screening_net_fees_in_gbp,
     sum(ir.xero_booking_net_fees_in_gbp) as xero_booking_net_fees_in_gbp,
     sum(ir.xero_listing_net_fees_in_gbp) as xero_listing_net_fees_in_gbp,
     sum(ir.xero_verification_net_fees_in_gbp) as xero_verification_net_fees_in_gbp,
@@ -26,8 +44,12 @@ select
         ir.xero_waiver_paid_back_to_host_in_gbp
     ) as xero_waiver_paid_back_to_host_in_gbp,
     sum(ir.xero_e_deposit_net_fees_in_gbp) as xero_e_deposit_net_fees_in_gbp,
+    sum(ir.xero_athena_net_fees_in_gbp) as xero_athena_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(
+        ir.xero_guesty_resolutions_net_fees_in_gbp
+    ) as xero_guesty_resolutions_net_fees_in_gbp
 
 from {{ ref("int_kpis__dimension_dates") }} d
 left join

models/intermediate/kpis/int_kpis__metric_mtd_invoiced_revenue.sql

@@ -18,6 +18,24 @@ select
     -- Dimensions --
     ir.main_billing_country_iso_3_per_deal,
     -- Metrics --
+    sum(
+        ir.xero_basic_protection_net_fees_in_gbp
+    ) as xero_basic_protection_net_fees_in_gbp,
+    sum(ir.xero_waiver_pro_net_fees_in_gbp) as xero_waiver_pro_net_fees_in_gbp,
+    sum(
+        ir.xero_id_verification_net_fees_in_gbp
+    ) as xero_id_verification_net_fees_in_gbp,
+    sum(
+        ir.xero_protection_plus_net_fees_in_gbp
+    ) as xero_protection_plus_net_fees_in_gbp,
+    sum(ir.xero_screening_plus_net_fees_in_gbp) as xero_screening_plus_net_fees_in_gbp,
+    sum(
+        ir.xero_sex_offenders_check_net_fees_in_gbp
+    ) as xero_sex_offenders_check_net_fees_in_gbp,
+    sum(ir.xero_protection_pro_net_fees_in_gbp) as xero_protection_pro_net_fees_in_gbp,
+    sum(
+        ir.xero_basic_screening_net_fees_in_gbp
+    ) as xero_basic_screening_net_fees_in_gbp,
     sum(ir.xero_booking_net_fees_in_gbp) as xero_booking_net_fees_in_gbp,
     sum(ir.xero_listing_net_fees_in_gbp) as xero_listing_net_fees_in_gbp,
     sum(ir.xero_verification_net_fees_in_gbp) as xero_verification_net_fees_in_gbp,
@@ -26,8 +44,12 @@ select
         ir.xero_waiver_paid_back_to_host_in_gbp
     ) as xero_waiver_paid_back_to_host_in_gbp,
     sum(ir.xero_e_deposit_net_fees_in_gbp) as xero_e_deposit_net_fees_in_gbp,
+    sum(ir.xero_athena_net_fees_in_gbp) as xero_athena_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(
+        ir.xero_guesty_resolutions_net_fees_in_gbp
+    ) as xero_guesty_resolutions_net_fees_in_gbp
 
 from {{ ref("int_kpis__dimension_dates") }} d
 left join

models/intermediate/kpis/schema.yml

@@ -4118,6 +4118,17 @@ models:
     description: |
       This model computes the Daily Invoiced Revenue at the deepest granularity.
 
+      The logic behind this model is mostly retrieving different revenue sources 
+      that are invoiced to the hosts. This considers both Invoices and Credit Notes, 
+      thus metrics correspond to the net amount. 
+
+      Data is retrieved by account codes following accounting standards, and is 
+      aggregated at different levels of business revenue understanding.
+      Only documents with status equal to Authorised or Paid are considered. Revenue is 
+      computed without taxes, in GBP. Revenue is attributed to the document issued date, 
+      thus it might show some differences vs. financials since we do not consider accrued 
+      revenue.
+
       The unique key corresponds to the deepest granularity of the model,
       in this case: 
       - date, 
@@ -4165,6 +4176,62 @@ models:
         data_tests:
           - not_null
 
+      - name: xero_basic_protection_net_fees_in_gbp
+        data_type: decimal
+        description: |
+          Sum of daily Basic Protection Net Fees, in GBP, without taxes 
+          in a given date and per specified dimension. This is a New 
+          Dashboard service.
+
+      - name: xero_waiver_pro_net_fees_in_gbp
+        data_type: decimal
+        description: |
+          Sum of daily Waiver Pro Net Fees, in GBP, without taxes 
+          in a given date and per specified dimension. This is a New 
+          Dashboard service.
+
+      - name: xero_id_verification_net_fees_in_gbp
+        data_type: decimal
+        description: |
+          Sum of daily ID Verification Net Fees, in GBP, without taxes 
+          in a given date and per specified dimension. This is a New 
+          Dashboard service.
+
+      - name: xero_protection_plus_net_fees_in_gbp
+        data_type: decimal
+        description: |
+          Sum of daily Protection Pro Net Fees, in GBP, without taxes 
+          in a given date and per specified dimension. This is a New 
+          Dashboard service.
+
+      - name: xero_screening_plus_net_fees_in_gbp
+        data_type: decimal
+        description: |
+          Sum of daily Screening Plus Net Fees, in GBP, without taxes 
+          in a given date and per specified dimension. This is a New 
+          Dashboard service.
+
+      - name: xero_sex_offenders_check_net_fees_in_gbp
+        data_type: decimal
+        description: |
+          Sum of daily Sex Offenders Check Net Fees, in GBP, without taxes 
+          in a given date and per specified dimension. This is a New 
+          Dashboard service.
+
+      - name: xero_protection_pro_net_fees_in_gbp
+        data_type: decimal
+        description: |
+          Sum of daily Protection Pro Net Fees, in GBP, without taxes 
+          in a given date and per specified dimension. This is a New 
+          Dashboard service.
+
+      - name: xero_basic_screening_net_fees_in_gbp
+        data_type: decimal
+        description: |
+          Sum of daily Basic Screening Net Fees, in GBP, without taxes 
+          in a given date and per specified dimension. This is a New 
+          Dashboard service.
+
       - name: xero_booking_net_fees_in_gbp
         data_type: decimal
         description: |
@@ -4186,21 +4253,38 @@ models:
       - name: xero_operator_net_fees_in_gbp
         data_type: decimal
         description: |
-          Sum of daily Operator Net Fees, which include Booking,
+          Sum of daily Operator Net Fees, which include New Dash Services,
-          Listing and Verification Net Fees, in GBP, without taxes 
+          Booking, Listing and Verification Net Fees for Old Dash; 
-          in a given date and per specified dimension.
+          in GBP, without taxes in a given date and per specified dimension.
+          Partial data of 2022 corresponds to revenue categorised as Other Revenue 
+          according to the financials.
 
       - name: xero_e_deposit_net_fees_in_gbp
         data_type: decimal
         description: |
           Sum of daily E-Deposit Net Fees, in GBP, without taxes 
+          in a given date and per specified dimension. This is an 
+          API service.
+
+      - name: xero_athena_net_fees_in_gbp
+        data_type: decimal
+        description: |
+          Sum of daily Athena (Guesty) Net Fees, in GBP, without taxes 
+          in a given date and per specified dimension. This is an 
+          API service.
+
+      - name: xero_guesty_resolutions_net_fees_in_gbp
+        data_type: decimal
+        description: |
+          Sum of daily Guesty Resolutions Net Fees, in GBP, without taxes 
           in a given date and per specified dimension.
 
       - name: xero_guesty_net_fees_in_gbp
         data_type: decimal
         description: |
-          Sum of daily Athena (Guesty) Net Fees, in GBP, without taxes 
+          Sum of daily Athena (Guesty) Net Fees and Guesty Resolutions 
-          in a given date and per specified dimension.
+          Net Fees, in GBP, without taxes in a given date and per specified 
+          dimension.
 
       - name: xero_apis_net_fees_in_gbp
         data_type: decimal
@@ -4279,6 +4363,62 @@ models:
         data_tests:
           - not_null
 
+      - name: xero_basic_protection_net_fees_in_gbp
+        data_type: decimal
+        description: |
+          Sum of accumulated Basic Protection Net Fees, in GBP, without taxes 
+          in a given month and per specified dimension. This is a New 
+          Dashboard service.
+
+      - name: xero_waiver_pro_net_fees_in_gbp
+        data_type: decimal
+        description: |
+          Sum of accumulated Waiver Pro Net Fees, in GBP, without taxes 
+          in a given month and per specified dimension. This is a New 
+          Dashboard service.
+
+      - name: xero_id_verification_net_fees_in_gbp
+        data_type: decimal
+        description: |
+          Sum of accumulated ID Verification Net Fees, in GBP, without taxes 
+          in a given month and per specified dimension. This is a New 
+          Dashboard service.
+
+      - name: xero_protection_plus_net_fees_in_gbp
+        data_type: decimal
+        description: |
+          Sum of accumulated Protection Plus Net Fees, in GBP, without taxes 
+          in a given month and per specified dimension. This is a New 
+          Dashboard service.
+
+      - name: xero_screening_plus_net_fees_in_gbp
+        data_type: decimal
+        description: |
+          Sum of accumulated Screening Plus Net Fees, in GBP, without taxes 
+          in a given month and per specified dimension. This is a New 
+          Dashboard service.
+
+      - name: xero_sex_offenders_check_net_fees_in_gbp
+        data_type: decimal
+        description: |
+          Sum of accumulated Sex Offenders Check Net Fees, in GBP, without taxes 
+          in a given month and per specified dimension. This is a New 
+          Dashboard service.
+
+      - name: xero_protection_pro_net_fees_in_gbp
+        data_type: decimal
+        description: |
+          Sum of accumulated Protection Pro Net Fees, in GBP, without taxes 
+          in a given month and per specified dimension. This is a New 
+          Dashboard service.
+
+      - name: xero_basic_screening_net_fees_in_gbp
+        data_type: decimal
+        description: |
+          Sum of accumulated Basic Screening Net Fees, in GBP, without taxes 
+          in a given month and per specified dimension. This is a New 
+          Dashboard service.
+
       - name: xero_booking_net_fees_in_gbp
         data_type: decimal
         description: |
@@ -4300,28 +4440,38 @@ models:
       - name: xero_operator_net_fees_in_gbp
         data_type: decimal
         description: |
-          Sum of accumulated Operator Net Fees, which include Booking,
+          Sum of accummulated Operator Net Fees, which include New Dash Services,
-          Listing and Verification Net Fees, in GBP, without taxes 
+          Booking, Listing and Verification Net Fees for Old Dash; 
-          in a given month and per specified dimension.
+          in GBP, without taxes in a given month and per specified dimension.
+          Partial data of 2022 corresponds to revenue categorised as Other Revenue 
+          according to the financials.
 
       - name: xero_e_deposit_net_fees_in_gbp
         data_type: decimal
         description: |
-          Sum of accumulated E-Deposit Net Fees, in GBP, without taxes 
+          Sum of accummulated E-Deposit Net Fees, in GBP, without taxes 
+          in a given month and per specified dimension. This is an 
+          API service.
+
+      - name: xero_athena_net_fees_in_gbp
+        data_type: decimal
+        description: |
+          Sum of accummulated Athena (Guesty) Net Fees, in GBP, without taxes 
+          in a given month and per specified dimension. This is an 
+          API service.
+
+      - name: xero_guesty_resolutions_net_fees_in_gbp
+        data_type: decimal
+        description: |
+          Sum of accummulated Guesty Resolutions Net Fees, in GBP, without taxes 
           in a given month and per specified dimension.
 
       - name: xero_guesty_net_fees_in_gbp
         data_type: decimal
         description: |
-          Sum of accumulated Athena (Guesty) Net Fees, in GBP, without taxes 
+          Sum of accummulated Athena (Guesty) Net Fees and Guesty Resolutions 
-          in a given month and per specified dimension.
+          Net Fees, in GBP, without taxes in a given month and per specified 
-
+          dimension.
-      - name: xero_apis_net_fees_in_gbp
-        data_type: decimal
-        description: |
-          Sum of accumulated API Net Fees, which include E-Deposit,
-          and Athena (Guesty) Net Fees, in GBP, without taxes 
-          in a given month and per specified dimension.
 
       - name: xero_waiver_paid_back_to_host_in_gbp
         data_type: decimal
@@ -4393,6 +4543,62 @@ models:
         data_tests:
           - not_null
 
+      - name: xero_basic_protection_net_fees_in_gbp
+        data_type: decimal
+        description: |
+          Sum of accumulated Basic Protection Net Fees, in GBP, without taxes 
+          in a given month up to the given date and per specified dimension. 
+          This is a New Dashboard service.
+
+      - name: xero_waiver_pro_net_fees_in_gbp
+        data_type: decimal
+        description: |
+          Sum of accumulated Waiver Pro Net Fees, in GBP, without taxes 
+          in a given month up to the given date and per specified dimension. 
+          This is a New Dashboard service.
+
+      - name: xero_id_verification_net_fees_in_gbp
+        data_type: decimal
+        description: |
+          Sum of accumulated ID Verification Net Fees, in GBP, without taxes 
+          in a given month up to the given date and per specified dimension. 
+          This is a New Dashboard service.
+
+      - name: xero_protection_plus_net_fees_in_gbp
+        data_type: decimal
+        description: |
+          Sum of accumulated Protection Plus Net Fees, in GBP, without taxes 
+          in a given month up to the given date and per specified dimension. 
+          This is a New Dashboard service.
+
+      - name: xero_screening_plus_net_fees_in_gbp
+        data_type: decimal
+        description: |
+          Sum of accumulated Screening Plus Net Fees, in GBP, without taxes 
+          in a given month up to the given date and per specified dimension. 
+          This is a New Dashboard service.
+
+      - name: xero_sex_offenders_check_net_fees_in_gbp
+        data_type: decimal
+        description: |
+          Sum of accumulated Sex Offenders Check Net Fees, in GBP, without taxes 
+          in a given month up to the given date and per specified dimension. 
+          This is a New Dashboard service.
+
+      - name: xero_protection_pro_net_fees_in_gbp
+        data_type: decimal
+        description: |
+          Sum of accumulated Protection Pro Net Fees, in GBP, without taxes 
+          in a given month up to the given date and per specified dimension. 
+          This is a New Dashboard service.
+
+      - name: xero_basic_screening_net_fees_in_gbp
+        data_type: decimal
+        description: |
+          Sum of accumulated Basic Screening Net Fees, in GBP, without taxes 
+          in a given month up to the given date and per specified dimension. 
+          This is a New Dashboard service.
+
       - name: xero_booking_net_fees_in_gbp
         data_type: decimal
         description: |
@@ -4414,34 +4620,46 @@ models:
       - name: xero_operator_net_fees_in_gbp
         data_type: decimal
         description: |
-          Sum of accumulated Operator Net Fees, which include Booking,
+          Sum of accummulated Operator Net Fees, which include New Dash Services,
-          Listing and Verification Net Fees, in GBP, without taxes 
+          Booking, Listing and Verification Net Fees for Old Dash; 
-          in a given month up to the given date and per specified dimension.
+          in GBP, without taxes in a given month up to the given date 
+          and per specified dimension.
+          Partial data of 2022 corresponds to revenue categorised as Other Revenue 
+          according to the financials.
 
       - name: xero_e_deposit_net_fees_in_gbp
         data_type: decimal
         description: |
-          Sum of accumulated E-Deposit Net Fees, in GBP, without taxes 
+          Sum of accummulated E-Deposit Net Fees, in GBP, without taxes 
+          in a given month up to the given date and per specified dimension. 
+          This is an API service.
+
+      - name: xero_athena_net_fees_in_gbp
+        data_type: decimal
+        description: |
+          Sum of accummulated Athena (Guesty) Net Fees, in GBP, without taxes 
+          in a given month up to the given date and per specified dimension. 
+          This is an API service.
+
+      - name: xero_guesty_resolutions_net_fees_in_gbp
+        data_type: decimal
+        description: |
+          Sum of accummulated Guesty Resolutions Net Fees, in GBP, without taxes 
           in a given month up to the given date and per specified dimension.
 
       - name: xero_guesty_net_fees_in_gbp
         data_type: decimal
         description: |
-          Sum of accumulated Athena (Guesty) Net Fees, in GBP, without taxes 
+          Sum of accummulated Athena (Guesty) Net Fees and Guesty Resolutions 
-          in a given month up to the given date and per specified dimension.
+          Net Fees, in GBP, without taxes in a given month up to the given date 
-
+          and per specified dimension.
-      - name: xero_apis_net_fees_in_gbp
-        data_type: decimal
-        description: |
-          Sum of accumulated API Net Fees, which include E-Deposit,
-          and Athena (Guesty) Net Fees, in GBP, without taxes 
-          in a given month up to the given date and per specified dimension.
 
       - name: xero_waiver_paid_back_to_host_in_gbp
         data_type: decimal
         description: |
-          Sum of accumulated Waiver Amount Paid Back to Hosts, in GBP, without taxes 
+          Sum of accumulated Waiver Amount Paid Back to Hosts, in GBP, 
-          in a given month up to the given date and per specified dimension.
+          without taxes in a given month up to the given date and per 
+          specified dimension.
 
   - name: int_kpis__agg_monthly_invoiced_revenue
     description: |
@@ -4479,11 +4697,21 @@ models:
         data_tests:
           - assert_dimension_completeness:
               metric_column_names:
+                - xero_basic_protection_net_fees_in_gbp
+                - xero_waiver_pro_net_fees_in_gbp
+                - xero_id_verification_net_fees_in_gbp
+                - xero_protection_plus_net_fees_in_gbp
+                - xero_screening_plus_net_fees_in_gbp
+                - xero_sex_offenders_check_net_fees_in_gbp
+                - xero_protection_pro_net_fees_in_gbp
+                - xero_basic_screening_net_fees_in_gbp
                 - xero_booking_net_fees_in_gbp
                 - xero_listing_net_fees_in_gbp
                 - xero_verification_net_fees_in_gbp
                 - xero_operator_net_fees_in_gbp
                 - xero_e_deposit_net_fees_in_gbp
+                - xero_athena_net_fees_in_gbp
+                - xero_guesty_resolutions_net_fees_in_gbp
                 - xero_guesty_net_fees_in_gbp
                 - xero_apis_net_fees_in_gbp
                 - xero_waiver_paid_back_to_host_in_gbp
@@ -4500,6 +4728,56 @@ models:
         data_tests:
           - not_null
 
+      - name: xero_basic_protection_net_fees_in_gbp
+        data_type: decimal
+        description: |
+          The monthly Basic Protection Net Fees, in GBP, without taxes 
+          for a given date, dimension and value.
+
+      - name: xero_waiver_pro_net_fees_in_gbp
+        data_type: decimal
+        description: |
+          The monthly Waiver Pro Net Fees, in GBP, without taxes 
+          for a given date, dimension and value.
+
+      - name: xero_id_verification_net_fees_in_gbp
+        data_type: decimal
+        description: |
+          The monthly ID Verification Net Fees, in GBP, without taxes 
+          for a given date, dimension and value.
+
+      - name: xero_protection_plus_net_fees_in_gbp
+        data_type: decimal
+        description: |
+          The monthly Protection Plus Net Fees, in GBP, without taxes 
+          for a given date, dimension and value.
+
+      - name: xero_screening_plus_net_fees_in_gbp
+        data_type: decimal
+        description: |
+          The monthly Screening Plus Net Fees, in GBP, without taxes 
+          for a given date, dimension and value.
+
+      - name: xero_sex_offenders_check_net_fees_in_gbp
+        data_type: decimal
+        description: |
+          The monthly Sex Offenders Check Net Fees, in GBP, without taxes 
+          for a given date, dimension and value.
+
+      - name: xero_protection_pro_net_fees_in_gbp
+        data_type: decimal
+        description: |
+          The monthly Protection Pro Net Fees, in GBP, without taxes 
+          for a given date, dimension and value.
+          This is a New Dashboard service.
+
+      - name: xero_basic_screening_net_fees_in_gbp
+        data_type: decimal
+        description: |
+          The monthly Basic Screening Net Fees, in GBP, without taxes 
+          for a given date, dimension and value.
+          This is a New Dashboard service.
+
       - name: xero_booking_net_fees_in_gbp
         data_type: decimal
         description: |
@@ -4521,29 +4799,38 @@ models:
       - name: xero_operator_net_fees_in_gbp
         data_type: decimal
         description: |
-          The monthly Operator Net Fees, which include Booking,
+          The monthly Operator Net Fees, which include New Dash Services,
-          Listing and Verification Net Fees, in GBP, without taxes 
+          Booking, Listing and Verification Net Fees for Old Dash; 
-          for a given date, dimension and value.
+          in GBP, without taxes for a given date, dimension and value.
+          Partial data of 2022 corresponds to revenue categorised as Other Revenue 
+          according to the financials.
 
       - name: xero_e_deposit_net_fees_in_gbp
         data_type: decimal
         description: |
           The monthly E-Deposit Net Fees, in GBP, without taxes 
           for a given date, dimension and value.
+          This is an API service.
 
-      - name: xero_guesty_net_fees_in_gbp
+      - name: xero_athena_net_fees_in_gbp
         data_type: decimal
         description: |
           The monthly Athena (Guesty) Net Fees, in GBP, without taxes 
           for a given date, dimension and value.
+          This is an API service.
 
-      - name: xero_apis_net_fees_in_gbp
+      - name: xero_guesty_resolutions_net_fees_in_gbp
         data_type: decimal
         description: |
-          The monthly API Net Fees, which include E-Deposit,
+          The monthly Guesty Resolutions Net Fees, in GBP, without taxes 
-          and Athena (Guesty) Net Fees, in GBP, without taxes 
           for a given date, dimension and value.
 
+      - name: xero_guesty_net_fees_in_gbp
+        data_type: decimal
+        description: |
+          The monthly Athena (Guesty) Net Fees and Guesty Resolutions 
+          Net Fees, in GBP, without taxes for a given date, dimension and value.
+
       - name: xero_waiver_paid_back_to_host_in_gbp
         data_type: decimal
         description: |
@@ -4586,11 +4873,21 @@ models:
         data_tests:
           - assert_dimension_completeness:
               metric_column_names:
+                - xero_basic_protection_net_fees_in_gbp
+                - xero_waiver_pro_net_fees_in_gbp
+                - xero_id_verification_net_fees_in_gbp
+                - xero_protection_plus_net_fees_in_gbp
+                - xero_screening_plus_net_fees_in_gbp
+                - xero_sex_offenders_check_net_fees_in_gbp
+                - xero_protection_pro_net_fees_in_gbp
+                - xero_basic_screening_net_fees_in_gbp
                 - xero_booking_net_fees_in_gbp
                 - xero_listing_net_fees_in_gbp
                 - xero_verification_net_fees_in_gbp
                 - xero_operator_net_fees_in_gbp
                 - xero_e_deposit_net_fees_in_gbp
+                - xero_athena_net_fees_in_gbp
+                - xero_guesty_resolutions_net_fees_in_gbp
                 - xero_guesty_net_fees_in_gbp
                 - xero_apis_net_fees_in_gbp
                 - xero_waiver_paid_back_to_host_in_gbp
@@ -4608,6 +4905,56 @@ models:
         data_tests:
           - not_null
 
+      - name: xero_basic_protection_net_fees_in_gbp
+        data_type: decimal
+        description: |
+          The month-to-date Basic Protection Net Fees, in GBP, without taxes 
+          for a given date, dimension and value.
+
+      - name: xero_waiver_pro_net_fees_in_gbp
+        data_type: decimal
+        description: |
+          The month-to-date Waiver Pro Net Fees, in GBP, without taxes 
+          for a given date, dimension and value.
+
+      - name: xero_id_verification_net_fees_in_gbp
+        data_type: decimal
+        description: |
+          The month-to-date ID Verification Net Fees, in GBP, without taxes 
+          for a given date, dimension and value.
+
+      - name: xero_protection_plus_net_fees_in_gbp
+        data_type: decimal
+        description: |
+          The month-to-date Protection Plus Net Fees, in GBP, without taxes 
+          for a given date, dimension and value.
+
+      - name: xero_screening_plus_net_fees_in_gbp
+        data_type: decimal
+        description: |
+          The month-to-date Screening Plus Net Fees, in GBP, without taxes 
+          for a given date, dimension and value.
+
+      - name: xero_sex_offenders_check_net_fees_in_gbp
+        data_type: decimal
+        description: |
+          The month-to-date Sex Offenders Check Net Fees, in GBP, without taxes 
+          for a given date, dimension and value.
+
+      - name: xero_protection_pro_net_fees_in_gbp
+        data_type: decimal
+        description: |
+          The month-to-date Protection Pro Net Fees, in GBP, without taxes 
+          for a given date, dimension and value.
+          This is a New Dashboard service.
+
+      - name: xero_basic_screening_net_fees_in_gbp
+        data_type: decimal
+        description: |
+          The month-to-date Basic Screening Net Fees, in GBP, without taxes 
+          for a given date, dimension and value.
+          This is a New Dashboard service.
+
       - name: xero_booking_net_fees_in_gbp
         data_type: decimal
         description: |
@@ -4629,34 +4976,43 @@ models:
       - name: xero_operator_net_fees_in_gbp
         data_type: decimal
         description: |
-          The month-to-date Operator Net Fees, which include Booking,
+          The month-to-date Operator Net Fees, which include New Dash Services,
-          Listing and Verification Net Fees, in GBP, without taxes 
+          Booking, Listing and Verification Net Fees for Old Dash; 
-          for a given date, dimension and value.
+          in GBP, without taxes for a given date, dimension and value.
+          Partial data of 2022 corresponds to revenue categorised as Other Revenue 
+          according to the financials.
 
       - name: xero_e_deposit_net_fees_in_gbp
         data_type: decimal
         description: |
           The month-to-date E-Deposit Net Fees, in GBP, without taxes 
           for a given date, dimension and value.
+          This is an API service.
 
-      - name: xero_guesty_net_fees_in_gbp
+      - name: xero_athena_net_fees_in_gbp
         data_type: decimal
         description: |
           The month-to-date Athena (Guesty) Net Fees, in GBP, without taxes 
           for a given date, dimension and value.
+          This is an API service.
 
-      - name: xero_apis_net_fees_in_gbp
+      - name: xero_guesty_resolutions_net_fees_in_gbp
         data_type: decimal
         description: |
-          The month-to-date API Net Fees, which include E-Deposit,
+          The month-to-date Guesty Resolutions Net Fees, in GBP, without taxes 
-          and Athena (Guesty) Net Fees, in GBP, without taxes 
           for a given date, dimension and value.
 
+      - name: xero_guesty_net_fees_in_gbp
+        data_type: decimal
+        description: |
+          The month-to-date Athena (Guesty) Net Fees and Guesty Resolutions 
+          Net Fees, in GBP, without taxes for a given date, dimension and value.
+
       - name: xero_waiver_paid_back_to_host_in_gbp
         data_type: decimal
         description: |
-          The month-to-date Waiver Amount Paid Back to Hosts, in GBP, 
+          The month-to-date Waiver Amount Paid Back to Hosts, in GBP, without taxes 
-          without taxes for a given date, dimension and value.
+          for a given date, dimension and value.
 
   - name: int_kpis__metric_daily_deals
     description: |

seeds/stg_seed__accounting_aggregations.csv

@@ -17,7 +17,7 @@ account_code,root_aggregation,kpis_aggregation,financial_aggregation
 "216",Booking Fees,Invoiced Operator Revenue,Guest Screening and Protection
 "219",Athena API,Invoiced API Revenue,Guest Screening and Protection
 "220",E-Deposit API,Invoiced API Revenue,Guest Screening and Protection
-"221",Guesty Resolutions,Accounting Resolutions,Mediation and Resolution
+"221",Guesty Resolutions,Invoiced API Revenue,Mediation and Resolution
 "222",Check In Cover,Accounting Guest Revenue,Guest Products
 "227",Basic Protection,Invoiced Operator Revenue,Guest Screening and Protection
 "228",Waiver Pro,Invoiced Operator Revenue,Deposit Management