From 2e9acedc901d948047ab9208c4f4e4a80cc17c00 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Sat, 7 Apr 2018 15:18:10 +0300 Subject: [PATCH 01/30] Improve test name #790 --- test/integration/epp/domain/transfer/request_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/epp/domain/transfer/request_test.rb b/test/integration/epp/domain/transfer/request_test.rb index f3ea644fc..996296257 100644 --- a/test/integration/epp/domain/transfer/request_test.rb +++ b/test/integration/epp/domain/transfer/request_test.rb @@ -75,7 +75,7 @@ class EppDomainTransferRequestTest < ActionDispatch::IntegrationTest assert_equal '2304', Nokogiri::XML(response.body).at_css('result')[:code] end - def test_discarded_domain + def test_discarded_domain_cannot_be_transferred @domain.update!(statuses: [DomainStatus::DELETE_CANDIDATE]) post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_goodnames' } From 00a30fc019a058e5cbaa6db7190b6afdc18359fa Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Sat, 7 Apr 2018 16:21:07 +0300 Subject: [PATCH 02/30] Remove unneeded attribute alias #790 --- app/models/concerns/domain/deletable.rb | 4 ---- app/models/domain.rb | 2 +- app/presenters/domain_presenter.rb | 2 +- spec/models/domain_spec.rb | 6 +++--- spec/presenters/domain_presenter_spec.rb | 4 ++-- 5 files changed, 7 insertions(+), 11 deletions(-) diff --git a/app/models/concerns/domain/deletable.rb b/app/models/concerns/domain/deletable.rb index 86c296d88..204d924ba 100644 --- a/app/models/concerns/domain/deletable.rb +++ b/app/models/concerns/domain/deletable.rb @@ -1,10 +1,6 @@ module Concerns::Domain::Deletable extend ActiveSupport::Concern - included do - alias_attribute :delete_time, :delete_at - end - def discard statuses << DomainStatus::DELETE_CANDIDATE save diff --git a/app/models/domain.rb b/app/models/domain.rb index 9eef0f30f..a9fec134e 100644 --- a/app/models/domain.rb +++ b/app/models/domain.rb @@ -684,7 +684,7 @@ class Domain < ActiveRecord::Base end def self.delete_candidates - where("#{attribute_alias(:delete_time)} < ?", Time.zone.now) + where('delete_at < ?', Time.zone.now) end def self.uses_zone?(zone) diff --git a/app/presenters/domain_presenter.rb b/app/presenters/domain_presenter.rb index aac3c1527..2ecb82922 100644 --- a/app/presenters/domain_presenter.rb +++ b/app/presenters/domain_presenter.rb @@ -30,7 +30,7 @@ class DomainPresenter end def delete_date - view.l(domain.delete_time, format: :date) if domain.delete_time + view.l(domain.delete_at, format: :date) if domain.delete_at end def force_delete_date diff --git a/spec/models/domain_spec.rb b/spec/models/domain_spec.rb index cc1fe52a2..6c09ef7ed 100644 --- a/spec/models/domain_spec.rb +++ b/spec/models/domain_spec.rb @@ -877,9 +877,9 @@ RSpec.describe Domain do create(:zone, origin: 'ee') - create(:domain, id: 1, delete_time: Time.zone.parse('04.07.2010 23:59')) - create(:domain, id: 2, delete_time: Time.zone.parse('05.07.2010 00:00')) - create(:domain, id: 3, delete_time: Time.zone.parse('05.07.2010 00:01')) + create(:domain, id: 1, delete_at: Time.zone.parse('04.07.2010 23:59')) + create(:domain, id: 2, delete_at: Time.zone.parse('05.07.2010 00:00')) + create(:domain, id: 3, delete_at: Time.zone.parse('05.07.2010 00:01')) end it 'returns domains with delete time in the past' do diff --git a/spec/presenters/domain_presenter_spec.rb b/spec/presenters/domain_presenter_spec.rb index 3726960b4..d0cef5e6d 100644 --- a/spec/presenters/domain_presenter_spec.rb +++ b/spec/presenters/domain_presenter_spec.rb @@ -44,7 +44,7 @@ RSpec.describe DomainPresenter do subject(:delete_date) { presenter.delete_date } context 'when present' do - let(:domain) { instance_double(Domain, delete_time: '05.07.2010') } + let(:domain) { instance_double(Domain, delete_at: '05.07.2010') } it 'returns localized date' do expect(view).to receive(:l).with('05.07.2010', format: :date).and_return('delete date') @@ -53,7 +53,7 @@ RSpec.describe DomainPresenter do end context 'when absent' do - let(:domain) { instance_double(Domain, delete_time: nil) } + let(:domain) { instance_double(Domain, delete_at: nil) } specify { expect(delete_date).to be_nil } end From e776d09f9d99e4cc33ca8cd7666646510e0a0e67 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Sun, 8 Apr 2018 00:36:00 +0300 Subject: [PATCH 03/30] Improve domain discard - Extract rake task domain:discard - Remove background job when keeping a domain #790 --- app/models/concerns/domain/deletable.rb | 31 +++++++++++++ app/models/domain.rb | 11 ----- app/models/domain_cron.rb | 16 ------- app/models/que_job.rb | 3 ++ config/schedule.rb | 4 ++ lib/tasks/domain.rake | 5 +++ spec/models/domain_spec.rb | 16 ------- .../epp/domain/transfer/request_test.rb | 2 +- test/integration/tasks/discard_domain_test.rb | 43 +++++++++++++++++++ test/models/domain/deletable_test.rb | 19 +++++++- 10 files changed, 104 insertions(+), 46 deletions(-) create mode 100644 app/models/que_job.rb create mode 100644 lib/tasks/domain.rake create mode 100644 test/integration/tasks/discard_domain_test.rb diff --git a/app/models/concerns/domain/deletable.rb b/app/models/concerns/domain/deletable.rb index 204d924ba..6075ef8f7 100644 --- a/app/models/concerns/domain/deletable.rb +++ b/app/models/concerns/domain/deletable.rb @@ -1,12 +1,43 @@ module Concerns::Domain::Deletable extend ActiveSupport::Concern + class_methods do + def discard_domains + domains = where('delete_at < ? AND ? != ALL(statuses) AND ? != ALL(statuses)', + Time.zone.now, + DomainStatus::SERVER_DELETE_PROHIBITED, + DomainStatus::DELETE_CANDIDATE) + + domains.map(&:discard) + end + end + def discard statuses << DomainStatus::DELETE_CANDIDATE + # We don't validate deliberately since nobody is interested in fixing discarded domain + save(validate: false) + delete_later + logger.info "Domain #{name} (ID: #{id}) is scheduled to be deleted" + end + + def keep + statuses.delete(DomainStatus::DELETE_CANDIDATE) save + do_not_delete_later end def discarded? statuses.include?(DomainStatus::DELETE_CANDIDATE) end + + private + + def delete_later + run_at = rand(((24 * 60) - (DateTime.now.hour * 60 + DateTime.now.minute))).minutes.from_now + DomainDeleteJob.enqueue(id, run_at: run_at) + end + + def do_not_delete_later + QueJob.find_by!("args->>0 = '#{id}'").delete + end end diff --git a/app/models/domain.rb b/app/models/domain.rb index a9fec134e..1425fc1e1 100644 --- a/app/models/domain.rb +++ b/app/models/domain.rb @@ -281,13 +281,6 @@ class Domain < ActiveRecord::Base true end - def delete_candidateable? - return false if delete_at > Time.zone.now - return false if statuses.include?(DomainStatus::DELETE_CANDIDATE) - return false if statuses.include?(DomainStatus::SERVER_DELETE_PROHIBITED) - true - end - def renewable? if Setting.days_to_renew_domain_before_expire != 0 # if you can renew domain at days_to_renew before domain expiration @@ -683,10 +676,6 @@ class Domain < ActiveRecord::Base where("#{attribute_alias(:outzone_time)} < ?", Time.zone.now) end - def self.delete_candidates - where('delete_at < ?', Time.zone.now) - end - def self.uses_zone?(zone) exists?(["name ILIKE ?", "%.#{zone.origin}"]) end diff --git a/app/models/domain_cron.rb b/app/models/domain_cron.rb index dcd99328a..6ca502b00 100644 --- a/app/models/domain_cron.rb +++ b/app/models/domain_cron.rb @@ -104,22 +104,6 @@ class DomainCron c = 0 - domains = Domain.delete_candidates - - domains.each do |domain| - next unless domain.delete_candidateable? - - domain.statuses << DomainStatus::DELETE_CANDIDATE - - # If domain successfully saved, add it to delete schedule - if domain.save(validate: false) - ::PaperTrail.whodunnit = "cron - #{__method__}" - DomainDeleteJob.enqueue(domain.id, run_at: rand(((24*60) - (DateTime.now.hour * 60 + DateTime.now.minute))).minutes.from_now) - STDOUT << "#{Time.zone.now.utc} Domain.destroy_delete_candidates: job added by deleteCandidate status ##{domain.id} (#{domain.name})\n" unless Rails.env.test? - c += 1 - end - end - Domain.where('force_delete_at <= ?', Time.zone.now.end_of_day.utc).each do |x| DomainDeleteJob.enqueue(x.id, run_at: rand(((24*60) - (DateTime.now.hour * 60 + DateTime.now.minute))).minutes.from_now) STDOUT << "#{Time.zone.now.utc} DomainCron.destroy_delete_candidates: job added by force delete time ##{x.id} (#{x.name})\n" unless Rails.env.test? diff --git a/app/models/que_job.rb b/app/models/que_job.rb new file mode 100644 index 000000000..d08e65d10 --- /dev/null +++ b/app/models/que_job.rb @@ -0,0 +1,3 @@ +class QueJob < ActiveRecord::Base # To be able to remove existing jobs + self.primary_key = 'job_id' +end diff --git a/config/schedule.rb b/config/schedule.rb index a136ba5c3..dd5741dd0 100644 --- a/config/schedule.rb +++ b/config/schedule.rb @@ -61,6 +61,10 @@ if @cron_group == 'registry' every :day, at: '19:00pm' do runner 'Directo.send_receipts' end if @environment == 'production' + + every 42.minutes do + rake 'domain:discard' + end end every 10.minutes do diff --git a/lib/tasks/domain.rake b/lib/tasks/domain.rake new file mode 100644 index 000000000..f59a76141 --- /dev/null +++ b/lib/tasks/domain.rake @@ -0,0 +1,5 @@ +namespace :domain do + task discard: :environment do + Domain.discard_domains + end +end diff --git a/spec/models/domain_spec.rb b/spec/models/domain_spec.rb index 6c09ef7ed..4f1d5d6a1 100644 --- a/spec/models/domain_spec.rb +++ b/spec/models/domain_spec.rb @@ -871,22 +871,6 @@ RSpec.describe Domain do end end - describe '::delete_candidates', db: true do - before :example do - travel_to Time.zone.parse('05.07.2010 00:00') - - create(:zone, origin: 'ee') - - create(:domain, id: 1, delete_at: Time.zone.parse('04.07.2010 23:59')) - create(:domain, id: 2, delete_at: Time.zone.parse('05.07.2010 00:00')) - create(:domain, id: 3, delete_at: Time.zone.parse('05.07.2010 00:01')) - end - - it 'returns domains with delete time in the past' do - expect(described_class.delete_candidates.ids).to eq([1]) - end - end - describe '::uses_zone?', db: true do let!(:zone) { create(:zone, origin: 'domain.tld') } diff --git a/test/integration/epp/domain/transfer/request_test.rb b/test/integration/epp/domain/transfer/request_test.rb index 996296257..aef189104 100644 --- a/test/integration/epp/domain/transfer/request_test.rb +++ b/test/integration/epp/domain/transfer/request_test.rb @@ -76,7 +76,7 @@ class EppDomainTransferRequestTest < ActionDispatch::IntegrationTest end def test_discarded_domain_cannot_be_transferred - @domain.update!(statuses: [DomainStatus::DELETE_CANDIDATE]) + @domain.discard post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_goodnames' } @domain.reload diff --git a/test/integration/tasks/discard_domain_test.rb b/test/integration/tasks/discard_domain_test.rb new file mode 100644 index 000000000..0a341765b --- /dev/null +++ b/test/integration/tasks/discard_domain_test.rb @@ -0,0 +1,43 @@ +require 'test_helper' + +class DiscardDomainTaskTest < ActiveSupport::TestCase + setup do + travel_to Time.zone.parse('2010-07-05 08:00') + @domain = domains(:shop) + end + + def test_discard_domains_with_past_delete_at + @domain.update!(delete_at: Time.zone.parse('2010-07-05 07:59')) + Rake::Task['domain:discard'].execute + @domain.reload + assert @domain.discarded? + end + + def test_ignore_domains_with_delete_at_in_the_future_or_now + @domain.update!(delete_at: Time.zone.parse('2010-07-05 08:00')) + Rake::Task['domain:discard'].execute + @domain.reload + refute @domain.discarded? + end + + def test_ignore_already_discarded_domains + @domain.update!(delete_at: Time.zone.parse('2010-07-05 07:59')) + @domain.discard + + job_count = lambda do + QueJob.where("args->>0 = '#{@domain.id}'", job_class: DomainDeleteJob.name).count + end + + assert_no_difference job_count, 'A domain should not be discarded again' do + Rake::Task['domain:discard'].execute + end + end + + def test_ignore_domains_with_server_delete_prohibited_status + @domain.update!(delete_at: Time.zone.parse('2010-07-05 07:59'), + statuses: [DomainStatus::SERVER_DELETE_PROHIBITED]) + Rake::Task['domain:discard'].execute + @domain.reload + refute @domain.discarded? + end +end diff --git a/test/models/domain/deletable_test.rb b/test/models/domain/deletable_test.rb index dbec7bc7f..5e41968d7 100644 --- a/test/models/domain/deletable_test.rb +++ b/test/models/domain/deletable_test.rb @@ -5,10 +5,25 @@ class DomainDeletableTest < ActiveSupport::TestCase @domain = domains(:shop) end - def test_discard - refute @domain.discarded? + def test_discard_domain @domain.discard @domain.reload + assert QueJob.find_by("args->>0 = '#{@domain.id}'", job_class: DomainDeleteJob.name) assert @domain.discarded? end + + def test_discard_invalid_domain + domain = domains(:invalid) + domain.discard + domain.reload + assert domain.discarded?, 'a domain should be discarded' + end + + def test_keep_domain + @domain.discard + @domain.keep + @domain.reload + assert_nil QueJob.find_by("args->>0 = '#{@domain.id}'", job_class: DomainDeleteJob.name) + refute @domain.discarded? + end end From a932d43dda65cd89c4f0ac5e316795f18133d5fd Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Sun, 8 Apr 2018 15:45:01 +0300 Subject: [PATCH 04/30] Improve UI #790 --- app/views/admin/domains/edit.html.erb | 24 +++++++++++++----------- config/locales/admin/domains.en.yml | 1 - 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/app/views/admin/domains/edit.html.erb b/app/views/admin/domains/edit.html.erb index 3f831e86b..6593f431b 100644 --- a/app/views/admin/domains/edit.html.erb +++ b/app/views/admin/domains/edit.html.erb @@ -1,20 +1,22 @@ <% domain = DomainPresenter.new(domain: @domain, view: self) %> -
-
-

- Edit: <%= domain.name %> -

-
-
-

+
    +
  1. <%= link_to t('admin.domains.index.header'), admin_domains_path %>
    2. +
  2. <%= link_to @domain, admin_domain_path(@domain) %>
    3. +
+ +
+
+
+

Edit: <%= domain.name %>

+
+ +
<%= link_to t('.add_new_status_btn'), '#', class: 'btn btn-primary js-add-status' %> <%= domain.force_delete_toggle_btn %> - <%= link_to t('.back_btn'), [:admin, @domain], class: 'btn btn-default' %> -

+
-
<%= render 'form' %> <%= 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 87c2c9c6a..aa574e8a3 100644 --- a/config/locales/admin/domains.en.yml +++ b/config/locales/admin/domains.en.yml @@ -14,7 +14,6 @@ en: edit: add_new_status_btn: Add new status - back_btn: Back to domain force_delete_dialog: title: Force delete From 4dc77235542dece7e80ece28bd2808fc71430f5a Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Sun, 8 Apr 2018 15:53:29 +0300 Subject: [PATCH 05/30] Remove dead code #790 --- app/controllers/admin/domains_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/admin/domains_controller.rb b/app/controllers/admin/domains_controller.rb index 576b5f8e1..3cf4577fc 100644 --- a/app/controllers/admin/domains_controller.rb +++ b/app/controllers/admin/domains_controller.rb @@ -1,7 +1,7 @@ module Admin class DomainsController < BaseController load_and_authorize_resource - before_action :set_domain, only: [:show, :edit, :update, :zonefile] + before_action :set_domain, only: [:show, :edit, :update] helper_method :force_delete_templates # rubocop: disable Metrics/PerceivedComplexity From 9e46222e6bf5b2a3398f03b16b81a42124ebf0c9 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Sun, 8 Apr 2018 15:54:42 +0300 Subject: [PATCH 06/30] Remove unused routes #790 --- config/routes.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/routes.rb b/config/routes.rb index 9caeef4a2..883cad6a8 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -186,7 +186,7 @@ Rails.application.routes.draw do match 'forward', via: [:post, :get] end - resources :domains do + resources :domains, except: %i[new create destroy] do resources :domain_versions, controller: 'domains', action: 'versions' resources :pending_updates resources :pending_deletes From b4ed8f6c8200fbaa3f5112144a5478c2890e5fbe Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Sun, 8 Apr 2018 16:01:00 +0300 Subject: [PATCH 07/30] Remove double load #790 --- app/controllers/admin/domains_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/admin/domains_controller.rb b/app/controllers/admin/domains_controller.rb index 3cf4577fc..f2e78aaf0 100644 --- a/app/controllers/admin/domains_controller.rb +++ b/app/controllers/admin/domains_controller.rb @@ -1,7 +1,7 @@ module Admin class DomainsController < BaseController - load_and_authorize_resource - before_action :set_domain, only: [:show, :edit, :update] + before_action :set_domain, only: %i[show edit update] + authorize_resource helper_method :force_delete_templates # rubocop: disable Metrics/PerceivedComplexity From 90a4e11ce4057ed92c13571d5e495b613bf53155 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Sun, 8 Apr 2018 16:07:08 +0300 Subject: [PATCH 08/30] Improve readability #790 --- app/controllers/admin/domains_controller.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/admin/domains_controller.rb b/app/controllers/admin/domains_controller.rb index f2e78aaf0..9237d61af 100644 --- a/app/controllers/admin/domains_controller.rb +++ b/app/controllers/admin/domains_controller.rb @@ -40,7 +40,8 @@ module Admin # rubocop: enable Metrics/AbcSize def show - @domain.valid? + # Validation is needed to warn users + @domain.validate end def edit From cc4a2448442854c782db296815e9483ef6656ae1 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Sun, 8 Apr 2018 18:52:32 +0300 Subject: [PATCH 09/30] Enable to keep a domain #790 --- app/controllers/admin/domains_controller.rb | 7 ++++++- app/models/domain_status.rb | 3 ++- app/presenters/domain_presenter.rb | 9 +++++++++ app/views/admin/domains/edit.html.erb | 5 +++-- config/locales/admin/domains.en.yml | 5 +++++ config/routes.rb | 4 ++++ test/integration/admin/domains/details_test.rb | 10 ++++++++++ 7 files changed, 39 insertions(+), 4 deletions(-) diff --git a/app/controllers/admin/domains_controller.rb b/app/controllers/admin/domains_controller.rb index 9237d61af..0718d600a 100644 --- a/app/controllers/admin/domains_controller.rb +++ b/app/controllers/admin/domains_controller.rb @@ -1,6 +1,6 @@ module Admin class DomainsController < BaseController - before_action :set_domain, only: %i[show edit update] + before_action :set_domain, only: %i[show edit update keep] authorize_resource helper_method :force_delete_templates @@ -68,6 +68,11 @@ module Admin @versions = @domain.versions end + def keep + @domain.keep + redirect_to edit_admin_domain_url(@domain), notice: t('.kept') + end + private def set_domain diff --git a/app/models/domain_status.rb b/app/models/domain_status.rb index 4da6a4a3c..3c4e09beb 100644 --- a/app/models/domain_status.rb +++ b/app/models/domain_status.rb @@ -175,7 +175,8 @@ class DomainStatus < ActiveRecord::Base PENDING_RENEW, PENDING_TRANSFER, PENDING_UPDATE, - PENDING_DELETE_CONFIRMATION + PENDING_DELETE_CONFIRMATION, + DELETE_CANDIDATE, ] end end diff --git a/app/presenters/domain_presenter.rb b/app/presenters/domain_presenter.rb index 2ecb82922..11d767203 100644 --- a/app/presenters/domain_presenter.rb +++ b/app/presenters/domain_presenter.rb @@ -67,6 +67,15 @@ class DomainPresenter end end + def keep_btn + return unless domain.discarded? + + view.link_to view.t('admin.domains.edit.keep_btn'), view.keep_admin_domain_path(@domain), + method: :patch, + data: { confirm: view.t('admin.domains.edit.keep_btn_confirm') }, + class: 'btn btn-default' + end + private attr_reader :domain diff --git a/app/views/admin/domains/edit.html.erb b/app/views/admin/domains/edit.html.erb index 6593f431b..24735734c 100644 --- a/app/views/admin/domains/edit.html.erb +++ b/app/views/admin/domains/edit.html.erb @@ -7,12 +7,13 @@
-
+

Edit: <%= domain.name %>

-
+
<%= link_to t('.add_new_status_btn'), '#', class: 'btn btn-primary js-add-status' %> + <%= domain.keep_btn %> <%= domain.force_delete_toggle_btn %>
diff --git a/config/locales/admin/domains.en.yml b/config/locales/admin/domains.en.yml index aa574e8a3..da4c4f013 100644 --- a/config/locales/admin/domains.en.yml +++ b/config/locales/admin/domains.en.yml @@ -14,6 +14,11 @@ en: edit: add_new_status_btn: Add new status + keep_btn: Remove deleteCandidate status + keep_btn_confirm: Are you sure you want to remove deleteCandidate status? + + keep: + kept: deleteCandidate status has been removed force_delete_dialog: title: Force delete diff --git a/config/routes.rb b/config/routes.rb index 883cad6a8..d530c6a14 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -191,6 +191,10 @@ Rails.application.routes.draw do resources :pending_updates resources :pending_deletes resource :force_delete, controller: 'domains/force_delete', only: %i[create destroy] + + member do + patch :keep + end end resources :domain_versions do diff --git a/test/integration/admin/domains/details_test.rb b/test/integration/admin/domains/details_test.rb index a3ec6bdeb..c1175325d 100644 --- a/test/integration/admin/domains/details_test.rb +++ b/test/integration/admin/domains/details_test.rb @@ -13,4 +13,14 @@ class AdminAreaDomainDetailsTest < ActionDispatch::IntegrationTest visit admin_domain_url(@domain) assert_css 'span.label.label-warning', text: 'deleteCandidate' end + + def test_keep_a_domain + @domain.discard + visit edit_admin_domain_url(@domain) + click_link_or_button 'Remove deleteCandidate status' + @domain.reload + refute @domain.discarded? + assert_text 'deleteCandidate status has been removed' + assert_no_link 'Remove deleteCandidate status' + end end From 454ce4874bb360cf8f0aa84d24938311a71fd61d Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Sun, 8 Apr 2018 18:56:00 +0300 Subject: [PATCH 10/30] Remove useless comments #790 --- app/models/domain_status.rb | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/models/domain_status.rb b/app/models/domain_status.rb index 3c4e09beb..2f7a457dd 100644 --- a/app/models/domain_status.rb +++ b/app/models/domain_status.rb @@ -153,13 +153,11 @@ class DomainStatus < ActiveRecord::Base [ ['Hold', SERVER_HOLD], ['ManualInzone', SERVER_MANUAL_INZONE], - # [''], ['RenewProhibited', SERVER_RENEW_PROHIBITED], ['TransferProhibited', SERVER_TRANSFER_PROHIBITED], ['RegistrantChangeProhibited', SERVER_REGISTRANT_CHANGE_PROHIBITED], ['AdminChangeProhibited', SERVER_ADMIN_CHANGE_PROHIBITED], ['TechChangeProhibited', SERVER_TECH_CHANGE_PROHIBITED], - # [''], ['UpdateProhibited', SERVER_UPDATE_PROHIBITED], ['DeleteProhibited', SERVER_DELETE_PROHIBITED] ] @@ -171,7 +169,6 @@ class DomainStatus < ActiveRecord::Base INACTIVE, FORCE_DELETE, PENDING_CREATE, - #PENDING_DELETE, PENDING_RENEW, PENDING_TRANSFER, PENDING_UPDATE, From 9bf1a7a06b441db757858e4f01f51aee0a4bd534 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Sun, 8 Apr 2018 19:07:16 +0300 Subject: [PATCH 11/30] Fix Rubocop offences #790 --- .rubocop.yml | 2 ++ app/models/que_job.rb | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.rubocop.yml b/.rubocop.yml index 3d8fd0b90..b4151741d 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -2,3 +2,5 @@ inherit_from: .rubocop_todo.yml Style/Alias: EnforcedStyle: prefer_alias_method +Style/TrailingCommaInLiteral: + EnforcedStyleForMultiline: consistent_comma diff --git a/app/models/que_job.rb b/app/models/que_job.rb index d08e65d10..5eed581fc 100644 --- a/app/models/que_job.rb +++ b/app/models/que_job.rb @@ -1,3 +1,4 @@ -class QueJob < ActiveRecord::Base # To be able to remove existing jobs +# To be able to remove existing jobs +class QueJob < ActiveRecord::Base self.primary_key = 'job_id' end From 4a64bead3478fd875b88d45cc9d885d5d447ecea Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Sun, 15 Apr 2018 23:52:54 +0300 Subject: [PATCH 12/30] Fix domain deletion #790 --- app/models/concerns/domain/deletable.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/concerns/domain/deletable.rb b/app/models/concerns/domain/deletable.rb index 6075ef8f7..bb23c3522 100644 --- a/app/models/concerns/domain/deletable.rb +++ b/app/models/concerns/domain/deletable.rb @@ -38,6 +38,6 @@ module Concerns::Domain::Deletable end def do_not_delete_later - QueJob.find_by!("args->>0 = '#{id}'").delete + QueJob.find_by!("args->>0 = '#{id}'", job_class: DomainDeleteJob.name).delete end end From 63db8d140920f55ca0b4417071d4cfcc7640b9e5 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Wed, 18 Apr 2018 23:40:04 +0300 Subject: [PATCH 13/30] Extract concern #790 --- app/models/concerns/domain/deletable.rb | 29 ----------------- app/models/concerns/domain/discardable.rb | 32 +++++++++++++++++++ app/models/domain.rb | 1 + ...{deletable_test.rb => discardable_test.rb} | 2 +- 4 files changed, 34 insertions(+), 30 deletions(-) create mode 100644 app/models/concerns/domain/discardable.rb rename test/models/domain/{deletable_test.rb => discardable_test.rb} (92%) diff --git a/app/models/concerns/domain/deletable.rb b/app/models/concerns/domain/deletable.rb index bb23c3522..ac78de92c 100644 --- a/app/models/concerns/domain/deletable.rb +++ b/app/models/concerns/domain/deletable.rb @@ -1,35 +1,6 @@ module Concerns::Domain::Deletable extend ActiveSupport::Concern - class_methods do - def discard_domains - domains = where('delete_at < ? AND ? != ALL(statuses) AND ? != ALL(statuses)', - Time.zone.now, - DomainStatus::SERVER_DELETE_PROHIBITED, - DomainStatus::DELETE_CANDIDATE) - - domains.map(&:discard) - end - end - - def discard - statuses << DomainStatus::DELETE_CANDIDATE - # We don't validate deliberately since nobody is interested in fixing discarded domain - save(validate: false) - delete_later - logger.info "Domain #{name} (ID: #{id}) is scheduled to be deleted" - end - - def keep - statuses.delete(DomainStatus::DELETE_CANDIDATE) - save - do_not_delete_later - end - - def discarded? - statuses.include?(DomainStatus::DELETE_CANDIDATE) - end - private def delete_later diff --git a/app/models/concerns/domain/discardable.rb b/app/models/concerns/domain/discardable.rb new file mode 100644 index 000000000..b7b8ed608 --- /dev/null +++ b/app/models/concerns/domain/discardable.rb @@ -0,0 +1,32 @@ +module Concerns::Domain::Discardable + extend ActiveSupport::Concern + + class_methods do + def discard_domains + domains = where('delete_at < ? AND ? != ALL(statuses) AND ? != ALL(statuses)', + Time.zone.now, + DomainStatus::SERVER_DELETE_PROHIBITED, + DomainStatus::DELETE_CANDIDATE) + + domains.map(&:discard) + end + end + + def discard + statuses << DomainStatus::DELETE_CANDIDATE + # We don't validate deliberately since nobody is interested in fixing discarded domain + save(validate: false) + delete_later + logger.info "Domain #{name} (ID: #{id}) is scheduled to be deleted" + end + + def keep + statuses.delete(DomainStatus::DELETE_CANDIDATE) + save + do_not_delete_later + end + + def discarded? + statuses.include?(DomainStatus::DELETE_CANDIDATE) + end +end diff --git a/app/models/domain.rb b/app/models/domain.rb index 1b59a1607..3dd1ac308 100644 --- a/app/models/domain.rb +++ b/app/models/domain.rb @@ -5,6 +5,7 @@ class Domain < ActiveRecord::Base include Concerns::Domain::Expirable include Concerns::Domain::Activatable include Concerns::Domain::ForceDelete + include Concerns::Domain::Discardable include Concerns::Domain::Deletable include Concerns::Domain::Transferable diff --git a/test/models/domain/deletable_test.rb b/test/models/domain/discardable_test.rb similarity index 92% rename from test/models/domain/deletable_test.rb rename to test/models/domain/discardable_test.rb index 5e41968d7..9d366a5f2 100644 --- a/test/models/domain/deletable_test.rb +++ b/test/models/domain/discardable_test.rb @@ -1,6 +1,6 @@ require 'test_helper' -class DomainDeletableTest < ActiveSupport::TestCase +class DomainDiscardableTest < ActiveSupport::TestCase setup do @domain = domains(:shop) end From 60a66942d1ee540f121a1b537ec6eabcd163f659 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Thu, 19 Apr 2018 18:20:38 +0300 Subject: [PATCH 14/30] Do not validate a domain when keeping it #790 --- app/models/concerns/domain/discardable.rb | 2 +- test/models/domain/discardable_test.rb | 24 ++++++++++++++++------- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/app/models/concerns/domain/discardable.rb b/app/models/concerns/domain/discardable.rb index b7b8ed608..e568c1c60 100644 --- a/app/models/concerns/domain/discardable.rb +++ b/app/models/concerns/domain/discardable.rb @@ -22,7 +22,7 @@ module Concerns::Domain::Discardable def keep statuses.delete(DomainStatus::DELETE_CANDIDATE) - save + save(validate: false) do_not_delete_later end diff --git a/test/models/domain/discardable_test.rb b/test/models/domain/discardable_test.rb index 9d366a5f2..8894b7fb0 100644 --- a/test/models/domain/discardable_test.rb +++ b/test/models/domain/discardable_test.rb @@ -5,25 +5,35 @@ class DomainDiscardableTest < ActiveSupport::TestCase @domain = domains(:shop) end - def test_discard_domain + def test_discarding_a_domain @domain.discard @domain.reload - assert QueJob.find_by("args->>0 = '#{@domain.id}'", job_class: DomainDeleteJob.name) assert @domain.discarded? end - def test_discard_invalid_domain + def test_discarding_a_domain_deletes_schedules_domain_deletion + @domain.discard + assert QueJob.find_by("args->>0 = '#{@domain.id}'", job_class: DomainDeleteJob.name) + end + + def test_discarding_a_domain_bypasses_validation domain = domains(:invalid) domain.discard domain.reload - assert domain.discarded?, 'a domain should be discarded' + assert domain.discarded? end - def test_keep_domain + def test_keeping_a_domain_bypasses_validation + domain = domains(:invalid) + domain.discard + domain.keep + domain.reload + assert_not domain.discarded? + end + + def test_keeping_a_domain_cancels_domain_deletion @domain.discard @domain.keep - @domain.reload assert_nil QueJob.find_by("args->>0 = '#{@domain.id}'", job_class: DomainDeleteJob.name) - refute @domain.discarded? end end From 3e94c10da168cfe856c06984998c583879481a00 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Fri, 20 Apr 2018 16:55:36 +0300 Subject: [PATCH 15/30] Delete discarded domains at the random moment within next 24h #790 --- app/models/concerns/domain/deletable.rb | 16 ++++++++-- app/models/concerns/domain/discardable.rb | 16 ++++++---- .../integration/admin/domains/details_test.rb | 15 +++------ test/integration/admin/domains_test.rb | 26 ++++++++++++--- .../epp/domain/domain_delete_test.rb | 9 +++++- .../epp/domain/domain_update_test.rb | 12 +++++-- .../epp/domain/transfer/request_test.rb | 10 +++++- test/models/domain/discardable_test.rb | 32 ++++++++++++++++--- 8 files changed, 105 insertions(+), 31 deletions(-) diff --git a/app/models/concerns/domain/deletable.rb b/app/models/concerns/domain/deletable.rb index ac78de92c..e3283e5b2 100644 --- a/app/models/concerns/domain/deletable.rb +++ b/app/models/concerns/domain/deletable.rb @@ -4,11 +4,21 @@ module Concerns::Domain::Deletable private def delete_later - run_at = rand(((24 * 60) - (DateTime.now.hour * 60 + DateTime.now.minute))).minutes.from_now - DomainDeleteJob.enqueue(id, run_at: run_at) + deletion_time = Time.zone.at(rand(deletion_time_span)) + DomainDeleteJob.enqueue(id, run_at: deletion_time) + logger.info "Domain #{name} is scheduled to be deleted around #{deletion_time}" end def do_not_delete_later - QueJob.find_by!("args->>0 = '#{id}'", job_class: DomainDeleteJob.name).delete + QueJob.find_by!("args->>0 = '#{id}'", job_class: DomainDeleteJob.name).destroy! + end + + def deletion_time_span + # 5 minutes to ensure we don't create a background job with past `run_at` + ((Time.zone.now + 5.minutes).to_i)..(deletion_deadline.to_i) + end + + def deletion_deadline + delete_at + 24.hours end end diff --git a/app/models/concerns/domain/discardable.rb b/app/models/concerns/domain/discardable.rb index e568c1c60..a5aa3d2b4 100644 --- a/app/models/concerns/domain/discardable.rb +++ b/app/models/concerns/domain/discardable.rb @@ -13,17 +13,21 @@ module Concerns::Domain::Discardable end def discard + raise 'Domain is already discarded' if discarded? + statuses << DomainStatus::DELETE_CANDIDATE - # We don't validate deliberately since nobody is interested in fixing discarded domain - save(validate: false) - delete_later - logger.info "Domain #{name} (ID: #{id}) is scheduled to be deleted" + transaction do + save(validate: false) + delete_later + end end def keep statuses.delete(DomainStatus::DELETE_CANDIDATE) - save(validate: false) - do_not_delete_later + transaction do + save(validate: false) + do_not_delete_later + end end def discarded? diff --git a/test/integration/admin/domains/details_test.rb b/test/integration/admin/domains/details_test.rb index c1175325d..36a0e043d 100644 --- a/test/integration/admin/domains/details_test.rb +++ b/test/integration/admin/domains/details_test.rb @@ -7,20 +7,15 @@ class AdminAreaDomainDetailsTest < ActionDispatch::IntegrationTest end def test_discarded_domain_has_corresponding_label + travel_to Time.zone.parse('2010-07-05 10:30') + @domain.delete_at = Time.zone.parse('2010-07-05 10:00') + visit admin_domain_url(@domain) assert_no_css 'span.label.label-warning', text: 'deleteCandidate' + @domain.discard + visit admin_domain_url(@domain) assert_css 'span.label.label-warning', text: 'deleteCandidate' end - - def test_keep_a_domain - @domain.discard - visit edit_admin_domain_url(@domain) - click_link_or_button 'Remove deleteCandidate status' - @domain.reload - refute @domain.discarded? - assert_text 'deleteCandidate status has been removed' - assert_no_link 'Remove deleteCandidate status' - end end diff --git a/test/integration/admin/domains_test.rb b/test/integration/admin/domains_test.rb index 81261f017..36cd0356d 100644 --- a/test/integration/admin/domains_test.rb +++ b/test/integration/admin/domains_test.rb @@ -1,13 +1,31 @@ require 'test_helper' class AdminDomainsTestTest < ActionDispatch::IntegrationTest - setup do + def setup login_as users(:admin) + @domain = domains(:shop) + end + + def teardown + travel_back end def test_shows_details - domain = domains(:shop) - visit admin_domain_path(domain) - assert_field nil, with: domain.transfer_code + visit admin_domain_path(@domain) + assert_field nil, with: @domain.transfer_code + end + + def test_keep_a_domain + travel_to Time.zone.parse('2010-07-05 10:30') + @domain.delete_at = Time.zone.parse('2010-07-05 10:00') + @domain.discard + + visit edit_admin_domain_url(@domain) + click_link_or_button 'Remove deleteCandidate status' + @domain.reload + + assert_not @domain.discarded? + assert_text 'deleteCandidate status has been removed' + assert_no_link 'Remove deleteCandidate status' end end diff --git a/test/integration/epp/domain/domain_delete_test.rb b/test/integration/epp/domain/domain_delete_test.rb index eae4d39ff..014497423 100644 --- a/test/integration/epp/domain/domain_delete_test.rb +++ b/test/integration/epp/domain/domain_delete_test.rb @@ -1,6 +1,10 @@ require 'test_helper' class EppDomainDeleteTest < ActionDispatch::IntegrationTest + def setup + @domain = domains(:shop) + end + def test_bypasses_domain_and_registrant_and_contacts_validation request_xml = <<-XML @@ -27,7 +31,9 @@ class EppDomainDeleteTest < ActionDispatch::IntegrationTest end def test_discarded_domain_cannot_be_deleted - domains(:shop).discard + travel_to Time.zone.parse('2010-07-05 10:30') + @domain.delete_at = Time.zone.parse('2010-07-05 10:00') + @domain.discard request_xml = <<-XML @@ -51,5 +57,6 @@ class EppDomainDeleteTest < ActionDispatch::IntegrationTest post '/epp/command/delete', { frame: request_xml }, 'HTTP_COOKIE' => 'session=api_bestnames' end assert_equal '2105', Nokogiri::XML(response.body).at_css('result')[:code] + travel_back end end diff --git a/test/integration/epp/domain/domain_update_test.rb b/test/integration/epp/domain/domain_update_test.rb index ac7160558..599512cf1 100644 --- a/test/integration/epp/domain/domain_update_test.rb +++ b/test/integration/epp/domain/domain_update_test.rb @@ -1,6 +1,10 @@ require 'test_helper' class EppDomainUpdateTest < ActionDispatch::IntegrationTest + def setup + @domain = domains(:shop) + end + def test_update_domain request_xml = <<-XML @@ -21,13 +25,16 @@ class EppDomainUpdateTest < ActionDispatch::IntegrationTest XML post '/epp/command/update', { frame: request_xml }, 'HTTP_COOKIE' => 'session=api_bestnames' - assert_equal 'f0ff7d17b0', domains(:shop).transfer_code + @domain.reload + assert_equal 'f0ff7d17b0', @domain.transfer_code assert_equal '1000', Nokogiri::XML(response.body).at_css('result')[:code] assert_equal 1, Nokogiri::XML(response.body).css('result').size end def test_discarded_domain_cannot_be_updated - domains(:shop).discard + travel_to Time.zone.parse('2010-07-05 10:30') + @domain.delete_at = Time.zone.parse('2010-07-05 10:00') + @domain.discard request_xml = <<-XML @@ -44,5 +51,6 @@ class EppDomainUpdateTest < ActionDispatch::IntegrationTest post '/epp/command/update', { frame: request_xml }, 'HTTP_COOKIE' => 'session=api_bestnames' assert_equal '2105', Nokogiri::XML(response.body).at_css('result')[:code] + travel_back end end diff --git a/test/integration/epp/domain/transfer/request_test.rb b/test/integration/epp/domain/transfer/request_test.rb index aef189104..95f05fc66 100644 --- a/test/integration/epp/domain/transfer/request_test.rb +++ b/test/integration/epp/domain/transfer/request_test.rb @@ -1,12 +1,17 @@ require 'test_helper' class EppDomainTransferRequestTest < ActionDispatch::IntegrationTest - setup do + def setup @domain = domains(:shop) @new_registrar = registrars(:goodnames) + @original_transfer_wait_time = Setting.transfer_wait_time Setting.transfer_wait_time = 0 end + def teardown + Setting.transfer_wait_time = @original_transfer_wait_time + end + def test_transfers_domain_at_once post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_goodnames' } assert_equal '1000', Nokogiri::XML(response.body).at_css('result')[:code] @@ -76,6 +81,8 @@ class EppDomainTransferRequestTest < ActionDispatch::IntegrationTest end def test_discarded_domain_cannot_be_transferred + travel_to Time.zone.parse('2010-07-05 10:30') + @domain.delete_at = Time.zone.parse('2010-07-05 10:00') @domain.discard post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_goodnames' } @@ -83,6 +90,7 @@ class EppDomainTransferRequestTest < ActionDispatch::IntegrationTest assert_equal registrars(:bestnames), @domain.registrar assert_equal '2105', Nokogiri::XML(response.body).at_css('result')[:code] + travel_back end def test_same_registrar diff --git a/test/models/domain/discardable_test.rb b/test/models/domain/discardable_test.rb index 8894b7fb0..8c65d18a9 100644 --- a/test/models/domain/discardable_test.rb +++ b/test/models/domain/discardable_test.rb @@ -1,30 +1,54 @@ require 'test_helper' class DomainDiscardableTest < ActiveSupport::TestCase - setup do + def setup + travel_to Time.zone.parse('2010-07-05 10:30') @domain = domains(:shop) + @domain.delete_at = Time.zone.parse('2010-07-05 10:00') end - def test_discarding_a_domain + def teardown + travel_back + end + + def test_discarding_a_domain_persists_the_state @domain.discard @domain.reload assert @domain.discarded? end - def test_discarding_a_domain_deletes_schedules_domain_deletion + def test_discarding_a_domain_schedules_deletion_at_random_time @domain.discard - assert QueJob.find_by("args->>0 = '#{@domain.id}'", job_class: DomainDeleteJob.name) + other_domain = domains(:airport) + other_domain.delete_at = Time.zone.parse('2010-07-05 10:00') + other_domain.discard + + background_job = QueJob.find_by("args->>0 = '#{@domain.id}'", job_class: DomainDeleteJob.name) + other_background_job = QueJob.find_by("args->>0 = '#{other_domain.id}'", + job_class: DomainDeleteJob.name) + assert_not_equal background_job.run_at, other_background_job.run_at end def test_discarding_a_domain_bypasses_validation domain = domains(:invalid) + domain.delete_at = Time.zone.parse('2010-07-05 10:00') domain.discard domain.reload assert domain.discarded? end + def test_domain_cannot_be_discarded_repeatedly + @domain.discard + + exception = assert_raises do + @domain.discard + end + assert_equal 'Domain is already discarded', exception.message + end + def test_keeping_a_domain_bypasses_validation domain = domains(:invalid) + domain.delete_at = Time.zone.parse('2010-07-05 10:00') domain.discard domain.keep domain.reload From 6c7bfa01acd954c101f486d7bc591c65334962d0 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Fri, 20 Apr 2018 17:31:14 +0300 Subject: [PATCH 16/30] Increase the priority of background job of domain deletion #790 --- app/models/concerns/domain/deletable.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/concerns/domain/deletable.rb b/app/models/concerns/domain/deletable.rb index e3283e5b2..547d7fb95 100644 --- a/app/models/concerns/domain/deletable.rb +++ b/app/models/concerns/domain/deletable.rb @@ -5,7 +5,7 @@ module Concerns::Domain::Deletable def delete_later deletion_time = Time.zone.at(rand(deletion_time_span)) - DomainDeleteJob.enqueue(id, run_at: deletion_time) + DomainDeleteJob.enqueue(id, run_at: deletion_time, priority: 1) logger.info "Domain #{name} is scheduled to be deleted around #{deletion_time}" end From cc48bbb16e180ba5864bc17e59b4f8459b62727d Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Mon, 4 Jun 2018 04:01:47 +0300 Subject: [PATCH 17/30] Revert "Fix Rubocop offences" This reverts commit 9bf1a7a06b441db757858e4f01f51aee0a4bd534. --- .rubocop.yml | 2 -- app/models/que_job.rb | 3 +-- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index b4151741d..3d8fd0b90 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -2,5 +2,3 @@ inherit_from: .rubocop_todo.yml Style/Alias: EnforcedStyle: prefer_alias_method -Style/TrailingCommaInLiteral: - EnforcedStyleForMultiline: consistent_comma diff --git a/app/models/que_job.rb b/app/models/que_job.rb index 5eed581fc..d08e65d10 100644 --- a/app/models/que_job.rb +++ b/app/models/que_job.rb @@ -1,4 +1,3 @@ -# To be able to remove existing jobs -class QueJob < ActiveRecord::Base +class QueJob < ActiveRecord::Base # To be able to remove existing jobs self.primary_key = 'job_id' end From 5d6f256a5f223f256fe4124c19d08d2e367baa3d Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Mon, 4 Jun 2018 04:02:27 +0300 Subject: [PATCH 18/30] Reformat --- app/models/que_job.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/models/que_job.rb b/app/models/que_job.rb index d08e65d10..5eed581fc 100644 --- a/app/models/que_job.rb +++ b/app/models/que_job.rb @@ -1,3 +1,4 @@ -class QueJob < ActiveRecord::Base # To be able to remove existing jobs +# To be able to remove existing jobs +class QueJob < ActiveRecord::Base self.primary_key = 'job_id' end From fd383a9c18071651005e82dddfc8573bb5a28c5d Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Mon, 11 Jun 2018 10:59:19 +0300 Subject: [PATCH 19/30] Allow creating a background job with `run_at` in the past #790 --- app/models/concerns/domain/deletable.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/models/concerns/domain/deletable.rb b/app/models/concerns/domain/deletable.rb index 547d7fb95..2a113e12b 100644 --- a/app/models/concerns/domain/deletable.rb +++ b/app/models/concerns/domain/deletable.rb @@ -14,8 +14,7 @@ module Concerns::Domain::Deletable end def deletion_time_span - # 5 minutes to ensure we don't create a background job with past `run_at` - ((Time.zone.now + 5.minutes).to_i)..(deletion_deadline.to_i) + Time.zone.now.to_i..deletion_deadline.to_i end def deletion_deadline From d84d7cf77211e642143f78044444d351f6bccd3f Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Wed, 20 Jun 2018 15:13:31 +0300 Subject: [PATCH 20/30] Do not use bang version of methods --- app/models/concerns/domain/deletable.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/models/concerns/domain/deletable.rb b/app/models/concerns/domain/deletable.rb index 2a113e12b..2a4f0704f 100644 --- a/app/models/concerns/domain/deletable.rb +++ b/app/models/concerns/domain/deletable.rb @@ -10,7 +10,8 @@ module Concerns::Domain::Deletable end def do_not_delete_later - QueJob.find_by!("args->>0 = '#{id}'", job_class: DomainDeleteJob.name).destroy! + # Que job can be manually deleted in admin area UI + QueJob.find_by("args->>0 = '#{id}'", job_class: DomainDeleteJob.name)&.destroy end def deletion_time_span From 07bc0546bb344b8e0f2ddae72f43243a8fd95e44 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Sun, 22 Jul 2018 23:58:25 +0300 Subject: [PATCH 21/30] Handle past `domains.delete_at` --- app/models/concerns/domain/deletable.rb | 5 +++-- test/models/domain/discardable_test.rb | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/models/concerns/domain/deletable.rb b/app/models/concerns/domain/deletable.rb index 2a4f0704f..8640277c8 100644 --- a/app/models/concerns/domain/deletable.rb +++ b/app/models/concerns/domain/deletable.rb @@ -15,10 +15,11 @@ module Concerns::Domain::Deletable end def deletion_time_span - Time.zone.now.to_i..deletion_deadline.to_i + range_params = [Time.zone.now.to_i, deletion_deadline.to_i].sort + Range.new(*range_params) end def deletion_deadline delete_at + 24.hours end -end +end \ No newline at end of file diff --git a/test/models/domain/discardable_test.rb b/test/models/domain/discardable_test.rb index 8c65d18a9..dad23b17b 100644 --- a/test/models/domain/discardable_test.rb +++ b/test/models/domain/discardable_test.rb @@ -20,7 +20,7 @@ class DomainDiscardableTest < ActiveSupport::TestCase def test_discarding_a_domain_schedules_deletion_at_random_time @domain.discard other_domain = domains(:airport) - other_domain.delete_at = Time.zone.parse('2010-07-05 10:00') + other_domain.delete_at = Time.zone.parse('2010-07-04') other_domain.discard background_job = QueJob.find_by("args->>0 = '#{@domain.id}'", job_class: DomainDeleteJob.name) From 13f2bff8d0d00dbd4a822eb9825fa17ba90bdce7 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Thu, 9 Aug 2018 15:05:28 +0300 Subject: [PATCH 22/30] Use setup callback --- test/models/domain/discardable_test.rb | 4 ++-- test/models/domain/force_delete_test.rb | 2 +- test/system/admin_area/domains_test.rb | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/test/models/domain/discardable_test.rb b/test/models/domain/discardable_test.rb index dad23b17b..0181a6bb4 100644 --- a/test/models/domain/discardable_test.rb +++ b/test/models/domain/discardable_test.rb @@ -1,13 +1,13 @@ require 'test_helper' class DomainDiscardableTest < ActiveSupport::TestCase - def setup + setup do travel_to Time.zone.parse('2010-07-05 10:30') @domain = domains(:shop) @domain.delete_at = Time.zone.parse('2010-07-05 10:00') end - def teardown + teardown do travel_back end diff --git a/test/models/domain/force_delete_test.rb b/test/models/domain/force_delete_test.rb index 535ad84d8..70db52659 100644 --- a/test/models/domain/force_delete_test.rb +++ b/test/models/domain/force_delete_test.rb @@ -1,7 +1,7 @@ require 'test_helper' class DomainForceDeleteTest < ActiveSupport::TestCase - def setup + setup do @domain = domains(:shop) end diff --git a/test/system/admin_area/domains_test.rb b/test/system/admin_area/domains_test.rb index 83ceac3d5..cd7a8f10a 100644 --- a/test/system/admin_area/domains_test.rb +++ b/test/system/admin_area/domains_test.rb @@ -1,12 +1,12 @@ require 'test_helper' class AdminDomainsTestTest < ApplicationSystemTestCase - def setup + setup do sign_in users(:admin) @domain = domains(:shop) end - def teardown + teardown do travel_back end From 6ebb77fb5c6b8659d05cccab91afdda5c6d9e30f Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Thu, 16 Aug 2018 15:43:22 +0300 Subject: [PATCH 23/30] Change `contacts.email` to NOT NULL --- .../20180816123540_change_contacts_email_to_not_null.rb | 5 +++++ db/structure.sql | 4 +++- test/system/admin_area/contact_versions_test.rb | 4 ++-- test/system/admin_area/domain_versions_test.rb | 4 ++-- 4 files changed, 12 insertions(+), 5 deletions(-) create mode 100644 db/migrate/20180816123540_change_contacts_email_to_not_null.rb diff --git a/db/migrate/20180816123540_change_contacts_email_to_not_null.rb b/db/migrate/20180816123540_change_contacts_email_to_not_null.rb new file mode 100644 index 000000000..e6080e38b --- /dev/null +++ b/db/migrate/20180816123540_change_contacts_email_to_not_null.rb @@ -0,0 +1,5 @@ +class ChangeContactsEmailToNotNull < ActiveRecord::Migration + def change + change_column_null :contacts, :email, false + end +end \ No newline at end of file diff --git a/db/structure.sql b/db/structure.sql index b07f08000..939b00565 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -613,7 +613,7 @@ CREATE TABLE public.contacts ( id integer NOT NULL, code character varying NOT NULL, phone character varying, - email character varying, + email character varying NOT NULL, fax character varying, created_at timestamp without time zone, updated_at timestamp without time zone, @@ -4757,3 +4757,5 @@ INSERT INTO schema_migrations (version) VALUES ('20180613030330'); INSERT INTO schema_migrations (version) VALUES ('20180613045614'); +INSERT INTO schema_migrations (version) VALUES ('20180816123540'); + diff --git a/test/system/admin_area/contact_versions_test.rb b/test/system/admin_area/contact_versions_test.rb index 10d20615a..8130706b6 100644 --- a/test/system/admin_area/contact_versions_test.rb +++ b/test/system/admin_area/contact_versions_test.rb @@ -21,8 +21,8 @@ class ContactVersionsTest < ApplicationSystemTestCase VALUES (75, 'test_registrar', 'test123', 'test@test.com', 'EE', 'TEST123', 'test123', 'en'); - INSERT INTO contacts (id, code, auth_info, registrar_id) - VALUES (75, 'test_code', '8b4d462aa04194ca78840a', 75); + INSERT INTO contacts (id, code, email, auth_info, registrar_id) + VALUES (75, 'test_code', 'test@inbox.test', '8b4d462aa04194ca78840a', 75); INSERT INTO log_contacts (item_type, item_id, event, whodunnit, object, object_changes, created_at, session, children, ident_updated_at, uuid) diff --git a/test/system/admin_area/domain_versions_test.rb b/test/system/admin_area/domain_versions_test.rb index 6c375cefe..dae7592c8 100644 --- a/test/system/admin_area/domain_versions_test.rb +++ b/test/system/admin_area/domain_versions_test.rb @@ -21,8 +21,8 @@ class DomainVersionsTest < ApplicationSystemTestCase VALUES (54, 'test_registrar', 'test123', 'test@test.com', 'EE', 'TEST123', 'test123', 'en'); - INSERT INTO contacts (id, code, auth_info, registrar_id) - VALUES (54, 'test_code', '8b4d462aa04194ca78840a', 54); + INSERT INTO contacts (id, code, email, auth_info, registrar_id) + VALUES (54, 'test_code', 'test@inbox.test', '8b4d462aa04194ca78840a', 54); INSERT INTO domains (id, registrar_id, valid_to, registrant_id, transfer_code) From 8b340cbafa658ccebeb8da11c898802f5529ca2a Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Mon, 20 Aug 2018 22:45:07 +0300 Subject: [PATCH 24/30] Add rake task description --- lib/tasks/domain.rake | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/tasks/domain.rake b/lib/tasks/domain.rake index f59a76141..926175180 100644 --- a/lib/tasks/domain.rake +++ b/lib/tasks/domain.rake @@ -1,4 +1,5 @@ namespace :domain do + desc 'Discard domains' task discard: :environment do Domain.discard_domains end From 31935a933fee4a0b678954ffdfcb90a10a44718e Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Tue, 21 Aug 2018 00:39:04 +0300 Subject: [PATCH 25/30] Take NULL into account --- app/models/concerns/domain/discardable.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/models/concerns/domain/discardable.rb b/app/models/concerns/domain/discardable.rb index a5aa3d2b4..68ba9406a 100644 --- a/app/models/concerns/domain/discardable.rb +++ b/app/models/concerns/domain/discardable.rb @@ -3,7 +3,8 @@ module Concerns::Domain::Discardable class_methods do def discard_domains - domains = where('delete_at < ? AND ? != ALL(statuses) AND ? != ALL(statuses)', + domains = where('delete_at < ? AND ? != ALL(coalesce(statuses, array[]::varchar[])) AND' \ + ' ? != ALL(COALESCE(statuses, array[]::varchar[]))', Time.zone.now, DomainStatus::SERVER_DELETE_PROHIBITED, DomainStatus::DELETE_CANDIDATE) From cd633d0a4b405e0d20e175ffa8030e693b4ea54b Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Tue, 21 Aug 2018 00:53:25 +0300 Subject: [PATCH 26/30] Output rake task results --- app/models/concerns/domain/discardable.rb | 5 ++++- lib/tasks/domain.rake | 6 ++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/app/models/concerns/domain/discardable.rb b/app/models/concerns/domain/discardable.rb index 68ba9406a..e46492220 100644 --- a/app/models/concerns/domain/discardable.rb +++ b/app/models/concerns/domain/discardable.rb @@ -9,7 +9,10 @@ module Concerns::Domain::Discardable DomainStatus::SERVER_DELETE_PROHIBITED, DomainStatus::DELETE_CANDIDATE) - domains.map(&:discard) + domains.each do |domain| + domain.discard + yield domain if block_given? + end end end diff --git a/lib/tasks/domain.rake b/lib/tasks/domain.rake index 926175180..60075adde 100644 --- a/lib/tasks/domain.rake +++ b/lib/tasks/domain.rake @@ -1,6 +1,8 @@ namespace :domain do desc 'Discard domains' task discard: :environment do - Domain.discard_domains + Domain.discard_domains do |domain| + puts "#{domain} is discarded" + end end -end +end \ No newline at end of file From 99516d87d6eca3e8ad1008f4de0bb0c14b78386e Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Tue, 21 Aug 2018 00:53:47 +0300 Subject: [PATCH 27/30] Use TaskTestCase as a parent --- test/integration/tasks/discard_domain_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/tasks/discard_domain_test.rb b/test/integration/tasks/discard_domain_test.rb index 0a341765b..05d7e3083 100644 --- a/test/integration/tasks/discard_domain_test.rb +++ b/test/integration/tasks/discard_domain_test.rb @@ -1,6 +1,6 @@ require 'test_helper' -class DiscardDomainTaskTest < ActiveSupport::TestCase +class DiscardDomainTaskTest < TaskTestCase setup do travel_to Time.zone.parse('2010-07-05 08:00') @domain = domains(:shop) From 5338e59a2e01c5e5d9700d2d1e357dc704976c70 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Tue, 21 Aug 2018 12:48:08 +0300 Subject: [PATCH 28/30] Fix tests --- test/models/domain/force_delete_test.rb | 1 + test/system/admin_area/domains/force_delete_test.rb | 1 + 2 files changed, 2 insertions(+) diff --git a/test/models/domain/force_delete_test.rb b/test/models/domain/force_delete_test.rb index 1cc76e2d7..b9df6f24a 100644 --- a/test/models/domain/force_delete_test.rb +++ b/test/models/domain/force_delete_test.rb @@ -74,6 +74,7 @@ class DomainForceDeleteTest < ActiveSupport::TestCase end def test_force_delete_cannot_be_cancelled_when_a_domain_is_discarded + @domain.delete_at = Time.zone.parse('2010-07-05 10:00') @domain.discard @domain.schedule_force_delete assert_raises StandardError do diff --git a/test/system/admin_area/domains/force_delete_test.rb b/test/system/admin_area/domains/force_delete_test.rb index cc8292c48..224bceb24 100644 --- a/test/system/admin_area/domains/force_delete_test.rb +++ b/test/system/admin_area/domains/force_delete_test.rb @@ -56,6 +56,7 @@ class AdminAreaDomainForceDeleteTest < ApplicationSystemTestCase end def test_force_delete_cannot_be_cancelled_when_a_domain_is_discarded + @domain.delete_at = Time.zone.parse('2010-07-05 10:00') @domain.discard @domain.schedule_force_delete From a7f15c46eb40b2c0d4939ca8e32dd1972c3382dc Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Mon, 27 Aug 2018 16:17:21 +0300 Subject: [PATCH 29/30] Improve rake task output --- lib/tasks/domain.rake | 5 +++++ test/integration/tasks/discard_domain_test.rb | 10 +++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/lib/tasks/domain.rake b/lib/tasks/domain.rake index 60075adde..a5cc6d557 100644 --- a/lib/tasks/domain.rake +++ b/lib/tasks/domain.rake @@ -1,8 +1,13 @@ namespace :domain do desc 'Discard domains' task discard: :environment do + domain_count = 0 + Domain.discard_domains do |domain| puts "#{domain} is discarded" + domain_count = domain_count + 1 end + + puts "Discarded total: #{domain_count}" end end \ No newline at end of file diff --git a/test/integration/tasks/discard_domain_test.rb b/test/integration/tasks/discard_domain_test.rb index 05d7e3083..0da7014c7 100644 --- a/test/integration/tasks/discard_domain_test.rb +++ b/test/integration/tasks/discard_domain_test.rb @@ -40,4 +40,12 @@ class DiscardDomainTaskTest < TaskTestCase @domain.reload refute @domain.discarded? end -end + + def test_show_results + @domain.update!(delete_at: Time.zone.parse('2010-07-05 07:59')) + $stdout = StringIO.new + + Rake::Task['domain:discard'].execute + assert_equal "shop.test is discarded\nDiscarded total: 1\n", $stdout.string + end +end \ No newline at end of file From 852d754eac400efe5f0ae82075654317d34f91ef Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Mon, 27 Aug 2018 16:52:30 +0300 Subject: [PATCH 30/30] Fix tests --- test/models/domain/force_delete_test.rb | 2 +- test/system/admin_area/domains/force_delete_test.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/models/domain/force_delete_test.rb b/test/models/domain/force_delete_test.rb index 8607dd4a3..646a34015 100644 --- a/test/models/domain/force_delete_test.rb +++ b/test/models/domain/force_delete_test.rb @@ -74,7 +74,7 @@ class DomainForceDeleteTest < ActiveSupport::TestCase end def test_force_delete_cannot_be_scheduled_when_a_domain_is_discarded - @domain.discard + @domain.update!(statuses: [DomainStatus::DELETE_CANDIDATE]) assert_raises StandardError do @domain.schedule_force_delete end diff --git a/test/system/admin_area/domains/force_delete_test.rb b/test/system/admin_area/domains/force_delete_test.rb index 22bb23d38..75835cf59 100644 --- a/test/system/admin_area/domains/force_delete_test.rb +++ b/test/system/admin_area/domains/force_delete_test.rb @@ -56,7 +56,7 @@ class AdminAreaDomainForceDeleteTest < ApplicationSystemTestCase end def test_force_delete_procedure_cannot_be_scheduled_on_a_discarded_domain - @domain.discard + @domain.update!(statuses: [DomainStatus::DELETE_CANDIDATE]) visit edit_admin_domain_url(@domain) assert_no_button 'Schedule force delete'