diff --git a/app/models/domain_transfer.rb b/app/models/domain_transfer.rb index adcd10e50..8f2fbcdf5 100644 --- a/app/models/domain_transfer.rb +++ b/app/models/domain_transfer.rb @@ -1,5 +1,4 @@ class DomainTransfer < ActiveRecord::Base - include Versions # version/domain_transfer_version.rb belongs_to :domain belongs_to :transfer_from, class_name: 'Registrar' diff --git a/app/models/version/domain_transfer_version.rb b/app/models/version/domain_transfer_version.rb deleted file mode 100644 index 7005337ba..000000000 --- a/app/models/version/domain_transfer_version.rb +++ /dev/null @@ -1,5 +0,0 @@ -class DomainTransferVersion < PaperTrail::Version - include VersionSession - self.table_name = :log_domain_transfers - self.sequence_name = :log_domain_transfers_id_seq -end diff --git a/db/migrate/20180120182712_drop_log_domain_transfers.rb b/db/migrate/20180120182712_drop_log_domain_transfers.rb new file mode 100644 index 000000000..1b77aa1bf --- /dev/null +++ b/db/migrate/20180120182712_drop_log_domain_transfers.rb @@ -0,0 +1,5 @@ +class DropLogDomainTransfers < ActiveRecord::Migration + def change + drop_table :log_domain_transfers + end +end diff --git a/db/migrate/20180120183441_remove_domain_transfers_paper_trail.rb b/db/migrate/20180120183441_remove_domain_transfers_paper_trail.rb new file mode 100644 index 000000000..b77b6fffb --- /dev/null +++ b/db/migrate/20180120183441_remove_domain_transfers_paper_trail.rb @@ -0,0 +1,6 @@ +class RemoveDomainTransfersPaperTrail < ActiveRecord::Migration + def change + remove_column :domain_transfers, :creator_str, :string + remove_column :domain_transfers, :updator_str, :string + end +end diff --git a/db/structure.sql b/db/structure.sql index 50ec2d2ca..d49004ee5 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -962,9 +962,7 @@ CREATE TABLE domain_transfers ( transfer_to_id integer, created_at timestamp without time zone, updated_at timestamp without time zone, - wait_until timestamp without time zone, - creator_str character varying, - updator_str character varying + wait_until timestamp without time zone ); @@ -1722,44 +1720,6 @@ CREATE SEQUENCE log_domain_statuses_id_seq ALTER SEQUENCE log_domain_statuses_id_seq OWNED BY log_domain_statuses.id; --- --- Name: log_domain_transfers; Type: TABLE; Schema: public; Owner: -; Tablespace: --- - -CREATE TABLE log_domain_transfers ( - id integer NOT NULL, - item_type character varying NOT NULL, - item_id integer NOT NULL, - event character varying NOT NULL, - whodunnit character varying, - object json, - object_changes json, - created_at timestamp without time zone, - session character varying, - children json, - uuid character varying -); - - --- --- Name: log_domain_transfers_id_seq; Type: SEQUENCE; Schema: public; Owner: - --- - -CREATE SEQUENCE log_domain_transfers_id_seq - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE - CACHE 1; - - --- --- Name: log_domain_transfers_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: - --- - -ALTER SEQUENCE log_domain_transfers_id_seq OWNED BY log_domain_transfers.id; - - -- -- Name: log_domains; Type: TABLE; Schema: public; Owner: -; Tablespace: -- @@ -3029,13 +2989,6 @@ ALTER TABLE ONLY log_domain_contacts ALTER COLUMN id SET DEFAULT nextval('log_do ALTER TABLE ONLY log_domain_statuses ALTER COLUMN id SET DEFAULT nextval('log_domain_statuses_id_seq'::regclass); --- --- Name: id; Type: DEFAULT; Schema: public; Owner: - --- - -ALTER TABLE ONLY log_domain_transfers ALTER COLUMN id SET DEFAULT nextval('log_domain_transfers_id_seq'::regclass); - - -- -- Name: id; Type: DEFAULT; Schema: public; Owner: - -- @@ -3506,14 +3459,6 @@ ALTER TABLE ONLY log_domain_statuses ADD CONSTRAINT log_domain_statuses_pkey PRIMARY KEY (id); --- --- Name: log_domain_transfers_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: --- - -ALTER TABLE ONLY log_domain_transfers - ADD CONSTRAINT log_domain_transfers_pkey PRIMARY KEY (id); - - -- -- Name: log_domains_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: -- @@ -4171,20 +4116,6 @@ CREATE INDEX index_log_domain_statuses_on_item_type_and_item_id ON log_domain_st CREATE INDEX index_log_domain_statuses_on_whodunnit ON log_domain_statuses USING btree (whodunnit); --- --- Name: index_log_domain_transfers_on_item_type_and_item_id; Type: INDEX; Schema: public; Owner: -; Tablespace: --- - -CREATE INDEX index_log_domain_transfers_on_item_type_and_item_id ON log_domain_transfers USING btree (item_type, item_id); - - --- --- Name: index_log_domain_transfers_on_whodunnit; Type: INDEX; Schema: public; Owner: -; Tablespace: --- - -CREATE INDEX index_log_domain_transfers_on_whodunnit ON log_domain_transfers USING btree (whodunnit); - - -- -- Name: index_log_domains_on_item_type_and_item_id; Type: INDEX; Schema: public; Owner: -; Tablespace: -- @@ -5111,3 +5042,7 @@ INSERT INTO schema_migrations (version) VALUES ('20180120172649'); INSERT INTO schema_migrations (version) VALUES ('20180120172657'); +INSERT INTO schema_migrations (version) VALUES ('20180120182712'); + +INSERT INTO schema_migrations (version) VALUES ('20180120183441'); + diff --git a/doc/models_brief.svg b/doc/models_brief.svg index 22d63cfe7..fa3f478c7 100644 --- a/doc/models_brief.svg +++ b/doc/models_brief.svg @@ -249,17 +249,6 @@ - -DomainTransferVersion - -DomainTransferVersion - - -DomainTransferVersion->VersionAssociation - - - - BankTransactionVersion @@ -1142,13 +1131,6 @@ versions - -DomainTransfer->DomainTransferVersion - - - -versions - ContactStatus->ContactStatusVersion diff --git a/doc/models_complete.svg b/doc/models_complete.svg index b6216a3b0..9391a7f6d 100644 --- a/doc/models_complete.svg +++ b/doc/models_complete.svg @@ -490,28 +490,6 @@ - -DomainTransferVersion - -DomainTransferVersion - -id :integer -item_type :string -item_id :integer -event :string -whodunnit :string -object :json -object_changes :json -created_at :datetime -session :string -children :json - - -DomainTransferVersion->VersionAssociation - - - - BankTransactionVersion @@ -1848,13 +1826,6 @@ versions - -DomainTransfer->DomainTransferVersion - - - -versions - ContactStatus->ContactStatusVersion diff --git a/spec/models/domain_transfer_spec.rb b/spec/models/domain_transfer_spec.rb index 5f8bf54a0..b68838f3c 100644 --- a/spec/models/domain_transfer_spec.rb +++ b/spec/models/domain_transfer_spec.rb @@ -34,10 +34,6 @@ describe DomainTransfer do @domain_transfer.errors.full_messages.should match_array([ ]) end - - it 'should not have any versions' do - @domain_transfer.versions.should == [] - end end context 'with valid attributes' do @@ -55,15 +51,5 @@ describe DomainTransfer do @domain_transfer.valid? @domain_transfer.errors.full_messages.should match_array([]) end - - it 'should have one version' do - with_versioning do - @domain_transfer.versions.should == [] - @domain_transfer.wait_until = 1.day.since - @domain_transfer.save - @domain_transfer.errors.full_messages.should match_array([]) - @domain_transfer.versions.size.should == 1 - end - end end end