foreman_maintain 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: '09c832269d99bedd38510d834f77ef84f7921e3c'
-  data.tar.gz: 5b4c6b6dced266b4ea569113d71efe9b1efc65ff
+SHA256:
+  metadata.gz: 0f6837492a59470b98bbbf7d98963f98c0324326ed7beca8d682a2a04df38d6b
+  data.tar.gz: b84626fc17039356e4ab10b77a2b2a54fda21c6438850e7558b63617a0556073
 SHA512:
-  metadata.gz: af2b744d60ae39bf1c6d0e07f1a2eeb51554228fa53ec6cdcb1d23354e50de2f9a240557c8da8585be64e8b6a398de35c9f30a1e11a0c74d144cd0c566432b46
-  data.tar.gz: 124bd65b249e146f671d06484a605d0ba158d3b2462df7238725bb7561fe9c9802d5d3e5dcd1ad0541ca6e49edbae4ac86603654a584b6c7e4baa961c8e34907
+  metadata.gz: dc8146e0110fd7334b28d56a45b84f7d10936e3e72e56ceaaf0ccc33e8ff16c256fdb1ca73961b3833306b488d471c545b7d8f3967ebab1c2a8653ebde12a594
+  data.tar.gz: bbad46d7af9797cf1dcfba28c734dc2494e3258d34f784642460d94d852f70e23a9e49aca2c57bb8fab579bb29ca5c89fdf7438fa2e63a982d58684393cf39b2

data/definitions/features/sync_plans.rb

@@ -3,21 +3,34 @@ class Features::SyncPlans < ForemanMaintain::Feature
     label :sync_plans
   end
 
-  def active_sync_plans_count
-    feature(:foreman_database).query(
-      <<-SQL
-        SELECT count(*) AS count FROM katello_sync_plans WHERE enabled ='t'
-      SQL
-    ).first['count'].to_i
+  def required_new_implementation
+    @required_new_implementation ||=
+      feature(:foreman_database).query(
+        <<-SQL
+          SELECT COUNT(1) FROM information_schema.table_constraints
+          WHERE constraint_name='katello_sync_plan_foreman_tasks_recurring_logic_fk' AND table_name='katello_sync_plans'
+        SQL
+      ).first['count'].to_i > 0
   end
 
-  def ids_by_status(enabled = true)
-    enabled = enabled ? 't' : 'f'
-    feature(:foreman_database).query(
-      <<-SQL
-        SELECT id FROM katello_sync_plans WHERE enabled ='#{enabled}'
+  def sync_plan_ids_by_status(enabled = true, filter_ids = nil)
+    if filter_ids
+      return [] if filter_ids.empty?
+
+      ids_condition = filter_ids.map { |id| "'#{id}'" }.join(',')
+    end
+
+    if required_new_implementation
+      query = <<-SQL
+        select sp.id as id from katello_sync_plans sp inner join foreman_tasks_recurring_logics rl on sp.foreman_tasks_recurring_logic_id = rl.id
+        where rl.state='#{enabled ? 'active' : 'disabled'}' #{ids_condition ? " AND sp.id IN (#{ids_condition})" : ''}
+      SQL
+    else
+      query = <<-SQL
+        SELECT id FROM katello_sync_plans WHERE enabled ='#{enabled ? 't' : 'f'}' #{ids_condition ? " AND id IN (#{ids_condition})" : ''}
       SQL
-    ).map { |r| r['id'].to_i }
+    end
+    feature(:foreman_database).query(query).map { |r| r['id'].to_i }
   end
 
   def make_disable(ids)
@@ -39,8 +52,11 @@ class Features::SyncPlans < ForemanMaintain::Feature
   private
 
   def update_records(ids, enabled)
+    ids_not_required_update = sync_plan_ids_by_status(enabled, ids)
+    ids_required_update = ids - ids_not_required_update
+    make_data_key_empty(enabled) if !ids_not_required_update.empty? && ids_required_update.empty?
     updated_record_ids = []
-    ids.each do |sp_id|
+    ids_required_update.each do |sp_id|
       result = feature(:hammer).run("sync-plan update --id #{sp_id} --enabled #{enabled}")
       if result.include?('Sync plan updated')
         updated_record_ids << sp_id
@@ -55,15 +71,23 @@ class Features::SyncPlans < ForemanMaintain::Feature
 
   def data
     raise 'Use load_from_storage before accessing the data' unless defined? @data
+
     @data
   end
 
+  def make_data_key_empty(enabled)
+    key_name = enabled ? 'disabled' : 'enabled'
+    @data[:"#{key_name}"] = []
+  end
+
   def update_data(enabled, new_ids)
     if enabled
       @data[:disabled] -= new_ids
       @data[:enabled] = new_ids
     else
-      @data[:disabled].concat(new_ids)
+      @data[:disabled] = [] unless @data[:disabled]
+      @data[:enabled] = [] if @data[:disabled].empty?
+      @data[:disabled].concat(new_ids).uniq!
     end
   end
 end

data/definitions/procedures/sync_plans/disable.rb

@@ -21,7 +21,7 @@ module Procedures::SyncPlans
       default_storage = ForemanMaintain.storage(:default)
       feature(:sync_plans).load_from_storage(default_storage)
       with_spinner('disabling sync plans') do |spinner|
-        ids = feature(:sync_plans).ids_by_status(true)
+        ids = feature(:sync_plans).sync_plan_ids_by_status(true)
         feature(:sync_plans).make_disable(ids)
         spinner.update "Total #{ids.length} sync plans are now disabled."
       end

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '0.3.3'.freeze
+  VERSION = '0.3.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-11 00:00:00.000000000 Z
+date: 2019-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -329,7 +329,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Foreman maintenance tool belt