Merge branch...

Merge branch 'fj-225615-add-flag-to-update-namespace-statistics-after-snippets-update' into 'master'

Add feature flag to update namespace statistics after snippets update

See merge request gitlab-org/gitlab!35835

app/models/project_statistics.rb

@@ -14,6 +14,7 @@ class ProjectStatistics < ApplicationRecord
   COLUMNS_TO_REFRESH = [:repository_size, :wiki_size, :lfs_objects_size, :commit_count, :snippets_size].freeze
   INCREMENTABLE_COLUMNS = { build_artifacts_size: %i[storage_size], packages_size: %i[storage_size] }.freeze
   NAMESPACE_RELATABLE_COLUMNS = [:repository_size, :wiki_size, :lfs_objects_size].freeze
+  FLAGGED_NAMESPACE_RELATABLE_COLUMNS = [*NAMESPACE_RELATABLE_COLUMNS, :snippets_size].freeze
 
   scope :for_project_ids, ->(project_ids) { where(project_id: project_ids) }
 
@@ -31,7 +32,7 @@ class ProjectStatistics < ApplicationRecord
       end
     end
 
-    if only.empty? || only.any? { |column| NAMESPACE_RELATABLE_COLUMNS.include?(column) }
+    if only.empty? || only.any? { |column| namespace_relatable_columns.include?(column) }
       schedule_namespace_aggregation_worker
     end
 
@@ -110,6 +111,10 @@ class ProjectStatistics < ApplicationRecord
       Namespaces::ScheduleAggregationWorker.perform_async(project.namespace_id)
     end
   end
+
+  def namespace_relatable_columns
+    Feature.enabled?(:namespace_snippets_size_stat) ? FLAGGED_NAMESPACE_RELATABLE_COLUMNS : NAMESPACE_RELATABLE_COLUMNS
+  end
 end
 
 ProjectStatistics.prepend_if_ee('EE::ProjectStatistics')

spec/models/project_statistics_spec.rb

@@ -189,6 +189,26 @@ RSpec.describe ProjectStatistics do
           statistics.refresh!
         end
       end
+
+      context 'when snippets_size is updated' do
+        it 'schedules the aggregation worker' do
+          expect(Namespaces::ScheduleAggregationWorker)
+            .to receive(:perform_async)
+
+          statistics.refresh!(only: [:snippets_size])
+        end
+
+        context 'when feature flag :namespace_snippets_size_stat is disabled' do
+          it 'does not schedules an aggregation worker' do
+            stub_feature_flags(namespace_snippets_size_stat: false)
+
+            expect(Namespaces::ScheduleAggregationWorker)
+              .not_to receive(:perform_async)
+
+            statistics.refresh!(only: [:snippets_size])
+          end
+        end
+      end
     end
 
     context 'when the column is not namespace relatable' do