Merge branch '384551-fix-vsa-dora-metrics-classes' into 'master'

Pass the correct container object for DORA metrics

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/111916



Merged-by: Pavel Shutsin <pshutsin@gitlab.com>
Approved-by: Serena Fang <sfang@gitlab.com>
Approved-by: Pavel Shutsin <pshutsin@gitlab.com>
Reviewed-by: Serena Fang <sfang@gitlab.com>
Co-authored-by: Adam Hegyi <ahegyi@gitlab.com>

ee/lib/gitlab/analytics/cycle_analytics/summary/base_dora_summary.rb

@@ -48,7 +48,7 @@ def dora_metric
             params[:group_project_ids] = options[:projects] if options[:projects].present?
             Dora::AggregateMetricsService.new(
-              container: stage.parent,
+              container: container,
               current_user: current_user,
               params: params
             ).execute
@@ -61,6 +61,10 @@ def convert_to_days(seconds)
             Gitlab::CycleAnalytics::Summary::Value::Numeric.new(days)
           end
+
+          def container
+            stage.namespace.is_a?(Namespaces::ProjectNamespace) ? stage.namespace.project : stage.namespace
+          end
         end
       end
     end

ee/spec/lib/gitlab/analytics/cycle_analytics/summary/lead_time_for_changes_spec.rb

@@ -15,6 +15,23 @@
   subject(:result) { described_class.new(stage: stage, current_user: user, options: options).value }
+  context 'when ProjectNamespace based stage is given' do
+    let(:user)  { create(:user) }
+    let(:group) { create(:group).tap { |g| g.add_developer(user) } }
+    let(:project) { create(:project, group: group) }
+    let(:stage) { build(:cycle_analytics_stage, project: project) }
+
+    subject(:result) { described_class.new(stage: stage, current_user: user, options: options).value }
+
+    before do
+      stub_licensed_features(dora4_analytics: true)
+    end
+
+    it 'returns none value' do
+      expect(result.to_s).to eq('-')
+    end
+  end
+
   context 'when the DORA service returns non-successful status' do
     it 'returns nil' do
       expect_next_instance_of(Dora::AggregateMetricsService) do |service|