finapps 6.3.1 → 6.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da87dbf4f482897200d46a058a9b1a1880b2e26d7b6ed51e2c2fc15cea7ae75c
-  data.tar.gz: 6205c1233eb93210743ad3c3f3d0df23fd7417fab346cb025ed92782ec3b71ac
+  metadata.gz: 8428ee4965080f78c083fc2e3d0de2fc66b59596bf5ea81bbbc17e2c11ad2b39
+  data.tar.gz: 0656c926f0b3c70929fb6fbe1b69282d766c56c777aa32ed377218ceac9a6824
 SHA512:
-  metadata.gz: 462b87d38b04166f6af1520e30c080f1d56e4add706bcbc4d4fbbe80eb0adb56c50dd3919dbcaa383238aaef7df413785cdc6045dd4113b60b85eb5fc2e2bb87
-  data.tar.gz: d887ab78aff54275e58674d6bfc15db18c16bdf16ed819944065cc31bd481c8bab226d0a5c2503694c57c23faa958de47d95bc59aa35c6b4171163393e726fc4
+  metadata.gz: 4163eda4a00e4df6c1a34cd76733d11c53fc4774899aabea933bbfe304e5acbd92ea714ccbbd974f8bd496278e501d7fd0d8591ad503480356e9ca75f98198ee
+  data.tar.gz: 756edbc47cdb115e15efe6dc53be0aeea1610feb93470fed421105ce2a7a6b8fa59c04fc84c99c9c5d75a8914b21de5e68d69c29ff584ab810506f948daed233

data/finapps.gemspec

@@ -25,13 +25,13 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler',                    '~> 2.2',   '>= 2.2.16'
   spec.add_development_dependency 'rake',                       '~> 13.0',  '>= 13.0.1'
   spec.add_development_dependency 'rspec',                      '~> 3.10',  '>= 3.10.0'
-  spec.add_development_dependency 'rubocop-performance',        '~> 1.9',   '>= 1.9.2'
+  spec.add_development_dependency 'rubocop-performance',        '~> 1.11',  '>= 1.11.5'
   spec.add_development_dependency 'rubocop-rake',               '~> 0.5',   '>= 0.5.1'
   spec.add_development_dependency 'rubocop-rspec',              '~> 2.4',   '>= 2.4.0'
   spec.add_development_dependency 'simplecov',                  '~> 0.21',  '>= 0.21.2'
   spec.add_development_dependency 'simplecov-console',          '~> 0.9'
   spec.add_development_dependency 'sinatra',                    '~> 2.1',   '>= 2.1.0'
-  spec.add_development_dependency 'webmock',                    '~> 3.12',  '>= 3.12.2'
+  spec.add_development_dependency 'webmock',                    '~> 3.14',  '>= 3.14.0'
 
   spec.extra_rdoc_files = %w[README.md LICENSE.txt]
   spec.rdoc_options = %w[--line-numbers --inline-source --title finapps-ruby --main README.md]

data/lib/finapps/rest/screenings.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'date'
 require_relative '../utils/query_builder'
 
 module FinApps
@@ -55,22 +56,71 @@ module FinApps
       private
 
       def build_filter(params)
-        search_query(params[:searchTerm])
+        term_filter(params[:searchTerm])
+          .merge(date_range_filter(params[:fromDate], params[:toDate]))
+          .merge(progress_filter(params[:progress]))
       end
 
-      def search_query(term)
+      def term_filter(term)
         return {} unless term
 
-        query = search_query_object(term)
-        {'$or': query}
+        {'$or': term_array(term) + split_term_array(term)}
       end
 
-      def search_query_object(term)
+      def term_array(term)
         [
           {'consumer.public_id': term},
-          {'consumer.email': term}
+          {'consumer.email': term},
+          {'consumer.first_name': term},
+          {'consumer.last_name': term},
+          {'consumer.external_id': term}
         ]
       end
+
+      def split_term_array(term)
+        return [] unless space?(term)
+
+        arr = []
+        term.split.each do |t|
+          arr.append('consumer.first_name': t)
+          arr.append('consumer.last_name': t)
+        end
+
+        arr
+      end
+
+      def date_range_filter(from_date, to_date)
+        return {} unless from_date || to_date
+
+        {'*date_created': from_filter(from_date).merge(to_filter(to_date))}
+      end
+
+      def from_filter(from_date)
+        return {} unless from_date
+
+        {'$gte': to_rfc_date(from_date.to_s)}
+      end
+
+      def to_filter(to_date)
+        return {} unless to_date
+
+        {'$lt': to_rfc_date(to_date.to_s)}
+      end
+
+      def to_rfc_date(str)
+        date = DateTime.parse(str)
+        date.rfc3339
+      end
+
+      def progress_filter(progress)
+        return {} unless progress
+
+        {progress: progress}
+      end
+
+      def space?(string)
+        /\s/.match?(string)
+      end
     end
   end
 end

data/lib/finapps/version.rb

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

data/spec/rest/screenings_spec.rb

@@ -13,15 +13,6 @@ RSpec.describe FinApps::REST::Screenings do
     subject(:list) { described_class.new(client).list(params) }
 
     context 'with valid params' do
-      let(:params) do
-        {
-          page: 2,
-          sort: 'date_created',
-          requested: 25,
-          searchTerm: 'term'
-        }
-      end
-
       context 'without searchTerm' do
         let(:params) { {searchTerm: nil, page: 2} }
 
@@ -38,8 +29,34 @@ RSpec.describe FinApps::REST::Screenings do
         end
       end
 
+      # rubocop:disable RSpec/ExampleLength
+      context 'with date range' do
+        let(:params) { {fromDate: '08/01/2021', toDate: '09/01/2021'} }
+
+        it_behaves_like 'an API request'
+        it_behaves_like 'a successful request'
+        it 'performs a get and returns the response' do
+          expect(results).to have_key(:records)
+        end
+
+        it 'builds query and sends proper request' do
+          list
+          json_filter = {
+            '*date_created': {'$gte': '2021-01-08T00:00:00%2B00:00',
+                              '$lt': '2021-01-09T00:00:00%2B00:00'}
+          }.to_json
+          encoded_filter = ERB::Util.url_encode json_filter
+          url = "#{versioned_api_path}/screenings?filter=#{encoded_filter}"
+
+          expect(WebMock).to have_requested(:get, url)
+        end
+      end
+      # rubocop:enable RSpec/ExampleLength
+
       # rubocop:disable RSpec/ExampleLength
       context 'with searchTerm' do
+        let(:params) { {searchTerm: 'le term'} }
+
         it_behaves_like 'an API request'
         it_behaves_like 'a successful request'
         it 'performs a get and returns the response' do
@@ -48,10 +65,17 @@ RSpec.describe FinApps::REST::Screenings do
 
         it 'builds query and sends proper request' do
           list
-          url =
-            "#{versioned_api_path}/screenings?filter=%7B%22$or%22:%5B%7B%22" \
-            'consumer.public_id%22:%22term%22%7D,%7B%22consumer.email%22:%22' \
-            'term%22%7D%5D%7D&page=2&requested=25&sort=date_created'
+          json_filter = {'$or': [{'consumer.public_id': 'le term'},
+                                 {'consumer.email': 'le term'},
+                                 {'consumer.first_name': 'le term'},
+                                 {'consumer.last_name': 'le term'},
+                                 {'consumer.external_id': 'le term'},
+                                 {'consumer.first_name': 'le'},
+                                 {'consumer.last_name': 'le'},
+                                 {'consumer.first_name': 'term'},
+                                 {'consumer.last_name': 'term'}]}.to_json
+          encoded_filter = ERB::Util.url_encode json_filter
+          url = "#{versioned_api_path}/screenings?filter=#{encoded_filter}"
 
           expect(WebMock).to have_requested(:get, url)
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: finapps
 version: !ruby/object:Gem::Version
-  version: 6.3.1
+  version: 6.4.0
 platform: ruby
 authors:
 - Erich Quintero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-26 00:00:00.000000000 Z
+date: 2021-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: finapps_core
@@ -96,20 +96,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '1.11'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.9.2
+        version: 1.11.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '1.11'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.9.2
+        version: 1.11.5
 - !ruby/object:Gem::Dependency
   name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
@@ -210,20 +210,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '3.14'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.12.2
+        version: 3.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '3.14'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.12.2
+        version: 3.14.0
 description: A simple library for communicating with the FinApps REST API.
 email:
 - erich@financialapps.com
@@ -459,54 +459,54 @@ signing_key:
 specification_version: 4
 summary: FinApps REST API ruby client.
 test_files:
-- spec/rest/order_refreshes_spec.rb
-- spec/rest/documents_orders_notifications_spec.rb
-- spec/rest/operators_password_resets_spec.rb
-- spec/rest/operators_spec.rb
-- spec/rest/tenant_settings_spec.rb
-- spec/rest/api_request.rb
-- spec/rest/password_resets_spec.rb
+- spec/support/screenings_routes.rb
+- spec/support/fake_api.rb
+- spec/support/documents_uploads_routes.rb
+- spec/spec_helper.rb
+- spec/spec_helpers/client.rb
+- spec/rest/portfolios_alerts_spec.rb
 - spec/rest/products_spec.rb
+- spec/rest/documents_orders_spec.rb
+- spec/rest/password_resets_spec.rb
+- spec/rest/order_statuses_spec.rb
+- spec/rest/operators_spec.rb
+- spec/rest/operator_change_password_email_spec.rb
+- spec/rest/esign_templates_spec.rb
+- spec/rest/order_tokens_spec.rb
+- spec/rest/order_reports_spec.rb
+- spec/rest/documents_upload_types_spec.rb
+- spec/rest/consumers_portfolios_spec.rb
+- spec/rest/portfolios_consumers_spec.rb
 - spec/rest/verix/verix_metadata_spec.rb
-- spec/rest/verix/verix_records_spec.rb
 - spec/rest/verix/verix_documents_spec.rb
+- spec/rest/verix/verix_records_spec.rb
 - spec/rest/verix/verix_pdf_documents_spec.rb
+- spec/rest/api_request.rb
+- spec/rest/tenant_settings_spec.rb
+- spec/rest/consumers_spec.rb
+- spec/rest/client_spec.rb
+- spec/rest/portfolios_available_consumers_spec.rb
+- spec/rest/alert_definitions_spec.rb
+- spec/rest/order_notifications_spec.rb
+- spec/rest/operators_password_resets_spec.rb
+- spec/rest/version_spec.rb
+- spec/rest/portfolios_spec.rb
+- spec/rest/sessions_spec.rb
+- spec/rest/documents_orders_notifications_spec.rb
+- spec/rest/tenant_app_settings_spec.rb
 - spec/rest/documents_uploads_spec.rb
-- spec/rest/alert_occurrences_spec.rb
-- spec/rest/consumers_portfolios_spec.rb
-- spec/rest/esign_templates_spec.rb
-- spec/rest/orders_spec.rb
+- spec/rest/screenings_spec.rb
+- spec/rest/signed_documents_downloads_spec.rb
+- spec/rest/plaid/plaid_account_permissions_spec.rb
+- spec/rest/plaid/plaid_webhooks_spec.rb
 - spec/rest/plaid/plaid_accounts_spec.rb
 - spec/rest/plaid/plaid_institution_logos_spec.rb
 - spec/rest/plaid/plaid_consumer_institutions_spec.rb
-- spec/rest/plaid/plaid_account_permissions_spec.rb
-- spec/rest/plaid/plaid_webhooks_spec.rb
-- spec/rest/portfolios_consumers_spec.rb
-- spec/rest/order_statuses_spec.rb
 - spec/rest/order_assignments_spec.rb
-- spec/rest/version_spec.rb
-- spec/rest/portfolio_reports_spec.rb
-- spec/rest/order_tokens_spec.rb
-- spec/rest/order_notifications_spec.rb
-- spec/rest/sessions_spec.rb
-- spec/rest/client_spec.rb
-- spec/rest/documents_orders_spec.rb
-- spec/rest/portfolios_available_consumers_spec.rb
-- spec/rest/consumers_spec.rb
 - spec/rest/consumer_login_tokens_spec.rb
-- spec/rest/screenings_spec.rb
-- spec/rest/tenant_app_settings_spec.rb
-- spec/rest/order_reports_spec.rb
-- spec/rest/signed_documents_downloads_spec.rb
+- spec/rest/alert_occurrences_spec.rb
 - spec/rest/operators_login_tokens_spec.rb
-- spec/rest/operator_change_password_email_spec.rb
-- spec/rest/documents_upload_types_spec.rb
-- spec/rest/portfolios_alerts_spec.rb
-- spec/rest/portfolios_spec.rb
-- spec/rest/alert_definitions_spec.rb
-- spec/spec_helpers/client.rb
-- spec/support/fake_api.rb
-- spec/support/screenings_routes.rb
-- spec/support/documents_uploads_routes.rb
-- spec/spec_helper.rb
+- spec/rest/order_refreshes_spec.rb
+- spec/rest/portfolio_reports_spec.rb
+- spec/rest/orders_spec.rb
 - spec/utils/query_builder_spec.rb