zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-06-06 20:55:44 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix CC issues

Browse source
This commit is contained in:
Karl Erik Õunapuu 2020-11-06 16:21:14 +02:00
parent 451e1f79af
commit a182dfb3ba
No known key found for this signature in database
GPG key ID: C9DD647298A34764
5 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/api/repp/nameservers_v1.rb
View file

@ -32,7 +32,8 @@ module Repp
domains = params[:data][:domains] || [] domains = params[:data][:domains] || []
begin begin
affected_domains = current_user.registrar.replace_nameservers(hostname, new_attributes, domains) affected_domains = current_user.registrar.replace_nameservers(hostname, new_attributes,
domains: domains)
rescue ActiveRecord::RecordInvalid => e rescue ActiveRecord::RecordInvalid => e
error!({ errors: e.record.errors.full_messages.map { |error| { title: error } } }, 400) error!({ errors: e.record.errors.full_messages.map { |error| { title: error } } }, 400)
end end

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

@ -8,7 +8,6 @@ class Registrar
domains = domain_list_from_csv domains = domain_list_from_csv
puts "Domains are #{domains}"
uri = URI.parse("#{ENV['repp_url']}registrar/nameservers") uri = URI.parse("#{ENV['repp_url']}registrar/nameservers")
request = Net::HTTP::Put.new(uri, 'Content-Type' => 'application/json') request = Net::HTTP::Put.new(uri, 'Content-Type' => 'application/json')
request.body = { data: { type: 'nameserver', id: params[:old_hostname], request.body = { data: { type: 'nameserver', id: params[:old_hostname],
@ -61,10 +60,10 @@ class Registrar
end end
def domain_list_from_csv def domain_list_from_csv
return [] if params[:batch_file].blank? return [] if params[:puny_file].blank?
domains = [] domains = []
CSV.read(params[:batch_file].path, headers: true).each { |b| domains << b['domain_name'] } CSV.read(params[:puny_file].path, headers: true).each { |b| domains << b['domain_name'] }
domains domains
end end
end end

2
app/models/registrar.rb
View file

@ -141,7 +141,7 @@ class Registrar < ApplicationRecord
end end
# Audit log is needed, therefore no raw SQL # Audit log is needed, therefore no raw SQL
def replace_nameservers(hostname, new_attributes, domains) def replace_nameservers(hostname, new_attributes, domains: [])
transaction do transaction do
domain_list = [] domain_list = []

2
app/views/registrar/bulk_change/_nameserver_form.html.erb
View file

@ -49,7 +49,7 @@
<%= label_tag 'List of domains' %> <%= label_tag 'List of domains' %>
</div> </div>
<div class="col-md-4"> <div class="col-md-4">
<%= file_field_tag :batch_file, required: false, accept: 'text/csv' %> <%= file_field_tag :puny_file, required: false, accept: 'text/csv' %>
<span class="help-block">CSV format, must have domain_name field. List of domains that nameserver change should be scoped to.</span> <span class="help-block">CSV format, must have domain_name field. List of domains that nameserver change should be scoped to.</span>
</div> </div>
</div> </div>

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

@ -8,6 +8,7 @@ class RegistrarAreaNameserverBulkChangeTest < ApplicationSystemTestCase
def test_replaces_current_registrar_nameservers def test_replaces_current_registrar_nameservers
request_body = { data: { type: 'nameserver', request_body = { data: { type: 'nameserver',
id: 'ns1.bestnames.test', id: 'ns1.bestnames.test',
domains: [],
attributes: { hostname: 'new-ns.bestnames.test', attributes: { hostname: 'new-ns.bestnames.test',
ipv4: %w[192.0.2.55 192.0.2.56], ipv4: %w[192.0.2.55 192.0.2.56],
ipv6: %w[2001:db8::55 2001:db8::56] } } } ipv6: %w[2001:db8::55 2001:db8::56] } } }