Updated model

models/reporting/core/core__new_dash_services_offered.sql

@@ -13,11 +13,17 @@ select
     number_active_accommodations as number_active_accommodations,
     number_inactive_accommodations as number_inactive_accommodations,
     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_incomplete_information_bookings as number_incomplete_information_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_not_approved_bookings as number_not_approved_bookings,
-    number_rejected_bookings as number_rejected_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
 from int_core__new_dash_services_offered

models/reporting/core/schema.yml

@@ -1579,19 +1579,6 @@ models:
         description: "The name of the New Dash service."
         data_tests:
           - not_null
-          - accepted_values:
-              values:
-                - "BASIC SCREENING"
-                - "SCREENING PLUS"
-                - "ID VERIFICATION"
-                - "SEX OFFENDERS CHECK"
-                - "BASIC DAMAGE DEPOSIT"
-                - "BASIC WAIVER"
-                - "WAIVER PLUS"
-                - "WAIVER PRO"
-                - "BASIC PROTECTION"
-                - "PROTECTION PLUS"
-                - "PROTECTION PRO"
 
       - name: number_users
         data_type: bigint
@@ -1640,47 +1627,57 @@ models:
         data_type: bigint
         description: "Number of bookings that have a bundle that considers this service."
 
-      - name: number_approved_bookings
+      - name: number_protected_bookings
         data_type: bigint
-        description:
-          "Number of bookings that have a bundle that considers this service and
-          are approved."
-
-      - name: number_cancelled_bookings
-        data_type: bigint
-        description:
-          "Number of bookings that have a bundle that considers this service and
-          are cancelled."
-
-      - name: number_flagged_bookings
-        data_type: bigint
-        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."
+        description: "Number of bookings with status PROTECTED for this service."
 
       - name: number_rejected_bookings
         data_type: bigint
-        description:
-          "Number of bookings that have a bundle that considers this service and
-          are rejected."
+        description: "Number of bookings with status REJECTED for this service."
+
+      - name: number_no_checks_bookings
+        data_type: bigint
+        description: "Number of bookings with status NO CHECKS for this service."
+
+      - name: number_no_flags_bookings
+        data_type: bigint
+        description: "Number of bookings with status NO FLAGS for this service."
+
+      - name: number_paid_bookings
+        data_type: bigint
+        description: "Number of bookings with status PAID for this service."
+
+      - name: number_pending_bookings
+        data_type: bigint
+        description: "Number of bookings with status PENDING for this service."
+
+      - name: number_unknown_status_bookings
+        data_type: bigint
+        description: "Number of bookings with unknown status for this service."
+
+      - name: number_partially_protected_bookings
+        data_type: bigint
+        description: "Number of bookings with status PARTIALLY PROTECTED for this service."
+
+      - name: number_not_protected_bookings
+        data_type: bigint
+        description: "Number of bookings with status NOT PROTECTED for this service."
+
+      - name: number_not_paid_bookings
+        data_type: bigint
+        description: "Number of bookings with status NOT PAID for this service."
+
+      - name: number_confirmed_bookings
+        data_type: bigint
+        description: "Number of bookings with status CONFIRMED for this service."
+
+      - name: number_for_review_bookings
+        data_type: bigint
+        description: "Number of bookings with status FOR REVIEW for this service."
+
+      - name: number_flagged_bookings
+        data_type: bigint
+        description: "Number of bookings with status FLAGGED for this service."
 
   - name: core__payments
     description: |