From b8a59745deacd63d79f17d43250d713d11c47505 Mon Sep 17 00:00:00 2001 From: dinsmol Date: Wed, 15 Dec 2021 10:39:34 +0300 Subject: [PATCH] Fix codeclimate errors --- app/controllers/registrar/domains_controller.rb | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/app/controllers/registrar/domains_controller.rb b/app/controllers/registrar/domains_controller.rb index c1901ec12..a2235d6c0 100644 --- a/app/controllers/registrar/domains_controller.rb +++ b/app/controllers/registrar/domains_controller.rb @@ -91,14 +91,12 @@ class Registrar def create authorize! :create, Depp::Domain @domain_params = domain_params.to_h - if contacts_check = check_contacts - @data = @domain.create(@domain_params) - end + @data = @domain.create(@domain_params) if emails_valid? if @data && response_ok? redirect_to info_registrar_domains_url(domain_name: @domain_params[:name]) else - flash[:alert] = t('.email_error_message') unless contacts_check + flash[:alert] = t('.email_error_message') unless @emails_check_result render 'new' end end @@ -113,7 +111,7 @@ class Registrar def update authorize! :update, Depp::Domain @domain_params = params[:domain] - if contacts_check = check_contacts + if emails_valid? @data = @domain.update(@domain_params) @dispute = Dispute.active.find_by(domain_name: @domain_params[:name]) end @@ -121,7 +119,7 @@ class Registrar if @data && response_ok? redirect_to info_registrar_domains_url(domain_name: @domain_params[:name]) else - flash[:alert] = t('.email_error_message') unless contacts_check + flash[:alert] = t('.email_error_message') unless @emails_check_result params[:domain_name] = @domain_params[:name] render 'new' end @@ -179,9 +177,9 @@ class Registrar private - def check_contacts + def emails_valid? params_as_hash = @domain_params[:contacts_attributes].to_h - params_as_hash.all? { |_k, val| Contact.find_by(code: val[:code]).verify_email } + @emails_check_result = params_as_hash.all? { |_k, val| Contact.find_by(code: val[:code]).verify_email } end def init_domain