Remove domains.reserved database column as unused

This commit is contained in:
Artur Beljajev 2019-03-19 15:43:23 +02:00
parent c85ebf542d
commit 1ad62bf4bd
9 changed files with 8 additions and 11 deletions

View file

@ -79,7 +79,6 @@ class Domain < ActiveRecord::Base
self.status_notes = {} if status_notes.nil? self.status_notes = {} if status_notes.nil?
end end
before_create -> { self.reserved = in_reserved_list?; nil }
before_save :manage_automatic_statuses before_save :manage_automatic_statuses
before_save :touch_always_version before_save :touch_always_version
def touch_always_version def touch_always_version

View file

@ -72,7 +72,6 @@ class DomainStatus < ActiveRecord::Base
FORCE_DELETE = 'serverForceDelete' FORCE_DELETE = 'serverForceDelete'
DELETE_CANDIDATE = 'deleteCandidate' DELETE_CANDIDATE = 'deleteCandidate'
EXPIRED = 'expired' EXPIRED = 'expired'
RESERVED = 'reserved'
STATUSES = [ STATUSES = [
CLIENT_DELETE_PROHIBITED, SERVER_DELETE_PROHIBITED, CLIENT_HOLD, SERVER_HOLD, CLIENT_DELETE_PROHIBITED, SERVER_DELETE_PROHIBITED, CLIENT_HOLD, SERVER_HOLD,

View file

@ -0,0 +1,5 @@
class RemoveDomainsReserved < ActiveRecord::Migration
def change
remove_column :domains, :reserved
end
end

View file

@ -938,7 +938,6 @@ CREATE TABLE public.domains (
pending_json jsonb, pending_json jsonb,
force_delete_date date, force_delete_date date,
statuses character varying[], statuses character varying[],
reserved boolean DEFAULT false,
status_notes public.hstore, status_notes public.hstore,
statuses_before_force_delete character varying[] DEFAULT '{}'::character varying[], statuses_before_force_delete character varying[] DEFAULT '{}'::character varying[],
upid integer, upid integer,
@ -4935,6 +4934,8 @@ INSERT INTO schema_migrations (version) VALUES ('20190311111718');
INSERT INTO schema_migrations (version) VALUES ('20190312211614'); INSERT INTO schema_migrations (version) VALUES ('20190312211614');
INSERT INTO schema_migrations (version) VALUES ('20190319133036');
INSERT INTO schema_migrations (version) VALUES ('20190322152123'); INSERT INTO schema_migrations (version) VALUES ('20190322152123');
INSERT INTO schema_migrations (version) VALUES ('20190322152529'); INSERT INTO schema_migrations (version) VALUES ('20190322152529');

View file

@ -96,7 +96,6 @@ Content-Type: application/json
}, },
], ],
"reserved":false,
"status_notes":{ "status_notes":{
}, },
@ -212,7 +211,6 @@ Content-Type: application/json
}, },
], ],
"reserved":false,
"status_notes":{ "status_notes":{
}, },
@ -319,7 +317,6 @@ Content-Type: application/json
] ]
} }
], ],
"reserved":false,
"status_notes":{ "status_notes":{
}, },

View file

@ -97,7 +97,6 @@ Content-Type: application/json
] ]
} }
], ],
"reserved":false,
"status_notes":{ "status_notes":{
}, },
@ -240,7 +239,6 @@ Content-Type: application/json
] ]
} }
], ],
"reserved":false,
"status_notes":{ "status_notes":{
}, },

View file

@ -61,7 +61,6 @@ Content-Type: application/json
"statuses": [ "statuses": [
"ok" "ok"
], ],
"reserved": false,
"status_notes": { "status_notes": {
} }
} }

View file

@ -43,7 +43,6 @@ module Serializers
force_delete_date: domain.force_delete_date, force_delete_date: domain.force_delete_date,
statuses: domain.statuses, statuses: domain.statuses,
locked_by_registrant_at: domain.locked_by_registrant_at, locked_by_registrant_at: domain.locked_by_registrant_at,
reserved: domain.reserved,
status_notes: domain.status_notes, status_notes: domain.status_notes,
nameservers: nameservers, nameservers: nameservers,
} }

View file

@ -74,7 +74,7 @@ class SerializersRegistrantApiDomainTest < ActiveSupport::TestCase
period_unit creator_str updator_str legacy_id legacy_registrar_id legacy_registrant_id period_unit creator_str updator_str legacy_id legacy_registrar_id legacy_registrant_id
outzone_at delete_at registrant_verification_asked_at outzone_at delete_at registrant_verification_asked_at
registrant_verification_token pending_json force_delete_date statuses registrant_verification_token pending_json force_delete_date statuses
locked_by_registrant_at reserved status_notes nameservers] locked_by_registrant_at status_notes nameservers]
assert_equal(keys, @json.keys & keys) assert_equal(keys, @json.keys & keys)
end end