From ff552ebd0d6b2133019eca223f060e98be68a6ae Mon Sep 17 00:00:00 2001 From: CIEF ACC1 Date: Mon, 13 May 2024 02:21:08 +0000 Subject: [PATCH] renamed to new service type --- .../reporting/rep_exchange__daily_orders.sql | 4 ++-- .../rep_exchange__exchange_rate_analysis.sql | 14 ++++++------- .../fct_exchange__transaction_orders.sql | 20 +++++++++---------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/models/marts/reporting/rep_exchange__daily_orders.sql b/models/marts/reporting/rep_exchange__daily_orders.sql index d7a5a8e..99d1e6e 100644 --- a/models/marts/reporting/rep_exchange__daily_orders.sql +++ b/models/marts/reporting/rep_exchange__daily_orders.sql @@ -6,9 +6,9 @@ -- working days mapping for each service type {% set service_type_working_day_mapping = { - '1 DAY TRANSFER': 1, + 'BANK TRANSFER (EXPRESS)': 1, '1688 PAYMENT': 1, - '3 DAYS TRANSFER': 3, + 'BANK TRANSFER (SAVER)': 3, 'ENTERPRISE TO ENTERPRISE 公打公': 7 } %} diff --git a/models/marts/reporting/rep_exchange__exchange_rate_analysis.sql b/models/marts/reporting/rep_exchange__exchange_rate_analysis.sql index e7e5f0a..03fb93d 100644 --- a/models/marts/reporting/rep_exchange__exchange_rate_analysis.sql +++ b/models/marts/reporting/rep_exchange__exchange_rate_analysis.sql @@ -5,7 +5,7 @@ WITH currency_exchange_rate_compilation AS ( orders AS ( SELECT * FROM {{ ref('fct_exchange__transaction_orders') }} - WHERE service_type NOT IN ('BA') + WHERE service_type NOT IN ('BA', 'RECEIVED-ON-BEHALF') ), @@ -94,7 +94,7 @@ restructure_and_expand_table_cief_1688_vs_c2m_tbdf AS ( ), -restructure_and_expand_table_cief_1_day_transfer_vs_c2m_altr AS ( +restructure_and_expand_table_cief_bank_transfer_express_vs_c2m_altr AS ( SELECT t1.provider, @@ -127,11 +127,11 @@ restructure_and_expand_table_cief_1_day_transfer_vs_c2m_altr AS ( AND competitor_name IN ('C2M') AND - t1.service_type IN ('1 DAY TRANSFER') + t1.service_type IN ('BANK TRANSFER (EXPRESS)') ), -restructure_and_expand_table_cief_3_days_vs_sd AS ( +restructure_and_expand_table_cief_bank_transfer_saver_vs_sd AS ( SELECT t1.provider, @@ -163,7 +163,7 @@ restructure_and_expand_table_cief_3_days_vs_sd AS ( AND competitor_name IN ('SD') AND - t1.service_type IN ('3 DAYS TRANSFER') + t1.service_type IN ('BANK TRANSFER (SAVER)') ), @@ -173,9 +173,9 @@ union_expanded_tables AS ( UNION ALL SELECT * FROM restructure_and_expand_table_cief_1688_vs_c2m_tbdf UNION ALL - SELECT * FROM restructure_and_expand_table_cief_1_day_transfer_vs_c2m_altr + SELECT * FROM restructure_and_expand_table_cief_bank_transfer_express_vs_c2m_altr UNION ALL - SELECT * FROM restructure_and_expand_table_cief_3_days_vs_sd + SELECT * FROM restructure_and_expand_table_cief_bank_transfer_saver_vs_sd ), diff --git a/models/marts/warehouse/fct_exchange__transaction_orders.sql b/models/marts/warehouse/fct_exchange__transaction_orders.sql index d954e12..4320a17 100644 --- a/models/marts/warehouse/fct_exchange__transaction_orders.sql +++ b/models/marts/warehouse/fct_exchange__transaction_orders.sql @@ -159,35 +159,35 @@ transaction_order_datetime_imputation AS ( THEN COALESCE(order_completed_datetime, DATEADD(minute, 433, new_order_approved_datetime)) /* - Imputation for order_approved_datetime for 1 day transfer + Imputation for order_approved_datetime for BANK TRANSFER (EXPRESS) - If payment_method is 'cash', add median of 59 minute to order_approved datetime - If payment_method is 'wallet', add median of 206 minute to order_approved datetime - If payment_method is 'cheque', reuse order_completed datetime, all orders have completed datetime - If payment_method is 'payment_gateway', add median of 214.5 minute to order_approved datetime */ - WHEN order_created_datetime >= '2023-01-01' AND service_type = '1 DAY TRANSFER' AND payment_method = 'CASH' + WHEN order_created_datetime >= '2023-01-01' AND service_type = 'BANK TRANSFER (EXPRESS)' AND payment_method = 'CASH' THEN COALESCE(order_completed_datetime, DATEADD(minute, 59, new_order_approved_datetime)) - WHEN order_created_datetime >= '2023-01-01' AND service_type = '1 DAY TRANSFER' AND payment_method = 'WALLET' + WHEN order_created_datetime >= '2023-01-01' AND service_type = 'BANK TRANSFER (EXPRESS)' AND payment_method = 'WALLET' THEN COALESCE(order_completed_datetime, DATEADD(minute, 206, new_order_approved_datetime)) - WHEN order_created_datetime >= '2023-01-01' AND service_type = '1 DAY TRANSFER' AND payment_method = 'CHEQUE' + WHEN order_created_datetime >= '2023-01-01' AND service_type = 'BANK TRANSFER (EXPRESS)' AND payment_method = 'CHEQUE' THEN order_completed_datetime - WHEN order_created_datetime >= '2023-01-01' AND service_type = '1 DAY TRANSFER' AND payment_method = 'PAYMENT_GATEWAY' + WHEN order_created_datetime >= '2023-01-01' AND service_type = 'BANK TRANSFER (EXPRESS)' AND payment_method = 'PAYMENT_GATEWAY' THEN COALESCE(order_completed_datetime, DATEADD(minute, 214.5, new_order_approved_datetime)) /* - Imputation for order_approved_datetime for 3 days transfer + Imputation for order_approved_datetime for BANK TRANSFER (SAVER) - If payment_method is 'cash', add median of 2702 minute to order_approved datetime - If payment_method is 'wallet', add median of 4502.92 minute to order_approved datetime - If payment_method is 'cheque', reuse order_completed datetime, all orders have completed datetime - If payment_method is 'payment_gateway', add median of 5253 minute to order_approved datetime */ - WHEN order_created_datetime >= '2023-01-01' AND service_type = '3 DAYS TRANSFER' AND payment_method = 'CASH' + WHEN order_created_datetime >= '2023-01-01' AND service_type = 'BANK TRANSFER (SAVER)' AND payment_method = 'CASH' THEN COALESCE(order_completed_datetime, DATEADD(minute, 2702, new_order_approved_datetime)) - WHEN order_created_datetime >= '2023-01-01' AND service_type = '3 DAYS TRANSFER' AND payment_method = 'WALLET' + WHEN order_created_datetime >= '2023-01-01' AND service_type = 'BANK TRANSFER (SAVER)' AND payment_method = 'WALLET' THEN COALESCE(order_completed_datetime, DATEADD(minute, 4502.92, new_order_approved_datetime)) - WHEN order_created_datetime >= '2023-01-01' AND service_type = '3 DAYS TRANSFER' AND payment_method = 'CHEQUE' + WHEN order_created_datetime >= '2023-01-01' AND service_type = 'BANK TRANSFER (SAVER)' AND payment_method = 'CHEQUE' THEN order_completed_datetime - WHEN order_created_datetime >= '2023-01-01' AND service_type = '3 DAYS TRANSFER' AND payment_method = 'PAYMENT_GATEWAY' + WHEN order_created_datetime >= '2023-01-01' AND service_type = 'BANK TRANSFER (SAVER)' AND payment_method = 'PAYMENT_GATEWAY' THEN COALESCE(order_completed_datetime, DATEADD(minute, 5253, new_order_approved_datetime)) END AS new_order_completed_datetime