finapps 5.0.30 → 5.0.35

data/lib/finapps/rest/consumers_portfolios.rb

@@ -11,7 +11,7 @@ module FinApps
         path = "consumers/#{ERB::Util.url_encode(id)}/portfolios"
         return super path if params.nil?
 
-        raise FinAppsCore::InvalidArgumentsError, 'Invalid argument: params' unless params.is_a? Hash
+        fail FinAppsCore::InvalidArgumentsError, 'Invalid argument: params' unless params.is_a? Hash
 
         super build_query_path(path, params)
       end

data/lib/finapps/rest/documents_orders.rb

@@ -10,7 +10,7 @@ module FinApps
       def list(params = nil)
         path = 'documents/orders'
         return super(path) if params.nil?
-        raise FinAppsCore::InvalidArgumentsError, 'Invalid argument: params' unless params.is_a? Hash
+        fail FinAppsCore::InvalidArgumentsError, 'Invalid argument: params' unless params.is_a? Hash
 
         super build_query_path(path, params)
       end
@@ -46,42 +46,59 @@ module FinApps
       private
 
       def build_filter(params)
-        search_query(params[:searchTerm]).merge(consumer_query(params[:consumer])).merge(tag_query(params[:tag]))
+        search_query(params[:searchTerm])
+          .merge(consumer_query(params[:consumer]))
+          .merge(tag_query(params[:tag]))
+          .merge(status_query(params[:status]))
       end
 
       def search_query(term)
-        if term
+        return {} unless term
+
+        query = with_space_search(term).concat(name_search(term))
+        {"$or": query}
+      end
+
+      def name_search(term)
+        search_arr = []
+        if /\s/.match?(term)
+          term.split.each do |t|
+            search_arr.append("applicant.first_name": t)
+            search_arr.append("applicant.last_name": t)
+          end
+        end
+        search_arr
+      end
+
+      def with_space_search(term)
+        [
+          {"applicant.email": term},
+          {"applicant.first_name": term},
+          {"applicant.last_name": term},
           {
-            "$or": [
-              { "applicant.email": term },
-              { "applicant.first_name": term },
-              { "applicant.last_name": term },
-              {
-                "reference_no": {
-                  "$regex": "^#{term}", "$options": 'i'
-                }
-              }
-            ]
+            "reference_no": {
+              "$regex": "^#{term}", "$options": 'i'
+            }
           }
-        else
-          {}
-        end
+        ]
       end
 
       def tag_query(tag)
-        if tag
-          { "tag": tag.empty? ? nil : tag }
-        else
-          {}
-        end
+        return {} unless tag
+
+        {"tag": tag.empty? ? nil : tag}
+      end
+
+      def status_query(status)
+        return {} unless status
+
+        {status: status}
       end
 
       def consumer_query(consumer)
-        if consumer
-          { "consumer_id": consumer.empty? ? nil : consumer }
-        else
-          {}
-        end
+        return {} unless consumer
+
+        {"consumer_id": consumer.empty? ? nil : consumer}
       end
     end
   end

data/lib/finapps/rest/operators.rb

@@ -9,7 +9,7 @@ module FinApps
 
       def list(params = nil)
         return super if params.nil?
-        raise FinAppsCore::InvalidArgumentsError, 'Invalid argument: params' unless params.is_a? Hash
+        fail FinAppsCore::InvalidArgumentsError, 'Invalid argument: params' unless params.is_a? Hash
 
         super build_query_path(end_point, params)
       end
@@ -36,7 +36,7 @@ module FinApps
       def update_password(params)
         # update password for current operator, need authorization session in header
         not_blank(params, :params)
-        raise FinAppsCore::InvalidArgumentsError, 'Invalid argument: params.' unless validates params
+        fail FinAppsCore::InvalidArgumentsError, 'Invalid argument: params.' unless validates params
 
         path = "#{end_point}/password/change"
 
@@ -64,14 +64,14 @@ module FinApps
       end
 
       def search_query(term)
-        { "last_name": term }
+        {"last_name": term}
       end
 
       def role_query(role)
         if role.is_a?(Array)
-          { "role": { "$in": role.map(&:to_i) } }
+          {"role": {"$in": role.map(&:to_i)}}
         else
-          { "role": role.to_i }
+          {"role": role.to_i}
         end
       end
     end

data/lib/finapps/rest/operators_password_resets.rb

@@ -22,7 +22,7 @@ module FinApps
       private
 
       def validates_email(params)
-        raise FinAppsCore::InvalidArgumentsError, 'Invalid argument: params.' unless email_exists? params
+        fail FinAppsCore::InvalidArgumentsError, 'Invalid argument: params.' unless email_exists? params
       end
 
       def email_exists?(params)

data/lib/finapps/rest/order_assignments.rb

@@ -6,7 +6,7 @@ module FinApps
       def update(id, orders_array)
         not_blank(id, :operator_id)
         not_blank(orders_array, :params)
-        raise FinAppsCore::InvalidArgumentsError, 'Invalid argument: params' unless orders_array.is_a? Array
+        fail FinAppsCore::InvalidArgumentsError, 'Invalid argument: params' unless orders_array.is_a? Array
 
         path = "operators/#{ERB::Util.url_encode(id)}/assign"
         super orders_array, path

data/lib/finapps/rest/order_reports.rb

@@ -6,7 +6,7 @@ module FinApps
       def show(id, format)
         not_blank(id, :id)
         not_blank(format, :format)
-        raise FinAppsCore::InvalidArgumentsError, 'Invalid argument: format' unless accepted_format?(format)
+        fail FinAppsCore::InvalidArgumentsError, 'Invalid argument: format' unless accepted_format?(format)
 
         path =
           "orders/#{ERB::Util.url_encode(id)}/report.#{ERB::Util.url_encode(format)}"

data/lib/finapps/rest/orders.rb

@@ -28,7 +28,7 @@ module FinApps
       #
       def list(params = nil)
         return super if params.nil?
-        raise FinAppsCore::InvalidArgumentsError, 'Invalid argument: params' unless params.is_a? Hash
+        fail FinAppsCore::InvalidArgumentsError, 'Invalid argument: params' unless params.is_a? Hash
 
         super build_query_path(end_point, params)
       end
@@ -63,30 +63,41 @@ module FinApps
       end
 
       def search_query(term)
-        if term
-          {
-            "$or": [
-              { "public_id": { "$regex": "^#{term}", "$options": 'i' } },
-              { "applicant.last_name": term },
-              { "assignment.last_name": term },
-              {
-                "requestor.reference_no": {
-                  "$regex": "^#{term}", "$options": 'i'
-                }
-              }
-            ]
-          }
-        else
-          {}
+        return {} unless term
+
+        query = search_query_object(term).concat(consumer_name_query(term))
+        {"$or": query}
+      end
+
+      def consumer_name_query(term)
+        search_arr = []
+        if /\s/.match?(term)
+          term.split.each do |t|
+            search_arr.append("applicant.first_name": t)
+            search_arr.append("applicant.last_name": t)
+          end
         end
+        search_arr
+      end
+
+      def search_query_object(term)
+        [{"public_id": {"$regex": "^#{term}", "$options": 'i'}},
+         {"assignment.last_name": term},
+         {"applicant.first_name": term},
+         {"applicant.last_name": term},
+         {
+           "requestor.reference_no": {
+             "$regex": "^#{term}", "$options": 'i'
+           }
+         }]
       end
 
       def status_query(status)
         if status
           if status.is_a?(Array)
-            { "status": { "$in": status.map(&:to_i) } }
+            {"status": {"$in": status.map(&:to_i)}}
           else
-            { "status": status.to_i }
+            {"status": status.to_i}
           end
         else
           {}
@@ -96,7 +107,7 @@ module FinApps
       def assignment_query(assignment)
         # translate "" to null assignment
         if assignment
-          { "assignment.operator_id": assignment.empty? ? nil : assignment }
+          {"assignment.operator_id": assignment.empty? ? nil : assignment}
         else
           {}
         end
@@ -104,7 +115,7 @@ module FinApps
 
       def consumer_query(consumer)
         if consumer
-          { "consumer_id": consumer.empty? ? nil : consumer }
+          {"consumer_id": consumer.empty? ? nil : consumer}
         else
           {}
         end
@@ -114,8 +125,8 @@ module FinApps
         if !search_term && !nil_or_empty?(relation)
           {
             "$or": [
-              { "public_id": { "$in": relation } },
-              { "original_order_id": { "$in": relation } }
+              {"public_id": {"$in": relation}},
+              {"original_order_id": {"$in": relation}}
             ]
           }
         else

data/lib/finapps/rest/plaid/plaid_consumer_institutions.rb

@@ -9,7 +9,7 @@ module FinApps
         super(params, 'p/institution/consumer')
       end
 
-      def show(id, options = { show_accounts: false })
+      def show(id, options = {show_accounts: false})
         results, error_messages = super(nil, "p/institution/consumer/#{id}")
 
         if error_messages.empty? && options[:show_accounts]

data/lib/finapps/rest/portfolio_reports.rb

@@ -9,7 +9,7 @@ module FinApps
         path = 'portfolio/reports'
 
         return super path if params.nil?
-        raise FinAppsCore::InvalidArgumentsError, 'Invalid argument: params' unless params.is_a? Hash
+        fail FinAppsCore::InvalidArgumentsError, 'Invalid argument: params' unless params.is_a? Hash
 
         super build_query_path(path, params)
       end

data/lib/finapps/rest/portfolios.rb

@@ -7,7 +7,7 @@ module FinApps
 
       def list(params = nil)
         return super if params.nil?
-        raise FinAppsCore::InvalidArgumentsError, 'Invalid argument: params' unless params.is_a? Hash
+        fail FinAppsCore::InvalidArgumentsError, 'Invalid argument: params' unless params.is_a? Hash
 
         super build_query_path(end_point, params)
       end

data/lib/finapps/rest/portfolios_available_consumers.rb

@@ -12,7 +12,7 @@ module FinApps
           "portfolios/#{ERB::Util.url_encode(portfolio_id)}/consumers/available"
         return super path if params.nil?
 
-        raise FinAppsCore::InvalidArgumentsError, 'Invalid argument: params' unless params.is_a? Hash
+        fail FinAppsCore::InvalidArgumentsError, 'Invalid argument: params' unless params.is_a? Hash
 
         super build_query_path(path, params)
       end

data/lib/finapps/rest/portfolios_consumers.rb

@@ -11,7 +11,7 @@ module FinApps
         path = build_path(portfolio_id)
         return super path if params.nil?
 
-        raise FinAppsCore::InvalidArgumentsError, 'Invalid argument: params' unless params.is_a? Hash
+        fail FinAppsCore::InvalidArgumentsError, 'Invalid argument: params' unless params.is_a? Hash
 
         super build_query_path(path, params)
       end

data/lib/finapps/rest/sessions.rb

@@ -8,21 +8,14 @@ module FinApps
 
       def create(params, path = nil)
         return super nil, path if path == LOGOUT
-        raise FinAppsCore::InvalidArgumentsError, 'Invalid argument: params.' unless validates params
+        fail FinAppsCore::InvalidArgumentsError, 'Invalid argument: params.' unless validates params
 
         path ||= CONSUMER_LOGIN
 
         begin
           super params, path
         rescue FinAppsCore::ApiUnauthenticatedError
-          (
-            [
-              nil,
-              [
-                "Invalid #{path == CONSUMER_LOGIN ? 'Consumer' : 'Operator'} Identifier or Credentials"
-              ]
-            ]
-          )
+          login_error(path)
         end
       end
 
@@ -36,6 +29,15 @@ module FinApps
         params.key?(:email) && params[:email] && params.key?(:password) &&
           params[:password]
       end
+
+      def login_error(path)
+        [
+          nil,
+          [
+            "Invalid #{path == CONSUMER_LOGIN ? 'Consumer' : 'Operator'} Identifier or Credentials"
+          ]
+        ]
+      end
     end
   end
 end

data/lib/finapps/rest/signed_documents_downloads.rb

@@ -6,8 +6,10 @@ module FinApps
       def show(consumer_id, signature_request_id)
         not_blank(consumer_id, :consumer_id)
         not_blank(signature_request_id, :signature_request_id)
+
         path =
-          "consumers/#{ERB::Util.url_encode(consumer_id)}/documents/#{ERB::Util.url_encode(signature_request_id)}"
+          "consumers/#{ERB::Util.url_encode(consumer_id)}/"\
+          "documents/#{ERB::Util.url_encode(signature_request_id)}"
         super(nil, path)
       end
     end

data/lib/finapps/utils/query_builder.rb

@@ -5,15 +5,24 @@ module FinApps
     module QueryBuilder
       def build_query_path(root_url, params)
         filter_obj = build_filter(params)
-        page = "page=#{params[:page].to_i}" if params[:page]
-        requested = "requested=#{params[:requested].to_i}" if params[:requested]
-        sort = "sort=#{ERB::Util.url_encode(params[:sort])}" if params[:sort]
         filter = "filter=#{ERB::Util.url_encode(filter_obj.to_json)}" unless filter_obj.empty?
-        query_join(root_url, [page, requested, sort, filter])
+        query_join(root_url, [page(params), requested(params), sort(params), filter])
       end
 
       private
 
+      def page(params)
+        "page=#{params[:page].to_i}" if params[:page]
+      end
+
+      def requested(params)
+        "requested=#{params[:requested].to_i}" if params[:requested]
+      end
+
+      def sort(params)
+        "sort=#{ERB::Util.url_encode(params[:sort])}" if params[:sort]
+      end
+
       def query_join(root_url, params_array)
         query_string = params_array.compact.join('&')
         [root_url, query_string].reject(&:empty?).join('?')

data/lib/finapps/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FinApps
-  VERSION = '5.0.30'
+  VERSION = '5.0.35'
 end

data/spec/rest/alert_definitions_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helpers/client'
 
 RSpec.describe FinApps::REST::AlertDefinitions do
   include SpecHelpers::Client
-  subject { FinApps::REST::AlertDefinitions.new(client) }
+  subject { described_class.new(client) }
 
   describe '#list' do
     let(:list) { subject.list(params) }
@@ -16,9 +16,11 @@ RSpec.describe FinApps::REST::AlertDefinitions do
 
       it { expect { list }.not_to raise_error }
       it('returns an array') { expect(list).to be_a(Array) }
+
       it('performs a get and returns the response') do
         expect(results).to have_key(:records)
       end
+
       it('returns no error messages') { expect(errors).to be_empty }
     end
 
@@ -29,14 +31,17 @@ RSpec.describe FinApps::REST::AlertDefinitions do
     end
 
     context 'when including valid params' do
-      let(:params) { { page: 2, sort: '-created_date', requested: 25 } }
+      let(:params) { {page: 2, sort: '-created_date', requested: 25} }
 
       it { expect { list }.not_to raise_error }
       it('returns an array') { expect(list).to be_a(Array) }
+
       it('performs a get and returns the response') do
         expect(results).to have_key(:records)
       end
+
       it('returns no error messages') { expect(errors).to be_empty }
+
       it 'builds query and sends proper request' do
         list
         url =
@@ -63,10 +68,8 @@ RSpec.describe FinApps::REST::AlertDefinitions do
 
       it { expect { show }.not_to raise_error }
       it('returns an array') { expect(show).to be_a(Array) }
-      it('performs a get and returns the response') do
-        expect(results).to have_key(:_id)
-        expect(results).to have_key(:rule_name)
-      end
+      it { expect(results).to have_key(:_id) }
+      it { expect(results).to have_key(:rule_name) }
       it('returns no error messages') { expect(errors).to be_empty }
     end
 
@@ -75,6 +78,7 @@ RSpec.describe FinApps::REST::AlertDefinitions do
 
       it { expect { show }.not_to raise_error }
       it('results is nil') { expect(results).to be_nil }
+
       it('error messages array is populated') do
         expect(errors.first.downcase).to eq('resource not found')
       end