From 6a050f9ce31748f8ff6827d1761ceb41cce84c05 Mon Sep 17 00:00:00 2001 From: olegphenomenon Date: Fri, 22 Oct 2021 13:40:33 +0300 Subject: [PATCH] updated restore function --- .../cancel_force_delete/remove_force_delete_statuses.rb | 1 + .../domains/force_delete/post_set_process.rb | 1 - app/models/concerns/domain/registry_lockable.rb | 9 +++++++++ app/models/registrant_user.rb | 6 +++--- test/models/domain/force_delete_test.rb | 3 +-- 5 files changed, 14 insertions(+), 6 deletions(-) diff --git a/app/interactions/domains/cancel_force_delete/remove_force_delete_statuses.rb b/app/interactions/domains/cancel_force_delete/remove_force_delete_statuses.rb index 4f4f1645c..bc4122f80 100644 --- a/app/interactions/domains/cancel_force_delete/remove_force_delete_statuses.rb +++ b/app/interactions/domains/cancel_force_delete/remove_force_delete_statuses.rb @@ -10,6 +10,7 @@ module Domains DomainStatus::SERVER_OBJ_UPDATE_PROHIBITED, DomainStatus::SERVER_DELETE_PROHIBITED ] if domain.locked_by_registrant? + domain.admin_store_statuses_history -= domain_statuses unless domain.admin_store_statuses_history.nil? rejected_statuses = domain.statuses.reject { |a| domain_statuses.include? a } domain.statuses = rejected_statuses diff --git a/app/interactions/domains/force_delete/post_set_process.rb b/app/interactions/domains/force_delete/post_set_process.rb index 3e1aad8d4..4b0f618ad 100644 --- a/app/interactions/domains/force_delete/post_set_process.rb +++ b/app/interactions/domains/force_delete/post_set_process.rb @@ -11,7 +11,6 @@ module Domains # Allow deletion statuses.delete(DomainStatus::CLIENT_DELETE_PROHIBITED) - # statuses.delete(DomainStatus::SERVER_DELETE_PROHIBITED) domain.save(validate: false) end end diff --git a/app/models/concerns/domain/registry_lockable.rb b/app/models/concerns/domain/registry_lockable.rb index d61e7cf91..028966c58 100644 --- a/app/models/concerns/domain/registry_lockable.rb +++ b/app/models/concerns/domain/registry_lockable.rb @@ -53,14 +53,23 @@ module Domain::RegistryLockable end end + def restore_statuses_if_domain_had_fd + self.statuses = self.statuses | Domain::FORCE_DELETE_STATUSES + + save! + end + def remove_statuses_from_locked_domain + fd_flag = force_delete_scheduled? LOCK_STATUSES.each do |domain_status| statuses.delete([domain_status]) end + self.force_delete_domain_statuses_history -= LOCK_STATUSES if force_delete_domain_statuses_history.present? statuses.delete([EXTENSIONS_STATUS]) if statuses.include? EXTENSIONS_STATUS self.locked_by_registrant_at = nil self.statuses = admin_store_statuses_history || [] + self.statuses = self.statuses | Domain::FORCE_DELETE_STATUSES if fd_flag alert_registrar_lock_changes!(lock: false) save! diff --git a/app/models/registrant_user.rb b/app/models/registrant_user.rb index ba1b52a67..f7e85c5af 100644 --- a/app/models/registrant_user.rb +++ b/app/models/registrant_user.rb @@ -17,11 +17,11 @@ 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) diff --git a/test/models/domain/force_delete_test.rb b/test/models/domain/force_delete_test.rb index 184c606ef..5f2d8ad95 100644 --- a/test/models/domain/force_delete_test.rb +++ b/test/models/domain/force_delete_test.rb @@ -102,8 +102,7 @@ class ForceDeleteTest < ActionMailer::TestCase def test_scheduling_force_delete_allows_domain_deletion statuses_to_be_removed = [ - DomainStatus::CLIENT_DELETE_PROHIBITED, - DomainStatus::SERVER_DELETE_PROHIBITED + DomainStatus::CLIENT_DELETE_PROHIBITED ] @domain.statuses = statuses_to_be_removed + %w[other-status]