foreman_scc_manager 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c9b8504241cd3feed62bc340cf0db3c37bfc10943bf7db7ac9d119d154a1abc
-  data.tar.gz: 33c6c4286f16de71f6d3af9ad4d35bbaa741ddc5e66cbc164c95730256945778
+  metadata.gz: 96e9a75d883e70453b301cfc95ccdcb3906204f9ae87b5c8abec1f1970bef49f
+  data.tar.gz: 9b5b2d8a57b2a0da65631603bb77f5b3503353aa0095267ffe7bb4724c93049d
 SHA512:
-  metadata.gz: 729e90d1a64ee314ac3772346b19f3869a142431cbc2d932359c19ea8d9615bc10465b747efe8a7003bc8ae532d310e4a13dd077262fea05266f84059554a7f8
-  data.tar.gz: e0a3d085ea59df19371f774b48f83d229a970bde2fcf5b394b0c65ac0f9b27489b00530d3582fb4248488442894b3ceb72898fa592573ef2f87cd31170725a37
+  metadata.gz: ea1ba3bbdfb6215d48a99ef89a241cf1735de4c085df7e0ee16b849e1bbd786a5734e9b1bfbd79c18ea78d42e2d0440ffbf263e94401b44689a8ef7742b04428
+  data.tar.gz: 6ef467fe3c5deead9ccc7555a30ac4b96257a8ec269f333d3826b5e28e366def180a5940f1f932be8329719cb488e06d0184ee533c0fb862b915ad135bbf5595

data/app/controllers/scc_accounts_controller.rb

@@ -65,6 +65,7 @@ class SccAccountsController < ApplicationController
   # PUT /scc_accounts/1/sync
   def sync
     sync_task = ForemanTasks.async_task(::Actions::SccManager::Sync, @scc_account)
+    @scc_account.update! sync_task: sync_task
     notice _('Sync task started.')
   rescue ::Foreman::Exception => e
     error _('Failed to add task to queue: %s') % e.to_s
@@ -77,10 +78,15 @@ class SccAccountsController < ApplicationController
   def bulk_subscribe
     scc_products_to_subscribe =
       @scc_account.scc_products.where(id: scc_bulk_subscribe_params[:scc_subscribe_product_ids])
-    ForemanTasks.async_task(::Actions::BulkAction,
-                            ::Actions::SccManager::SubscribeProduct,
-                            scc_products_to_subscribe)
-    notice _('Task to subscribe products started.')
+
+    if (scc_products_to_subscribe.count > 0)
+      ForemanTasks.async_task(::Actions::BulkAction,
+                              ::Actions::SccManager::SubscribeProduct,
+                              scc_products_to_subscribe)
+      notice _('Task to subscribe products started.')
+    else
+      notice _('No products selected.')
+    end
   rescue ::Foreman::Exception => e
     error _('Failed to add task to queue: %s') % e.to_s
   rescue ForemanTasks::Lock::LockConflict => e

data/app/lib/actions/scc_manager/sync.rb

@@ -10,18 +10,15 @@ module Actions
           sync_prod_action = plan_action(::Actions::SccManager::SyncProducts, scc_account)
           plan_self(repo_status: sync_repo_action.output[:status], prod_status: sync_prod_action.output[:status])
         end
-        scc_account.update! sync_status: 'running'
       end
 
       def finalize
         scc_account = SccAccount.find(input[:scc_account][:id])
         if input[:repo_status] == 'SUCCESS' && input[:prod_status] == 'SUCCESS'
-          scc_account.sync_status = 'successful'
-          scc_account.synced = DateTime.current
+          scc_account.update! synced: DateTime.current
         else
-          scc_account.sync_status = 'failed'
+          raise 'Updating failed'
         end
-        scc_account.save!
       end
 
       def rescue_strategy

data/app/models/scc_account.rb

@@ -4,11 +4,10 @@ class SccAccount < ApplicationRecord
   include ForemanTasks::Concerns::ActionSubject
   encrypts :password
 
-  SYNC_STATI = [nil, 'running', 'successful', 'failed'].freeze
-
   self.include_root_in_json = false
 
   belongs_to :organization
+  belongs_to :sync_task, class_name: ForemanTasks::Task
   has_many :scc_products, dependent: :destroy
   has_many :scc_repositories, dependent: :destroy
 
@@ -18,7 +17,6 @@ class SccAccount < ApplicationRecord
   validates :login, presence: true
   validates :password, presence: true
   validates :base_url, presence: true
-  validates :sync_status, inclusion: { in: SYNC_STATI }
 
   default_scope -> { order(:login) }
 
@@ -29,16 +27,17 @@ class SccAccount < ApplicationRecord
   end
 
   def get_sync_status
-    if sync_status.nil?
+    if sync_task.nil?
       return _('never synced')
-    elsif sync_status == 'running'
-      return _('sync in progress')
-    elsif sync_status == 'successful'
-      return synced
-    elsif sync_status == 'failed'
-      return _('last sync failed')
+    elsif sync_task.state == 'stopped'
+      if sync_task.result == 'success'
+        return synced
+      else
+        return sync_task.result
+      end
+    else
+      return sync_task.state
     end
-    ''
   end
 
   def test_connection

data/app/views/scc_accounts/index.html.erb

@@ -18,7 +18,7 @@
           <%= link_to_if_authorized(scc_account.name, hash_for_edit_scc_account_path(:id => scc_account).merge(:auth_object => scc_account, :authorizer => authorizer)) %>
         </td>
         <td><%= scc_account.scc_products.count.to_s %></td>
-        <td><%= scc_account.get_sync_status %></td>
+        <td><%= link_to_if(scc_account.sync_task, scc_account.get_sync_status, scc_account.sync_task) %></td>
         <td>
           <%= action_buttons(
             display_link_if_authorized(_("Select products"), hash_for_scc_account_path(:id => scc_account).merge(:auth_object => scc_account, :authorizer => authorizer)),

data/db/migrate/20180321000000_change_sync_status_to_sync_task.rb

@@ -0,0 +1,7 @@
+class ChangeSyncStatusToSyncTask < ActiveRecord::Migration
+  def change
+    remove_column :scc_accounts, :sync_status, :string
+    add_column :scc_accounts, :sync_task_id, :uuid, null: true
+    # add_foreign_key "scc_accounts", "foreman_tasks_tasks", name: "scc_accounts_foreman_tasks_tasks_id_fk", column: "sync_task_id", primary_key: "id" , on_delete: :nullify
+  end
+end

data/lib/foreman_scc_manager/version.rb

@@ -1,3 +1,3 @@
 module ForemanSccManager
-  VERSION = '1.2.0'.freeze
+  VERSION = '1.3.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_scc_manager
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - ATIX AG
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-19 00:00:00.000000000 Z
+date: 2018-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.49.0
+        version: '0.49'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.49.0
+        version: '0.49'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: '0.10'
 description: Foreman plugin to sync SUSE Customer Center products and repositories
   into Katello.
 email:
@@ -109,6 +109,7 @@ files:
 - db/migrate/20170307092057_add_synced_to_scc_account.rb
 - db/migrate/20170418132648_add_name_to_scc_account.rb
 - db/migrate/20170505063726_add_sync_status_to_scc_account.rb
+- db/migrate/20180321000000_change_sync_status_to_sync_task.rb
 - lib/foreman_scc_manager.rb
 - lib/foreman_scc_manager/engine.rb
 - lib/foreman_scc_manager/version.rb