Merge branch '39-count-unique-users-for-more-accurate-smau-reporting-package' into 'master'

Count unique users for more accurate SMAU reporting - Package

See merge request !17256

ee/app/models/ee/project.rb

@@ -122,6 +122,7 @@ module Project
       scope :with_active_prometheus_service, -> { joins(:prometheus_service).merge(PrometheusService.active) }
       scope :with_enabled_error_tracking, -> { joins(:error_tracking_setting).where(project_error_tracking_settings: { enabled: true }) }
       scope :with_tracing_enabled, -> { joins(:tracing_setting) }
+      scope :with_packages, -> { joins(:packages) }
 
       delegate :shared_runners_minutes, :shared_runners_seconds, :shared_runners_seconds_last_reset,
         to: :statistics, allow_nil: true

ee/lib/ee/gitlab/usage_data.rb

@@ -186,6 +186,7 @@ def usage_activity_by_stage
               create: usage_activity_by_stage_create,
               manage: usage_activity_by_stage_manage,
               monitor: usage_activity_by_stage_monitor,
+              package: usage_activity_by_stage_package,
               plan: usage_activity_by_stage_plan,
               verify: usage_activity_by_stage_verify
             }
@@ -229,6 +230,12 @@ def usage_activity_by_stage_monitor
           }
         end
 
+        def usage_activity_by_stage_package
+          {
+            projects_with_packages: ::Project.with_packages.distinct_count_by(:creator_id)
+          }
+        end
+
         # Omitted because no user, creator or author associated: `boards`, `labels`, `milestones`, `uploads`
         # Omitted because too expensive: `epics_deepest_relationship_level`
         # Omitted because of encrypted properties: `projects_jira_cloud_active`, `projects_jira_server_active`

ee/spec/lib/ee/gitlab/usage_data_spec.rb

@@ -107,6 +107,16 @@
         end
       end
 
+      context 'for package' do
+        it 'includes accurate usage_activity_by_stage data' do
+          create(:project, packages: [create(:package)] )
+
+          expect(described_class.uncached_data[:usage_activity_by_stage][:package]).to eq(
+            projects_with_packages: 1
+          )
+        end
+      end
+
       context 'for plan' do
         it 'includes accurate usage_activity_by_stage data' do
           stub_licensed_features(board_assignee_lists: true, board_milestone_lists: true)