Refactor domain transfer query

app/models/domain_transfer.rb

@@ -13,6 +13,16 @@ class DomainTransfer < ActiveRecord::Base
   SERVER_CANCELLED = 'serverCancelled'
 
   before_create :set_wait_until
+  before_create :set_status
+
+  def set_status
+    if Setting.transfer_wait_time > 0
+      self.status = PENDING unless status
+    else
+      self.status = SERVER_APPROVED unless status
+      self.transferred_at = Time.zone.now unless transferred_at
+    end
+  end
 
   delegate :name, :valid_to, to: :domain, prefix: true
 
@@ -26,6 +36,10 @@ class DomainTransfer < ActiveRecord::Base
     status == CLIENT_APPROVED || status == SERVER_APPROVED
   end
 
+  def pending?
+    status == PENDING
+  end
+
   def approve_as_client
     transaction do
       self.status = DomainTransfer::CLIENT_APPROVED

app/models/epp/domain.rb

@@ -408,31 +408,22 @@ class Epp::Domain < Domain
 
     transaction do
       begin
-        if Setting.transfer_wait_time > 0
+        dt = domain_transfers.create!(
-          dt = domain_transfers.create!(
-            status: DomainTransfer::PENDING,
             transfer_requested_at: Time.zone.now,
             transfer_to: current_user.registrar,
             transfer_from: registrar
           )
 
+        if dt.pending?
           registrar.messages.create!(
             body: I18n.t('transfer_requested'),
             attached_obj_id: dt.id,
             attached_obj_type: dt.class.to_s
           )
+        end
 
-        else
+        if dt.approved?
-          dt = domain_transfers.create!(
-            status: DomainTransfer::SERVER_APPROVED,
-            transfer_requested_at: Time.zone.now,
-            transferred_at: Time.zone.now,
-            transfer_to: current_user.registrar,
-            transfer_from: registrar
-          )
-
           generate_auth_info
-
           self.registrar = current_user.registrar
         end