finapps 5.0.34 → 5.0.43

data/lib/finapps/rest/documents_uploads.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module FinApps
+  module REST
+    class DocumentsUploads < FinAppsCore::REST::Resources
+      def show(consumer_id, doc_id, thumbnail = false)
+        not_blank(consumer_id, :consumer_id)
+        not_blank(doc_id, :doc_id)
+
+        path =
+          "consumers/#{ERB::Util.url_encode(consumer_id)}/"\
+        "documents/#{ERB::Util.url_encode(doc_id)}?thumbnail=#{thumbnail}"
+        super(nil, path)
+      end
+
+      def destroy(order_id, doc_id)
+        not_blank(order_id, :order_id)
+        not_blank(doc_id, :doc_id)
+        super(nil, "documents/orders/#{order_id}/#{doc_id}")
+      end
+    end
+  end
+end

data/lib/finapps/rest/orders.rb

@@ -63,22 +63,33 @@ 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)

data/lib/finapps/rest/sessions.rb

@@ -15,14 +15,7 @@ module FinApps
         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/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.34'
+  VERSION = '5.0.43'
 end

data/spec/rest/alert_definitions_spec.rb

@@ -68,12 +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
 

data/spec/rest/client_spec.rb

@@ -9,22 +9,22 @@ RSpec.describe FinApps::REST::Client do
     end
   end
 
-  context 'an instance of Client' do
-    subject { described_class.new(:company_token) }
+  context 'with an instance of Client' do
+    subject(:client) { described_class.new(:company_token) }
 
     FinApps::REST::Client::RESOURCES.each do |method|
-      it("responds to #{method}") { expect(subject).to respond_to(method) }
+      it("responds to #{method}") { expect(client).to respond_to(method) }
 
       it "memoizes the result of #{method}" do
-        first = subject.send(method)
-        second = subject.send(method)
+        first = client.send(method)
+        second = client.send(method)
         expect(first.object_id).to eq(second.object_id)
       end
     end
 
     describe '#alert_definitions' do
       it do
-        expect(subject.alert_definitions).to be_an_instance_of(
+        expect(client.alert_definitions).to be_an_instance_of(
           FinApps::REST::AlertDefinitions
         )
       end
@@ -32,7 +32,7 @@ RSpec.describe FinApps::REST::Client do
 
     describe '#alert_occurrences' do
       it do
-        expect(subject.alert_occurrences).to be_an_instance_of(
+        expect(client.alert_occurrences).to be_an_instance_of(
           FinApps::REST::AlertOccurrences
         )
       end
@@ -40,41 +40,41 @@ RSpec.describe FinApps::REST::Client do
 
     describe '#version' do
       it do
-        expect(subject.version).to be_an_instance_of(FinApps::REST::Version)
+        expect(client.version).to be_an_instance_of(FinApps::REST::Version)
       end
     end
 
     describe '#consumers' do
       it do
-        expect(subject.consumers).to be_an_instance_of(FinApps::REST::Consumers)
+        expect(client.consumers).to be_an_instance_of(FinApps::REST::Consumers)
       end
     end
 
     describe '#plaid_webhooks' do
       it do
         expect(
-          subject.plaid_webhooks
+          client.plaid_webhooks
         ).to be_an_instance_of FinApps::REST::PlaidWebhooks
       end
     end
 
     describe '#sessions' do
       it do
-        expect(subject.sessions).to be_an_instance_of(FinApps::REST::Sessions)
+        expect(client.sessions).to be_an_instance_of(FinApps::REST::Sessions)
       end
     end
 
     describe '#order_assignments' do
       it do
-        expect(subject.order_assignments).to be_an_instance_of(
+        expect(client.order_assignments).to be_an_instance_of(
           FinApps::REST::OrderAssignments
         )
       end
     end
 
-    describe '#order_statuses' do
+    describe '#order_notifications' do
       it do
-        expect(subject.order_notifications).to be_an_instance_of(
+        expect(client.order_notifications).to be_an_instance_of(
           FinApps::REST::OrderNotifications
         )
       end
@@ -82,7 +82,7 @@ RSpec.describe FinApps::REST::Client do
 
     describe '#order_statuses' do
       it do
-        expect(subject.order_statuses).to be_an_instance_of(
+        expect(client.order_statuses).to be_an_instance_of(
           FinApps::REST::OrderStatuses
         )
       end
@@ -90,7 +90,7 @@ RSpec.describe FinApps::REST::Client do
 
     describe '#order_refreshes' do
       it do
-        expect(subject.order_refreshes).to be_an_instance_of(
+        expect(client.order_refreshes).to be_an_instance_of(
           FinApps::REST::OrderRefreshes
         )
       end
@@ -98,7 +98,7 @@ RSpec.describe FinApps::REST::Client do
 
     describe '#order_reports' do
       it do
-        expect(subject.order_reports).to be_an_instance_of(
+        expect(client.order_reports).to be_an_instance_of(
           FinApps::REST::OrderReports
         )
       end
@@ -106,19 +106,19 @@ RSpec.describe FinApps::REST::Client do
 
     describe '#order_tokens' do
       it do
-        expect(subject.order_tokens).to be_an_instance_of(
+        expect(client.order_tokens).to be_an_instance_of(
           FinApps::REST::OrderTokens
         )
       end
     end
 
     describe '#orders' do
-      it { expect(subject.orders).to be_an_instance_of(FinApps::REST::Orders) }
+      it { expect(client.orders).to be_an_instance_of(FinApps::REST::Orders) }
     end
 
     describe '#password_resets' do
       it do
-        expect(subject.password_resets).to be_an_instance_of(
+        expect(client.password_resets).to be_an_instance_of(
           FinApps::REST::PasswordResets
         )
       end
@@ -126,7 +126,7 @@ RSpec.describe FinApps::REST::Client do
 
     describe '#operators_password_resets' do
       it do
-        expect(subject.operators_password_resets).to be_an_instance_of(
+        expect(client.operators_password_resets).to be_an_instance_of(
           FinApps::REST::OperatorsPasswordResets
         )
       end
@@ -134,19 +134,19 @@ RSpec.describe FinApps::REST::Client do
 
     describe '#operators' do
       it do
-        expect(subject.operators).to be_an_instance_of(FinApps::REST::Operators)
+        expect(client.operators).to be_an_instance_of(FinApps::REST::Operators)
       end
     end
 
     describe '#products' do
       it do
-        expect(subject.products).to be_an_instance_of(FinApps::REST::Products)
+        expect(client.products).to be_an_instance_of(FinApps::REST::Products)
       end
     end
 
     describe '#portfolios' do
       it do
-        expect(subject.portfolios).to be_an_instance_of(
+        expect(client.portfolios).to be_an_instance_of(
           FinApps::REST::Portfolios
         )
       end
@@ -154,7 +154,7 @@ RSpec.describe FinApps::REST::Client do
 
     describe '#portfolios_alerts' do
       it do
-        expect(subject.portfolios_alerts).to be_an_instance_of(
+        expect(client.portfolios_alerts).to be_an_instance_of(
           FinApps::REST::PortfoliosAlerts
         )
       end
@@ -162,7 +162,7 @@ RSpec.describe FinApps::REST::Client do
 
     describe '#portfolios_available_consumers' do
       it do
-        expect(subject.portfolios_available_consumers).to be_an_instance_of(
+        expect(client.portfolios_available_consumers).to be_an_instance_of(
           FinApps::REST::PortfoliosAvailableConsumers
         )
       end
@@ -170,7 +170,7 @@ RSpec.describe FinApps::REST::Client do
 
     describe '#portfolios_consumers' do
       it do
-        expect(subject.portfolios_consumers).to be_an_instance_of(
+        expect(client.portfolios_consumers).to be_an_instance_of(
           FinApps::REST::PortfoliosConsumers
         )
       end
@@ -178,7 +178,7 @@ RSpec.describe FinApps::REST::Client do
 
     describe '#consumers_portfolios' do
       it do
-        expect(subject.consumers_portfolios).to be_an_instance_of(
+        expect(client.consumers_portfolios).to be_an_instance_of(
           FinApps::REST::ConsumersPortfolios
         )
       end
@@ -186,7 +186,7 @@ RSpec.describe FinApps::REST::Client do
 
     describe '#portfolio_reports' do
       it do
-        expect(subject.portfolio_reports).to be_an_instance_of(
+        expect(client.portfolio_reports).to be_an_instance_of(
           FinApps::REST::PortfolioReports
         )
       end
@@ -194,7 +194,7 @@ RSpec.describe FinApps::REST::Client do
 
     describe '#tenant_settings' do
       it do
-        expect(subject.tenant_settings).to be_an_instance_of(
+        expect(client.tenant_settings).to be_an_instance_of(
           FinApps::REST::TenantSettings
         )
       end
@@ -202,23 +202,15 @@ RSpec.describe FinApps::REST::Client do
 
     describe '#tenant_app_settings' do
       it do
-        expect(subject.tenant_app_settings).to be_an_instance_of(
+        expect(client.tenant_app_settings).to be_an_instance_of(
           FinApps::REST::TenantAppSettings
         )
       end
     end
 
-    describe '#plaid_webhooks' do
-      it do
-        expect(subject.plaid_webhooks).to be_an_instance_of(
-          FinApps::REST::PlaidWebhooks
-        )
-      end
-    end
-
     describe '#plaid_institution_logos' do
       it do
-        expect(subject.plaid_institution_logos).to be_an_instance_of(
+        expect(client.plaid_institution_logos).to be_an_instance_of(
           FinApps::REST::PlaidInstitutionLogos
         )
       end

data/spec/rest/consumers_spec.rb

@@ -1,308 +1,309 @@
 # frozen_string_literal: true
 
 require 'spec_helpers/client'
-RSpec.describe FinApps::REST::Consumers,
-               'initialized with valid FinApps::Client object' do
-  include SpecHelpers::Client
-  subject(:users) { described_class.new(client) }
-
-  missing_public_id = ': public_id'
-
-  describe '#create' do
-    let(:results) { create[0] }
-    let(:error_messages) { create[1] }
-
-    context 'when missing params' do
-      it do
-        expect { subject.create(nil) }.to raise_error(
-          FinAppsCore::MissingArgumentsError
-        )
-      end
-    end
+RSpec.describe FinApps::REST::Consumers do
+  context 'when initialized with valid FinApps::Client object' do
+    include SpecHelpers::Client
+    subject(:users) { described_class.new(client) }
 
-    context 'for valid params' do
-      let(:create) { subject.create(email: 'email', password: 'password') }
+    missing_public_id = ': public_id'
 
-      it { expect { create }.not_to raise_error }
-      it('results is a Hash') { expect(results).to be_a(Hash) }
+    describe '#create' do
+      let(:results) { create[0] }
+      let(:error_messages) { create[1] }
 
-      it('performs a post and returns the response') do
-        expect(results).to have_key(:public_id)
+      context 'when missing params' do
+        it do
+          expect { users.create(nil) }.to raise_error(
+            FinAppsCore::MissingArgumentsError
+          )
+        end
       end
 
-      it('error_messages array is empty') { expect(error_messages).to eq([]) }
-    end
+      context 'with valid params' do
+        let(:create) { subject.create(email: 'email', password: 'password') }
 
-    context 'for invalid params' do
-      let(:create) { subject.create(email: 'email') }
+        it { expect { create }.not_to raise_error }
+        it('results is a Hash') { expect(results).to be_a(Hash) }
 
-      it { expect { create }.not_to raise_error }
-      it('results is nil') { expect(results).to be_nil }
+        it('performs a post and returns the response') do
+          expect(results).to have_key(:public_id)
+        end
 
-      it('error messages array is populated') do
-        expect(error_messages.first.downcase).to eq('invalid request body')
+        it('error_messages array is empty') { expect(error_messages).to eq([]) }
       end
-    end
-  end
 
-  describe '#list' do
-    let(:list) { subject.list(params) }
-    let(:results) { list[0] }
-    let(:error_messages) { list[1] }
+      context 'with invalid params' do
+        let(:create) { subject.create(email: 'email') }
 
-    context 'when missing params' do
-      let(:params) { nil }
-
-      it { expect { list }.not_to raise_error }
+        it { expect { create }.not_to raise_error }
+        it('results is nil') { expect(results).to be_nil }
 
-      it('performs a get and returns the response') do
-        expect(results).to have_key(:records)
+        it('error messages array is populated') do
+          expect(error_messages.first.downcase).to eq('invalid request body')
+        end
       end
-
-      it('returns an array of records') { expect(results[:records]).to be_a(Array) }
-      it('returns no error messages') { expect(error_messages).to be_empty }
     end
 
-    context 'when invalid params are provided' do
-      let(:params) { ['invalid array'] }
+    describe '#list' do
+      let(:list) { subject.list(params) }
+      let(:results) { list[0] }
+      let(:error_messages) { list[1] }
 
-      it { expect { list }.to raise_error(FinAppsCore::InvalidArgumentsError) }
-    end
+      context 'when missing params' do
+        let(:params) { nil }
 
-    context 'when including valid params without searchTerm' do
-      let(:params) do
-        {
-          page: 3,
-          requested: 19
-        }
-      end
+        it { expect { list }.not_to raise_error }
 
-      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('performs a get and returns the response') do
-        expect(results).to have_key(:records)
+        it('returns an array of records') { expect(results[:records]).to be_a(Array) }
+        it('returns no error messages') { expect(error_messages).to be_empty }
       end
 
-      it('returns no error messages') do
-        expect(error_messages).to be_empty
-      end
+      context 'when invalid params are provided' do
+        let(:params) { ['invalid array'] }
 
-      it 'builds query and sends proper request' do
-        list
-        url = "#{versioned_api_path}/consumers?page=3&requested=19"
-        expect(WebMock).to have_requested(:get, url)
+        it { expect { list }.to raise_error(FinAppsCore::InvalidArgumentsError) }
       end
-    end
 
-    context 'when including valid params with searchTerm' do
-      let(:params) do
-        {
-          page: 2,
-          sort: 'date_created',
-          requested: 25,
-          searchTerm: 'term'
-        }
-      end
+      context 'when including valid params without searchTerm' do
+        let(:params) do
+          {
+            page: 3,
+            requested: 19
+          }
+        end
 
-      it { expect { list }.not_to raise_error }
-      it('returns an array') { expect(list).to be_a(Array) }
+        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('performs a get and returns the response') do
+          expect(results).to have_key(:records)
+        end
 
-      it('returns no error messages') do
-        expect(error_messages).to be_empty
-      end
+        it('returns no error messages') do
+          expect(error_messages).to be_empty
+        end
 
-      it 'builds query and sends proper request' do
-        list
-        url = "#{versioned_api_path}/consumers?"\
-          'filter=%7B%22$or%22:%5B%7B%22email%22:%22term%22%7D,' \
-          '%7B%22first_name%22:%22term%22%7D,'\
-          '%7B%22last_name%22:%22term%22%7D%5D%7D&page=2&requested=25' \
-          '&sort=date_created'
-        expect(WebMock).to have_requested(:get, url)
+        it 'builds query and sends proper request' do
+          list
+          url = "#{versioned_api_path}/consumers?page=3&requested=19"
+          expect(WebMock).to have_requested(:get, url)
+        end
       end
 
-      context 'when search term contains a space' do
+      context 'when including valid params with searchTerm' do
         let(:params) do
           {
             page: 2,
             sort: 'date_created',
             requested: 25,
-            searchTerm: 'Two terms'
+            searchTerm: 'term'
           }
         end
 
-        it 'treats space as start of a new query for first and last name' 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') do
+          expect(error_messages).to be_empty
+        end
+
+        it 'builds query and sends proper request' do
           list
           url = "#{versioned_api_path}/consumers?"\
-            'filter=%7B%22$or%22:%5B%7B%22email%22:%22Two%20terms%22%7D,'\
-            '%7B%22first_name%22:%22Two%20terms%22%7D,'\
-            '%7B%22last_name%22:%22Two%20terms%22%7D,%7B%22first_name%22:'\
-            '%22Two%22%7D,%7B%22last_name%22:%22Two%22%7D,'\
-            '%7B%22first_name%22:%22terms%22%7D,%7B%22last_name%22:'\
-            '%22terms%22%7D%5D%7D&page=2&requested=25&sort=date_created'
+            'filter=%7B%22$or%22:%5B%7B%22email%22:%22term%22%7D,' \
+            '%7B%22first_name%22:%22term%22%7D,'\
+            '%7B%22last_name%22:%22term%22%7D%5D%7D&page=2&requested=25' \
+            '&sort=date_created'
           expect(WebMock).to have_requested(:get, url)
         end
-      end
-    end
-  end
 
-  describe '#show' do
-    context 'when missing public_id' do
-      it do
-        expect { subject.show(nil) }.to raise_error(
-          FinAppsCore::MissingArgumentsError,
-          missing_public_id
-        )
+        context 'when search term contains a space' do
+          let(:params) do
+            {
+              page: 2,
+              sort: 'date_created',
+              requested: 25,
+              searchTerm: 'Two terms'
+            }
+          end
+
+          it 'treats space as start of a new query for first and last name' do
+            list
+            url = "#{versioned_api_path}/consumers?"\
+              'filter=%7B%22$or%22:%5B%7B%22email%22:%22Two%20terms%22%7D,'\
+              '%7B%22first_name%22:%22Two%20terms%22%7D,'\
+              '%7B%22last_name%22:%22Two%20terms%22%7D,%7B%22first_name%22:'\
+              '%22Two%22%7D,%7B%22last_name%22:%22Two%22%7D,'\
+              '%7B%22first_name%22:%22terms%22%7D,%7B%22last_name%22:'\
+              '%22terms%22%7D%5D%7D&page=2&requested=25&sort=date_created'
+            expect(WebMock).to have_requested(:get, url)
+          end
+        end
       end
     end
 
-    context 'for valid public_id' do
-      let(:show) { subject.show(:valid_public_id) }
-      let(:results) { show[0] }
-      let(:error_messages) { show[1] }
-
-      it { expect { show }.not_to raise_error }
-      it('results is a Hash') { expect(results).to be_a(Hash) }
-
-      it('performs a get and returns the response') do
-        expect(results).to have_key(:public_id)
+    describe '#show' do
+      context 'when missing public_id' do
+        it do
+          expect { users.show(nil) }.to raise_error(
+            FinAppsCore::MissingArgumentsError,
+            missing_public_id
+          )
+        end
       end
 
-      it('error_messages array is empty') { expect(error_messages).to eq([]) }
-    end
-
-    context 'for invalid token' do
-      let(:show) { subject.show(:invalid_public_id) }
-      let(:results) { show[0] }
-      let(:error_messages) { show[1] }
-
-      it { expect { show }.not_to raise_error }
-      it('results is nil') { expect(results).to be_nil }
+      context 'with valid public_id' do
+        let(:show) { users.show(:valid_public_id) }
+        let(:results) { show[0] }
+        let(:error_messages) { show[1] }
 
-      it('error messages array is populated') do
-        expect(error_messages.first.downcase).to eq('resource not found')
-      end
-    end
-  end
-
-  describe '#update' do
-    context 'when missing public_id' do
-      it do
-        expect { subject.update(nil, {}) }.to raise_error(
-          FinAppsCore::MissingArgumentsError,
-          missing_public_id
-        )
-      end
-    end
+        it { expect { show }.not_to raise_error }
+        it('results is a Hash') { expect(results).to be_a(Hash) }
 
-    context 'when updating user details' do
-      context 'for valid public_id' do
-        let(:update) { subject.update(:valid_public_id, postal_code: '33021') }
-        let(:results) { update[0] }
-        let(:error_messages) { update[1] }
+        it('performs a get and returns the response') do
+          expect(results).to have_key(:public_id)
+        end
 
-        it { expect { update }.not_to raise_error }
-        it('results is nil') { expect(results).to be_nil }
         it('error_messages array is empty') { expect(error_messages).to eq([]) }
       end
 
-      context 'for invalid public_id' do
-        let(:update) do
-          subject.update(:invalid_public_id, postal_code: '33021')
-        end
-        let(:results) { update[0] }
-        let(:error_messages) { update[1] }
+      context 'with invalid token' do
+        let(:show) { users.show(:invalid_public_id) }
+        let(:results) { show[0] }
+        let(:error_messages) { show[1] }
 
-        it { expect { update }.not_to raise_error }
+        it { expect { show }.not_to raise_error }
         it('results is nil') { expect(results).to be_nil }
 
         it('error messages array is populated') do
-          expect(error_messages.first.downcase).to eq(
-            'invalid user id specified.'
-          )
+          expect(error_messages.first.downcase).to eq('resource not found')
         end
       end
     end
 
-    context 'when updating password' do
-      context 'for valid public_id' do
-        let(:update) do
-          subject.update(
-            :valid_public_id,
-            password: 'Aa123456!', password_confirm: 'Aa123456!'
+    describe '#update' do
+      context 'when missing public_id' do
+        it do
+          expect { users.update(nil, {}) }.to raise_error(
+            FinAppsCore::MissingArgumentsError,
+            missing_public_id
           )
         end
-        let(:results) { update[0] }
-        let(:error_messages) { update[1] }
+      end
 
-        it { expect { update }.not_to raise_error }
-        it('results is a Hash') { expect(results).to be_a(Hash) }
+      context 'when updating user details' do
+        context 'with valid public_id' do
+          let(:update) { users.update(:valid_public_id, postal_code: '33021') }
+          let(:results) { update[0] }
+          let(:error_messages) { update[1] }
 
-        it('the public_id is on the results') do
-          expect(results).to have_key(:public_id)
+          it { expect { update }.not_to raise_error }
+          it('results is nil') { expect(results).to be_nil }
+          it('error_messages array is empty') { expect(error_messages).to eq([]) }
         end
 
-        it('the new token is on the results') do
-          expect(results).to have_key(:token)
+        context 'with invalid public_id' do
+          let(:update) do
+            subject.update(:invalid_public_id, postal_code: '33021')
+          end
+          let(:results) { update[0] }
+          let(:error_messages) { update[1] }
+
+          it { expect { update }.not_to raise_error }
+          it('results is nil') { expect(results).to be_nil }
+
+          it('error messages array is populated') do
+            expect(error_messages.first.downcase).to eq(
+              'invalid user id specified.'
+            )
+          end
         end
-
-        it('error_messages array is empty') { expect(error_messages).to eq([]) }
       end
 
-      context 'for invalid public_id' do
-        let(:update) do
-          subject.update(
-            :invalid_public_id,
-            password: 'Aa123456!', password_confirm: 'Aa123456!'
-          )
+      context 'when updating password' do
+        context 'with valid public_id' do
+          let(:update) do
+            subject.update(
+              :valid_public_id,
+              password: 'Aa123456!', password_confirm: 'Aa123456!'
+            )
+          end
+          let(:results) { update[0] }
+          let(:error_messages) { update[1] }
+
+          it { expect { update }.not_to raise_error }
+          it('results is a Hash') { expect(results).to be_a(Hash) }
+
+          it('the public_id is on the results') do
+            expect(results).to have_key(:public_id)
+          end
+
+          it('the new token is on the results') do
+            expect(results).to have_key(:token)
+          end
+
+          it('error_messages array is empty') { expect(error_messages).to eq([]) }
         end
-        let(:results) { update[0] }
-        let(:error_messages) { update[1] }
-
-        it { expect { update }.not_to raise_error }
-        it('results is nil') { expect(results).to be_nil }
 
-        it('error messages array is populated') do
-          expect(error_messages.first.downcase).to eq('resource not found')
+        context 'with invalid public_id' do
+          let(:update) do
+            subject.update(
+              :invalid_public_id,
+              password: 'Aa123456!', password_confirm: 'Aa123456!'
+            )
+          end
+          let(:results) { update[0] }
+          let(:error_messages) { update[1] }
+
+          it { expect { update }.not_to raise_error }
+          it('results is nil') { expect(results).to be_nil }
+
+          it('error messages array is populated') do
+            expect(error_messages.first.downcase).to eq('resource not found')
+          end
         end
       end
-    end
 
-    describe '#destroy' do
-      context 'when missing public_id' do
-        it do
-          expect { subject.destroy(nil) }.to raise_error(
-            FinAppsCore::MissingArgumentsError,
-            missing_public_id
-          )
+      describe '#destroy' do
+        context 'when missing public_id' do
+          it do
+            expect { users.destroy(nil) }.to raise_error(
+              FinAppsCore::MissingArgumentsError,
+              missing_public_id
+            )
+          end
         end
-      end
 
-      context 'for valid public_id' do
-        let(:destroy) { subject.destroy(:valid_public_id) }
-        let(:results) { destroy[0] }
-        let(:error_messages) { destroy[1] }
+        context 'with valid public_id' do
+          let(:destroy) { users.destroy(:valid_public_id) }
+          let(:results) { destroy[0] }
+          let(:error_messages) { destroy[1] }
 
-        it { expect { destroy }.not_to raise_error }
-        it('results is nil') { expect(results).to be_nil }
-        it('error_messages array is empty') { expect(error_messages).to eq([]) }
-      end
+          it { expect { destroy }.not_to raise_error }
+          it('results is nil') { expect(results).to be_nil }
+          it('error_messages array is empty') { expect(error_messages).to eq([]) }
+        end
 
-      context 'for invalid token' do
-        let(:destroy) { subject.destroy(:invalid_public_id) }
-        let(:results) { destroy[0] }
-        let(:error_messages) { destroy[1] }
+        context 'with invalid token' do
+          let(:destroy) { subject.destroy(:invalid_public_id) }
+          let(:results) { destroy[0] }
+          let(:error_messages) { destroy[1] }
 
-        it { expect { destroy }.not_to raise_error }
-        it('results is nil') { expect(results).to be_nil }
+          it { expect { destroy }.not_to raise_error }
+          it('results is nil') { expect(results).to be_nil }
 
-        it('error messages array is populated') do
-          expect(error_messages.first.downcase).to eq('resource not found')
+          it('error messages array is populated') do
+            expect(error_messages.first.downcase).to eq('resource not found')
+          end
         end
       end
     end