mirror of
https://github.com/internetee/registry.git
synced 2025-06-06 12:47:29 +02:00
Remove redundant database column domains.registered_at
Alias `Domain#registered_at` to `created_at` Closes #1442
This commit is contained in:
parent
bfa60a9c17
commit
41fee1d098
7 changed files with 16 additions and 7 deletions
|
@ -18,6 +18,7 @@ class Domain < ApplicationRecord
|
||||||
alias_attribute :on_hold_time, :outzone_at
|
alias_attribute :on_hold_time, :outzone_at
|
||||||
alias_attribute :outzone_time, :outzone_at
|
alias_attribute :outzone_time, :outzone_at
|
||||||
alias_attribute :auth_info, :transfer_code # Old attribute name; for PaperTrail
|
alias_attribute :auth_info, :transfer_code # Old attribute name; for PaperTrail
|
||||||
|
alias_attribute :registered_at, :created_at
|
||||||
|
|
||||||
# TODO: whois requests ip whitelist for full info for own domains and partial info for other domains
|
# TODO: whois requests ip whitelist for full info for own domains and partial info for other domains
|
||||||
# TODO: most inputs should be trimmed before validatation, probably some global logic?
|
# TODO: most inputs should be trimmed before validatation, probably some global logic?
|
||||||
|
@ -627,7 +628,7 @@ class Domain < ApplicationRecord
|
||||||
def as_json(_options)
|
def as_json(_options)
|
||||||
hash = super
|
hash = super
|
||||||
hash['auth_info'] = hash.delete('transfer_code') # API v1 requirement
|
hash['auth_info'] = hash.delete('transfer_code') # API v1 requirement
|
||||||
hash['valid_from'] = hash['registered_at'] # API v1 requirement
|
hash['valid_from'] = hash['created_at'] # API v1 requirement
|
||||||
hash.delete('statuses_before_force_delete')
|
hash.delete('statuses_before_force_delete')
|
||||||
hash
|
hash
|
||||||
end
|
end
|
||||||
|
|
|
@ -41,7 +41,6 @@ class Epp::Domain < Domain
|
||||||
domain = Epp::Domain.new
|
domain = Epp::Domain.new
|
||||||
domain.attributes = domain.attrs_from(frame, current_user)
|
domain.attributes = domain.attrs_from(frame, current_user)
|
||||||
domain.attach_default_contacts
|
domain.attach_default_contacts
|
||||||
domain.registered_at = Time.zone.now
|
|
||||||
|
|
||||||
period = domain.period.to_i
|
period = domain.period.to_i
|
||||||
plural_period_unit_name = (domain.period_unit == 'm' ? 'months' : 'years').to_sym
|
plural_period_unit_name = (domain.period_unit == 'm' ? 'months' : 'years').to_sym
|
||||||
|
@ -150,7 +149,6 @@ class Epp::Domain < Domain
|
||||||
|
|
||||||
at[:name] = frame.css('name').text if new_record?
|
at[:name] = frame.css('name').text if new_record?
|
||||||
at[:registrar_id] = current_user.registrar.try(:id)
|
at[:registrar_id] = current_user.registrar.try(:id)
|
||||||
at[:registered_at] = Time.zone.now if new_record?
|
|
||||||
|
|
||||||
period = frame.css('period').text
|
period = frame.css('period').text
|
||||||
at[:period] = (period.to_i == 0) ? 1 : period.to_i
|
at[:period] = (period.to_i == 0) ? 1 : period.to_i
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
class RemoveDomainsRegisteredAt < ActiveRecord::Migration[5.0]
|
||||||
|
def change
|
||||||
|
remove_column :domains, :registered_at
|
||||||
|
end
|
||||||
|
end
|
|
@ -778,7 +778,6 @@ CREATE TABLE public.domains (
|
||||||
id integer NOT NULL,
|
id integer NOT NULL,
|
||||||
name character varying NOT NULL,
|
name character varying NOT NULL,
|
||||||
registrar_id integer NOT NULL,
|
registrar_id integer NOT NULL,
|
||||||
registered_at timestamp without time zone,
|
|
||||||
valid_to timestamp without time zone NOT NULL,
|
valid_to timestamp without time zone NOT NULL,
|
||||||
registrant_id integer NOT NULL,
|
registrant_id integer NOT NULL,
|
||||||
transfer_code character varying NOT NULL,
|
transfer_code character varying NOT NULL,
|
||||||
|
@ -4828,6 +4827,7 @@ INSERT INTO "schema_migrations" (version) VALUES
|
||||||
('20191203083643'),
|
('20191203083643'),
|
||||||
('20191206183853'),
|
('20191206183853'),
|
||||||
('20191212133136'),
|
('20191212133136'),
|
||||||
|
('20191217013225'),
|
||||||
('20191219112434'),
|
('20191219112434'),
|
||||||
('20191219124429'),
|
('20191219124429'),
|
||||||
('20191227110904'),
|
('20191227110904'),
|
||||||
|
|
1
test/fixtures/domains.yml
vendored
1
test/fixtures/domains.yml
vendored
|
@ -5,7 +5,6 @@ shop:
|
||||||
registrar: bestnames
|
registrar: bestnames
|
||||||
registrant: john
|
registrant: john
|
||||||
transfer_code: 65078d5
|
transfer_code: 65078d5
|
||||||
registered_at: <%= Time.zone.parse('2010-07-04').to_s(:db) %>
|
|
||||||
valid_to: <%= Time.zone.parse('2010-07-05').to_s(:db) %>
|
valid_to: <%= Time.zone.parse('2010-07-05').to_s(:db) %>
|
||||||
outzone_at: <%= Time.zone.parse('2010-07-06').to_s(:db) %>
|
outzone_at: <%= Time.zone.parse('2010-07-06').to_s(:db) %>
|
||||||
delete_date: 2010-07-07
|
delete_date: 2010-07-07
|
||||||
|
|
|
@ -425,6 +425,12 @@ class DomainTest < ActiveSupport::TestCase
|
||||||
assert_not(@domain.force_delete_scheduled?)
|
assert_not(@domain.force_delete_scheduled?)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def test_aliases_registered_at_to_created_at
|
||||||
|
created_at = Time.zone.parse('2010-07-05 10:00')
|
||||||
|
domain = Domain.new(created_at: created_at)
|
||||||
|
assert_equal created_at, domain.registered_at
|
||||||
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
def valid_domain
|
def valid_domain
|
||||||
|
|
|
@ -12,7 +12,7 @@ class RegistrantAreaDomainDetailsTest < ApplicationSystemTestCase
|
||||||
visit registrant_domain_url(@domain)
|
visit registrant_domain_url(@domain)
|
||||||
|
|
||||||
assert_text 'Name shop.test'
|
assert_text 'Name shop.test'
|
||||||
assert_text "Registered at #{l Time.zone.parse('2010-07-04')}"
|
assert_text "Registered at #{l @domain.registered_at}"
|
||||||
assert_link 'Best Names', href: registrant_registrar_path(@domain.registrar)
|
assert_link 'Best Names', href: registrant_registrar_path(@domain.registrar)
|
||||||
|
|
||||||
assert_text 'Transfer code'
|
assert_text 'Transfer code'
|
||||||
|
@ -73,4 +73,4 @@ class RegistrantAreaDomainDetailsTest < ApplicationSystemTestCase
|
||||||
|
|
||||||
assert_field nil, with: registrant_domain_update_confirm_url(@domain, token: 'a01')
|
assert_field nil, with: registrant_domain_update_confirm_url(@domain, token: 'a01')
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue