From bcd6f0bd71c30b571cc9039f7019676c733bc5bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karl=20Erik=20=C3=95unapuu?= Date: Thu, 21 May 2020 11:57:22 +0300 Subject: [PATCH] Find requester's tied domains via RegistrantUser --- app/models/contact.rb | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/app/models/contact.rb b/app/models/contact.rb index 2aeb761a8..efee4926e 100644 --- a/app/models/contact.rb +++ b/app/models/contact.rb @@ -451,17 +451,16 @@ class Contact < ApplicationRecord end def qualified_domain_name_list(requester, filter_sql) - if requester != id - first_scope = Contact.find(requester).domains - second_scope = Contact.find(requester).registrant_domains + return Domain.where('domains.id IN (?)', filter_sql) unless requester != id - domains = Domain.from("(#{first_scope.to_sql} UNION #{second_scope.to_sql}) as domains") - .where('domains.id IN (?)', filter_sql) - else - domains = Domain.where('domains.id IN (?)', filter_sql) + requester = Contact.find_by(id: requester) + registrant_user = RegistrantUser.find_or_initialize_by(registrant_ident: + "#{requester.ident_country_code}-#{requester.ident}") + begin + registrant_user.domains.where('domains.id IN (?)', filter_sql) + rescue CompanyRegister::NotAvailableError + registrant_user.direct_domains.where('domains.id IN (?)', filter_sql) end - - domains end def qualified_domain_ids(domain_filter)