From e241c89977c32fabbbe5a49c1ba69564d5e09e31 Mon Sep 17 00:00:00 2001 From: sujay patel Date: Thu, 13 Jun 2019 01:33:21 +0530 Subject: Adding order by to list runner jobs api. --- app/finders/runner_jobs_finder.rb | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'app/finders') diff --git a/app/finders/runner_jobs_finder.rb b/app/finders/runner_jobs_finder.rb index f1ee1d38255..ef90817416a 100644 --- a/app/finders/runner_jobs_finder.rb +++ b/app/finders/runner_jobs_finder.rb @@ -3,7 +3,7 @@ class RunnerJobsFinder attr_reader :runner, :params - ALLOWED_INDEXED_COLUMNS = %w[id created_at].freeze + ALLOWED_INDEXED_COLUMNS = %w[id].freeze def initialize(runner, params = {}) @runner = runner @@ -28,13 +28,10 @@ class RunnerJobsFinder # rubocop: disable CodeReuse/ActiveRecord def sort_items(items) - order_by = if ALLOWED_INDEXED_COLUMNS.include?(params[:order_by]) - params[:order_by] - else - :id - end + return items unless ALLOWED_INDEXED_COLUMNS.include?(params[:order_by]) - sort = if params[:sort] =~ /\A(ASC|DESC)\z/i + order_by = params[:order_by] + sort = if /\A(ASC|DESC)\z/i.match?(params[:sort]) params[:sort] else :desc -- cgit v1.2.1