Addressed comments

models/reporting/core/core__new_dash_services_offered.sql

@@ -13,17 +13,30 @@ select
     number_active_accommodations as number_active_accommodations,
     number_inactive_accommodations as number_inactive_accommodations,
     number_bookings as number_bookings,
-    number_protected_bookings as number_protected_bookings,
-    number_rejected_bookings as number_rejected_bookings,
-    number_no_checks_bookings as number_no_checks_bookings,
-    number_no_flags_bookings as number_no_flags_bookings,
-    number_paid_bookings as number_paid_bookings,
-    number_pending_bookings as number_pending_bookings,
-    number_unknown_status_bookings as number_unknown_status_bookings,
-    number_partially_protected_bookings as number_partially_protected_bookings,
-    number_not_protected_bookings as number_not_protected_bookings,
-    number_not_paid_bookings as number_not_paid_bookings,
-    number_confirmed_bookings as number_confirmed_bookings,
-    number_for_review_bookings as number_for_review_bookings,
-    number_flagged_bookings as number_flagged_bookings
+    number_bookings_with_service_status_protected
+    as number_bookings_with_service_status_protected,
+    number_bookings_with_service_status_rejected
+    as number_bookings_with_service_status_rejected,
+    number_bookings_with_service_status_no_checks
+    as number_bookings_with_service_status_no_checks,
+    number_bookings_with_service_status_no_flags
+    as number_bookings_with_service_status_no_flags,
+    number_bookings_with_service_status_paid
+    as number_bookings_with_service_status_paid,
+    number_bookings_with_service_status_pending
+    as number_bookings_with_service_status_pending,
+    number_bookings_with_service_status_unknown_status
+    as number_bookings_with_service_status_unknown_status,
+    number_bookings_with_service_status_partially_protected
+    as number_bookings_with_service_status_partially_protected,
+    number_bookings_with_service_status_not_protected
+    as number_bookings_with_service_status_not_protected,
+    number_bookings_with_service_status_not_paid
+    as number_bookings_with_service_status_not_paid,
+    number_bookings_with_service_status_confirmed
+    as number_bookings_with_service_status_confirmed,
+    number_bookings_with_service_status_for_review
+    as number_bookings_with_service_status_for_review,
+    number_bookings_with_service_status_flagged
+    as number_bookings_with_service_status_flagged
 from int_core__new_dash_services_offered

models/reporting/core/schema.yml

@@ -1627,55 +1627,55 @@ models:
         data_type: bigint
         description: "Number of bookings that have a bundle that considers this service."
 
-      - name: number_protected_bookings
+      - name: number_bookings_with_service_status_protected
         data_type: bigint
         description: "Number of bookings with status PROTECTED for this service."
 
-      - name: number_rejected_bookings
+      - name: number_bookings_with_service_status_rejected
         data_type: bigint
         description: "Number of bookings with status REJECTED for this service."
 
-      - name: number_no_checks_bookings
+      - name: number_bookings_with_service_status_no_checks
         data_type: bigint
         description: "Number of bookings with status NO CHECKS for this service."
 
-      - name: number_no_flags_bookings
+      - name: number_bookings_with_service_status_no_flags
         data_type: bigint
         description: "Number of bookings with status NO FLAGS for this service."
 
-      - name: number_paid_bookings
+      - name: number_bookings_with_service_status_paid
         data_type: bigint
         description: "Number of bookings with status PAID for this service."
 
-      - name: number_pending_bookings
+      - name: number_bookings_with_service_status_pending
         data_type: bigint
         description: "Number of bookings with status PENDING for this service."
 
-      - name: number_unknown_status_bookings
+      - name: number_bookings_with_service_status_unknown
         data_type: bigint
         description: "Number of bookings with unknown status for this service."
 
-      - name: number_partially_protected_bookings
+      - name: number_bookings_with_service_status_partially_protected
         data_type: bigint
         description: "Number of bookings with status PARTIALLY PROTECTED for this service."
 
-      - name: number_not_protected_bookings
+      - name: number_bookings_with_service_status_not_protected
         data_type: bigint
         description: "Number of bookings with status NOT PROTECTED for this service."
 
-      - name: number_not_paid_bookings
+      - name: number_bookings_with_service_status_not_paid
         data_type: bigint
         description: "Number of bookings with status NOT PAID for this service."
 
-      - name: number_confirmed_bookings
+      - name: number_bookings_with_service_status_confirmed
         data_type: bigint
         description: "Number of bookings with status CONFIRMED for this service."
 
-      - name: number_for_review_bookings
+      - name: number_bookings_with_service_status_for_review
         data_type: bigint
         description: "Number of bookings with status FOR REVIEW for this service."
 
-      - name: number_flagged_bookings
+      - name: number_bookings_with_service_status_flagged
         data_type: bigint
         description: "Number of bookings with status FLAGGED for this service."