From f9f74fa3e3bed259eee96ed9d4ff150d860ad8a1 Mon Sep 17 00:00:00 2001
From: dinsmol <dinar184@mail.ru>
Date: Mon, 6 Sep 2021 21:32:56 +0300
Subject: [PATCH] replaced deprecated method (search)

---
 app/controllers/admin/account_activities_controller.rb     | 4 ++--
 app/controllers/admin/accounts_controller.rb               | 2 +-
 app/controllers/admin/admin_users_controller.rb            | 2 +-
 app/controllers/admin/api_users_controller.rb              | 2 +-
 app/controllers/admin/bank_statements_controller.rb        | 4 ++--
 app/controllers/admin/billing/prices_controller.rb         | 2 +-
 app/controllers/admin/blocked_domains_controller.rb        | 2 +-
 app/controllers/admin/bounced_mail_addresses_controller.rb | 2 +-
 app/controllers/admin/contact_versions_controller.rb       | 4 ++--
 app/controllers/admin/contacts_controller.rb               | 2 +-
 app/controllers/admin/dns/zones_controller.rb              | 2 +-
 app/controllers/admin/domain_versions_controller.rb        | 4 ++--
 app/controllers/admin/domains_controller.rb                | 4 ++--
 app/controllers/admin/invoices_controller.rb               | 2 +-
 app/controllers/admin/repp_logs_controller.rb              | 2 +-
 app/controllers/admin/reserved_domains_controller.rb       | 2 +-
 app/controllers/registrar/account_activities_controller.rb | 2 +-
 app/controllers/registrar/contacts_controller.rb           | 2 +-
 app/controllers/registrar/domains_controller.rb            | 4 ++--
 app/controllers/registrar/invoices_controller.rb           | 2 +-
 20 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/app/controllers/admin/account_activities_controller.rb b/app/controllers/admin/account_activities_controller.rb
index cb34d1645..cf5c0dc81 100644
--- a/app/controllers/admin/account_activities_controller.rb
+++ b/app/controllers/admin/account_activities_controller.rb
@@ -18,8 +18,8 @@ module Admin
         balance_params.delete('created_at_gteq')
       end
 
-      @q = AccountActivity.includes(:invoice, account: :registrar).search(params[:q])
-      @b = AccountActivity.search(balance_params)
+      @q = AccountActivity.includes(:invoice, account: :registrar).ransack(params[:q])
+      @b = AccountActivity.ransack(balance_params)
       @q.sorts = 'id desc' if @q.sorts.empty?
 
       @account_activities = @q.result.page(params[:page]).per(params[:results_per_page])
diff --git a/app/controllers/admin/accounts_controller.rb b/app/controllers/admin/accounts_controller.rb
index 756bbc662..2150ab2e6 100644
--- a/app/controllers/admin/accounts_controller.rb
+++ b/app/controllers/admin/accounts_controller.rb
@@ -3,7 +3,7 @@ module Admin
     load_and_authorize_resource
 
     def index
-      @q = Account.includes(:registrar).search(params[:q])
+      @q = Account.includes(:registrar).ransack(params[:q])
       @accounts = @q.result.page(params[:page])
       @accounts = @accounts.per(params[:results_per_page]) if paginate?
 
diff --git a/app/controllers/admin/admin_users_controller.rb b/app/controllers/admin/admin_users_controller.rb
index 39a177342..43faee693 100644
--- a/app/controllers/admin/admin_users_controller.rb
+++ b/app/controllers/admin/admin_users_controller.rb
@@ -4,7 +4,7 @@ module Admin
     before_action :set_user, only: [:show, :edit, :update, :destroy]
 
     def index
-      @q = AdminUser.search(params[:q])
+      @q = AdminUser.ransack(params[:q])
       @admin_users = @q.result.page(params[:page]).order(:username)
       @count = @q.result.count
       @admin_users = @admin_users.per(params[:results_per_page]) if paginate?
diff --git a/app/controllers/admin/api_users_controller.rb b/app/controllers/admin/api_users_controller.rb
index 534dc4491..cbef7def2 100644
--- a/app/controllers/admin/api_users_controller.rb
+++ b/app/controllers/admin/api_users_controller.rb
@@ -3,7 +3,7 @@ module Admin
     load_and_authorize_resource
 
     def index
-      @q = ApiUser.includes(:registrar).search(params[:q])
+      @q = ApiUser.includes(:registrar).ransack(params[:q])
       @api_users = @q.result.page(params[:page])
       @api_users = @api_users.per(params[:results_per_page]) if paginate?
     end
diff --git a/app/controllers/admin/bank_statements_controller.rb b/app/controllers/admin/bank_statements_controller.rb
index 227af994b..e286f7f65 100644
--- a/app/controllers/admin/bank_statements_controller.rb
+++ b/app/controllers/admin/bank_statements_controller.rb
@@ -5,14 +5,14 @@ module Admin
     before_action :set_bank_statement, only: %i[show bind_invoices]
 
     def index
-      @q = BankStatement.search(params[:q])
+      @q = BankStatement.ransack(params[:q])
       @q.sorts = 'id desc' if @q.sorts.empty?
       @bank_statements = @q.result.page(params[:page])
       @bank_statements = @bank_statements.per(params[:results_per_page]) if paginate?
     end
 
     def show
-      @q = @bank_statement.bank_transactions.includes(:account_activity).search(params[:q])
+      @q = @bank_statement.bank_transactions.includes(:account_activity).ransack(params[:q])
       @q.sorts = 'account_activity_id desc' if @q.sorts.empty?
       @bank_transactions = @q.result.page(params[:page])
     end
diff --git a/app/controllers/admin/billing/prices_controller.rb b/app/controllers/admin/billing/prices_controller.rb
index e8610c365..a632592b1 100644
--- a/app/controllers/admin/billing/prices_controller.rb
+++ b/app/controllers/admin/billing/prices_controller.rb
@@ -25,7 +25,7 @@ module Admin
           prices = ::Billing::Price.send(@search.status)
         end
 
-        @q = prices.search(params[:q])
+        @q = prices.ransack(params[:q])
         @q.sorts = ['zone_id asc', 'duration asc', 'operation_category asc',
                     'valid_from desc', 'valid_to asc'] if @q.sorts.empty?
         @prices = @q.result.page(params[:page])
diff --git a/app/controllers/admin/blocked_domains_controller.rb b/app/controllers/admin/blocked_domains_controller.rb
index d9bcb4f0f..7be85f6fb 100644
--- a/app/controllers/admin/blocked_domains_controller.rb
+++ b/app/controllers/admin/blocked_domains_controller.rb
@@ -5,7 +5,7 @@ module Admin
     def index
       params[:q] ||= {}
       domains = BlockedDomain.all.order(:name)
-      @q = domains.search(params[:q])
+      @q = domains.ransack(params[:q])
       @domains = @q.result.page(params[:page])
       @domains = @domains.per(params[:results_per_page]) if params[:results_per_page].to_i.positive?
 
diff --git a/app/controllers/admin/bounced_mail_addresses_controller.rb b/app/controllers/admin/bounced_mail_addresses_controller.rb
index eae306477..f99785c4d 100644
--- a/app/controllers/admin/bounced_mail_addresses_controller.rb
+++ b/app/controllers/admin/bounced_mail_addresses_controller.rb
@@ -5,7 +5,7 @@ module Admin
 
     # GET /bounced_mail_addresses
     def index
-      @q = BouncedMailAddress.all.order(created_at: :desc).search(params[:q])
+      @q = BouncedMailAddress.all.order(created_at: :desc).ransack(params[:q])
       @bounced_mail_addresses = @q.result.page(params[:page]).per(params[:results_per_page])
       @count = @q.result.count
     end
diff --git a/app/controllers/admin/contact_versions_controller.rb b/app/controllers/admin/contact_versions_controller.rb
index b720290d8..0271fe30b 100644
--- a/app/controllers/admin/contact_versions_controller.rb
+++ b/app/controllers/admin/contact_versions_controller.rb
@@ -7,7 +7,7 @@ module Admin
     def index
       params[:q] ||= {}
 
-      @q = Version::ContactVersion.search(params[:q])
+      @q = Version::ContactVersion.ransack(params[:q])
       @versions = @q.result.page(params[:page])
       search_params = params[:q].deep_dup
 
@@ -24,7 +24,7 @@ module Admin
       end
 
       versions = Version::ContactVersion.includes(:item).where(whereS).order(created_at: :desc, id: :desc)
-      @q = versions.search(params[:q])
+      @q = versions.ransack(params[:q])
       @versions = @q.result.page(params[:page])
       @versions = @versions.per(params[:results_per_page]) if params[:results_per_page].to_i.positive?
 
diff --git a/app/controllers/admin/contacts_controller.rb b/app/controllers/admin/contacts_controller.rb
index ea6ba066a..0b25d1c1d 100644
--- a/app/controllers/admin/contacts_controller.rb
+++ b/app/controllers/admin/contacts_controller.rb
@@ -19,7 +19,7 @@ module Admin
       contacts = filter_by_flags(contacts)
 
       normalize_search_parameters do
-        @q = contacts.search(search_params)
+        @q = contacts.ransack(search_params)
         @contacts = @q.result.distinct.page(params[:page])
       end
 
diff --git a/app/controllers/admin/dns/zones_controller.rb b/app/controllers/admin/dns/zones_controller.rb
index 42bb553a3..8274e0295 100644
--- a/app/controllers/admin/dns/zones_controller.rb
+++ b/app/controllers/admin/dns/zones_controller.rb
@@ -5,7 +5,7 @@ module Admin
       before_action :load_zone, only: %i[edit update destroy]
 
       def index
-        @q = ::DNS::Zone.search(params[:q])
+        @q = ::DNS::Zone.ransack(params[:q])
         @count = @q.result.count
         @zones = @q.result.page(params[:page]).per(params[:results_per_page])
       end
diff --git a/app/controllers/admin/domain_versions_controller.rb b/app/controllers/admin/domain_versions_controller.rb
index 511da6a0b..ee2bbf67b 100644
--- a/app/controllers/admin/domain_versions_controller.rb
+++ b/app/controllers/admin/domain_versions_controller.rb
@@ -7,7 +7,7 @@ module Admin
     def index
       params[:q] ||= {}
 
-      @q = Version::DomainVersion.includes(:item).search(params[:q])
+      @q = Version::DomainVersion.includes(:item).ransack(params[:q])
       @versions = @q.result.page(params[:page])
       search_params = params[:q].deep_dup
 
@@ -41,7 +41,7 @@ module Admin
       whereS += "  AND 1=0" if registrars == []
 
       versions = Version::DomainVersion.includes(:item).where(whereS).order(created_at: :desc, id: :desc)
-      @q = versions.search(params[:q])
+      @q = versions.ransack(params[:q])
       @versions = @q.result.page(params[:page])
       @versions = @versions.per(params[:results_per_page]) if params[:results_per_page].to_i.positive?
 
diff --git a/app/controllers/admin/domains_controller.rb b/app/controllers/admin/domains_controller.rb
index 5d3bd82da..934d6370c 100644
--- a/app/controllers/admin/domains_controller.rb
+++ b/app/controllers/admin/domains_controller.rb
@@ -14,7 +14,7 @@ module Admin
       end
 
       normalize_search_parameters do
-        @q = domains.search(params[:q])
+        @q = domains.ransack(params[:q])
         @domains = @q.result.page(params[:page])
         if @domains.count == 1 && params[:q][:name_matches].present?
           redirect_to [:admin, @domains.first] and return
@@ -22,7 +22,7 @@ module Admin
           # if we do not get any results, add wildcards to the name field and search again
           n_cache = params[:q][:name_matches]
           params[:q][:name_matches] = "%#{params[:q][:name_matches]}%"
-          @q = domains.search(params[:q])
+          @q = domains.ransack(params[:q])
           @domains = @q.result.page(params[:page])
           params[:q][:name_matches] = n_cache # we don't want to show wildcards in search form
         end
diff --git a/app/controllers/admin/invoices_controller.rb b/app/controllers/admin/invoices_controller.rb
index 0e154dff0..96a106d18 100644
--- a/app/controllers/admin/invoices_controller.rb
+++ b/app/controllers/admin/invoices_controller.rb
@@ -36,7 +36,7 @@ module Admin
       invoices = filter_by_status
       invoices = filter_by_receipt_date(invoices)
 
-      @q = invoices.search(params[:q])
+      @q = invoices.ransack(params[:q])
       @q.sorts = 'number desc' if @q.sorts.empty?
       @invoices = @q.result.page(params[:page])
       @invoices = @invoices.per(params[:results_per_page]) if paginate?
diff --git a/app/controllers/admin/repp_logs_controller.rb b/app/controllers/admin/repp_logs_controller.rb
index b26236e77..8efbd5292 100644
--- a/app/controllers/admin/repp_logs_controller.rb
+++ b/app/controllers/admin/repp_logs_controller.rb
@@ -4,7 +4,7 @@ module Admin
     before_action :set_default_dates, only: [:index]
 
     def index
-      @q = ApiLog::ReppLog.search(params[:q])
+      @q = ApiLog::ReppLog.ransack(params[:q])
       @q.sorts = 'id desc' if @q.sorts.empty?
 
       @repp_logs = @q.result
diff --git a/app/controllers/admin/reserved_domains_controller.rb b/app/controllers/admin/reserved_domains_controller.rb
index 430913fa1..35a81842d 100644
--- a/app/controllers/admin/reserved_domains_controller.rb
+++ b/app/controllers/admin/reserved_domains_controller.rb
@@ -6,7 +6,7 @@ module Admin
     def index
       params[:q] ||= {}
       domains = ReservedDomain.all.order(:name)
-      @q = domains.search(params[:q])
+      @q = domains.ransack(params[:q])
       @domains = @q.result.page(params[:page])
       @domains = @domains.per(params[:results_per_page]) if params[:results_per_page].to_i.positive?
 
diff --git a/app/controllers/registrar/account_activities_controller.rb b/app/controllers/registrar/account_activities_controller.rb
index baa0256af..55e53f8fc 100644
--- a/app/controllers/registrar/account_activities_controller.rb
+++ b/app/controllers/registrar/account_activities_controller.rb
@@ -14,7 +14,7 @@ class Registrar
         logger.warn('Invalid date')
       end
 
-      @q = account.activities.includes(:invoice).search(params[:q])
+      @q = account.activities.includes(:invoice).ransack(params[:q])
       @q.sorts = 'id desc' if @q.sorts.empty?
 
       respond_to do |format|
diff --git a/app/controllers/registrar/contacts_controller.rb b/app/controllers/registrar/contacts_controller.rb
index 756495457..1688ea89c 100644
--- a/app/controllers/registrar/contacts_controller.rb
+++ b/app/controllers/registrar/contacts_controller.rb
@@ -27,7 +27,7 @@ class Registrar
       end
 
       normalize_search_parameters do
-        @q = contacts.search(search_params)
+        @q = contacts.ransack(search_params)
       end
 
       contacts = @q.result
diff --git a/app/controllers/registrar/domains_controller.rb b/app/controllers/registrar/domains_controller.rb
index d477c2c27..864467e0d 100644
--- a/app/controllers/registrar/domains_controller.rb
+++ b/app/controllers/registrar/domains_controller.rb
@@ -26,14 +26,14 @@ class Registrar
       end
 
       normalize_search_parameters do
-        @q = domains.search(search_params.except(:contacts_ident_eq))
+        @q = domains.ransack(search_params.except(:contacts_ident_eq))
         @domains = @q.result.page(params[:page])
 
         # if we do not get any results, add wildcards to the name field and search again
         if @domains.count == 0 && search_params[:name_matches] !~ /^%.+%$/
           new_search_params = search_params.to_h.except(:contacts_ident_eq)
           new_search_params[:name_matches] = "%#{new_search_params[:name_matches]}%"
-          @q = domains.search(new_search_params)
+          @q = domains.ransack(new_search_params)
           @domains = @q.result.page(params[:page])
         end
       end
diff --git a/app/controllers/registrar/invoices_controller.rb b/app/controllers/registrar/invoices_controller.rb
index 9df92d141..34f6c17ae 100644
--- a/app/controllers/registrar/invoices_controller.rb
+++ b/app/controllers/registrar/invoices_controller.rb
@@ -7,7 +7,7 @@ class Registrar
       invoices = current_registrar_user.registrar.invoices.includes(:items, :account_activity)
 
       normalize_search_parameters do
-        @q = invoices.search(params[:q])
+        @q = invoices.ransack(params[:q])
         @q.sorts = 'id desc' if @q.sorts.empty?
         @invoices = @q.result.page(params[:page])
       end