From 419e5a587de995c522082e849977b4d8b3bae5cd Mon Sep 17 00:00:00 2001 From: olegphenomenon Date: Mon, 20 Sep 2021 15:30:30 +0300 Subject: [PATCH] refactoring --- .../replace_upd_to_obj_upd_prohibited_job.rb | 28 ++++++++++++++++--- app/models/registrant_user.rb | 8 +++--- ...lace_upd_to_obj_upd_prohibited_job_test.rb | 2 +- 3 files changed, 29 insertions(+), 9 deletions(-) diff --git a/app/jobs/replace_upd_to_obj_upd_prohibited_job.rb b/app/jobs/replace_upd_to_obj_upd_prohibited_job.rb index c0ea92dd6..8b2b26aef 100644 --- a/app/jobs/replace_upd_to_obj_upd_prohibited_job.rb +++ b/app/jobs/replace_upd_to_obj_upd_prohibited_job.rb @@ -16,19 +16,39 @@ class ReplaceUpdToObjUpdProhibitedJob < ApplicationJob domain_batches.each do |domain| if domain.locked_by_registrant? if rollback - domain.statuses = domain.statuses + ["serverUpdateProhibited"] if mode == 'add' and !domain.statuses.include? "serverUpdateProhibited" - domain.statuses = domain.statuses - ["serverObjUpdateProhibited"] if mode == 'remove' and domain.statuses.include? "serverObjUpdateProhibited" + domain = rollback_actions(mode, domain) else - domain.statuses = domain.statuses + ["serverObjUpdateProhibited"] if mode == 'add' and !domain.statuses.include? "serverObjUpdateProhibited" - domain.statuses = domain.statuses - ["serverUpdateProhibited"] if mode == 'remove' and domain.statuses.include? "serverUpdateProhibited" + domain = add_actions(mode, domain) end + domain.save! 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' + domain.statuses = domain.statuses + ['serverUpdateProhibited'] + elsif mode == 'remove' and domain.statuses.include? 'serverObjUpdateProhibited' + domain.statuses = domain.statuses - ['serverObjUpdateProhibited'] + end + + domain + end + + def add_actions(mode, domain) + if mode == 'add' and !domain.statuses.include? 'serverObjUpdateProhibited' + domain.statuses = domain.statuses + ['serverObjUpdateProhibited'] + elsif mode == 'remove' and domain.statuses.include? 'serverUpdateProhibited' + domain.statuses = domain.statuses - ['serverUpdateProhibited'] + end + + domain + end + def logger @logger ||= Logger.new(Rails.root.join('log/migrate_before_force_delete_statuses.log')) end diff --git a/app/models/registrant_user.rb b/app/models/registrant_user.rb index c6d80901e..57a2f58ab 100644 --- a/app/models/registrant_user.rb +++ b/app/models/registrant_user.rb @@ -17,13 +17,13 @@ class RegistrantUser < User Country.new(alpha2_code) end - def companies(company_register = nil) + def companies(company_register = CompanyRegister::Client.new) return [] if ident.include?('-') - [OpenStruct.new(registration_number: '43344412', company_name: 'TestFirma'), - OpenStruct.new(registration_number: '12345678', company_name: 'SuperFirma OU')] + company_register.representation_rights(citizen_personal_code: ident, + citizen_country_code: country.alpha3) end - + def contacts(representable: true) Contact.registrant_user_contacts(self, representable: representable) end diff --git a/test/jobs/replace_upd_to_obj_upd_prohibited_job_test.rb b/test/jobs/replace_upd_to_obj_upd_prohibited_job_test.rb index 6ad262439..7960fd38f 100644 --- a/test/jobs/replace_upd_to_obj_upd_prohibited_job_test.rb +++ b/test/jobs/replace_upd_to_obj_upd_prohibited_job_test.rb @@ -69,4 +69,4 @@ class ReplaceUpdToObjUpdProhibitedJobTest < ActiveSupport::TestCase assert @domain.statuses.include? "serverUpdateProhibited" end -end \ No newline at end of file +end