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

Exclude tech from default domain query

Browse source
This commit is contained in:
Karl Erik Õunapuu 2021-02-04 14:17:26 +02:00
parent d07b6a9c7b
commit 1bb975c0cc
No known key found for this signature in database
GPG key ID: C9DD647298A34764
3 changed files with 17 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/api/v1/registrant/domains_controller.rb
View file

@ -42,7 +42,7 @@ module Api
private
def current_user_domains
current_registrant_user.domains
current_registrant_user.domains(admin: params[:tech] != 'true')
rescue CompanyRegister::NotAvailableError
current_registrant_user.direct_domains
end

15
app/models/domain.rb
View file

@ -198,6 +198,15 @@ 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_domains(registrant_user)
from(
"(#{registrant_user_domains_by_registrant(registrant_user).to_sql} UNION " \
@ -255,8 +264,10 @@ class Domain < ApplicationRecord
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

4
app/models/registrant_user.rb
View file

@ -30,7 +30,9 @@ 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