changed naming

models/intermediate/core/int_core__new_dash_services_offered.sql

@@ -56,7 +56,7 @@ with
                     then bs.id_user_host
                     else null
                 end
-            ) as number_active_users
+            ) as number_users_with_service_applied_in_accommodation
         from bundle_services bs
         left join
             int_core__accommodation_to_product_bundle apb
@@ -157,7 +157,9 @@ select
     u.service_display_name,
     u.number_users,
     u.number_active_users,
-    u.number_users - u.number_active_users as number_inactive_users,
+    u.number_users
+    - u.number_users_with_service_applied_in_accommodation
+    as number_users_without_service_applied_in_accommodation,
     a.number_accommodations,
     a.number_active_accommodations,
     a.number_inactive_accommodations,

models/intermediate/core/schema.yml

@@ -5263,7 +5263,7 @@ models:
           that the service is active or used. Each user can associate any of their
           bundles with any of their accommodations."
 
-      - name: number_active_users
+      - name: number_users_with_service_applied_in_accommodation
         data_type: bigint
         description:
           "Number of user accounts that have a bundle that considers this service
@@ -5271,7 +5271,7 @@ models:
           In other words there is at least one active accommodation that offers
           this service for this number of users."
 
-      - name: number_inactive_users
+      - name: number_users_without_service_applied_in_accommodation
         data_type: bigint
         description:
           "Number of user accounts that have a bundle that considers this service

models/reporting/core/core__new_dash_services_offered.sql

@@ -5,8 +5,10 @@ with
 select
     service_display_name as service_display_name,
     number_users as number_users,
-    number_active_users as number_active_users,
-    number_inactive_users as number_inactive_users,
+    number_users_with_service_applied_in_accommodation
+    as number_users_with_service_applied_in_accommodation,
+    number_users_without_service_applied_in_accommodation
+    as number_users_without_service_applied_in_accommodation,
     number_accommodations as number_accommodations,
     number_active_accommodations as number_active_accommodations,
     number_inactive_accommodations as number_inactive_accommodations,

models/reporting/core/schema.yml

@@ -1601,7 +1601,7 @@ models:
           that the service is active or used. Each user can associate any of their
           bundles with any of their accommodations."
 
-      - name: number_active_users
+      - name: number_users_with_service_applied_in_accommodation
         data_type: bigint
         description:
           "Number of user accounts that have a bundle that considers this service
@@ -1609,7 +1609,7 @@ models:
           In other words there is at least one active accommodation that offers
           this service for this number of users."
 
-      - name: number_inactive_users
+      - name: number_users_without_service_applied_in_accommodation
         data_type: bigint
         description:
           "Number of user accounts that have a bundle that considers this service