From 83e8723d7dfc25a53847e314f7e7d8df6abdf557 Mon Sep 17 00:00:00 2001 From: Joaquin Ossa Date: Wed, 12 Feb 2025 09:07:47 +0100 Subject: [PATCH 1/3] commit wip --- dbt_project.yml | 4 ++ .../int_core__new_dash_services_offered.sql | 39 ++++++++++++++++++- 2 files changed, 41 insertions(+), 2 deletions(-) diff --git a/dbt_project.yml b/dbt_project.yml index 6123400..7ecc869 100644 --- a/dbt_project.yml +++ b/dbt_project.yml @@ -76,6 +76,10 @@ vars: "cancelled_booking_state": "'CANCELLED'" "approved_booking_state": "'APPROVED'" "flagged_booking_state": "'FLAGGED'" + "incomplete_information_booking_state": "'INCOMPLETE INFORMATION'" + "no_flags_booking_state": "'NO FLAGS'" + "not_approved_booking_state": "'NOT APPROVED'" + "rejected_booking_state": "'REJECTED'" # Payment state variables # States should be strings in capital letters. Models need to force an upper() diff --git a/models/intermediate/core/int_core__new_dash_services_offered.sql b/models/intermediate/core/int_core__new_dash_services_offered.sql index fd747bd..c419cb0 100644 --- a/models/intermediate/core/int_core__new_dash_services_offered.sql +++ b/models/intermediate/core/int_core__new_dash_services_offered.sql @@ -96,7 +96,38 @@ with then bpb.id_booking else null end - ) as number_flagged_bookings + ) as number_flagged_bookings, + count( + distinct case + when + upper(b.booking_state) + = {{ var("incomplete_information_booking_state") }} + then bpb.id_booking + else null + end + ) as incomplete_information_bookings, + count( + distinct case + when upper(b.booking_state) = {{ var("no_flags_booking_state") }} + then bpb.id_booking + else null + end + ) as no_flags_bookings, + count( + distinct case + when + upper(b.booking_state) = {{ var("not_approved_booking_state") }} + then bpb.id_booking + else null + end + ) as not_approved_bookings, + count( + distinct case + when upper(b.booking_state) = {{ var("rejected_booking_state") }} + then bpb.id_booking + else null + end + ) as rejected_bookings from bundle_services bs left join int_core__booking_to_product_bundle bpb @@ -116,7 +147,11 @@ select b.number_bookings, b.number_approved_bookings, b.number_cancelled_bookings, - b.number_flagged_bookings + b.number_flagged_bookings, + b.incomplete_information_bookings, + b.no_flags_bookings, + b.not_approved_bookings, + b.rejected_bookings from users u left join accommodations a on u.service_display_name = a.service_display_name left join bookings b on u.service_display_name = b.service_display_name From 0866b2bf9d41bc0ea2581013ea73a7d296245395 Mon Sep 17 00:00:00 2001 From: Joaquin Ossa Date: Wed, 12 Feb 2025 09:09:16 +0100 Subject: [PATCH 2/3] added all booking states --- models/intermediate/core/schema.yml | 25 +++++++++++++++++++ .../core/core__new_dash_services_offered.sql | 6 ++++- models/reporting/core/schema.yml | 25 +++++++++++++++++++ 3 files changed, 55 insertions(+), 1 deletion(-) diff --git a/models/intermediate/core/schema.yml b/models/intermediate/core/schema.yml index 25d8539..05f7141 100644 --- a/models/intermediate/core/schema.yml +++ b/models/intermediate/core/schema.yml @@ -5302,6 +5302,31 @@ models: description: "Number of bookings that have a bundle that considers this service and are flagged." + + - name: number_incomplete_information_bookings + data_type: bigint + description: + "Number of bookings that have a bundle that considers this service and + have incomplete information." + + - name: number_no_flags_bookings + data_type: bigint + description: + "Number of bookings that have a bundle that considers this service and + have no flags." + + - name: number_not_approved_bookings + data_type: bigint + description: + "Number of bookings that have a bundle that considers this service and + are not approved." + + - name: number_rejected_bookings + data_type: bigint + description: + "Number of bookings that have a bundle that considers this service and + are rejected." + - name: int_core__payments description: | A table holding payment details for guest journeys, including amounts in both diff --git a/models/reporting/core/core__new_dash_services_offered.sql b/models/reporting/core/core__new_dash_services_offered.sql index 78e870f..7b4b228 100644 --- a/models/reporting/core/core__new_dash_services_offered.sql +++ b/models/reporting/core/core__new_dash_services_offered.sql @@ -11,5 +11,9 @@ select number_bookings as number_bookings, number_approved_bookings as number_approved_bookings, number_cancelled_bookings as number_cancelled_bookings, - number_flagged_bookings as number_flagged_bookings + number_flagged_bookings as number_flagged_bookings, + incomplete_information_bookings as incomplete_information_bookings, + no_flags_bookings as no_flags_bookings, + not_approved_bookings as not_approved_bookings, + rejected_bookings as rejected_bookings from int_core__new_dash_services_offered diff --git a/models/reporting/core/schema.yml b/models/reporting/core/schema.yml index 1f30ed7..b3aff9c 100644 --- a/models/reporting/core/schema.yml +++ b/models/reporting/core/schema.yml @@ -1640,6 +1640,31 @@ models: description: "Number of bookings that have a bundle that considers this service and are flagged." + + - name: number_incomplete_information_bookings + data_type: bigint + description: + "Number of bookings that have a bundle that considers this service and + have incomplete information." + + - name: number_no_flags_bookings + data_type: bigint + description: + "Number of bookings that have a bundle that considers this service and + have no flags." + + - name: number_not_approved_bookings + data_type: bigint + description: + "Number of bookings that have a bundle that considers this service and + are not approved." + + - name: number_rejected_bookings + data_type: bigint + description: + "Number of bookings that have a bundle that considers this service and + are rejected." + - name: core__payments description: | A table holding payment details for guest journeys, including amounts in both From aa840aedd07c334ee556aca5c281d961522e32f5 Mon Sep 17 00:00:00 2001 From: Joaquin Ossa Date: Wed, 12 Feb 2025 09:24:53 +0100 Subject: [PATCH 3/3] fixed naming --- .../core/int_core__new_dash_services_offered.sql | 16 ++++++++-------- .../core/core__new_dash_services_offered.sql | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/models/intermediate/core/int_core__new_dash_services_offered.sql b/models/intermediate/core/int_core__new_dash_services_offered.sql index c419cb0..fe604cc 100644 --- a/models/intermediate/core/int_core__new_dash_services_offered.sql +++ b/models/intermediate/core/int_core__new_dash_services_offered.sql @@ -105,14 +105,14 @@ with then bpb.id_booking else null end - ) as incomplete_information_bookings, + ) as number_incomplete_information_bookings, count( distinct case when upper(b.booking_state) = {{ var("no_flags_booking_state") }} then bpb.id_booking else null end - ) as no_flags_bookings, + ) as number_no_flags_bookings, count( distinct case when @@ -120,14 +120,14 @@ with then bpb.id_booking else null end - ) as not_approved_bookings, + ) as number_not_approved_bookings, count( distinct case when upper(b.booking_state) = {{ var("rejected_booking_state") }} then bpb.id_booking else null end - ) as rejected_bookings + ) as number_rejected_bookings from bundle_services bs left join int_core__booking_to_product_bundle bpb @@ -148,10 +148,10 @@ select b.number_approved_bookings, b.number_cancelled_bookings, b.number_flagged_bookings, - b.incomplete_information_bookings, - b.no_flags_bookings, - b.not_approved_bookings, - b.rejected_bookings + b.number_incomplete_information_bookings, + b.number_no_flags_bookings, + b.number_not_approved_bookings, + b.number_rejected_bookings from users u left join accommodations a on u.service_display_name = a.service_display_name left join bookings b on u.service_display_name = b.service_display_name diff --git a/models/reporting/core/core__new_dash_services_offered.sql b/models/reporting/core/core__new_dash_services_offered.sql index 7b4b228..292d303 100644 --- a/models/reporting/core/core__new_dash_services_offered.sql +++ b/models/reporting/core/core__new_dash_services_offered.sql @@ -12,8 +12,8 @@ select number_approved_bookings as number_approved_bookings, number_cancelled_bookings as number_cancelled_bookings, number_flagged_bookings as number_flagged_bookings, - incomplete_information_bookings as incomplete_information_bookings, - no_flags_bookings as no_flags_bookings, - not_approved_bookings as not_approved_bookings, - rejected_bookings as rejected_bookings + number_incomplete_information_bookings as number_incomplete_information_bookings, + number_no_flags_bookings as number_no_flags_bookings, + number_not_approved_bookings as number_not_approved_bookings, + number_rejected_bookings as number_rejected_bookings from int_core__new_dash_services_offered