Merge branch 'master' into registry-791

# Conflicts:
#	db/structure.sql

app/models/contact.rb

@@ -447,31 +447,6 @@ class Contact < ActiveRecord::Base
     domains
   end
 
-  def all_registrant_domains(page: nil, per: nil, params: {}, registrant: nil)
-
-    if registrant
-      sorts = params.fetch(:sort, {}).first || []
-      sort  = Domain.column_names.include?(sorts.first) ? sorts.first : "valid_to"
-      order = {"asc"=>"desc", "desc"=>"asc"}[sorts.second] || "desc"
-
-      domain_ids = DomainContact.distinct.where(contact_id: registrant.id).pluck(:domain_id)
-
-      domains  = Domain.where(id: domain_ids).includes(:registrar).page(page).per(per)
-      if sorts.first == "registrar_name".freeze
-        domains = domains.includes(:registrar).where.not(registrars: {id: nil}).order("registrars.name #{order} NULLS LAST")
-      else
-        domains = domains.order("#{sort} #{order} NULLS LAST")
-      end
-
-      domain_c = Hash.new([])
-      registrant_domains.where(id: domains.map(&:id)).each{|d| domain_c[d.id] |= ["Registrant".freeze] }
-      DomainContact.where(contact_id: id, domain_id: domains.map(&:id)).each{|d| domain_c[d.domain_id] |= [d.type] }
-      domains.each{|d| d.roles = domain_c[d.id].uniq}
-      domains
-    end
-  end
-
-
   def update_prohibited?
     (statuses & [
       CLIENT_UPDATE_PROHIBITED,

app/models/directo.rb

@@ -26,7 +26,7 @@ class Directo < ActiveRecord::Base
             xml.invoice(
                 "SalesAgent"  => Setting.directo_sales_agent,
                 "Number"      => num,
-                "InvoiceDate" => invoice.created_at.strftime("%Y-%m-%dT%H:%M:%S"),
+                "InvoiceDate" => invoice.created_at.strftime("%Y-%m-%d"),
                 "PaymentTerm" => Setting.directo_receipt_payment_term,
                 "Currency"    => invoice.currency,
                 "CustomerCode"=> invoice.buyer.accounting_customer_code

app/models/domain.rb

@@ -294,36 +294,6 @@ class Domain < ActiveRecord::Base
     save
   end
 
-
-  # state changes may be done low-level - no validation
-  # in this metod we still save PaperTrail log.
-  def clean_pendings_lowlevel
-    statuses.delete(DomainStatus::PENDING_DELETE_CONFIRMATION)
-    statuses.delete(DomainStatus::PENDING_UPDATE)
-    statuses.delete(DomainStatus::PENDING_DELETE)
-
-    status_notes[DomainStatus::PENDING_UPDATE] = ''
-    status_notes[DomainStatus::PENDING_DELETE] = ''
-
-    hash = {
-        registrant_verification_token:    nil,
-        registrant_verification_asked_at: nil,
-        pending_json: {},
-        status_notes: status_notes,
-        statuses:     statuses.presence || [DomainStatus::OK],
-        # need this column in order to update PaperTrail version properly
-        updated_at:   Time.now.utc
-    }
-
-    # PaperTrail
-    self.attributes = hash
-    record_update
-    clear_version_instance!
-    reset_transaction_id
-
-    update_columns(hash)
-  end
-
   def pending_update!
     return true if pending_update?
     self.epp_pending_update = true # for epp
@@ -581,10 +551,6 @@ class Domain < ActiveRecord::Base
     end
   end
 
-  def send_mail(action)
-    DomainMailer.send(action, DomainMailModel.new(self).send(action)).deliver
-  end
-
   def admin_contact_names
     admin_contacts.names
   end

app/models/domain_cron.rb

@@ -21,7 +21,10 @@ class DomainCron
       if domain.pending_delete? || domain.pending_delete_confirmation?
         DomainMailer.pending_delete_expired_notification(domain.id, true).deliver
       end
-      domain.clean_pendings_lowlevel
+
+      domain.preclean_pendings
+      domain.clean_pendings!
+
       unless Rails.env.test?
         STDOUT << "#{Time.zone.now.utc} DomainCron.clean_expired_pendings: ##{domain.id} (#{domain.name})\n"
       end

app/models/domain_mail_model.rb

@@ -1,117 +0,0 @@
-class DomainMailModel
-  # Capture current values used in app/views/mailers/domain_mailer/* and app/mailers/domain_mailer will send later
-
-  def initialize(domain)
-    @domain = domain
-    @params = {errors: [], deliver_emails: domain.deliver_emails, id: domain.id}
-  end
-
-  def pending_delete_rejected_notification
-    registrant
-    subject(:pending_delete_rejected_notification_subject)
-    compose
-  end
-
-  def pending_delete_expired_notification
-    registrant
-    subject(:pending_delete_expired_notification_subject)
-    compose
-  end
-
-  def delete_confirmation
-    registrant
-    subject(:delete_confirmation_subject)
-    compose
-  end
-
-  def force_delete
-    admins
-    subject(:force_delete_subject)
-    compose
-  end
-
-  private
-
-  def registrant_old
-    @params[:recipient] = format Registrant.find(@domain.registrant_id_was).email
-  end
-
-  def registrant
-    @params[:recipient] = format @domain.registrant.email
-  end
-
-  def registrant_pending
-    @params[:recipient] = format @domain.pending_json['new_registrant_email']
-    @params[:new_registrant_name] = @domain.pending_json['new_registrant_name']
-    @params[:old_registrant_name] = @domain.registrant.name
-  end
-
-  # registrant and domain admin contacts
-  def admins
-    emails = ([@domain.registrant.email] + @domain.admin_contacts.map { |x| format(x.email) })
-    @params[:recipient] = emails.uniq.map { |x| format(x) }
-  end
-
-  # puny internet domain name, TODO: username<email>
-  def format(email)
-    return warn_no_email if email.nil?
-    user, host = email.split('@')
-    host = SimpleIDN.to_ascii(host)
-    "#{user}@#{host}"
-  end
-
-  def subject(subject)
-    @params[:name] = @domain.name
-    @params[:subject] = "#{I18n.t(subject, name: @domain.name)}, [#{@domain.name}]"
-  end
-
-  def confirm_update
-    verification_url('domain_update_confirms')
-  end
-
-  def compose
-    @params
-  end
-
-  def verification_url(path)
-    token = verification_token or return
-    @params[:verification_url] = "#{ENV['registrant_url']}/registrant/#{path}/#{@domain.id}?token=#{token}"
-  end
-
-  def verification_token
-    return warn_missing(:registrant_verification_token) if @domain.registrant_verification_token.blank?
-    return warn_missing(:registrant_verification_asked_at) if @domain.registrant_verification_asked_at.blank?
-    @domain.registrant_verification_token
-  end
-
-  def domain_info
-    [:name, :registrar_name,
-     :registrant_name, :registrant_ident, :registrant_email,
-     :registrant_street,:registrant_city
-    ].each do |attr|
-      @params.store attr, @domain.send(attr)
-    end
-    @params.store :registrant_country, @domain.registrant_country.name
-    @params.store :registrant_priv, @domain.registrant.priv?
-    @params.store :old_registrant_name, Registrant.find(@domain.registrant_id_was).name
-    @params
-  end
-
-  def warn_no_email(item = 'email')
-    warn_missing item
-    nil
-  end
-
-  def warn_missing(item)
-    warn_not_delivered "#{item.to_s} is missing for #{@domain.name}"
-  end
-
-  def warn_not_delivered(reason)
-    message = "EMAIL NOT DELIVERED: #{reason}"
-    @params[:errors] << message
-#    Rails.logger.warn message
-    nil
-  end
-
-end
-

app/models/registrar.rb

@@ -132,14 +132,20 @@ class Registrar < ActiveRecord::Base
   # Audit log is needed, therefore no raw SQL
   def replace_nameservers(hostname, new_attributes)
     transaction do
+      domain_list = []
+
       nameservers.where(hostname: hostname).find_each do |original_nameserver|
         new_nameserver = Nameserver.new
         new_nameserver.domain = original_nameserver.domain
         new_nameserver.attributes = new_attributes
         new_nameserver.save!
 
+        domain_list << original_nameserver.domain.name
+
         original_nameserver.destroy!
       end
+
+      domain_list.uniq.sort
     end
   end