mirror of
https://github.com/internetee/registry.git
synced 2025-06-12 07:34:45 +02:00
Merge pull request #1820 from internetee/1818-bulk-change-when-client-has-status-update-prohibited
Tech contacts bulk change blocked if domain UpdateProhibited
This commit is contained in:
commit
2f610b6d6c
4 changed files with 37 additions and 2 deletions
17
app/models/concerns/domain/bulk_updatable.rb
Normal file
17
app/models/concerns/domain/bulk_updatable.rb
Normal file
|
@ -0,0 +1,17 @@
|
||||||
|
module Concerns
|
||||||
|
module Domain
|
||||||
|
module BulkUpdatable
|
||||||
|
extend ActiveSupport::Concern
|
||||||
|
|
||||||
|
def bulk_update_prohibited?
|
||||||
|
discarded? || statuses_blocks_update?
|
||||||
|
end
|
||||||
|
|
||||||
|
def statuses_blocks_update?
|
||||||
|
prohibited_array = [DomainStatus::SERVER_UPDATE_PROHIBITED,
|
||||||
|
DomainStatus::CLIENT_UPDATE_PROHIBITED]
|
||||||
|
prohibited_array.any? { |block_status| statuses.include?(block_status) }
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
|
@ -10,6 +10,7 @@ class Domain < ApplicationRecord
|
||||||
include Concerns::Domain::RegistryLockable
|
include Concerns::Domain::RegistryLockable
|
||||||
include Concerns::Domain::Releasable
|
include Concerns::Domain::Releasable
|
||||||
include Concerns::Domain::Disputable
|
include Concerns::Domain::Disputable
|
||||||
|
include Concerns::Domain::BulkUpdatable
|
||||||
|
|
||||||
attr_accessor :roles
|
attr_accessor :roles
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,7 @@ class TechDomainContact < DomainContact
|
||||||
tech_contacts = where(contact: current_contact)
|
tech_contacts = where(contact: current_contact)
|
||||||
|
|
||||||
tech_contacts.each do |tech_contact|
|
tech_contacts.each do |tech_contact|
|
||||||
if tech_contact.domain.discarded?
|
if tech_contact.domain.bulk_update_prohibited?
|
||||||
skipped_domains << tech_contact.domain.name
|
skipped_domains << tech_contact.domain.name
|
||||||
next
|
next
|
||||||
end
|
end
|
||||||
|
@ -18,7 +18,6 @@ class TechDomainContact < DomainContact
|
||||||
skipped_domains << tech_contact.domain.name
|
skipped_domains << tech_contact.domain.name
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
[affected_domains.sort, skipped_domains.sort]
|
[affected_domains.sort, skipped_domains.sort]
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -107,6 +107,24 @@ class APIDomainContactsTest < ApplicationIntegrationTest
|
||||||
JSON.parse(response.body, symbolize_names: true)
|
JSON.parse(response.body, symbolize_names: true)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def test_tech_bulk_changed_when_domain_update_prohibited
|
||||||
|
domains(:shop).update!(statuses: [DomainStatus::SERVER_UPDATE_PROHIBITED])
|
||||||
|
|
||||||
|
shop_tech_contact = Contact.find_by(code: 'william-001')
|
||||||
|
assert domains(:shop).tech_contacts.include?(shop_tech_contact)
|
||||||
|
|
||||||
|
patch '/repp/v1/domains/contacts', params: { current_contact_id: 'william-001',
|
||||||
|
new_contact_id: 'john-001' },
|
||||||
|
headers: { 'HTTP_AUTHORIZATION' => http_auth_key }
|
||||||
|
|
||||||
|
assert_response :ok
|
||||||
|
assert_equal ({ code: 1000,
|
||||||
|
message: 'Command completed successfully',
|
||||||
|
data: { affected_domains: ["airport.test"],
|
||||||
|
skipped_domains: ["shop.test"] }}),
|
||||||
|
JSON.parse(response.body, symbolize_names: true)
|
||||||
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
def http_auth_key
|
def http_auth_key
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue