zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-07-23 11:16:00 +02:00
Code Issues Projects Releases Packages Wiki Activity

Process failed domains for bulk ns change

Browse source
This commit is contained in:
Karl Erik Õunapuu 2020-12-30 11:00:52 +02:00
parent 7d61eb07b0
commit 0e120d4992
No known key found for this signature in database
GPG key ID: C9DD647298A34764
5 changed files with 25 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/registrar/nameservers_controller.rb
View file

@ -51,6 +51,10 @@ class Registrar
notices = [t('.replaced')] notices = [t('.replaced')]
notices << "#{t('.affected_domains')}: " \ notices << "#{t('.affected_domains')}: " \
"#{parsed_response[:data][:affected_domains].join(', ')}" "#{parsed_response[:data][:affected_domains].join(', ')}"
if parsed_response[:data][:skipped_domains]
notices << "#{t('.skipped_domains')}: " \
"#{parsed_response[:data][:skipped_domains].join(', ')}"
end
flash[:notice] = notices.join(', ') flash[:notice] = notices.join(', ')
redirect_to registrar_domains_url redirect_to registrar_domains_url

7
app/controllers/repp/v1/registrar/nameservers_controller.rb
View file

@ -5,12 +5,12 @@ module Repp
before_action :verify_nameserver_existance, only: %i[update] before_action :verify_nameserver_existance, only: %i[update]
def update def update
affected = current_user.registrar affected, errored = current_user.registrar
.replace_nameservers(hostname, .replace_nameservers(hostname,
hostname_params[:data][:attributes], hostname_params[:data][:attributes],
domains: domains_from_params) domains: domains_from_params)
render_success(data: data_format_for_success(affected)) render_success(data: data_format_for_success(affected, errored))
rescue ActiveRecord::RecordInvalid => e rescue ActiveRecord::RecordInvalid => e
handle_errors(e.record) handle_errors(e.record)
end end
@ -23,12 +23,13 @@ module Repp
params[:data][:domains].map(&:downcase) params[:data][:domains].map(&:downcase)
end end
def data_format_for_success(affected_domains) def data_format_for_success(affected_domains, errored_domains)
{ {
type: 'nameserver', type: 'nameserver',
id: params[:data][:attributes][:hostname], id: params[:data][:attributes][:hostname],
attributes: params[:data][:attributes], attributes: params[:data][:attributes],
affected_domains: affected_domains, affected_domains: affected_domains,
skipped_domains: errored_domains,
} }
end end

18
app/models/registrar.rb
View file

@ -145,22 +145,28 @@ class Registrar < ApplicationRecord
def replace_nameservers(hostname, new_attributes, domains: []) def replace_nameservers(hostname, new_attributes, domains: [])
transaction do transaction do
domain_list = [] domain_list = []
failed_list = []
nameservers.where(hostname: hostname).find_each do |original_nameserver| nameservers.where(hostname: hostname).find_each do |origin|
next unless domains.include?(original_nameserver.domain.name) || domains.empty? next unless domains.include?(origin.domain.name) || domains.empty?
if origin.domain.nameservers.where(hostname: new_attributes[:hostname]).any?
failed_list << origin.domain.name
next
end
new_nameserver = Nameserver.new new_nameserver = Nameserver.new
new_nameserver.domain = original_nameserver.domain new_nameserver.domain = origin.domain
new_nameserver.attributes = new_attributes new_nameserver.attributes = new_attributes
new_nameserver.save! new_nameserver.save!
domain_list << original_nameserver.domain.name domain_list << origin.domain.name
original_nameserver.destroy! origin.destroy!
end end
self.domains.where(name: domain_list).find_each(&:update_whois_record) if domain_list.any? self.domains.where(name: domain_list).find_each(&:update_whois_record) if domain_list.any?
domain_list.uniq.sort [domain_list.uniq.sort, failed_list.uniq.sort]
end end
end end

1
config/locales/registrar/nameservers.en.yml
View file

@ -4,3 +4,4 @@ en:
update: update:
replaced: Nameserver have been successfully replaced replaced: Nameserver have been successfully replaced
affected_domains: Affected domains affected_domains: Affected domains
skipped_domains: Skipped domains

6
test/system/registrar_area/bulk_change/nameserver_test.rb
View file

@ -18,7 +18,8 @@ class RegistrarAreaNameserverBulkChangeTest < ApplicationSystemTestCase
.to_return(body: { data: { .to_return(body: { data: {
type: 'nameserver', type: 'nameserver',
id: 'new-ns.bestnames.test', id: 'new-ns.bestnames.test',
affected_domains: ["airport.test", "shop.test"] affected_domains: ["airport.test", "shop.test"],
skipped_domains: []
} }
}.to_json, status: 200) }.to_json, status: 200)
@ -73,7 +74,8 @@ class RegistrarAreaNameserverBulkChangeTest < ApplicationSystemTestCase
.to_return(body: { data: { .to_return(body: { data: {
type: 'nameserver', type: 'nameserver',
id: 'new-ns.bestnames.test', id: 'new-ns.bestnames.test',
affected_domains: ["shop.test"]}}.to_json, status: 200) affected_domains: ["shop.test"],
skipped_domains: []}}.to_json, status: 200)
visit registrar_domains_url visit registrar_domains_url
click_link 'Bulk change' click_link 'Bulk change'