Merge remote-tracking branch 'origin/master' into repp-domains

.codeclimate.yml

@@ -32,6 +32,9 @@ plugins:
   rubocop:
     enabled: true
     channel: rubocop-0-74
+    checks:
+      Rubocop/Style/ClassAndModuleChildren:
+        enabled: false
 checks:
   method-lines:
     config:

CHANGELOG.md

@@ -1,3 +1,44 @@
+18.03.2021
+* Added tests for renew and domain status management [#1886](https://github.com/internetee/registry/pull/1886)
+
+12.03.2021
+* Removed old classnames from notifications [#1878](https://github.com/internetee/registry/pull/1878)
+* improved test coverage [#1860](https://github.com/internetee/registry/pull/1860)
+* added test for whois record delete [#1811](https://github.com/internetee/registry/pull/1811)
+
+11.03.2021
+* Account activity in registrar and REPP now return balance with each record [#1819](https://github.com/internetee/registry/issues/1819)
+* Fixed CookieOverflow error with large authentication service keys [#1879](https://github.com/internetee/registry/pull/1879)
+
+10.03.2021
+* Registrant API returns full contact details for admin contacts [#1876](https://github.com/internetee/registry/pull/1876)
+
+09.03.2021
+* AWS message id saving over API [#1877](https://github.com/internetee/registry/pull/1877)
+* Enabled Zeitwerk autoloader [#1872](https://github.com/internetee/registry/issues/1872)
+
+04.03.2021
+* Removed old registrant portal from the project [#1826](https://github.com/internetee/registry/issues/1826)
+
+03.03.2021
+* Email notification is sent in case of pendingupdate expiry [#897](https://github.com/internetee/registry/issues/897)
+
+26.02.2021
+* Domain delete is not affected by updateProhibited [#1844](https://github.com/internetee/registry/issues/1844)
+* Registrant API fix for handling eidas personal identificators [#1864](https://github.com/internetee/registry/pull/1864)
+
+23.02.2021
+* UpdateProhibited status affects bulk actions in REPP [#1818](https://github.com/internetee/registry/issues/1818)
+* Registrant api domain request now excludes tech only domains by default [#1836](https://github.com/internetee/registry/pull/1836)
+
+22.02.2021
+* serverDeleteProhibited prohibts delete action [#1849](https://github.com/internetee/registry/issues/1849)
+
+19.02.2021
+* Update prohibited staatus is kept after renew [#1843](https://github.com/internetee/registry/issues/1843)
+* Fixed clientHold and serverManualInzone status conflict issue [#1845](https://github.com/internetee/registry/issues/1845)
+* Replacing registrant object with another that has the same ident data set does not require registrant verification [#1852](https://github.com/internetee/registry/issues/1852)
+
 11.02.2021
 * Poll messages on locking and unlocking a domain [#1828](https://github.com/internetee/registry/issues/1828)
 * Registrar's prefix is now checked and added to contact id for info and check requests [#1832](https://github.com/internetee/registry/issues/1832)

app/controllers/admin/contact_versions_controller.rb

@@ -2,12 +2,12 @@ module Admin
   class ContactVersionsController < BaseController
     include ObjectVersionsHelper
 
-    load_and_authorize_resource
+    load_and_authorize_resource class: Version::ContactVersion
 
     def index
       params[:q] ||= {}
 
-      @q = ContactVersion.search(params[:q])
+      @q = Version::ContactVersion.search(params[:q])
       @versions = @q.result.page(params[:page])
       search_params = params[:q].deep_dup
 
@@ -23,7 +23,7 @@ module Admin
         end
       end
 
-      versions = ContactVersion.includes(:item).where(whereS).order(created_at: :desc, id: :desc)
+      versions = Version::ContactVersion.includes(:item).where(whereS).order(created_at: :desc, id: :desc)
       @q = versions.search(params[:q])
       @versions = @q.result.page(params[:page])
       @versions = @versions.per(params[:results_per_page]) if params[:results_per_page].to_i.positive?
@@ -32,8 +32,8 @@ module Admin
 
     def show
       per_page = 7
-      @version = ContactVersion.find(params[:id])
+      @version = Version::ContactVersion.find(params[:id])
-      @versions = ContactVersion.where(item_id: @version.item_id).order(created_at: :desc, id: :desc)
+      @versions = Version::ContactVersion.where(item_id: @version.item_id).order(created_at: :desc, id: :desc)
       @versions_map = @versions.all.map(&:id)
 
       # what we do is calc amount of results until needed version
@@ -49,7 +49,7 @@ module Admin
     end
 
     def search
-      render json: ContactVersion.search_by_query(params[:q])
+      render json: Version::ContactVersion.search_by_query(params[:q])
     end
 
     def create_where_string(key, value)

app/controllers/admin/domain_versions_controller.rb

@@ -2,12 +2,12 @@ module Admin
   class DomainVersionsController < BaseController
     include ObjectVersionsHelper
 
-    load_and_authorize_resource
+    load_and_authorize_resource class: Version::DomainVersion
 
     def index
       params[:q] ||= {}
 
-      @q = DomainVersion.includes(:item).search(params[:q])
+      @q = Version::DomainVersion.includes(:item).search(params[:q])
       @versions = @q.result.page(params[:page])
       search_params = params[:q].deep_dup
 
@@ -40,7 +40,7 @@ module Admin
       whereS += "  AND object->>'registrar_id' IN (#{registrars.map { |r| "'#{r.id.to_s}'" }.join ','})" if registrars.present?
       whereS += "  AND 1=0" if registrars == []
 
-      versions = DomainVersion.includes(:item).where(whereS).order(created_at: :desc, id: :desc)
+      versions = Version::DomainVersion.includes(:item).where(whereS).order(created_at: :desc, id: :desc)
       @q = versions.search(params[:q])
       @versions = @q.result.page(params[:page])
       @versions = @versions.per(params[:results_per_page]) if params[:results_per_page].to_i.positive?
@@ -50,8 +50,8 @@ module Admin
 
     def show
       per_page = 7
-      @version = DomainVersion.find(params[:id])
+      @version = Version::DomainVersion.find(params[:id])
-      @versions = DomainVersion.where(item_id: @version.item_id).order(created_at: :desc, id: :desc)
+      @versions = Version::DomainVersion.where(item_id: @version.item_id).order(created_at: :desc, id: :desc)
       @versions_map = @versions.all.map(&:id)
 
       # what we do is calc amount of results until needed version
@@ -67,7 +67,7 @@ module Admin
     end
 
     def search
-      render json: DomainVersion.search_by_query(params[:q])
+      render json: Version::DomainVersion.search_by_query(params[:q])
     end
 
     def create_where_string(key, value)

app/controllers/api/v1/contact_requests_controller.rb

@@ -23,14 +23,15 @@ module Api
         record = ContactRequest.find_by(id: id)
         return :not_found unless record
 
-        record.update_status(contact_request_params)
+        record.update_record(contact_request_params)
         render json: record, status: :ok
       rescue StandardError
         head :bad_request
       end
 
       def contact_request_params
-        params.require(:contact_request).permit(:email, :whois_record_id, :name, :status, :ip)
+        params.require(:contact_request).permit(:email, :whois_record_id, :name, :status, :ip,
+                                                :message_id)
       end
     end
   end

app/controllers/api/v1/registrant/auth_controller.rb

@@ -19,6 +19,9 @@ module Api
           token = create_token(user)
 
           if token
+            msg = "Bearer for #{eid_params[:first_name]} #{eid_params[:last_name]} " \
+                  "(#{eid_params[:ident]}) - '#{token[:access_token]}'"
+            ToStdout.msg(msg) unless Rails.env.production?
             render json: token
           else
             render json: { errors: [{ base: ['Cannot create generate session token'] }] }
@@ -37,7 +40,7 @@ module Api
             obj.require(key)
           end
 
-          params.permit(required_params)
+          params.permit(required_params + [:country_code])
         end
 
         def create_token(user)

app/controllers/api/v1/registrant/domains_controller.rb

@@ -4,6 +4,8 @@ module Api
   module V1
     module Registrant
       class DomainsController < ::Api::V1::Registrant::BaseController
+        before_action :set_tech_flag, only: [:show]
+
         def index
           limit = params[:limit] || 200
           offset = params[:offset] || 0
@@ -25,7 +27,8 @@ module Api
             serializer.to_json
           end
 
-          render json: { count: domains.count, domains: serialized_domains }
+          render json: { total: current_user_domains_total_count, count: domains.count,
+                         domains: serialized_domains }
         end
 
         def show
@@ -41,10 +44,22 @@ module Api
 
         private
 
-        def current_user_domains
+        def set_tech_flag
-          current_registrant_user.domains
+          # current_user_domains scope depends on tech flag
+          # However, if it's not present, tech contact can not see specific domain entry at all.
+          params.merge!(tech: 'true')
+        end
+
+        def current_user_domains_total_count
+          current_registrant_user.domains.count
         rescue CompanyRegister::NotAvailableError
-          current_registrant_user.direct_domains
+          current_registrant_user.direct_domains.count
+        end
+
+        def current_user_domains
+          current_registrant_user.domains(admin: params[:tech] != 'true')
+        rescue CompanyRegister::NotAvailableError
+          current_registrant_user.direct_domains(admin: params[:tech] != 'true')
         end
       end
     end

app/controllers/epp/polls_controller.rb

@@ -12,9 +12,11 @@ module Epp
       @notification = current_user.unread_notifications.order('created_at DESC').take
 
       render_epp_response 'epp/poll/poll_no_messages' and return unless @notification
+
       if @notification.attached_obj_type && @notification.attached_obj_id
         begin
-          @object = Object.const_get(@notification.attached_obj_type).find(@notification.attached_obj_id)
+          @object = object_by_type(@notification.attached_obj_type)
+                    .find(@notification.attached_obj_id)
         rescue => problem
           # the data model might be inconsistent; or ...
           # this could happen if the registrar does not dequeue messages, and then the domain was deleted
@@ -31,6 +33,12 @@ module Epp
       render_epp_response 'epp/poll/poll_req'
     end
 
+    def object_by_type(object_type)
+      Object.const_get(object_type)
+    rescue NameError
+      Object.const_get("Version::#{object_type}")
+    end
+
     def ack_poll
       @notification = current_user.unread_notifications.find_by(id: params[:parsed_frame].css('poll').first['msgID'])
 

app/controllers/registrant/contacts_controller.rb

@@ -1,115 +0,0 @@
-class Registrant::ContactsController < RegistrantController
-  helper_method :domain
-  helper_method :fax_enabled?
-  helper_method :domain_filter_params
-  skip_authorization_check only: %i[edit update]
-  before_action :set_contact, only: [:show]
-
-  def show
-    @requester_contact = Contact.find_by(ident: current_registrant_user.ident)
-    authorize! :read, @contact
-  end
-
-  def edit
-    @contact = current_user_contacts.find(params[:id])
-  end
-
-  def update
-    @contact = current_user_contacts.find(params[:id])
-    @contact.attributes = contact_params
-    response = update_contact_via_api(@contact.uuid)
-    updated = response.is_a?(Net::HTTPSuccess)
-
-    if updated
-      redirect_to registrant_domain_contact_url(domain, @contact), notice: t('.updated')
-    else
-      parsed_response = JSON.parse(response.body, symbolize_names: true)
-      @errors = parsed_response[:errors]
-      render :edit
-    end
-  end
-
-  private
-
-  def set_contact
-    id = params[:id]
-    contact = domain.contacts.find_by(id: id) || current_user_contacts.find_by(id: id)
-    contact ||= Contact.find_by(id: id, ident: domain.registrant.ident)
-    @contact = contact
-  end
-
-  def domain
-    current_user_domains.find(params[:domain_id])
-  end
-
-  def contact_params
-    permitted = %i[
-      name
-      email
-      phone
-    ]
-
-    permitted << :fax if fax_enabled?
-    permitted += %i[street zip city state country_code] if Contact.address_processing?
-    params.require(:contact).permit(*permitted)
-  end
-
-  def access_token
-    uri = URI.parse("#{ENV['registrant_api_base_url']}/api/v1/registrant/auth/eid")
-    request = Net::HTTP::Post.new(uri)
-    request.form_data = access_token_request_params
-
-    response = Net::HTTP.start(uri.hostname, uri.port, use_ssl: (uri.scheme == 'https')) do |http|
-      http.request(request)
-    end
-
-    json_doc = JSON.parse(response.body, symbolize_names: true)
-    json_doc[:access_token]
-  end
-
-  def access_token_request_params
-    { ident: current_registrant_user.ident,
-      first_name: current_registrant_user.first_name,
-      last_name: current_registrant_user.last_name }
-  end
-
-  def fax_enabled?
-    ENV['fax_enabled'] == 'true'
-  end
-
-  def contact_update_api_params
-    params = contact_params
-    params = normalize_address_attributes_for_api(params) if Contact.address_processing?
-    params
-  end
-
-  def normalize_address_attributes_for_api(params)
-    normalized = params
-    address_parts = {}
-
-    Contact.address_attribute_names.each do |attr|
-      attr = attr.to_sym
-      address_parts[attr] = params[attr]
-      normalized.delete(attr)
-    end
-
-    normalized[:address] = address_parts
-    normalized
-  end
-
-  def update_contact_via_api(uuid)
-    uri = URI.parse("#{ENV['registrant_api_base_url']}/api/v1/registrant/contacts/#{uuid}")
-    request = Net::HTTP::Patch.new(uri)
-    request['Authorization'] = "Bearer #{access_token}"
-    request['Content-type'] = 'application/json'
-    request.body = contact_update_api_params.to_json
-
-    Net::HTTP.start(uri.hostname, uri.port, use_ssl: (uri.scheme == 'https')) do |http|
-      http.request(request)
-    end
-  end
-
-  def domain_filter_params
-    params.permit(:domain_filter)
-  end
-end

app/controllers/registrant/domain_delete_confirms_controller.rb

@@ -1,44 +0,0 @@
-class Registrant::DomainDeleteConfirmsController < RegistrantController
-  skip_before_action :authenticate_registrant_user!, only: [:show, :update]
-  skip_authorization_check only: [:show, :update]
-
-  def show
-    return if params[:confirmed] || params[:rejected]
-
-    @domain = Domain.find(params[:id])
-    @domain = nil unless @domain.registrant_delete_confirmable?(params[:token])
-  end
-
-  def update
-    @domain = Domain.find(params[:id])
-    unless @domain.registrant_delete_confirmable?(params[:token])
-      flash[:alert] = t(:registrant_domain_verification_failed)
-      return render 'show'
-    end
-
-    @registrant_verification = RegistrantVerification.new(domain_id: @domain.id,
-                                                          verification_token: params[:token])
-
-    initiator = current_registrant_user ? current_registrant_user.username :
-                  t(:user_not_authenticated)
-
-    confirmed = params[:confirmed] ? true : false
-    action = if confirmed
-               @registrant_verification.domain_registrant_delete_confirm!("email link #{initiator}")
-             else
-               @registrant_verification.domain_registrant_delete_reject!("email link #{initiator}")
-             end
-
-    fail_msg = t("registrant_domain_delete_#{confirmed ? 'confirmed' : 'rejected'}_failed".to_sym)
-    success_msg = t("registrant_domain_verification_#{confirmed ? 'confirmed' : 'rejected'}".to_sym)
-
-    flash[:alert] = action ? success_msg : fail_msg
-    (render 'show' && return) unless action
-
-    if confirmed
-      redirect_to registrant_domain_delete_confirm_path(@domain.id, confirmed: true)
-    else
-      redirect_to registrant_domain_delete_confirm_path(@domain.id, rejected: true)
-    end
-  end
-end

app/controllers/registrant/domain_update_confirms_controller.rb

@@ -1,44 +0,0 @@
-class Registrant::DomainUpdateConfirmsController < RegistrantController
-  skip_before_action :authenticate_registrant_user!, only: %i[show update]
-  skip_authorization_check only: %i[show update]
-
-  def show
-    return if params[:confirmed] || params[:rejected]
-    @domain = Domain.find(params[:id])
-    @domain = nil unless @domain.registrant_update_confirmable?(params[:token])
-  end
-
-  def update
-    @domain = Domain.find(params[:id])
-    unless @domain.registrant_update_confirmable?(params[:token])
-      flash[:alert] = t(:registrant_domain_verification_failed)
-      return render 'show'
-    end
-
-    @registrant_verification = RegistrantVerification.new(domain_id: @domain.id,
-                                                          verification_token: params[:token])
-
-    initiator = current_registrant_user ? current_registrant_user.username :
-                  t(:user_not_authenticated)
-
-    if params[:rejected]
-      if @registrant_verification.domain_registrant_change_reject!("email link, #{initiator}")
-        flash[:notice] = t(:registrant_domain_verification_rejected)
-        redirect_to registrant_domain_update_confirm_path(@domain.id, rejected: true)
-      else
-        flash[:alert] = t(:registrant_domain_verification_rejected_failed)
-        return render 'show'
-      end
-    elsif params[:confirmed]
-      if @registrant_verification.domain_registrant_change_confirm!("email link, #{initiator}")
-        Dispute.close_by_domain(@domain.name) if @domain.disputed?
-
-        flash[:notice] = t(:registrant_domain_verification_confirmed)
-        redirect_to registrant_domain_update_confirm_path(@domain.id, confirmed: true)
-      else
-        flash[:alert] = t(:registrant_domain_verification_confirmed_failed)
-        return render 'show'
-      end
-    end
-  end
-end

app/controllers/registrant/domains_controller.rb

@@ -1,79 +0,0 @@
-class Registrant::DomainsController < RegistrantController
-  def index
-    authorize! :view, :registrant_domains
-
-    params[:q] ||= {}
-    normalize_search_parameters do
-      @q = current_user_domains.search(search_params)
-    end
-
-    domains = @q.result
-
-    respond_to do |format|
-      format.html do
-        @domains = domains.page(params[:page])
-        domains_per_page = params[:results_per_page].to_i
-        @domains = @domains.per(domains_per_page) if domains_per_page.positive?
-      end
-      format.csv do
-        raw_csv = @q.result.to_csv
-        send_data raw_csv, filename: 'domains.csv', type: "#{Mime[:csv]}; charset=utf-8"
-      end
-      format.pdf do
-        view = ActionView::Base.new(ActionController::Base.view_paths, domains: domains)
-        raw_html = view.render(file: 'registrant/domains/list_pdf', layout: false)
-        raw_pdf = domains.pdf(raw_html)
-
-        send_data raw_pdf, filename: 'domains.pdf'
-      end
-    end
-  end
-
-  def show
-    @domain = current_user_domains.find(params[:id])
-    authorize! :read, @domain
-  end
-
-  def confirmation
-    authorize! :view, :registrant_domains
-    domain = current_user_domains.find(params[:id])
-
-    if (domain.statuses.include?(DomainStatus::PENDING_UPDATE) ||
-        domain.statuses.include?(DomainStatus::PENDING_DELETE_CONFIRMATION)) &&
-        domain.pending_json.present?
-
-      @domain = domain
-      @confirmation_url = confirmation_url(domain)
-    else
-      flash[:warning] = I18n.t('available_verification_url_not_found')
-      redirect_to registrant_domain_path(domain)
-    end
-  end
-
-  private
-
-  def normalize_search_parameters
-    ca_cache = params[:q][:valid_to_lteq]
-    begin
-      end_time = params[:q][:valid_to_lteq].try(:to_date)
-      params[:q][:valid_to_lteq] = end_time.try(:end_of_day)
-    rescue
-      logger.warn('Invalid date')
-    end
-    yield
-    params[:q][:valid_to_lteq] = ca_cache
-  end
-
-  def confirmation_url(domain)
-    if domain.statuses.include?(DomainStatus::PENDING_UPDATE)
-      registrant_domain_update_confirm_url(token: domain.registrant_verification_token)
-    elsif domain.statuses.include?(DomainStatus::PENDING_DELETE_CONFIRMATION)
-      registrant_domain_delete_confirm_url(token: domain.registrant_verification_token)
-    end
-  end
-
-  def search_params
-    params.require(:q).permit(:name_matches, :registrant_ident_eq, :valid_to_gteq, :valid_to_lteq,
-                              :results_per_page)
-  end
-end

app/controllers/registrant/registrars_controller.rb

@@ -1,6 +0,0 @@
-class Registrant::RegistrarsController < RegistrantController
-  def show
-    @registrar = Registrar.find(params[:id])
-    authorize! :read, @registrar
-  end
-end

app/controllers/registrant/sessions_controller.rb

@@ -1,17 +0,0 @@
-class Registrant::SessionsController < Devise::SessionsController
-  layout 'registrant/application'
-
-  private
-
-  def after_sign_in_path_for(_resource_or_scope)
-    registrant_root_path
-  end
-
-  def after_sign_out_path_for(_resource_or_scope)
-    new_registrant_user_session_path
-  end
-
-  def user_for_paper_trail
-    current_registrant_user.present? ? current_registrant_user.id_role_username : 'anonymous'
-  end
-end

app/controllers/registrar/base_controller.rb

@@ -17,7 +17,7 @@ class Registrar
     private
 
     def check_ip_restriction
-      ip_restriction = Authorization::RestrictedIP.new(request.ip)
+      ip_restriction = Authorization::RestrictedIp.new(request.ip)
       allowed = ip_restriction.can_access_registrar_area?(current_registrar_user.registrar)
 
       return if allowed

app/controllers/registrar/domains_controller.rb

@@ -49,7 +49,7 @@ class Registrar
             domain_presenters << ::DomainPresenter.new(domain: domain, view: view_context)
           end
 
-          raw_csv = Registrar::DomainListCSVPresenter.new(domains: domain_presenters,
+          raw_csv = Registrar::DomainListCsvPresenter.new(domains: domain_presenters,
                                                           view: view_context).to_s
           filename = "Domains_#{l(Time.zone.now, format: :filename)}.csv"
           send_data raw_csv, filename: filename, type: "#{Mime[:csv]}; charset=utf-8"

app/controllers/registrar/sessions_controller.rb

@@ -72,7 +72,7 @@ class Registrar
     end
 
     def check_ip_restriction
-      ip_restriction = Authorization::RestrictedIP.new(request.ip)
+      ip_restriction = Authorization::RestrictedIp.new(request.ip)
       allowed = ip_restriction.can_access_registrar_area_sign_in_page?
 
       return if allowed

app/controllers/repp/v1/accounts_controller.rb

@@ -6,8 +6,28 @@ module Repp
       def balance
         resp = { balance: current_user.registrar.cash_account.balance,
                  currency: current_user.registrar.cash_account.currency }
+        resp[:transactions] = activities if params[:detailed] == 'true'
         render_success(data: resp)
       end
+
+      def activities
+        arr = []
+        registrar_activities.each do |a|
+          arr << { created_at: a.created_at, description: a.description,
+                   type: a.activity_type == 'add_credit' ? 'credit' : 'debit',
+                   sum: a.sum, balance: a.new_balance }
+        end
+
+        arr
+      end
+
+      def registrar_activities
+        activities = current_user.registrar.cash_account.activities.order(created_at: :desc)
+        activities = activities.where('created_at >= ?', params[:from]) if params[:from]
+        activities = activities.where('created_at <= ?', params[:until]) if params[:until]
+
+        activities
+      end
     end
   end
 end

app/controllers/sso/tara_controller.rb

@@ -14,7 +14,7 @@ module Sso
 
     # rubocop:disable Style/AndOr
     def callback(user, registrar: true)
-      session[:omniauth_hash] = user_hash
+      session[:omniauth_hash] = user_hash.delete_if { |key, _| key == 'credentials' }
       (show_error(registrar: registrar) and return) unless user
 
       flash[:notice] = t(:signed_in_successfully)

app/interactions/actions/contact_delete.rb

@@ -19,6 +19,11 @@ module Actions
         return
       end
 
+      if contact.delete_prohibited?
+        contact.errors.add(:statuses, :delete_prohibited)
+        return
+      end
+
       commit
     end
 

app/interactions/actions/domain_renew.rb

@@ -11,6 +11,7 @@ module Actions
     end
 
     def call
+      domain.is_renewal = true
       if !domain.renewable? || domain.invalid?
         domain.add_renew_epp_errors
         false

app/interactions/domains/expired_pendings/process_clean.rb

@@ -17,7 +17,9 @@ module Domains
       def notify_pending_update
         RegistrantChangeMailer.expired(domain: domain,
                                        registrar: domain.registrar,
-                                       registrant: domain.registrant).deliver_later
+                                       registrant: domain.registrant,
+                                       send_to: [domain.new_registrant_email,
+                                                 domain.registrant.email]).deliver_later
       end
 
       def notify_pending_delete

app/jobs/registrant_change_expired_email_job.rb

@@ -1,20 +0,0 @@
-class RegistrantChangeExpiredEmailJob < Que::Job
-  def run(domain_id)
-    domain = Domain.find(domain_id)
-    log(domain)
-    RegistrantChangeMailer.expired(domain: domain,
-                                   registrar: domain.registrar,
-                                   registrant: domain.registrant).deliver_now
-  end
-
-  private
-
-  def log(domain)
-    message = "Send RegistrantChangeMailer#expired email for domain #{domain.name} (##{domain.id}) to #{domain.new_registrant_email}"
-    logger.info(message)
-  end
-
-  def logger
-    Rails.logger
-  end
-end

app/mailers/application_mailer.rb

@@ -6,10 +6,6 @@ class ApplicationMailer < ActionMailer::Base
     token = domain.registrant_verification_token
     base_url = ENV['registrant_portal_verifications_base_url']
 
-    url = registrant_domain_delete_confirm_url(domain, token: token) if method == 'delete'
-    url ||= registrant_domain_update_confirm_url(domain, token: token)
-    return url if base_url.blank?
-
     "#{base_url}/confirmation/#{domain.name_puny}/#{method}/#{token}"
   end
 end

app/mailers/interceptors/punycode_interceptor.rb

@@ -1,4 +1,4 @@
-class PunycodeInterceptor
+class Interceptors::PunycodeInterceptor
   class << self
     def delivering_email(message)
       message.from = encode_addresses_as_punycode(message.from)

app/mailers/registrant_change_mailer.rb

@@ -38,13 +38,13 @@ class RegistrantChangeMailer < ApplicationMailer
     mail(to: domain.new_registrant_email, subject: subject)
   end
 
-  def expired(domain:, registrar:, registrant:)
+  def expired(domain:, registrar:, registrant:, send_to:)
     @domain = DomainPresenter.new(domain: domain, view: view_context)
     @registrar = RegistrarPresenter.new(registrar: registrar, view: view_context)
     @registrant = RegistrantPresenter.new(registrant: registrant, view: view_context)
 
     subject = default_i18n_subject(domain_name: domain.name)
-    mail(to: domain.new_registrant_email, subject: subject)
+    mail(to: send_to, subject: subject)
   end
 
   private

app/models/ability.rb

@@ -89,8 +89,8 @@ class Ability
     can :manage, BlockedDomain
     can :manage, ReservedDomain
     can :manage, DNS::Zone
-    can :manage, DomainVersion
+    can :manage, Version::DomainVersion
-    can :manage, ContactVersion
+    can :manage, Version::ContactVersion
     can :manage, Billing::Price
     can :manage, User
     can :manage, ApiUser

app/models/account_activity.rb

@@ -13,6 +13,9 @@ class AccountActivity < ApplicationRecord
   def update_balance
     account.balance += sum
     account.save
+
+    self.new_balance = account.balance
+    save
   end
 
   class << self

app/models/action.rb

@@ -1,5 +1,5 @@
 class Action < ApplicationRecord
-  has_paper_trail versions: { class_name: 'ActionVersion' }
+  has_paper_trail versions: { class_name: 'Version::ActionVersion' }
 
   belongs_to :user
   belongs_to :contact

app/models/authorization/restricted_ip.rb

@@ -1,5 +1,5 @@
 module Authorization
-  class RestrictedIP
+  class RestrictedIp
     def initialize(ip)
       @ip = ip
     end

app/models/billing/price.rb

@@ -1,6 +1,6 @@
 module Billing
   class Price < ApplicationRecord
-    include Concerns::Billing::Price::Expirable
+    include Billing::Price::Expirable
     include Versions
 
     belongs_to :zone, class_name: 'DNS::Zone', required: true

app/models/concerns/billing/price/expirable.rb

@@ -1,4 +1,4 @@
-module Concerns::Billing::Price::Expirable
+module Billing::Price::Expirable
   extend ActiveSupport::Concern
 
   class_methods do

app/models/concerns/contact/archivable.rb

@@ -1,6 +1,4 @@
-module Concerns
+module Contact::Archivable
-  module Contact
-    module Archivable
   extend ActiveSupport::Concern
 
   class_methods do
@@ -37,11 +35,11 @@ module Concerns
   end
 
   def inactive?
-        if DomainVersion.contact_unlinked_more_than?(contact_id: id, period: inactivity_period)
+    if Version::DomainVersion.contact_unlinked_more_than?(contact_id: id, period: inactivity_period)
       return true
     end
 
-        DomainVersion.was_contact_linked?(id) ? false : created_at <= inactivity_period.ago
+    Version::DomainVersion.was_contact_linked?(id) ? false : created_at <= inactivity_period.ago
   end
 
   def inactivity_period
@@ -63,6 +61,4 @@ module Concerns
     f.write("#{code}\n")
     f.close
   end
-    end
-  end
 end

app/models/concerns/contact/disclosable.rb

@@ -1,6 +1,4 @@
-module Concerns
+module Contact::Disclosable
-  module Contact
-    module Disclosable
   extend ActiveSupport::Concern
 
   class_methods do
@@ -21,6 +19,4 @@ module Concerns
                                    .any?
     errors.add(:disclosed_attributes, :invalid) if has_undisclosable_attributes
   end
-    end
-  end
 end

app/models/concerns/contact/identical.rb

@@ -1,4 +1,4 @@
-module Concerns::Contact::Identical
+module Contact::Identical
   extend ActiveSupport::Concern
 
   IDENTIFIABLE_ATTRIBUTES = %w[

app/models/concerns/domain/activatable.rb

@@ -1,4 +1,4 @@
-module Concerns::Domain::Activatable
+module Domain::Activatable
   extend ActiveSupport::Concern
 
   def active?

app/models/concerns/domain/bulk_updatable.rb

@@ -1,6 +1,4 @@
-module Concerns
+module Domain::BulkUpdatable
-  module Domain
-    module BulkUpdatable
   extend ActiveSupport::Concern
 
   def bulk_update_prohibited?
@@ -12,6 +10,4 @@ module Concerns
                         DomainStatus::CLIENT_UPDATE_PROHIBITED]
     prohibited_array.any? { |block_status| statuses.include?(block_status) }
   end
-    end
-  end
 end

app/models/concerns/domain/deletable.rb

@@ -1,6 +1,12 @@
-module Concerns::Domain::Deletable
+module Domain::Deletable
   extend ActiveSupport::Concern
 
+  DELETE_STATUSES = [
+    DomainStatus::PENDING_DELETE_CONFIRMATION,
+    DomainStatus::PENDING_DELETE,
+    DomainStatus::FORCE_DELETE,
+  ].freeze
+
   private
 
   def delete_later

app/models/concerns/domain/discardable.rb

@@ -1,4 +1,4 @@
-module Concerns::Domain::Discardable
+module Domain::Discardable
   extend ActiveSupport::Concern
 
   def keep

app/models/concerns/domain/disputable.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
-module Concerns
+module Domain::Disputable
-  module Domain
-    module Disputable
   extend ActiveSupport::Concern
 
   included do
@@ -39,6 +37,4 @@ module Concerns
 
     errors.add(:base, :invalid_auth_information_reserved)
   end
-    end
-  end
 end

app/models/concerns/domain/expirable.rb

@@ -1,4 +1,4 @@
-module Concerns::Domain::Expirable
+module Domain::Expirable
   extend ActiveSupport::Concern
 
   included do

app/models/concerns/domain/force_delete.rb

@@ -1,4 +1,4 @@
-module Concerns::Domain::ForceDelete # rubocop:disable Metrics/ModuleLength
+module Domain::ForceDelete # rubocop:disable Metrics/ModuleLength
   extend ActiveSupport::Concern
 
   included do
@@ -11,6 +11,11 @@ module Concerns::Domain::ForceDelete # rubocop:disable Metrics/ModuleLength
           lambda {
             where("(force_delete_data->>'contact_notification_sent_date') is null")
           }
+
+    HOLD_STATUSES = [
+      DomainStatus::SERVER_HOLD,
+      DomainStatus::CLIENT_HOLD,
+    ].freeze
   end
 
   class_methods do
@@ -19,6 +24,10 @@ module Concerns::Domain::ForceDelete # rubocop:disable Metrics/ModuleLength
     end
   end
 
+  def hold_status?
+    HOLD_STATUSES.any? { |status| statuses.include? status }
+  end
+
   def notification_template(explicit: nil)
     reason = explicit&.downcase
     return reason if %w[invalid_email invalid_phone].include?(reason)

app/models/concerns/domain/registry_lockable.rb

@@ -1,6 +1,4 @@
-module Concerns
+module Domain::RegistryLockable
-  module Domain
-    module RegistryLockable
   extend ActiveSupport::Concern
 
   def apply_registry_lock
@@ -58,6 +56,4 @@ module Concerns
       attached_obj_type: self.class.name
     )
   end
-    end
-  end
 end

app/models/concerns/domain/releasable.rb

@@ -1,6 +1,4 @@
-module Concerns
+module Domain::Releasable
-  module Domain
-    module Releasable
   extend ActiveSupport::Concern
 
   class_methods do
@@ -52,6 +50,4 @@ module Concerns
       discard
     end
   end
-    end
-  end
 end

app/models/concerns/domain/transferable.rb

@@ -1,4 +1,4 @@
-module Concerns::Domain::Transferable
+module Domain::Transferable
   extend ActiveSupport::Concern
 
   included do
@@ -31,7 +31,9 @@ module Concerns::Domain::Transferable
       DomainStatus::PENDING_TRANSFER,
       DomainStatus::FORCE_DELETE,
       DomainStatus::SERVER_TRANSFER_PROHIBITED,
-      DomainStatus::CLIENT_TRANSFER_PROHIBITED
+      DomainStatus::CLIENT_TRANSFER_PROHIBITED,
+      DomainStatus::SERVER_UPDATE_PROHIBITED,
+      DomainStatus::CLIENT_UPDATE_PROHIBITED,
     ]).empty?
   end
 

app/models/concerns/email_verifable.rb

@@ -1,5 +1,4 @@
-module Concerns
+module EmailVerifable
-  module EmailVerifable
   extend ActiveSupport::Concern
 
   def email_verification
@@ -91,5 +90,4 @@ module Concerns
     end
   end
   # rubocop:enable Metrics/LineLength
-  end
 end

app/models/concerns/invoice/book_keeping.rb

@@ -1,6 +1,4 @@
-module Concerns
+module Invoice::BookKeeping
-  module Invoice
-    module BookKeeping
   extend ActiveSupport::Concern
 
   def as_directo_json
@@ -29,6 +27,4 @@ module Concerns
       'vat_reg_no': buyer_vat_no,
     }.as_json
   end
-    end
-  end
 end

app/models/concerns/invoice/cancellable.rb

@@ -1,6 +1,4 @@
-module Concerns
+module Invoice::Cancellable
-  module Invoice
-    module Cancellable
   extend ActiveSupport::Concern
 
   included do
@@ -23,6 +21,4 @@ module Concerns
   def not_cancelled?
     !cancelled?
   end
-    end
-  end
 end

app/models/concerns/invoice/payable.rb

@@ -1,6 +1,4 @@
-module Concerns
+module Invoice::Payable
-  module Invoice
-    module Payable
   extend ActiveSupport::Concern
 
   included do
@@ -23,6 +21,4 @@ module Concerns
   def unpaid?
     !paid?
   end
-    end
-  end
 end

app/models/concerns/registrar/book_keeping.rb

@@ -1,6 +1,4 @@
-module Concerns
+module Registrar::BookKeeping
-  module Registrar
-    module BookKeeping
   extend ActiveSupport::Concern
 
   DOMAIN_TO_PRODUCT = { 'ee': '01EE', 'com.ee': '02COM', 'pri.ee': '03PRI',
@@ -123,6 +121,4 @@ module Concerns
 
     @pricelists[account_activity.price_id] = account_activity.price
   end
-    end
-  end
 end

app/models/concerns/registrar/legal_doc.rb

@@ -1,6 +1,4 @@
-module Concerns
+module Registrar::LegalDoc
-  module Registrar
-    module LegalDoc
   extend ActiveSupport::Concern
 
   def legaldoc_mandatory?
@@ -11,6 +9,4 @@ module Concerns
     setting = Setting.legal_document_is_mandatory
     legaldoc_optout || !setting
   end
-    end
-  end
 end

app/models/concerns/versions.rb

@@ -7,10 +7,10 @@ module Versions
     attr_accessor :version_loader
 
     if WITH_CHILDREN.include?(model_name.name)
-      has_paper_trail versions: { class_name: "#{model_name}Version" },
+      has_paper_trail versions: { class_name: "Version::#{model_name}Version" },
                       meta: { children: :children_log }
     else
-      has_paper_trail versions: { class_name: "#{model_name}Version" }
+      has_paper_trail versions: { class_name: "Version::#{model_name}Version" }
     end
 
     # add creator and updator

app/models/concerns/zone/whois_queryable.rb

@@ -1,6 +1,4 @@
-module Concerns
+module Zone::WhoisQueryable
-  module Zone
-    module WhoisQueryable
   extend ActiveSupport::Concern
 
   included do
@@ -69,6 +67,4 @@ module Concerns
 
     vars
   end
-    end
-  end
 end

app/models/contact.rb

@@ -4,11 +4,11 @@ class Contact < ApplicationRecord
   include Versions # version/contact_version.rb
   include EppErrors
   include UserEvents
-  include Concerns::Contact::Transferable
+  include Contact::Transferable
-  include Concerns::Contact::Identical
+  include Contact::Identical
-  include Concerns::Contact::Disclosable
+  include Contact::Disclosable
-  include Concerns::Contact::Archivable
+  include Contact::Archivable
-  include Concerns::EmailVerifable
+  include EmailVerifable
 
   belongs_to :original, class_name: self.name
   belongs_to :registrar, required: true

app/models/contact/transferable.rb

@@ -1,4 +1,4 @@
-module Concerns::Contact::Transferable
+module Contact::Transferable
   extend ActiveSupport::Concern
 
   included do
@@ -9,7 +9,7 @@ module Concerns::Contact::Transferable
   def transfer(new_registrar)
     return identical(new_registrar) if identical(new_registrar)
 
-    new_contact = self.dup
+    new_contact = dup
     new_contact.registrar = new_registrar
     new_contact.original = self
     new_contact.code = nil

app/models/contact_request.rb

@@ -24,9 +24,10 @@ class ContactRequest < ApplicationRecord
     contact_request
   end
 
-  def update_status(params)
+  def update_record(params)
-    self.status = params['status']
+    self.status = params['status'] if params['status']
-    self.ip_address = params['ip']
+    self.ip_address = params['ip'] if params['ip']
+    self.message_id = params['ip'] if params['message_id']
     save!
   end
 

app/models/dns/zone.rb

@@ -5,7 +5,7 @@ module DNS
     validates :origin, :ttl, :refresh, :retry, :expire, :minimum_ttl, :email, :master_nameserver, presence: true
     validates :ttl, :refresh, :retry, :expire, :minimum_ttl, numericality: { only_integer: true }
     validates :origin, uniqueness: true
-    include Concerns::Zone::WhoisQueryable
+    include ::Zone::WhoisQueryable
 
     before_destroy do
       throw(:abort) if used?

app/models/domain.rb

@@ -1,16 +1,16 @@
 class Domain < ApplicationRecord
   include UserEvents
   include Versions # version/domain_version.rb
-  include Concerns::Domain::Expirable
+  include Domain::Expirable
-  include Concerns::Domain::Activatable
+  include Domain::Activatable
-  include Concerns::Domain::ForceDelete
+  include Domain::ForceDelete
-  include Concerns::Domain::Discardable
+  include Domain::Discardable
-  include Concerns::Domain::Deletable
+  include Domain::Deletable
-  include Concerns::Domain::Transferable
+  include Domain::Transferable
-  include Concerns::Domain::RegistryLockable
+  include Domain::RegistryLockable
-  include Concerns::Domain::Releasable
+  include Domain::Releasable
-  include Concerns::Domain::Disputable
+  include Domain::Disputable
-  include Concerns::Domain::BulkUpdatable
+  include Domain::BulkUpdatable
 
   attr_accessor :roles
 
@@ -107,9 +107,9 @@ class Domain < ApplicationRecord
 
   validate :status_is_consistant
   def status_is_consistant
-      has_error = (statuses.include?(DomainStatus::SERVER_HOLD) && statuses.include?(DomainStatus::SERVER_MANUAL_INZONE))
+    has_error = (hold_status? && statuses.include?(DomainStatus::SERVER_MANUAL_INZONE))
     unless has_error
-        if (statuses & [DomainStatus::PENDING_DELETE_CONFIRMATION, DomainStatus::PENDING_DELETE, DomainStatus::FORCE_DELETE]).any?
+      if (statuses & DELETE_STATUSES).any?
         has_error = statuses.include? DomainStatus::SERVER_DELETE_PROHIBITED
       end
     end
@@ -198,6 +198,23 @@ class Domain < ApplicationRecord
       Setting.nameserver_required
     end
 
+    def registrant_user_admin_registrant_domains(registrant_user)
+      companies = Contact.registrant_user_company_contacts(registrant_user)
+      from(
+        "(#{registrant_user_administered_domains(registrant_user).to_sql} UNION " \
+        "#{registrant_user_company_registrant(companies).to_sql} UNION " \
+        "#{registrant_user_domains_company(companies, except_tech: true).to_sql}) AS domains"
+      )
+    end
+
+    def registrant_user_direct_admin_registrant_domains(registrant_user)
+      from(
+        "(#{registrant_user_direct_domains_by_registrant(registrant_user).to_sql} UNION " \
+        "#{registrant_user_direct_domains_by_contact(registrant_user,
+                                                     except_tech: true).to_sql}) AS domains"
+      )
+    end
+
     def registrant_user_domains(registrant_user)
       from(
         "(#{registrant_user_domains_by_registrant(registrant_user).to_sql} UNION " \
@@ -247,16 +264,20 @@ class Domain < ApplicationRecord
       where(registrant: registrant_user.direct_contacts)
     end
 
-    def registrant_user_direct_domains_by_contact(registrant_user)
+    def registrant_user_direct_domains_by_contact(registrant_user, except_tech: false)
-      joins(:domain_contacts).where(domain_contacts: { contact_id: registrant_user.direct_contacts })
+      request = { contact_id: registrant_user.direct_contacts }
+      request[:type] = [AdminDomainContact.name] if except_tech
+      joins(:domain_contacts).where(domain_contacts: request)
     end
 
     def registrant_user_company_registrant(companies)
       where(registrant: companies)
     end
 
-    def registrant_user_domains_company(companies)
+    def registrant_user_domains_company(companies, except_tech: false)
-      joins(:domain_contacts).where(domain_contacts: { contact: companies })
+      request = { contact: companies }
+      request[:type] = [AdminDomainContact.name] if except_tech
+      joins(:domain_contacts).where(domain_contacts: request)
     end
   end
 

app/models/domain_status.rb

@@ -109,14 +109,12 @@ class DomainStatus < ApplicationRecord
   DELETE_PROHIBIT_STATES = [
       DomainStatus::CLIENT_DELETE_PROHIBITED,
       DomainStatus::SERVER_DELETE_PROHIBITED,
-      DomainStatus::CLIENT_UPDATE_PROHIBITED,
-      DomainStatus::SERVER_UPDATE_PROHIBITED,
       DomainStatus::PENDING_CREATE,
       DomainStatus::PENDING_RENEW,
       DomainStatus::PENDING_TRANSFER,
       DomainStatus::PENDING_UPDATE,
       DomainStatus::PENDING_DELETE
-  ]
+  ].freeze
 
   def epp_code_map
     {

app/models/epp/contact.rb

@@ -82,8 +82,11 @@ class Epp::Contact < Contact
       '2302' => [ # Object exists
         [:code, :epp_id_taken]
       ],
+      '2304' => [ # Status prohibits operation
+        [:statuses, :delete_prohibited],
+      ],
       '2305' => [ # Association exists
-        [:domains, :exist]
+        [:domains, :exist],
       ]
     }
   end

app/models/epp/domain.rb

@@ -201,7 +201,6 @@ class Epp::Domain < Domain
 
     statuses.delete(DomainStatus::SERVER_HOLD)
     statuses.delete(DomainStatus::EXPIRED)
-    statuses.delete(DomainStatus::SERVER_UPDATE_PROHIBITED)
     cancel_pending_delete
 
     save
@@ -387,4 +386,13 @@ class Epp::Domain < Domain
       result
     end
   end
+
+  private
+
+  def verification_needed?(code:)
+    new_registrant = Registrant.find_by(code: code)
+    return false if new_registrant.try(:identical_to?, registrant)
+
+    registrant.code != code
+  end
 end

app/models/invoice.rb

@@ -1,8 +1,8 @@
 class Invoice < ApplicationRecord
   include Versions
-  include Concerns::Invoice::Cancellable
+  include Invoice::Cancellable
-  include Concerns::Invoice::Payable
+  include Invoice::Payable
-  include Concerns::Invoice::BookKeeping
+  include Invoice::BookKeeping
 
   belongs_to :buyer, class_name: 'Registrar'
   has_one  :account_activity
@@ -34,7 +34,7 @@ class Invoice < ApplicationRecord
   before_create :calculate_total, unless: :total?
   before_create :apply_default_buyer_vat_no, unless: :buyer_vat_no?
 
-  attribute :vat_rate, ::Type::VATRate.new
+  attribute :vat_rate, ::Type::VatRate.new
 
   def set_invoice_number
     last_no = Invoice.order(number: :desc).limit(1).pluck(:number).first

app/models/legal_document.rb

@@ -82,7 +82,7 @@ class LegalDocument < ApplicationRecord
         end
       end
 
-      contact_ids = DomainVersion.where(item_id: orig_legal.documentable_id).distinct.
+      contact_ids = Version::DomainVersion.where(item_id: orig_legal.documentable_id).distinct.
           pluck("object->>'registrant_id'", "object_changes->>'registrant_id'",
                 "children->>'tech_contacts'", "children->>'admin_contacts'").flatten.uniq
       contact_ids = contact_ids.map{|id|

app/models/registrant_user.rb

@@ -9,7 +9,7 @@ class RegistrantUser < User
   delegate :can?, :cannot?, to: :ability
 
   def ident
-    registrant_ident.to_s.split('-').last
+    registrant_ident.to_s[3..]
   end
 
   def country
@@ -18,6 +18,8 @@ class RegistrantUser < User
   end
 
   def companies(company_register = CompanyRegister::Client.new)
+    return [] if ident.include?('-')
+
     company_register.representation_rights(citizen_personal_code: ident,
                                            citizen_country_code: country.alpha3)
   end
@@ -30,11 +32,15 @@ class RegistrantUser < User
     Contact.registrant_user_direct_contacts(self)
   end
 
-  def domains
+  def domains(admin: false)
+    return Domain.registrant_user_admin_registrant_domains(self) if admin
+
     Domain.registrant_user_domains(self)
   end
 
-  def direct_domains
+  def direct_domains(admin: false)
+    return Domain.registrant_user_direct_admin_registrant_domains(self) if admin
+
     Domain.registrant_user_direct_domains(self)
   end
 
@@ -72,7 +78,7 @@ class RegistrantUser < User
       return false unless user_data[:last_name]
 
       user_data[:country_code] ||= 'EE'
-      %i[ident country_code].each { |f| user_data[f].upcase! if user_data[f].is_a?(String) }
+      user_data[:country_code].upcase! if user_data[:country_code].is_a?(String)
 
       find_or_create_by_user_data(user_data)
     end

app/models/registrar.rb

@@ -1,8 +1,8 @@
 class Registrar < ApplicationRecord
   include Versions # version/registrar_version.rb
-  include Concerns::Registrar::BookKeeping
+  include Registrar::BookKeeping
-  include Concerns::EmailVerifable
+  include EmailVerifable
-  include Concerns::Registrar::LegalDoc
+  include Registrar::LegalDoc
 
   has_many :domains, dependent: :restrict_with_error
   has_many :contacts, dependent: :restrict_with_error
@@ -30,7 +30,7 @@ class Registrar < ApplicationRecord
   validates :vat_rate, numericality: { greater_than_or_equal_to: 0, less_than: 100 },
             allow_nil: true
 
-  attribute :vat_rate, ::Type::VATRate.new
+  attribute :vat_rate, ::Type::VatRate.new
   after_initialize :set_defaults
 
   validate :correct_email_format, if: proc { |c| c.will_save_change_to_email? }
@@ -153,7 +153,7 @@ class Registrar < ApplicationRecord
         puny = origin.domain.name_puny
         next unless domains.include?(idn) || domains.include?(puny) || domains.empty?
 
-        if origin.domain.nameservers.where(hostname: new_attributes[:hostname]).any?
+        if domain_not_updatable?(hostname: new_attributes[:hostname], domain: origin.domain)
           failed_list << idn
           next
         end
@@ -202,6 +202,10 @@ class Registrar < ApplicationRecord
 
   private
 
+  def domain_not_updatable?(hostname:, domain:)
+    domain.nameservers.where(hostname: hostname).any? || domain.bulk_update_prohibited?
+  end
+
   def set_defaults
     self.language = Setting.default_language unless language
   end

app/models/type/vat_rate.rb

@@ -1,5 +1,5 @@
 module Type
-  class VATRate < ActiveRecord::Type::Decimal
+  class VatRate < ActiveRecord::Type::Decimal
     def deserialize(value)
       super * 100 if value
     end

app/models/version.rb

@@ -0,0 +1 @@
+class Version; end

app/models/version/account_activity_version.rb

@@ -1,4 +1,4 @@
-class AccountActivityVersion < PaperTrail::Version
+class Version::AccountActivityVersion < PaperTrail::Version
   self.table_name    = :log_account_activities
   self.sequence_name = :log_account_activities_id_seq
 end

app/models/version/account_version.rb

@@ -1,4 +1,4 @@
-class AccountVersion < PaperTrail::Version
+class Version::AccountVersion < PaperTrail::Version
   self.table_name    = :log_accounts
   self.sequence_name = :log_accounts_id_seq
 end

app/models/version/action_version.rb

@@ -1,4 +1,4 @@
-class ActionVersion < PaperTrail::Version
+class Version::ActionVersion < PaperTrail::Version
   self.table_name = :log_actions
   self.sequence_name = :log_actions_id_seq
 end

app/models/version/bank_statement_version.rb

@@ -1,4 +1,4 @@
-class BankStatementVersion < PaperTrail::Version
+class Version::BankStatementVersion < PaperTrail::Version
   self.table_name    = :log_bank_statements
   self.sequence_name = :log_bank_statements_id_seq
 end

app/models/version/bank_transaction_version.rb

@@ -1,4 +1,4 @@
-class BankTransactionVersion < PaperTrail::Version
+class Version::BankTransactionVersion < PaperTrail::Version
   self.table_name    = :log_bank_transactions
   self.sequence_name = :log_bank_transactions_id_seq
 end

app/models/version/billing/price_version.rb

@@ -1,7 +1,4 @@
-module Billing
+class Version::Billing::PriceVersion < PaperTrail::Version
-  class PriceVersion < PaperTrail::Version
   self.table_name    = :log_prices
   self.sequence_name = :log_prices_id_seq
-  end
 end
-

app/models/version/blocked_domain_version.rb

@@ -1,4 +1,4 @@
-class BlockedDomainVersion < PaperTrail::Version
+class Version::BlockedDomainVersion < PaperTrail::Version
   self.table_name    = :log_blocked_domains
   self.sequence_name = :log_blocked_domains_id_seq
 end

app/models/version/certificate_version.rb

@@ -1,4 +1,4 @@
-class CertificateVersion < PaperTrail::Version
+class Version::CertificateVersion < PaperTrail::Version
   self.table_name    = :log_certificates
   self.sequence_name = :log_certificates_id_seq
 end

app/models/version/contact_version.rb

@@ -1,4 +1,4 @@
-class ContactVersion < PaperTrail::Version
+class Version::ContactVersion < PaperTrail::Version
   include VersionSession
   self.table_name    = :log_contacts
   self.sequence_name = :log_contacts_id_seq

app/models/version/dnskey_version.rb

@@ -1,4 +1,4 @@
-class DnskeyVersion < PaperTrail::Version
+class Version::DnskeyVersion < PaperTrail::Version
   include VersionSession
   self.table_name    = :log_dnskeys
   self.sequence_name = :log_dnskeys_id_seq

app/models/version/domain_contact_version.rb

@@ -1,4 +1,4 @@
-class DomainContactVersion < PaperTrail::Version
+class Version::DomainContactVersion < PaperTrail::Version
   include VersionSession
   self.table_name    = :log_domain_contacts
   self.sequence_name = :log_domain_contacts_id_seq

app/models/version/domain_version.rb

@@ -1,4 +1,4 @@
-class DomainVersion < PaperTrail::Version
+class Version::DomainVersion < PaperTrail::Version
   include VersionSession
 
   self.table_name    = :log_domains

app/models/version/invoice_item_version.rb

@@ -1,4 +1,4 @@
-class InvoiceItemVersion < PaperTrail::Version
+class Version::InvoiceItemVersion < PaperTrail::Version
   self.table_name    = :log_invoice_items
   self.sequence_name = :log_invoice_items_id_seq
 end

app/models/version/invoice_version.rb

@@ -1,4 +1,4 @@
-class InvoiceVersion < PaperTrail::Version
+class Version::InvoiceVersion < PaperTrail::Version
   self.table_name    = :log_invoices
   self.sequence_name = :log_invoices_id_seq
 end

app/models/version/nameserver_version.rb

@@ -1,4 +1,4 @@
-class NameserverVersion < PaperTrail::Version
+class Version::NameserverVersion < PaperTrail::Version
   include VersionSession
   self.table_name    = :log_nameservers
   self.sequence_name = :log_nameservers_id_seq

app/models/version/notification_version.rb

@@ -1,4 +1,4 @@
-class NotificationVersion < PaperTrail::Version
+class Version::NotificationVersion < PaperTrail::Version
   include VersionSession
   self.table_name    = :log_notifications
   self.sequence_name = :log_notifications_id_seq

app/models/version/payment_order_version.rb

@@ -1,4 +1,4 @@
-class PaymentOrderVersion < PaperTrail::Version
+class Version::PaymentOrderVersion < PaperTrail::Version
   self.table_name    = :log_payment_orders
   self.sequence_name = :log_payment_orders_id_seq
 end

app/models/version/registrant_verification_version.rb

@@ -1,4 +1,4 @@
-class RegistrantVerificationVersion < PaperTrail::Version
+class Version::RegistrantVerificationVersion < PaperTrail::Version
   include VersionSession
   self.table_name    = :log_registrant_verifications
   self.sequence_name = :log_registrant_verifications_id_seq

app/models/version/registrar_version.rb

@@ -1,4 +1,4 @@
-class RegistrarVersion < PaperTrail::Version
+class Version::RegistrarVersion < PaperTrail::Version
   include VersionSession
   self.table_name    = :log_registrars
   self.sequence_name = :log_registrars_id_seq

app/models/version/reserved_domain_version.rb

@@ -1,4 +1,4 @@
-class ReservedDomainVersion < PaperTrail::Version
+class Version::ReservedDomainVersion < PaperTrail::Version
   include VersionSession
   self.table_name    = :log_reserved_domains
   self.sequence_name = :log_reserved_domains_id_seq

app/models/version/setting_entry_version.rb

@@ -1,4 +1,4 @@
-class SettingEntryVersion < PaperTrail::Version
+class Version::SettingEntryVersion < PaperTrail::Version
   self.table_name    = :log_setting_entries
   self.sequence_name = :log_setting_entries
 end

app/models/version/setting_version.rb

@@ -1,4 +1,4 @@
-class SettingVersion < PaperTrail::Version
+class Version::SettingVersion < PaperTrail::Version
   include VersionSession
   self.table_name    = :log_settings
   self.sequence_name = :log_settings_id_seq

app/models/version/user_version.rb

@@ -1,4 +1,4 @@
-class UserVersion < PaperTrail::Version
+class Version::UserVersion < PaperTrail::Version
   include VersionSession
   self.table_name    = :log_users
   self.sequence_name = :log_users_id_seq

app/models/version/white_ip_version.rb

@@ -1,4 +1,4 @@
-class WhiteIpVersion < PaperTrail::Version
+class Version::WhiteIpVersion < PaperTrail::Version
   include VersionSession
   self.table_name    = :log_white_ips
   self.sequence_name = :log_white_ips_id_seq

app/presenters/registrar/domain_list_csv_presenter.rb

@@ -1,4 +1,4 @@
-class Registrar::DomainListCSVPresenter
+class Registrar::DomainListCsvPresenter
   def initialize(domains:, view:)
     @domains = domains
     @view = view

app/views/admin/domain_versions/archive.haml

@@ -66,7 +66,7 @@
                     = domain.registrant.name
                   - else
                     - contact = Contact.all_versions_for([domain.registrant_id], version.created_at).first
-                    - if contact.nil? && ver = ContactVersion.where(item_id: domain.registrant_id).last
+                    - if contact.nil? && ver = Version::ContactVersion.where(item_id: domain.registrant_id).last
                       - contact = Contact.new(ver.object.to_h.merge(ver.object_changes.to_h.each_with_object({}) {|(k,v), o| o[k] = v.last }))
                     = contact.try(:name)
                     = " ".html_safe

app/views/admin/domains/partials/_version.haml

@@ -23,7 +23,7 @@
     - admin_contacts = domain.admin_contacts
     - registrant     = domain.registrant
     - unless registrant
-      - ver = ContactVersion.where(item_id: domain.registrant_id).where(event: :destroy).last
+      - ver = Version::ContactVersion.where(item_id: domain.registrant_id).where(event: :destroy).last
       - registrant = ver.reify
       - registrant.version_loader = ver
     - registrant     = [registrant]

app/views/registrant/contacts/_api_errors.html.erb

@@ -1,7 +0,0 @@
-<div class="alert alert-danger">
-    <ul>
-        <% errors.each_value do |errors| %>
-            <li><%= errors.join('<br>') %></li>
-        <% end %>
-    </ul>
-</div>

app/views/registrant/contacts/_form.html.erb

@@ -1,64 +0,0 @@
-<%= form_for [:registrant, domain, @contact], html: { class: 'form-horizontal' } do |f| %>
-    <% if @errors.present? %>
-        <%= render 'api_errors', errors: @errors %>
-    <% end %>
-
-    <div class="form-group">
-        <div class="col-md-2 control-label">
-            <%= f.label :name %>
-        </div>
-
-        <div class="col-md-4">
-            <%= f.text_field :name, required: true, autofocus: true, class: 'form-control' %>
-        </div>
-    </div>
-
-    <div class="form-group">
-        <div class="col-md-2 control-label">
-            <%= f.label :email %>
-        </div>
-
-        <div class="col-md-4">
-            <%= f.email_field :email, required: true, class: 'form-control' %>
-        </div>
-    </div>
-
-    <div class="form-group">
-        <div class="col-md-2 control-label">
-            <%= f.label :phone %>
-        </div>
-
-        <div class="col-md-4">
-            <%= f.text_field :phone, required: true, class: 'form-control' %>
-        </div>
-    </div>
-
-    <% if Contact.address_processing? %>
-        <div class="panel panel-default">
-            <div class="panel-heading"><%= t '.address' %></div>
-            <div class="panel-body">
-                <%= render 'registrant/contacts/form/address', f: f %>
-            </div>
-        </div>
-    <% end %>
-
-    <% if fax_enabled? %>
-        <div class="form-group">
-            <div class="col-md-2 control-label">
-                <%= f.label :fax %>
-            </div>
-
-            <div class="col-md-4">
-                <%= f.text_field :fax, class: 'form-control' %>
-            </div>
-        </div>
-    <% end %>
-
-    <hr/>
-
-    <div class="row">
-        <div class="col-md-6 text-right">
-            <%= button_tag t('.submit_btn'), class: 'btn btn-success' %>
-        </div>
-    </div>
-<% end %>

app/views/registrant/contacts/edit.html.erb

@@ -1,12 +0,0 @@
-<ol class="breadcrumb">
-    <li><%= link_to t('registrant.domains.index.header'), registrant_domains_path %></li>
-    <li><%= link_to domain, registrant_domain_path(domain) %></li>
-    <li><%= t 'registrant.contacts.contact_index' %></li>
-    <li><%= link_to @contact, registrant_domain_contact_path(domain, @contact) %></li>
-</ol>
-
-<div class="page-header">
-    <h1><%= t '.header' %></h1>
-</div>
-
-<%= render 'form' %>

app/views/registrant/contacts/form/_address.html.erb

@@ -1,51 +0,0 @@
-<div class="form-group">
-    <div class="col-md-2 control-label">
-        <%= f.label :street %>
-    </div>
-
-    <div class="col-md-4">
-        <%= f.text_field :street, required: true, class: 'form-control' %>
-    </div>
-</div>
-
-<div class="form-group">
-    <div class="col-md-2 control-label">
-        <%= f.label :zip %>
-    </div>
-
-    <div class="col-md-4">
-        <%= f.text_field :zip, required: true, class: 'form-control' %>
-    </div>
-</div>
-
-<div class="form-group">
-    <div class="col-md-2 control-label">
-        <%= f.label :city %>
-    </div>
-
-    <div class="col-md-4">
-        <%= f.text_field :city, required: true, class: 'form-control' %>
-    </div>
-</div>
-
-<div class="form-group">
-    <div class="col-md-2 control-label">
-        <%= f.label :state %>
-    </div>
-
-    <div class="col-md-4">
-        <%= f.text_field :state, class: 'form-control' %>
-    </div>
-</div>
-
-<div class="form-group">
-    <div class="col-md-2 control-label">
-        <%= f.label :country_code, 'Country' %>
-    </div>
-
-    <div class="col-md-4">
-        <%= f.select :country_code, SortedCountry.all_options(f.object.country_code), {},
-                     required: true,
-                     class: 'form-control' %>
-    </div>
-</div>

app/views/registrant/contacts/show.html.erb

@@ -1,42 +0,0 @@
-<ol class="breadcrumb">
-    <li><%= link_to t('registrant.domains.index.header'), registrant_domains_path %></li>
-    <li><%= link_to domain, registrant_domain_path(domain) %></li>
-    <li><%= t 'registrant.contacts.contact_index' %></li>
-</ol>
-
-<div class="page-header">
-    <div class="row">
-        <div class="col-md-6">
-            <h1><%= @contact %></h1>
-        </div>
-
-        <% if @contact.managed_by?(current_registrant_user) %>
-            <div class="col-md-6 text-right">
-                <%= link_to t('.edit_btn'), edit_registrant_domain_contact_path(domain, @contact),
-                            class: 'btn btn-primary' %>
-            </div>
-        <% end %>
-    </div>
-</div>
-
-<div class="row">
-    <div class="col-md-6">
-        <%= render 'registrant/contacts/show/general' %>
-    </div>
-
-    <div class="col-md-6">
-        <%= render 'registrant/contacts/show/address' %>
-    </div>
-</div>
-
-<div class="row">
-    <div class="col-md-12">
-        <%= render 'registrant/contacts/show/statuses', contact: @contact %>
-    </div>
-</div>
-
-<div class="row">
-    <div class="col-md-12">
-        <%= render 'registrant/contacts/show/domains', contact: @contact %>
-    </div>
-</div>

app/views/registrant/contacts/show/_address.html.erb

@@ -1,31 +0,0 @@
-<div class="panel panel-default">
-    <div class="panel-heading">
-        <h3 class="panel-title">
-            <%= t '.header' %>
-        </h3>
-    </div>
-
-    <div class="panel-body">
-        <dl class="dl-horizontal">
-            <% if @contact.org_name.present? %>
-                <dt><%= Contact.human_attribute_name :org_name %></dt>
-                <dd><%= @contact.org_name %></dd>
-            <% end %>
-
-            <dt><%= Contact.human_attribute_name :street %></dt>
-            <dd><%= @contact.street %></dd>
-
-            <dt><%= Contact.human_attribute_name :city %></dt>
-            <dd><%= @contact.city %></dd>
-
-            <dt><%= Contact.human_attribute_name :zip %></dt>
-            <dd><%= @contact.zip %></dd>
-
-            <dt><%= Contact.human_attribute_name :state %></dt>
-            <dd><%= @contact.state %></dd>
-
-            <dt><%= Contact.human_attribute_name :country %></dt>
-            <dd><%= @contact.country %></dd>
-        </dl>
-    </div>
-</div>