diff --git a/app/models/actions/base_action.rb b/app/actions/base_action.rb similarity index 100% rename from app/models/actions/base_action.rb rename to app/actions/base_action.rb diff --git a/app/models/actions/contact_create.rb b/app/actions/contact_create.rb similarity index 95% rename from app/models/actions/contact_create.rb rename to app/actions/contact_create.rb index 9c700f858..8c6cb2282 100644 --- a/app/models/actions/contact_create.rb +++ b/app/actions/contact_create.rb @@ -59,7 +59,7 @@ module Actions end def maybe_attach_legal_doc - Actions::BaseAction.attach_legal_doc_to_new(contact, legal_document, domain: false) + ::Actions::BaseAction.attach_legal_doc_to_new(contact, legal_document, domain: false) end def commit diff --git a/app/models/actions/contact_delete.rb b/app/actions/contact_delete.rb similarity index 87% rename from app/models/actions/contact_delete.rb rename to app/actions/contact_delete.rb index 2923b7de0..27b131756 100644 --- a/app/models/actions/contact_delete.rb +++ b/app/actions/contact_delete.rb @@ -23,7 +23,7 @@ module Actions end def maybe_attach_legal_doc - Actions::BaseAction.maybe_attach_legal_doc(contact, legal_document) + ::Actions::BaseAction.maybe_attach_legal_doc(contact, legal_document) end def commit diff --git a/app/models/actions/contact_update.rb b/app/actions/contact_update.rb similarity index 97% rename from app/models/actions/contact_update.rb rename to app/actions/contact_update.rb index cba8fad51..e96ea8afb 100644 --- a/app/models/actions/contact_update.rb +++ b/app/actions/contact_update.rb @@ -42,7 +42,7 @@ module Actions end def maybe_attach_legal_doc - Actions::BaseAction.maybe_attach_legal_doc(contact, legal_document) + ::Actions::BaseAction.maybe_attach_legal_doc(contact, legal_document) end def maybe_update_ident diff --git a/app/models/actions/domain_create.rb b/app/actions/domain_create.rb similarity index 98% rename from app/models/actions/domain_create.rb rename to app/actions/domain_create.rb index 4e148ab3e..9c2dfba56 100644 --- a/app/models/actions/domain_create.rb +++ b/app/actions/domain_create.rb @@ -178,7 +178,7 @@ module Actions end def maybe_attach_legal_doc - Actions::BaseAction.attach_legal_doc_to_new(domain, params[:legal_document], domain: true) + ::Actions::BaseAction.attach_legal_doc_to_new(domain, params[:legal_document], domain: true) end def process_auction_and_disputes diff --git a/app/models/actions/domain_delete.rb b/app/actions/domain_delete.rb similarity index 92% rename from app/models/actions/domain_delete.rb rename to app/actions/domain_delete.rb index 929b1f6f7..cb6cfa5d7 100644 --- a/app/models/actions/domain_delete.rb +++ b/app/actions/domain_delete.rb @@ -23,7 +23,7 @@ module Actions end def maybe_attach_legal_doc - Actions::BaseAction.attach_legal_doc_to_new(domain, params[:legal_document], domain: true) + ::Actions::BaseAction.attach_legal_doc_to_new(domain, params[:legal_document], domain: true) end def verify_not_discarded diff --git a/app/models/actions/domain_renew.rb b/app/actions/domain_renew.rb similarity index 100% rename from app/models/actions/domain_renew.rb rename to app/actions/domain_renew.rb diff --git a/app/models/actions/domain_transfer.rb b/app/actions/domain_transfer.rb similarity index 100% rename from app/models/actions/domain_transfer.rb rename to app/actions/domain_transfer.rb diff --git a/app/models/actions/domain_update.rb b/app/actions/domain_update.rb similarity index 98% rename from app/models/actions/domain_update.rb rename to app/actions/domain_update.rb index 0e2349832..60b8b59cc 100644 --- a/app/models/actions/domain_update.rb +++ b/app/actions/domain_update.rb @@ -14,7 +14,7 @@ module Actions assign_new_registrant if params[:registrant] assign_relational_modifications assign_requested_statuses - Actions::BaseAction.maybe_attach_legal_doc(domain, params[:legal_document]) + ::Actions::BaseAction.maybe_attach_legal_doc(domain, params[:legal_document]) commit end diff --git a/app/controllers/epp/contacts_controller.rb b/app/controllers/epp/contacts_controller.rb index 85305213b..28559e3b7 100644 --- a/app/controllers/epp/contacts_controller.rb +++ b/app/controllers/epp/contacts_controller.rb @@ -23,7 +23,7 @@ module Epp @contact = Epp::Contact.new(params[:parsed_frame], current_user.registrar) collected_data = ::Deserializers::Xml::ContactCreate.new(params[:parsed_frame]) - action = Actions::ContactCreate.new(@contact, collected_data.legal_document, + action = ::Actions::ContactCreate.new(@contact, collected_data.legal_document, collected_data.ident) action_call_response(action: action) @@ -33,7 +33,7 @@ module Epp authorize! :update, @contact, @password collected_data = ::Deserializers::Xml::ContactUpdate.new(params[:parsed_frame]) - action = Actions::ContactUpdate.new(@contact, + action = ::Actions::ContactUpdate.new(@contact, collected_data.contact, collected_data.legal_document, collected_data.ident, @@ -44,7 +44,7 @@ module Epp def delete authorize! :delete, @contact, @password - action = Actions::ContactDelete.new(@contact, params[:legal_document]) + action = ::Actions::ContactDelete.new(@contact, params[:legal_document]) unless action.call handle_errors(@contact) return diff --git a/app/controllers/epp/domains_controller.rb b/app/controllers/epp/domains_controller.rb index 80b7d8843..c3ea3ac4a 100644 --- a/app/controllers/epp/domains_controller.rb +++ b/app/controllers/epp/domains_controller.rb @@ -32,7 +32,7 @@ module Epp registrar_id = current_user.registrar.id @domain = Epp::Domain.new data = ::Deserializers::Xml::DomainCreate.new(params[:parsed_frame], registrar_id).call - action = Actions::DomainCreate.new(@domain, data) + action = ::Actions::DomainCreate.new(@domain, data) action.call ? render_epp_response('/epp/domains/create') : handle_errors(@domain) end @@ -43,7 +43,7 @@ module Epp registrar_id = current_user.registrar.id update_params = ::Deserializers::Xml::DomainUpdate.new(params[:parsed_frame], registrar_id).call - action = Actions::DomainUpdate.new(@domain, update_params, false) + action = ::Actions::DomainUpdate.new(@domain, update_params, false) (handle_errors(@domain) and return) unless action.call pending = @domain.epp_pending_update.present? @@ -54,7 +54,7 @@ module Epp authorize!(:delete, @domain, @password) frame = params[:parsed_frame] delete_params = ::Deserializers::Xml::DomainDelete.new(frame).call - action = Actions::DomainDelete.new(@domain, delete_params, current_user.registrar) + action = ::Actions::DomainDelete.new(@domain, delete_params, current_user.registrar) (handle_errors(@domain) and return) unless action.call @@ -77,7 +77,7 @@ module Epp registrar_id = current_user.registrar.id renew_params = ::Deserializers::Xml::Domain.new(params[:parsed_frame], registrar_id).call - action = Actions::DomainRenew.new(@domain, renew_params, current_user.registrar) + action = ::Actions::DomainRenew.new(@domain, renew_params, current_user.registrar) if action.call render_epp_response '/epp/domains/renew' else diff --git a/app/controllers/repp/v1/contacts_controller.rb b/app/controllers/repp/v1/contacts_controller.rb index 92f89a160..6298bbbb3 100644 --- a/app/controllers/repp/v1/contacts_controller.rb +++ b/app/controllers/repp/v1/contacts_controller.rb @@ -35,7 +35,7 @@ module Repp desc 'Create a new contact' def create @contact = Epp::Contact.new(contact_params_with_address, current_user.registrar, epp: false) - action = Actions::ContactCreate.new(@contact, params[:legal_document], + action = ::Actions::ContactCreate.new(@contact, params[:legal_document], contact_ident_params) unless action.call @@ -49,7 +49,7 @@ module Repp api :PUT, '/repp/v1/contacts/:contact_code' desc 'Update existing contact' def update - action = Actions::ContactUpdate.new(@contact, contact_params_with_address(required: false), + action = ::Actions::ContactUpdate.new(@contact, contact_params_with_address(required: false), params[:legal_document], contact_ident_params(required: false), current_user) @@ -64,7 +64,7 @@ module Repp api :DELETE, '/repp/v1/contacts/:contact_code' desc 'Delete a specific contact' def destroy - action = Actions::ContactDelete.new(@contact, params[:legal_document]) + action = ::Actions::ContactDelete.new(@contact, params[:legal_document]) unless action.call handle_errors(@contact) return diff --git a/app/controllers/repp/v1/domains/contacts_controller.rb b/app/controllers/repp/v1/domains/contacts_controller.rb index f2e5e4018..35690a8c3 100644 --- a/app/controllers/repp/v1/domains/contacts_controller.rb +++ b/app/controllers/repp/v1/domains/contacts_controller.rb @@ -39,7 +39,7 @@ module Repp def cta(action = 'add') params[:contacts].each { |c| c[:action] = action } - action = Actions::DomainUpdate.new(@domain, contact_create_params, false) + action = ::Actions::DomainUpdate.new(@domain, contact_create_params, false) # rubocop:disable Style/AndOr handle_errors(@domain) and return unless action.call diff --git a/app/controllers/repp/v1/domains/dnssec_controller.rb b/app/controllers/repp/v1/domains/dnssec_controller.rb index fcfaa991a..4100a3bc9 100644 --- a/app/controllers/repp/v1/domains/dnssec_controller.rb +++ b/app/controllers/repp/v1/domains/dnssec_controller.rb @@ -38,7 +38,7 @@ module Repp def cta(action = 'add') params[:dns_keys].each { |n| n[:action] = action } - action = Actions::DomainUpdate.new(@domain, dnssec_params, false) + action = ::Actions::DomainUpdate.new(@domain, dnssec_params, false) # rubocop:disable Style/AndOr (handle_errors(@domain) and return) unless action.call diff --git a/app/controllers/repp/v1/domains/nameservers_controller.rb b/app/controllers/repp/v1/domains/nameservers_controller.rb index fe38de93c..1bf053477 100644 --- a/app/controllers/repp/v1/domains/nameservers_controller.rb +++ b/app/controllers/repp/v1/domains/nameservers_controller.rb @@ -14,7 +14,7 @@ module Repp end def create params[:nameservers].each { |n| n[:action] = 'add' } - action = Actions::DomainUpdate.new(@domain, nameserver_params, current_user) + action = ::Actions::DomainUpdate.new(@domain, nameserver_params, current_user) unless action.call handle_errors(@domain) @@ -28,7 +28,7 @@ module Repp desc 'Delete specific nameserver from domain' def destroy nameserver = { nameservers: [{ hostname: params[:id], action: 'rem' }] } - action = Actions::DomainUpdate.new(@domain, nameserver, false) + action = ::Actions::DomainUpdate.new(@domain, nameserver, false) unless action.call handle_errors(@domain) diff --git a/app/controllers/repp/v1/domains/transfers_controller.rb b/app/controllers/repp/v1/domains/transfers_controller.rb index e9474d94d..c4ece6aa4 100644 --- a/app/controllers/repp/v1/domains/transfers_controller.rb +++ b/app/controllers/repp/v1/domains/transfers_controller.rb @@ -10,7 +10,7 @@ module Repp param :transfer_code, String, required: true, desc: 'Renew period. Month (m) or year (y)' end def create - action = Actions::DomainTransfer.new(@domain, transfer_params[:transfer][:transfer_code], + action = ::Actions::DomainTransfer.new(@domain, transfer_params[:transfer][:transfer_code], current_user.registrar) unless action.call diff --git a/app/controllers/repp/v1/domains_controller.rb b/app/controllers/repp/v1/domains_controller.rb index 8213f2bb2..a402981fa 100644 --- a/app/controllers/repp/v1/domains_controller.rb +++ b/app/controllers/repp/v1/domains_controller.rb @@ -55,7 +55,7 @@ module Repp def create authorize!(:create, Epp::Domain) @domain = Epp::Domain.new - action = Actions::DomainCreate.new(@domain, domain_create_params) + action = ::Actions::DomainCreate.new(@domain, domain_create_params) # rubocop:disable Style/AndOr handle_errors(@domain) and return unless action.call @@ -76,7 +76,7 @@ module Repp param :auth_info, String, required: false, desc: 'New authorization code' end def update - action = Actions::DomainUpdate.new(@domain, params[:domain], false) + action = ::Actions::DomainUpdate.new(@domain, params[:domain], false) unless action.call handle_errors(@domain) @@ -122,7 +122,7 @@ module Repp desc: 'Whether to ask registrant verification or not' end def destroy - action = Actions::DomainDelete.new(@domain, params, current_user.registrar) + action = ::Actions::DomainDelete.new(@domain, params, current_user.registrar) # rubocop:disable Style/AndOr handle_errors(@domain) and return unless action.call @@ -141,7 +141,7 @@ module Repp def initiate_transfer(transfer) domain = Epp::Domain.find_or_initialize_by(name: transfer[:domain_name]) - action = Actions::DomainTransfer.new(domain, transfer[:transfer_code], + action = ::Actions::DomainTransfer.new(domain, transfer[:transfer_code], current_user.registrar) if action.call diff --git a/app/interactions/domains/update_confirm/process_update_confirmed.rb b/app/interactions/domains/update_confirm/process_update_confirmed.rb index 291253651..d12f479d2 100644 --- a/app/interactions/domains/update_confirm/process_update_confirmed.rb +++ b/app/interactions/domains/update_confirm/process_update_confirmed.rb @@ -25,7 +25,7 @@ module Domains frame = frame_json ? frame_json.with_indifferent_access : {} assign_domain_update_meta - Actions::DomainUpdate.new(domain, frame, true).call + ::Actions::DomainUpdate.new(domain, frame, true).call end def assign_domain_update_meta diff --git a/config/application.rb b/config/application.rb index 014c03269..22c2c4df9 100644 --- a/config/application.rb +++ b/config/application.rb @@ -38,6 +38,7 @@ module DomainNameRegistry config.autoload_paths += Dir[Rails.root.join('app', 'models', '**/')] config.autoload_paths += Dir[Rails.root.join('app', 'lib', '**/')] config.autoload_paths += Dir[Rails.root.join('app', 'interactions', '**/')] + config.autoload_paths += Dir[Rails.root.join('app', 'actions', '**/')] config.eager_load_paths << config.root.join('lib', 'validators') config.eager_load_paths << config.root.join('app', 'lib') config.watchable_dirs['lib'] = %i[rb]