foreman-tasks 4.0.0 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bded348bac199b96bf0c1bf458c0785cdc233892acc1a5d06a940a8c5b28309b
-  data.tar.gz: f90eaf365ebfb191b45ab12b4693c7253d829ffcf0c57192e8bb4c1fa3e51986
+  metadata.gz: 9bb66102c3571249534dc929d2f1515666d393d4d9f7987c098e529849bfeca7
+  data.tar.gz: 01c53850b401aaf7c50f4807a5947956bdfe0fa99582c778bd615fba922286f9
 SHA512:
-  metadata.gz: 41d60c3a188d66c0f7f3e9982c72de16f323d458529e2b90a16e8c023733acaedcf94a09ae30e94e54a66f4303f0b904a06d54c33b6db2af3acf49669c8b8b0f
-  data.tar.gz: b0ec169bf37128b471263c189b839416d8ae572a69732d3a9d4dcb64d4e2cdf2aef53d423cb2a7eef1c5f50f0756d332066dc9a244788f2b8c05643e1ca73b0f
+  metadata.gz: bc272bf14fd55504672179272d3b26123b0d3c68cc6ddd97a8181bf9cfc1dd257e809501b9cb4d94cfe5730e8098c2fa0232fe26b35d227921520a66d976ae39
+  data.tar.gz: 4b264080240f04e2544af9d026026df2c70f126f4168cef1f74a21fd0d810c21b7696f8fc7520c107d4402ea5bfad0762c75c93d6679c841e406e4d0898c23bd

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

@@ -253,10 +253,7 @@ module ForemanTasks
           if search_params[:user_id].blank?
             raise BadRequest, _('User search_params requires user_id to be specified')
           end
-          scope.joins(:locks).where(foreman_tasks_locks:
-                                        { name:          ::ForemanTasks::Lock::OWNER_LOCK_NAME,
-                                          resource_type: 'User',
-                                          resource_id:   search_params[:user_id] })
+          scope.search_for("user_id = #{search_params[:user_id]}")
         when 'resource'
           if search_params[:resource_type].blank? || search_params[:resource_id].blank?
             raise BadRequest,

data/app/lib/actions/observable_action.rb

@@ -70,7 +70,7 @@ module Actions
     apipie :class, "An common ancestor action for observable actions" do
       name 'Actions::ObservableAction'
       refs 'Actions::ObservableAction'
-      sections only: %w[webhooks]
+      sections only: %w[all webhooks]
       property :task, object_of: 'Task', desc: 'Returns the task to which this action belongs'
     end
     class Jail < Safemode::Jail

data/db/migrate/20180927120509_add_user_id.foreman_tasks.rb

@@ -1,4 +1,6 @@
 class AddUserId < ActiveRecord::Migration[5.0]
+  OWNER_LOCK_NAME = :task_owner
+
   def up
     add_reference :foreman_tasks_tasks, :user, :foreign_key => true
 
@@ -29,7 +31,7 @@ class AddUserId < ActiveRecord::Migration[5.0]
   private
 
   def create_lock(user_id, task)
-    ForemanTasks::Lock.new(:name          => ForemanTasks::Lock::OWNER_LOCK_NAME,
+    ForemanTasks::Lock.new(:name          => OWNER_LOCK_NAME,
                            :resource_type => User.name,
                            :resource_id   => user_id,
                            :task_id       => task.id,
@@ -37,6 +39,6 @@ class AddUserId < ActiveRecord::Migration[5.0]
   end
 
   def user_locks
-    ForemanTasks::Lock.where(:name => ForemanTasks::Lock::OWNER_LOCK_NAME)
+    ForemanTasks::Lock.where(:name => OWNER_LOCK_NAME)
   end
 end

data/lib/foreman_tasks/version.rb

@@ -1,3 +1,3 @@
 module ForemanTasks
-  VERSION = '4.0.0'.freeze
+  VERSION = '4.0.1'.freeze
 end

data/test/controllers/api/tasks_controller_test.rb

@@ -29,7 +29,7 @@ module ForemanTasks
 
         it 'renders task ids when searching by resource id' do
           task = FactoryBot.create(:dynflow_task, :product_create_task)
-          ForemanTasks::Lock.create!(name: "create", resource_type: "Katello::Product", resource_id: 1, task_id: task.id)
+          ForemanTasks::Link.create!(resource_type: "Katello::Product", resource_id: 1, task_id: task.id)
           get :index, params: { :search => "label = Actions::Katello::Product::Create and resource_id = 1" }
           assert_response :success
           data = JSON.parse(response.body)

data/test/controllers/tasks_controller_test.rb

@@ -44,8 +44,8 @@ module ForemanTasks
             @locations = [0, 0].map { FactoryBot.create(:location) }
             @tasks = [0, 0].map { FactoryBot.create(:some_task) }
             @tasks.zip(@organizations, @locations).each do |task, org, loc|
-              Lock.link!(org, task.id)
-              Lock.link!(loc, task.id)
+              Link.link!(org, task)
+              Link.link!(loc, task)
             end
           end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman-tasks
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.1
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-02 00:00:00.000000000 Z
+date: 2021-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynflow