From 349df32e95b0c0306a3b2f7af63e30b68cbd5507 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karl=20Erik=20=C3=95unapuu?= Date: Thu, 21 Jan 2021 14:00:59 +0200 Subject: [PATCH] Improve renew action --- app/controllers/repp/v1/domains/renews_controller.rb | 4 +++- app/models/actions/domain_renew.rb | 9 +-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/app/controllers/repp/v1/domains/renews_controller.rb b/app/controllers/repp/v1/domains/renews_controller.rb index 1ba8db506..e77c2e2d0 100644 --- a/app/controllers/repp/v1/domains/renews_controller.rb +++ b/app/controllers/repp/v1/domains/renews_controller.rb @@ -40,7 +40,9 @@ module Repp @domain = Epp::Domain.find_by(registrar: registrar, name: params[:domain_id]) @domain ||= Epp::Domain.find_by!(registrar: registrar, name_puny: params[:domain_id]) - @domain + return @domain if @domain + + raise ActiveRecord::RecordNotFound end def renew_params diff --git a/app/models/actions/domain_renew.rb b/app/models/actions/domain_renew.rb index ec8178e6f..3e9740335 100644 --- a/app/models/actions/domain_renew.rb +++ b/app/models/actions/domain_renew.rb @@ -15,19 +15,12 @@ module Actions end def renew - period = params[:period] - unit = params[:period_unit] - task = Domains::BulkRenew::SingleDomainRenew.run(domain: domain, period: params[:period], unit: params[:period_unit], registrar: user) - return true if task - - puts task.errors - - false + task.valid? end end end