diff --git a/.reek b/.reek index 117b97186..aaf662290 100644 --- a/.reek +++ b/.reek @@ -145,7 +145,6 @@ DuplicateMethodCall: - Admin::DomainsController#build_associations - Admin::DomainsController#index - Admin::DomainsController#normalize_search_parameters - - Admin::DomainsController#schedule_force_delete - Admin::EppLogsController#index - Admin::EppLogsController#set_default_dates - Admin::LegalDocumentsController#show @@ -624,7 +623,6 @@ TooManyStatements: - Admin::DomainVersionsController#show - Admin::DomainsController#index - Admin::DomainsController#normalize_search_parameters - - Admin::DomainsController#schedule_force_delete - Admin::DomainsController#update - Admin::EppLogsController#index - Admin::InvoicesController#create diff --git a/app/controllers/admin/domains/force_delete_controller.rb b/app/controllers/admin/domains/force_delete_controller.rb new file mode 100644 index 000000000..5d72739d5 --- /dev/null +++ b/app/controllers/admin/domains/force_delete_controller.rb @@ -0,0 +1,39 @@ +module Admin + module Domains + class ForceDeleteController < BaseController + def create + authorize! :manage, domain + + domain.transaction do + domain.schedule_force_delete + domain.registrar.messages.create!(body: t('force_delete_set_on_domain', domain_name: domain.name)) + + if notify_by_email? + DomainDeleteMailer.forced(domain: domain, + registrar: domain.registrar, + registrant: domain.registrant, + template_name: params[:template_name]).deliver_now + end + end + + redirect_to edit_admin_domain_url(domain), notice: t('.scheduled') + end + + def destroy + authorize! :manage, domain + domain.cancel_force_delete + redirect_to edit_admin_domain_url(domain), notice: t('.cancelled') + end + + private + + def domain + @domain ||= Domain.find(params[:domain_id]) + end + + def notify_by_email? + ActiveRecord::Type::Boolean.new.type_cast_from_user(params[:notify_by_email]) + end + end + end +end diff --git a/app/controllers/admin/domains_controller.rb b/app/controllers/admin/domains_controller.rb index 66bc615c5..576b5f8e1 100644 --- a/app/controllers/admin/domains_controller.rb +++ b/app/controllers/admin/domains_controller.rb @@ -62,34 +62,6 @@ module Admin end end - def schedule_force_delete - raise 'Template param cannot be empty' if params[:template_name].blank? - - @domain.transaction do - @domain.schedule_force_delete - @domain.registrar.messages.create!(body: I18n.t('force_delete_set_on_domain', domain_name: @domain.name)) - - if notify_by_email? - DomainDeleteMailer.forced(domain: @domain, - registrar: @domain.registrar, - registrant: @domain.registrant, - template_name: params[:template_name]).deliver_now - end - end - - redirect_to edit_admin_domain_url(@domain), notice: t('.scheduled') - end - - def cancel_force_delete - if @domain.cancel_force_delete - flash[:notice] = t('.cancelled') - else - flash.now[:alert] = I18n.t('failed_to_update_domain') - end - - redirect_to edit_admin_domain_url(@domain) - end - def versions @domain = Domain.where(id: params[:domain_id]).includes({ versions: :item }).first @versions = @domain.versions @@ -138,9 +110,5 @@ module Admin def force_delete_templates %w(removed_company death) end - - def notify_by_email? - ActiveRecord::Type::Boolean.new.type_cast_from_user(params[:notify_by_email]) - end end end diff --git a/app/presenters/domain_presenter.rb b/app/presenters/domain_presenter.rb index 11a066b7a..473155734 100644 --- a/app/presenters/domain_presenter.rb +++ b/app/presenters/domain_presenter.rb @@ -49,8 +49,8 @@ class DomainPresenter ) else view.link_to(view.t('admin.domains.force_delete_toggle_btn.cancel'), - view.cancel_force_delete_admin_domain_path(domain), - method: :patch, + view.admin_domain_force_delete_path(domain), + method: :delete, data: { confirm: view.t('admin.domains.force_delete_toggle_btn.cancel_confim') }, class: 'btn btn-primary') end diff --git a/app/views/admin/domains/_force_delete_dialog.html.erb b/app/views/admin/domains/_force_delete_dialog.html.erb index d5863e0de..4e68302f8 100644 --- a/app/views/admin/domains/_force_delete_dialog.html.erb +++ b/app/views/admin/domains/_force_delete_dialog.html.erb @@ -10,8 +10,8 @@
- <%= form_tag schedule_force_delete_admin_domain_path, method: :patch, - id: 'domain-force-delete-form', class: 'form-horizontal' do %> + <%= form_tag admin_domain_force_delete_path(domain), id: 'domain-force-delete-form', + class: 'form-horizontal' do %>
diff --git a/app/views/admin/domains/edit.html.erb b/app/views/admin/domains/edit.html.erb index 9c65c33d3..3f831e86b 100644 --- a/app/views/admin/domains/edit.html.erb +++ b/app/views/admin/domains/edit.html.erb @@ -17,4 +17,4 @@
<%= render 'form' %> -<%= render 'force_delete_dialog', templates: force_delete_templates %> +<%= render 'force_delete_dialog', domain: @domain, templates: force_delete_templates %> diff --git a/config/locales/admin/domains.en.yml b/config/locales/admin/domains.en.yml index f6f51eaa4..dc9eea9a3 100644 --- a/config/locales/admin/domains.en.yml +++ b/config/locales/admin/domains.en.yml @@ -19,12 +19,6 @@ en: close_btn: Close dialog submit_btn: Force delete domain - schedule_force_delete: - scheduled: Force delete procedure has been scheduled - - cancel_force_delete: - cancelled: Force delete procedure has been cancelled - versions: time: Time registrant: Registrant diff --git a/config/locales/admin/domains/force_delete.en.yml b/config/locales/admin/domains/force_delete.en.yml new file mode 100644 index 000000000..470a3cd3b --- /dev/null +++ b/config/locales/admin/domains/force_delete.en.yml @@ -0,0 +1,9 @@ +en: + admin: + domains: + force_delete: + create: + scheduled: Force delete procedure has been scheduled + + destroy: + cancelled: Force delete procedure has been cancelled diff --git a/config/routes.rb b/config/routes.rb index c49399573..ae2390dde 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -202,11 +202,7 @@ Rails.application.routes.draw do resources :domain_versions, controller: 'domains', action: 'versions' resources :pending_updates resources :pending_deletes - - member do - patch 'schedule_force_delete' - patch 'cancel_force_delete' - end + resource :force_delete, controller: 'domains/force_delete', only: %i[create destroy] end resources :domain_versions do diff --git a/spec/presenters/domain_presenter_spec.rb b/spec/presenters/domain_presenter_spec.rb index 65f5efc93..3726960b4 100644 --- a/spec/presenters/domain_presenter_spec.rb +++ b/spec/presenters/domain_presenter_spec.rb @@ -114,41 +114,6 @@ RSpec.describe DomainPresenter do end end - describe '#force_delete_toggle_btn' do - let(:domain) { build_stubbed(:domain) } - - context 'when force delete is not scheduled' do - before :example do - expect(domain).to receive(:force_delete_scheduled?).and_return(false) - end - - it 'returns schedule button' do - html = view.content_tag(:a, 'Schedule force delete', - class: 'btn btn-danger', - data: { - toggle: 'modal', - target: '.domain-edit-force-delete-dialog', - }) - expect(presenter.force_delete_toggle_btn).to eq(html) - end - end - - context 'when force delete is scheduled' do - before :example do - expect(domain).to receive(:force_delete_scheduled?).and_return(true) - end - - it 'returns cancel button' do - html = link_to('Cancel force delete', - view.cancel_force_delete_admin_domain_path(domain), - method: :patch, - data: { confirm: 'Are you sure you want cancel force delete procedure?' }, - class: 'btn btn-primary') - expect(presenter.force_delete_toggle_btn).to eq(html) - end - end - end - domain_delegatable_attributes = %i( name transfer_code