diff --git a/ee/app/services/dora/aggregate_metrics_service.rb b/ee/app/services/dora/aggregate_metrics_service.rb index 5e71787d8b211bb0c55a3510cad329663b1ae972..0c73054d4222ce67f8a748f3d32b20c56b1bfb21 100644 --- a/ee/app/services/dora/aggregate_metrics_service.rb +++ b/ee/app/services/dora/aggregate_metrics_service.rb @@ -62,7 +62,7 @@ def validate return error(_('The start date must be ealier than the end date.'), :bad_request) end - if group_project_ids.present? && !group? + if group_project_ids.present? && !group_container? return error(_('The group_project_ids parameter is only allowed for a group'), :bad_request) end @@ -89,9 +89,9 @@ def environments end def target_projects - if project? + if project_container? [container] - elsif group? + elsif group_container? # The actor definitely has read permission in all subsequent projects of the group by the following reasons: # - DORA metrics can be read by reporter (or above) at project-level. # - With `read_dora4_analytics` permission check, we make sure that the @@ -105,14 +105,6 @@ def target_projects end end - def project? - container.is_a?(Project) - end - - def group? - container.is_a?(Group) - end - def start_date params[:start_date] || 3.months.ago.to_date end