From 82629e040b398a6249d949e94a5f196cec38b8e2 Mon Sep 17 00:00:00 2001 From: Joaquin Ossa Date: Thu, 5 Sep 2024 12:45:09 +0200 Subject: [PATCH] Silly mistake fixed --- .../intermediate/edeposit/int_edeposit__verification_fees.sql | 4 ++-- models/intermediate/edeposit/schema.yaml | 4 ++-- models/reporting/edeposit/schema.yaml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/models/intermediate/edeposit/int_edeposit__verification_fees.sql b/models/intermediate/edeposit/int_edeposit__verification_fees.sql index 9a3b52f..d0ba153 100644 --- a/models/intermediate/edeposit/int_edeposit__verification_fees.sql +++ b/models/intermediate/edeposit/int_edeposit__verification_fees.sql @@ -20,12 +20,12 @@ with cer.rate, v.is_cancelled, case - when v.verification_status in {{ ok_status }} + when v.verification_status in {{ ok_status }} and is_cancelled = false then v.nightly_fee_local * v.number_nights else 0 end as ok_status_fee_in_txn_currency, case - when v.verification_status in {{ ok_status }} + when v.verification_status in {{ ok_status }} and is_cancelled = false then cer.rate * v.nightly_fee_local * v.number_nights else 0 end as ok_status_fee_in_gbp, diff --git a/models/intermediate/edeposit/schema.yaml b/models/intermediate/edeposit/schema.yaml index 60665c0..10db076 100644 --- a/models/intermediate/edeposit/schema.yaml +++ b/models/intermediate/edeposit/schema.yaml @@ -242,7 +242,7 @@ models: - name: ok_status_fee_in_txn_currency data_type: numeric - description: "fee charged in used currency for approved or flagged verifications" + description: "fee charged in used currency for approved or flagged verifications and not cancelled" tests: - not_null - dbt_expectations.expect_column_values_to_be_between: @@ -251,7 +251,7 @@ models: - name: ok_status_fee_in_gbp data_type: numeric - description: "fee charged in gbp for approved or flagged verifications" + description: "fee charged in gbp for approved or flagged verifications and not cancelled" tests: - not_null - dbt_expectations.expect_column_values_to_be_between: diff --git a/models/reporting/edeposit/schema.yaml b/models/reporting/edeposit/schema.yaml index e46c312..6831134 100644 --- a/models/reporting/edeposit/schema.yaml +++ b/models/reporting/edeposit/schema.yaml @@ -34,7 +34,7 @@ models: - name: ok_status_fee_in_txn_currency data_type: numeric - description: "fee charged in used currency for approved or flagged verifications" + description: "fee charged in used currency for approved or flagged verifications and not cancelled" tests: - not_null - dbt_expectations.expect_column_values_to_be_between: @@ -43,7 +43,7 @@ models: - name: ok_status_fee_in_gbp data_type: numeric - description: "fee charged in gbp for approved or flagged verifications" + description: "fee charged in gbp for approved or flagged verifications and not cancelled" tests: - not_null - dbt_expectations.expect_column_values_to_be_between: