Merge branch 'master' into registry-790

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

@@ -0,0 +1,57 @@
+module Api
+  module V1
+    module Registrant
+      class ContactsController < BaseController
+        before_action :set_contacts_pool
+
+        def index
+          limit = params[:limit] || 200
+          offset = params[:offset] || 0
+
+          if limit.to_i > 200 || limit.to_i < 1
+            render(json: { errors: [{ limit: ['parameter is out of range'] }] },
+                   status: :bad_request) && return
+          end
+
+          if offset.to_i.negative?
+            render(json: { errors: [{ offset: ['parameter is out of range'] }] },
+                   status: :bad_request) && return
+          end
+
+          @contacts = @contacts_pool.limit(limit).offset(offset)
+          render json: @contacts
+        end
+
+        def show
+          @contact = @contacts_pool.find_by(uuid: params[:uuid])
+
+          if @contact
+            render json: @contact
+          else
+            render json: { errors: [{ base: ['Contact not found'] }] }, status: :not_found
+          end
+        end
+
+        private
+
+        def set_contacts_pool
+          country_code, ident = current_user.registrant_ident.to_s.split '-'
+          associated_domain_ids = begin
+            BusinessRegistryCache.fetch_by_ident_and_cc(ident, country_code).associated_domain_ids
+          end
+
+          available_contacts_ids = begin
+            DomainContact.where(domain_id: associated_domain_ids).pluck(:contact_id) |
+              Domain.where(id: associated_domain_ids).pluck(:registrant_id)
+          end
+
+          @contacts_pool = Contact.where(id: available_contacts_ids)
+        rescue Soap::Arireg::NotAvailableError => error
+          Rails.logger.fatal("[EXCEPTION] #{error}")
+          render json: { errors: [{ base: ['Business Registry not available'] }] },
+                 status: :service_unavailable and return
+        end
+      end
+    end
+  end
+end

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

@@ -1,5 +1,3 @@
-require 'rails5_api_controller_backport'
-
 module Api
   module V1
     module Registrant

app/controllers/registrant/contacts_controller.rb

@@ -26,4 +26,4 @@ class Registrant::ContactsController < RegistrantController
       BusinessRegistryCache.fetch_by_ident_and_cc(ident, ident_cc).associated_domain_ids
     end
   end
-end
+end

app/controllers/registrar/deposits_controller.rb

@@ -10,12 +10,12 @@ class Registrar
       @deposit = Deposit.new(deposit_params.merge(registrar: current_user.registrar))
       @invoice = @deposit.issue_prepayment_invoice
 
-      if @invoice&.persisted?
+      if @invoice
         flash[:notice] = t(:please_pay_the_following_invoice)
         redirect_to [:registrar, @invoice]
       else
-        flash.now[:alert] = t(:failed_to_create_record)
-        render 'new'
+        flash[:alert] = @deposit.errors.full_messages.join(', ')
+        redirect_to new_registrar_deposit_path
       end
     end