diff options
Diffstat (limited to 'app/finders/ci/jobs_finder.rb')
-rw-r--r-- | app/finders/ci/jobs_finder.rb | 55 |
1 files changed, 49 insertions, 6 deletions
diff --git a/app/finders/ci/jobs_finder.rb b/app/finders/ci/jobs_finder.rb index 2169bf8c53e..8515b77ec0b 100644 --- a/app/finders/ci/jobs_finder.rb +++ b/app/finders/ci/jobs_finder.rb @@ -4,31 +4,38 @@ module Ci class JobsFinder include Gitlab::Allowable - def initialize(current_user:, project: nil, params: {}) + def initialize(current_user:, pipeline: nil, project: nil, params: {}, type: ::Ci::Build) + @pipeline = pipeline @current_user = current_user @project = project @params = params + @type = type + raise ArgumentError 'type must be a subclass of Ci::Processable' unless type < ::Ci::Processable end def execute builds = init_collection.order_id_desc filter_by_scope(builds) rescue Gitlab::Access::AccessDeniedError - Ci::Build.none + type.none end private - attr_reader :current_user, :project, :params + attr_reader :current_user, :pipeline, :project, :params, :type def init_collection - project ? project_builds : all_builds + if Feature.enabled?(:ci_jobs_finder_refactor) + pipeline_jobs || project_jobs || all_jobs + else + project ? project_builds : all_jobs + end end - def all_builds + def all_jobs raise Gitlab::Access::AccessDeniedError unless current_user&.admin? - Ci::Build.all + type.all end def project_builds @@ -37,7 +44,25 @@ module Ci project.builds.relevant end + def project_jobs + return unless project + raise Gitlab::Access::AccessDeniedError unless can?(current_user, :read_build, project) + + jobs_by_type(project, type).relevant + end + + def pipeline_jobs + return unless pipeline + raise Gitlab::Access::AccessDeniedError unless can?(current_user, :read_build, pipeline) + + jobs_by_type(pipeline, type).latest + end + def filter_by_scope(builds) + if Feature.enabled?(:ci_jobs_finder_refactor) + return filter_by_statuses!(params[:scope], builds) if params[:scope].is_a?(Array) + end + case params[:scope] when 'pending' builds.pending.reverse_order @@ -49,5 +74,23 @@ module Ci builds end end + + def filter_by_statuses!(statuses, builds) + unknown_statuses = params[:scope] - ::CommitStatus::AVAILABLE_STATUSES + raise ArgumentError, 'Scope contains invalid value(s)' unless unknown_statuses.empty? + + builds.where(status: params[:scope]) # rubocop: disable CodeReuse/ActiveRecord + end + + def jobs_by_type(relation, type) + case type.name + when ::Ci::Build.name + relation.builds + when ::Ci::Bridge.name + relation.bridges + else + raise ArgumentError, "finder does not support #{type} type" + end + end end end |