refactoring

app/jobs/replace_upd_to_obj_upd_prohibited_job.rb

@@ -1,52 +1,48 @@
 class ReplaceUpdToObjUpdProhibitedJob < ApplicationJob
-  def perform(mode, rollback = false)
+  def perform(action:, rollback: false)
     logger.info 'Ran ReplaceUpdToObjUpdProhibitedJob!'
 
-    start_adding_new_status_for_locked_domains(mode, rollback)
+    start_adding_new_status_for_locked_domains(action: action, rollback: rollback)
   end
 
   private
 
-  def start_adding_new_status_for_locked_domains(mode, rollback)
+  def start_adding_new_status_for_locked_domains(action:, rollback:)
     count = 0
     Domain.all.find_in_batches do |domain_batches|
       count += domain_batches.count
       logger.info "Proccesing #{count} domains of #{Domain.count}"
 
       domain_batches.each do |domain|
-        if domain.locked_by_registrant?
-          if rollback
-            domain = rollback_actions(mode, domain)
-          else
-            domain = add_actions(mode, domain)
-          end
-
-          domain.save!
+        if domain.locked_by_registrant? && rollback
+          rollback_actions(action: action, domain: domain)
+        elsif domain.locked_by_registrant? && !rollback
+          add_actions(action: action, domain: domain)
         end
       end
 
       logger.info "Successfully proccesed #{count} domains of #{Domain.count}"
     end
   end
 
-  def rollback_actions(mode, domain)
-    if mode == 'add' and !domain.statuses.include? 'serverUpdateProhibited'
+  def rollback_actions(action:, domain:)
+    if action == :add and !domain.statuses.include? 'serverUpdateProhibited'
       domain.statuses = domain.statuses + ['serverUpdateProhibited']
-    elsif mode == 'remove' and domain.statuses.include? 'serverObjUpdateProhibited'
+      domain.save!
+    elsif action == :remove and domain.statuses.include? 'serverObjUpdateProhibited'
       domain.statuses = domain.statuses - ['serverObjUpdateProhibited']
+      domain.save!
     end
-
-    domain
   end
 
-  def add_actions(mode, domain)
-    if mode == 'add' and !domain.statuses.include? 'serverObjUpdateProhibited'
+  def add_actions(action:, domain:)
+    if action == :add and !domain.statuses.include? 'serverObjUpdateProhibited'
       domain.statuses = domain.statuses + ['serverObjUpdateProhibited']
-    elsif mode == 'remove' and domain.statuses.include? 'serverUpdateProhibited'
+      domain.save!
+    elsif action == :remove and domain.statuses.include? 'serverUpdateProhibited'
       domain.statuses = domain.statuses - ['serverUpdateProhibited']
+      domain.save!
     end
-
-    domain
   end
 
   def logger

lib/tasks/replace_upd_to_obj_upd_prohibited.rake

@@ -8,15 +8,15 @@ namespace :locked_domains do
   desc 'Add serverObjUpdateProhibited for locked domains'
   task add_new_status: :environment do
     time = Benchmark.realtime do
-      ReplaceUpdToObjUpdProhibitedJob.perform_later('add')
+      ReplaceUpdToObjUpdProhibitedJob.perform_later(action: :add)
     end
     puts "Time is #{time.round(2)} for add serverObjUpdateProhibited status for locked domains"
   end
 
   desc 'Remove serverUpdateProhibited from locked domains'
   task remove_old_status: :environment do
     time = Benchmark.realtime do
-      ReplaceUpdToObjUpdProhibitedJob.perform_later('remove')
+      ReplaceUpdToObjUpdProhibitedJob.perform_later(action: :remove)
     end
     puts "Time is #{time.round(2)} for remove serverUpdateProhibited for locked domains"
   end
@@ -27,15 +27,15 @@ namespace :locked_domains do
   desc 'Rollback remove old serverUpdateProhibited for locked domains'
   task rollback_remove_old_status: :environment do
     time = Benchmark.realtime do
-      ReplaceUpdToObjUpdProhibitedJob.perform_later('add', true)
+      ReplaceUpdToObjUpdProhibitedJob.perform_later(action: :add, rollback: true)
     end
     puts "Time is #{time.round(2)} for add serverObjUpdateProhibited status for locked domains"
   end
 
   desc 'Rollback add new serverObjUpdateProhibited for locked domains'
   task rollback_add_new_status: :environment do
     time = Benchmark.realtime do
-      ReplaceUpdToObjUpdProhibitedJob.perform_later('remove', true)
+      ReplaceUpdToObjUpdProhibitedJob.perform_later(action: :remove, rollback: true)
     end
     puts "Time is #{time.round(2)} for add serverObjUpdateProhibited status for locked domains"
   end

test/jobs/replace_upd_to_obj_upd_prohibited_job_test.rb

@@ -13,7 +13,7 @@ def test_start_adding_new_status_for_locked_domains
     assert @domain.locked_by_registrant?
 
     perform_enqueued_jobs do
-      ReplaceUpdToObjUpdProhibitedJob.perform_later('add')
+      ReplaceUpdToObjUpdProhibitedJob.perform_later(action: :add)
     end
 
     @domain.reload
@@ -32,7 +32,7 @@ def test_start_adding_new_status_for_locked_domains
     assert @domain.statuses.include? "serverObjUpdateProhibited"
 
     perform_enqueued_jobs do
-      ReplaceUpdToObjUpdProhibitedJob.perform_later('remove')
+      ReplaceUpdToObjUpdProhibitedJob.perform_later(action: :remove)
     end
 
     @domain.reload
@@ -49,7 +49,7 @@ def test_should_not_added_to_non_locked_domain_with_update_prohibited
     assert_not @domain.locked_by_registrant?
 
     perform_enqueued_jobs do
-      ReplaceUpdToObjUpdProhibitedJob.perform_later('add')
+      ReplaceUpdToObjUpdProhibitedJob.perform_later(action: :add)
     end
 
     assert_not @domain.statuses.include? "serverObjUpdateProhibited"
@@ -64,7 +64,7 @@ def test_should_not_removed_from_non_locked_domain_with_update_prohibited
     assert_not @domain.locked_by_registrant?
 
     perform_enqueued_jobs do
-      ReplaceUpdToObjUpdProhibitedJob.perform_later('remove')
+      ReplaceUpdToObjUpdProhibitedJob.perform_later(action: :remove)
     end
 
     assert @domain.statuses.include? "serverUpdateProhibited"