mirror of
https://github.com/internetee/registry.git
synced 2025-06-08 05:34:46 +02:00
Merge pull request #1836 from internetee/add-role-filter-to-registrant-api
Registrant API: Exclude tech from default domain list query
This commit is contained in:
Timo Võhmar
GitHub
commit
c72f2d9132
8 changed files with 93 additions and 16 deletions
|
|
@ -19,6 +19,9 @@ module Api
|
|||
token = create_token(user)
|
||||
|
||||
if token
|
||||
msg = "Bearer for #{eid_params[:first_name]} #{eid_params[:last_name]} " \
|
||||
"(#{eid_params[:ident]}) - '#{token[:access_token]}'"
|
||||
ToStdout.msg(msg) unless Rails.env.production?
|
||||
render json: token
|
||||
else
|
||||
render json: { errors: [{ base: ['Cannot create generate session token'] }] }
|
||||
|
|
|
|||
|
|
@ -25,7 +25,8 @@ module Api
|
|||
serializer.to_json
|
||||
end
|
||||
|
||||
render json: { count: domains.count, domains: serialized_domains }
|
||||
render json: { total: current_user_domains_total_count, count: domains.count,
|
||||
domains: serialized_domains }
|
||||
end
|
||||
|
||||
def show
|
||||
|
|
@ -41,10 +42,16 @@ module Api
|
|||
|
||||
private
|
||||
|
||||
def current_user_domains
|
||||
current_registrant_user.domains
|
||||
def current_user_domains_total_count
|
||||
current_registrant_user.domains.count
|
||||
rescue CompanyRegister::NotAvailableError
|
||||
current_registrant_user.direct_domains
|
||||
current_registrant_user.direct_domains.count
|
||||
end
|
||||
|
||||
def current_user_domains
|
||||
current_registrant_user.domains(admin: params[:tech] != 'true')
|
||||
rescue CompanyRegister::NotAvailableError
|
||||
current_registrant_user.direct_domains(admin: params[:tech] != 'true')
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -198,6 +198,23 @@ class Domain < ApplicationRecord
|
|||
Setting.nameserver_required
|
||||
end
|
||||
|
||||
def registrant_user_admin_registrant_domains(registrant_user)
|
||||
companies = Contact.registrant_user_company_contacts(registrant_user)
|
||||
from(
|
||||
"(#{registrant_user_administered_domains(registrant_user).to_sql} UNION " \
|
||||
"#{registrant_user_company_registrant(registrant_user).to_sql} UNION " \
|
||||
"#{registrant_user_domains_company(companies, except_tech: true).to_sql}) AS domains"
|
||||
)
|
||||
end
|
||||
|
||||
def registrant_user_direct_admin_registrant_domains(registrant_user)
|
||||
from(
|
||||
"(#{registrant_user_direct_domains_by_registrant(registrant_user).to_sql} UNION " \
|
||||
"#{registrant_user_direct_domains_by_contact(registrant_user,
|
||||
except_tech: true).to_sql}) AS domains"
|
||||
)
|
||||
end
|
||||
|
||||
def registrant_user_domains(registrant_user)
|
||||
from(
|
||||
"(#{registrant_user_domains_by_registrant(registrant_user).to_sql} UNION " \
|
||||
|
|
@ -247,16 +264,20 @@ class Domain < ApplicationRecord
|
|||
where(registrant: registrant_user.direct_contacts)
|
||||
end
|
||||
|
||||
def registrant_user_direct_domains_by_contact(registrant_user)
|
||||
joins(:domain_contacts).where(domain_contacts: { contact_id: registrant_user.direct_contacts })
|
||||
def registrant_user_direct_domains_by_contact(registrant_user, except_tech: false)
|
||||
request = { contact_id: registrant_user.direct_contacts }
|
||||
request[:type] = [AdminDomainContact.name] if except_tech
|
||||
joins(:domain_contacts).where(domain_contacts: request)
|
||||
end
|
||||
|
||||
def registrant_user_company_registrant(companies)
|
||||
where(registrant: companies)
|
||||
end
|
||||
|
||||
def registrant_user_domains_company(companies)
|
||||
joins(:domain_contacts).where(domain_contacts: { contact: companies })
|
||||
def registrant_user_domains_company(companies, except_tech: false)
|
||||
request = { contact: companies }
|
||||
request[:type] = [AdminDomainContact.name] if except_tech
|
||||
joins(:domain_contacts).where(domain_contacts: request)
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -30,11 +30,15 @@ class RegistrantUser < User
|
|||
Contact.registrant_user_direct_contacts(self)
|
||||
end
|
||||
|
||||
def domains
|
||||
def domains(admin: false)
|
||||
return Domain.registrant_user_admin_registrant_domains(self) if admin
|
||||
|
||||
Domain.registrant_user_domains(self)
|
||||
end
|
||||
|
||||
def direct_domains
|
||||
def direct_domains(admin: false)
|
||||
return Domain.registrant_user_direct_admin_registrant_domains(self) if admin
|
||||
|
||||
Domain.registrant_user_direct_domains(self)
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@ module Serializers
|
|||
registrant: {
|
||||
name: domain.registrant.name,
|
||||
id: domain.registrant.uuid,
|
||||
org: domain.registrant.org?,
|
||||
},
|
||||
tech_contacts: contacts(:tech),
|
||||
admin_contacts: contacts(:admin),
|
||||
|
|
@ -60,7 +61,7 @@ module Serializers
|
|||
registrar: { name: domain.registrar.name, website: domain.registrar.website },
|
||||
registrant: { name: domain.registrant.name, id: domain.registrant.uuid,
|
||||
phone: domain.registrant.phone, email: domain.registrant.email,
|
||||
ident: domain.registrant.ident }
|
||||
ident: domain.registrant.ident, org: domain.registrant.org? }
|
||||
}
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -5,9 +5,10 @@ class RegistrantApiDomainsTest < ApplicationIntegrationTest
|
|||
def setup
|
||||
super
|
||||
|
||||
@domain = domains(:hospital)
|
||||
@domain = domains(:airport)
|
||||
@registrant = @domain.registrant
|
||||
@user = users(:registrant)
|
||||
domains(:metro).tech_domain_contacts.update(contact_id: @registrant.id)
|
||||
@auth_headers = { 'HTTP_AUTHORIZATION' => auth_token }
|
||||
end
|
||||
|
||||
|
|
@ -19,7 +20,7 @@ class RegistrantApiDomainsTest < ApplicationIntegrationTest
|
|||
|
||||
assert_equal('hospital.test', domain[:name])
|
||||
assert_equal('5edda1a5-3548-41ee-8b65-6d60daf85a37', domain[:id])
|
||||
assert_equal({name: 'John', id: 'eb2f2766-b44c-4e14-9f16-32ab1a7cb957'}, domain[:registrant])
|
||||
assert_equal({name: 'John', id: 'eb2f2766-b44c-4e14-9f16-32ab1a7cb957', org: false}, domain[:registrant])
|
||||
assert_equal([{name: 'John',
|
||||
id: 'eb2f2766-b44c-4e14-9f16-32ab1a7cb957',
|
||||
email: 'john@inbox.test'}],
|
||||
|
|
@ -57,6 +58,46 @@ class RegistrantApiDomainsTest < ApplicationIntegrationTest
|
|||
assert(array_of_domain_registrars.include?({name: 'Good Names', website: nil}))
|
||||
end
|
||||
|
||||
def test_return_domain_list_with_registrants_and_admins
|
||||
domains(:hospital).admin_domain_contacts.update(contact_id: contacts(:william).id)
|
||||
domains(:hospital).update(registrant: contacts(:william).becomes(Registrant))
|
||||
|
||||
get '/api/v1/registrant/domains', headers: @auth_headers, params: { 'offset' => 0 }
|
||||
assert_equal(200, response.status)
|
||||
|
||||
response_json = JSON.parse(response.body, symbolize_names: true)
|
||||
response_json[:domains].each do |x|
|
||||
if x[:registrant][:org] == false
|
||||
x[:tech_contacts].each do |s|
|
||||
assert_not s[:name].include?(@registrant.name)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
def test_return_domain_list_with_registrants_and_admins_tech
|
||||
get '/api/v1/registrant/domains', headers: @auth_headers, params: { 'offset' => 0, 'tech' => true }
|
||||
assert_equal(200, response.status)
|
||||
|
||||
response_json = JSON.parse(response.body, symbolize_names: true)
|
||||
response_json[:domains].each do |x|
|
||||
if x[:name] == 'metro.test'
|
||||
x[:tech_contacts].each do |s|
|
||||
assert s[:name].include?(@registrant.name)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
def test_domains_total_if_an_incomplete_list_is_returned
|
||||
get '/api/v1/registrant/domains', headers: @auth_headers, params: { 'offset' => 0 }
|
||||
assert_equal(200, response.status)
|
||||
|
||||
response_json = JSON.parse(response.body, symbolize_names: true)
|
||||
assert_equal response_json[:domains].length, response_json[:count]
|
||||
assert_equal response_json[:total], 5
|
||||
end
|
||||
|
||||
def test_root_accepts_limit_and_offset_parameters
|
||||
get '/api/v1/registrant/domains', params: { 'limit' => 2, 'offset' => 0 },
|
||||
headers: @auth_headers
|
||||
|
|
|
|||
|
|
@ -130,7 +130,7 @@ class RegistrantApiRegistryLocksTest < ApplicationIntegrationTest
|
|||
response_json = JSON.parse(response.body, symbolize_names: true)
|
||||
|
||||
assert_equal({ name: 'Best Names', website: 'https://bestnames.test' }, response_json[:registrar])
|
||||
assert_equal({name: 'John', id: 'eb2f2766-b44c-4e14-9f16-32ab1a7cb957'}, response_json[:registrant])
|
||||
assert_equal({name: 'John', id: 'eb2f2766-b44c-4e14-9f16-32ab1a7cb957', org: false}, response_json[:registrant])
|
||||
assert_equal([{name: 'Jane',
|
||||
id: '9db3de62-2414-4487-bee2-d5c155567768',
|
||||
email: 'jane@mail.test'
|
||||
|
|
|
|||
|
|
@ -30,8 +30,8 @@ class SerializersRegistrantApiDomainTest < ActiveSupport::TestCase
|
|||
assert_equal({name: 'Best Names', website: 'https://bestnames.test' }, @json[:registrar])
|
||||
end
|
||||
|
||||
def test_returns_registrant_name_and_uuid
|
||||
assert_equal({name: 'John', id: 'eb2f2766-b44c-4e14-9f16-32ab1a7cb957'},
|
||||
def test_returns_registrant_name_uuid_and_org
|
||||
assert_equal({name: 'John', id: 'eb2f2766-b44c-4e14-9f16-32ab1a7cb957', org: false},
|
||||
@json[:registrant])
|
||||
end
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue