foreman-tasks 0.17.4 → 0.17.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d2cab32dfa0f863a101a5d4e6edfe28bc25c5f76c4fac5718856de5a7a4c489
-  data.tar.gz: 1ecc4c1acc4f1b02a7915602a6248b0b0523ff678f60e7d2b51020c3182996a4
+  metadata.gz: 643cb1c2534982870c1596b11ae870ac9b2ae0bd044a7a8478860bc81cb3ef6f
+  data.tar.gz: 8af310f891f2a938f687ddb0cbc8f6bc1a0aa89b2c81302e544c20b113bc4979
 SHA512:
-  metadata.gz: a6e35951542561fa3adff4efd4e92f519b0d4b723599d587bcb29b0575f1f46aa941c76500b91c71749478888615f0eacd4e11a1f170e92cd06a2dbdf7733ae3
-  data.tar.gz: bad6ba1e5959c8b8ab28e4461f36e0a1294bfc286c333b60e575ae7c2df12a92a8ebaabb27a5843012f4378bf64687b1d26f9f7ea7ec3b6347d0c3c8985d38d0
+  metadata.gz: 1695ffe92d34e48a3d06120aff778d46f3b522203b603421260eb86bb3368af5d3ec3b159168bcd0e14b309eb222512511921ce5c9a2af8ddcb727a15e234e64
+  data.tar.gz: 874641b33c524355abca31cf1d9016ff02ab51bf72a8efdc7893e1ec66baf0aab749c18f5f73723d87b44efd848dac45813beb4e2c7e8a4bd49f5ad593b9dac8

data/app/controllers/foreman_tasks/api/tasks_controller.rb

@@ -238,9 +238,10 @@ module ForemanTasks
 
       def ordering_scope(scope, ordering_params)
         sort_by = ordering_params[:sort_by] || 'started_at'
+        sort_by = 'foreman_tasks_tasks.' + sort_by if sort_by == 'started_at'
         sort_order = ordering_params[:sort_order] || 'DESC'
         scope = scope.select("*, coalesce(ended_at, current_timestamp) - coalesce(coalesce(started_at, ended_at), current_timestamp) as duration")
-        scope.order(sort_by => sort_order)
+        scope.order("#{sort_by} #{sort_order}")
       end
 
       def task_hash(task)

data/lib/foreman_tasks/version.rb

@@ -1,3 +1,3 @@
 module ForemanTasks
-  VERSION = '0.17.4'.freeze
+  VERSION = '0.17.5'.freeze
 end

data/test/controllers/api/tasks_controller_test.rb

@@ -12,8 +12,8 @@ module ForemanTasks
       end
 
       describe 'GET /api/tasks' do
+        before { FactoryBot.create_list(:dynflow_task, 5, :user_create_task) }
         it 'lists all tasks with default sorting' do
-          FactoryBot.create_list(:dynflow_task, 5, :user_create_task)
           get :index
           assert_response :success
           data = JSON.parse(response.body)
@@ -21,12 +21,19 @@ module ForemanTasks
         end
 
         it 'supports searching' do
-          FactoryBot.create_list(:dynflow_task, 5, :user_create_task)
           get :index, params: { :search => 'label = Actions::User::Create' }
           assert_response :success
           data = JSON.parse(response.body)
           _(data['results'].count).must_equal 5
         end
+
+        it 'supports ordering by duration' do
+          get :index, params: { :sort_by => 'duration' }
+          assert_response :success
+          data = JSON.parse(response.body)
+          _(data.dig('sort', 'by')).must_equal 'duration'
+          _(data['results'].count).must_equal 5
+        end
       end
 
       describe 'GET /api/tasks/show' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman-tasks
 version: !ruby/object:Gem::Version
-  version: 0.17.4
+  version: 0.17.5
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-05 00:00:00.000000000 Z
+date: 2019-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman-tasks-core