zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-06-10 14:44:47 +02:00
Code Issues Projects Releases Packages Wiki Activity

Remove unneeded attribute alias

Browse source 
#790
This commit is contained in:
Artur Beljajev 2018-04-07 16:21:07 +03:00
parent 2e9acedc90
commit 00a30fc019
5 changed files with 7 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/models/concerns/domain/deletable.rb
View file

@ -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

2
app/models/domain.rb
View file

@ -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)

2
app/presenters/domain_presenter.rb
View file

@ -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

6
spec/models/domain_spec.rb
View file

@ -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

4
spec/presenters/domain_presenter_spec.rb
View file

@ -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