Refactor #2623

app/controllers/epp/domains_controller.rb

@@ -63,7 +63,6 @@ class Epp::DomainsController < EppController
 
   def delete
     authorize! :delete, @domain, @password
-
     # all includes for bullet
     @domain = Epp::Domain.where(id: @domain.id).includes(nameservers: :versions).first
 

app/models/epp/domain.rb

@@ -487,17 +487,21 @@ class Epp::Domain < Domain
       manage_automatic_statuses
       true # aka 1001 pending_delete
     else
-      throw :epp_error, {
+      set_pending_delete!
-        code: '2304',
-        msg: I18n.t(:object_status_prohibits_operation)
-      } unless pending_deletable?
-
-      self.delete_at = Time.zone.now + Setting.redemption_grace_period.days
-      set_pending_delete
-      set_server_hold if server_holdable?
-      save(validate: false)
     end
   end
+
+  def set_pending_delete!
+    throw :epp_error, {
+      code: '2304',
+      msg: I18n.t(:object_status_prohibits_operation)
+    } unless pending_deletable?
+
+    self.delete_at = Time.zone.now + Setting.redemption_grace_period.days
+    set_pending_delete
+    set_server_hold if server_holdable?
+    save(validate: false)
+  end
   # rubocop: enable Metrics/PerceivedComplexity
   # rubocop: enable Metrics/CyclomaticComplexity
 

db/schema-read-only.rb

@@ -201,6 +201,7 @@ ActiveRecord::Schema.define(version: 20150910113839) do
     t.integer  "legacy_id"
     t.string   "statuses",           array: true
     t.hstore   "status_notes"
+    t.integer  "legacy_history_id"
     t.integer  "copy_from_id"
   end
 

db/structure.sql

@@ -597,6 +597,7 @@ CREATE TABLE contacts (
     legacy_id integer,
     statuses character varying[],
     status_notes hstore,
+    legacy_history_id integer,
     copy_from_id integer
 );
 
@@ -4929,5 +4930,7 @@ INSERT INTO schema_migrations (version) VALUES ('20150810114746');
 
 INSERT INTO schema_migrations (version) VALUES ('20150825125118');
 
+INSERT INTO schema_migrations (version) VALUES ('20150827151906');
+
 INSERT INTO schema_migrations (version) VALUES ('20150910113839');