From 2f86b3c76bc6103ba6a8297a8a8649eb5c7a86c4 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Tue, 27 Mar 2018 18:34:48 +0300 Subject: [PATCH 1/2] Remove Domain#valid_from As unused. `created_at` is the same value as `valid_from`. #787 --- app/models/domain.rb | 1 + app/models/epp/domain.rb | 1 - app/views/admin/domains/partials/_general.html.erb | 3 --- app/views/admin/domains/partials/_version.haml | 4 +--- app/views/registrant/domains/partials/_general.html.erb | 3 --- db/migrate/20180327151906_remove_domains_valid_from.rb | 5 +++++ db/structure.sql | 3 ++- doc/models_complete.svg | 1 - lib/tasks/dev.rake | 2 -- lib/tasks/import.rake | 1 - spec/models/epp/domain_spec.rb | 6 +----- 11 files changed, 10 insertions(+), 20 deletions(-) create mode 100644 db/migrate/20180327151906_remove_domains_valid_from.rb diff --git a/app/models/domain.rb b/app/models/domain.rb index 9eef0f30f..f8500a206 100644 --- a/app/models/domain.rb +++ b/app/models/domain.rb @@ -654,6 +654,7 @@ class Domain < ActiveRecord::Base def as_json(_options) hash = super hash['auth_info'] = hash.delete('transfer_code') # API v1 requirement + hash['valid_from'] = hash['created_at'] # API v1 requirement hash end diff --git a/app/models/epp/domain.rb b/app/models/epp/domain.rb index fb01fe38a..2ead51ea3 100644 --- a/app/models/epp/domain.rb +++ b/app/models/epp/domain.rb @@ -54,7 +54,6 @@ class Epp::Domain < Domain domain.attributes = domain.attrs_from(frame, current_user) domain.attach_default_contacts domain.registered_at = Time.zone.now - domain.valid_from = Time.zone.now period = domain.period.to_i plural_period_unit_name = (domain.period_unit == 'm' ? 'months' : 'years').to_sym diff --git a/app/views/admin/domains/partials/_general.html.erb b/app/views/admin/domains/partials/_general.html.erb index eeeef6eb5..7e09a7756 100644 --- a/app/views/admin/domains/partials/_general.html.erb +++ b/app/views/admin/domains/partials/_general.html.erb @@ -22,9 +22,6 @@ class: 'form-control input-sm' %> -
<%= t(:valid_from) %>
-
<%= l(@domain.valid_from) %>
-
<%= t(:valid_to) %>
<%= l(@domain.valid_to) %>
diff --git a/app/views/admin/domains/partials/_version.haml b/app/views/admin/domains/partials/_version.haml index b15bda0dd..da0a0ece1 100644 --- a/app/views/admin/domains/partials/_version.haml +++ b/app/views/admin/domains/partials/_version.haml @@ -66,12 +66,10 @@ %p = link_to t(:pending_epp), '#', class: 'js-pending' - %td{class: changing_css_class(version, "period", "period_unit", "valid_from", "valid_to")} + %td{class: changing_css_class(version, "period", "period_unit", "valid_to")} %p = "#{domain.period}#{domain.period_unit}" %br - = "#{l(domain.valid_from, format: :date)}" - %br = "#{l(domain.valid_to, format: :date)}" %td diff --git a/app/views/registrant/domains/partials/_general.html.erb b/app/views/registrant/domains/partials/_general.html.erb index 72ae8aad7..eed058437 100644 --- a/app/views/registrant/domains/partials/_general.html.erb +++ b/app/views/registrant/domains/partials/_general.html.erb @@ -22,9 +22,6 @@ class: 'form-control input-sm' %> -
<%= t(:valid_from) %>
-
<%= l(@domain.valid_from) %>
-
<%= t(:valid_to) %>
<%= l(@domain.valid_to) %>
diff --git a/db/migrate/20180327151906_remove_domains_valid_from.rb b/db/migrate/20180327151906_remove_domains_valid_from.rb new file mode 100644 index 000000000..3514fc9f2 --- /dev/null +++ b/db/migrate/20180327151906_remove_domains_valid_from.rb @@ -0,0 +1,5 @@ +class RemoveDomainsValidFrom < ActiveRecord::Migration + def change + remove_column :domains, :valid_from, :datetime + end +end diff --git a/db/structure.sql b/db/structure.sql index a9257ffa3..e5f1dad00 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -872,7 +872,6 @@ CREATE TABLE domains ( registrar_id integer NOT NULL, registered_at timestamp without time zone, status character varying, - valid_from timestamp without time zone, valid_to timestamp without time zone, registrant_id integer NOT NULL, transfer_code character varying NOT NULL, @@ -4679,3 +4678,5 @@ INSERT INTO schema_migrations (version) VALUES ('20180306183549'); INSERT INTO schema_migrations (version) VALUES ('20180308123240'); +INSERT INTO schema_migrations (version) VALUES ('20180327151906'); + diff --git a/doc/models_complete.svg b/doc/models_complete.svg index 296d20c67..d014e0c8d 100644 --- a/doc/models_complete.svg +++ b/doc/models_complete.svg @@ -852,7 +852,6 @@ registrar_id :integer registered_at :datetime status :string -valid_from :datetime valid_to :datetime registrant_id :integer transfer_code :string diff --git a/lib/tasks/dev.rake b/lib/tasks/dev.rake index f4b133ed1..e4c120a8d 100644 --- a/lib/tasks/dev.rake +++ b/lib/tasks/dev.rake @@ -23,7 +23,6 @@ namespace :dev do period: period, period_unit: period_unit, registered_at: reg_time, - valid_from: reg_time, expire_time: reg_time + period.send(duration.second.to_sym), created_at: reg_time, updated_at: reg_time, @@ -151,7 +150,6 @@ namespace :dev do period: period, period_unit: 'y', registered_at: Time.zone.now, - valid_from: Time.zone.now, expire_time: Time.zone.now + period.years, registrar: registrar, registrant: registrants.sample) diff --git a/lib/tasks/import.rake b/lib/tasks/import.rake index f26ad252f..45f3cae99 100644 --- a/lib/tasks/import.rake +++ b/lib/tasks/import.rake @@ -337,7 +337,6 @@ namespace :import do name registrar_id registered_at - valid_from valid_to transfer_code created_at diff --git a/spec/models/epp/domain_spec.rb b/spec/models/epp/domain_spec.rb index de0b8f4e1..402305527 100644 --- a/spec/models/epp/domain_spec.rb +++ b/spec/models/epp/domain_spec.rb @@ -21,11 +21,7 @@ RSpec.describe Epp::Domain, db: false do expect(domain.registered_at).to eq(Time.zone.parse('05.07.2010')) end - it 'has :valid_from set to now' do - expect(domain.valid_from).to eq(Time.zone.parse('05.07.2010')) - end - - it 'has :valid_to set to the beginning of next day after :valid_from' do + it 'has :valid_to set to the beginning of next day after :registered_at' do expect(domain.valid_to).to eq(Time.zone.parse('06.07.2011 00:00')) end end From 77104582f79107af4c38f7c4fab95f4ac969d585 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Sat, 31 Mar 2018 12:55:08 +0300 Subject: [PATCH 2/2] Fix attribute name --- app/models/domain.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/domain.rb b/app/models/domain.rb index f8500a206..d5c860913 100644 --- a/app/models/domain.rb +++ b/app/models/domain.rb @@ -654,7 +654,7 @@ class Domain < ActiveRecord::Base def as_json(_options) hash = super hash['auth_info'] = hash.delete('transfer_code') # API v1 requirement - hash['valid_from'] = hash['created_at'] # API v1 requirement + hash['valid_from'] = hash['registered_at'] # API v1 requirement hash end