mas-rad_core 0.0.80 → 0.0.81

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 439f2ddeb557336ca2337cfbf574b802cb70d4bb
-  data.tar.gz: e3bbba73a760d498ffaa5ac78cc9fb7a41bd2e3a
+  metadata.gz: e2f8947dfc7c45c34e1998ca8af771722f43f493
+  data.tar.gz: 6885e9c568e5100b60f6794e2416a6b59f88db2a
 SHA512:
-  metadata.gz: c65f5254b56b84ef07cc0482a0fc63a5ae55a6e7fbcc63fcb11af08ae64a946e045c174cb59d851787fb31e9af6757dd33f160e4c1a4e1da9a885b49f303f7c1
-  data.tar.gz: 0cbbb811bb47b2e00fec9b4d7292ba386c31cfba517c80974636d0bbd7180351e7df8113aabfb8af46d1f33ff8be8dc0a908da301fd8fea01b38a10b21c27440
+  metadata.gz: c715b56726070f6f800e7155434b4d418207bc22f776d19b0131997bd8f73c847928e26181a613007fad7939f7cd6d42253df5bbe41600c1a16c2e71bdc62860
+  data.tar.gz: 4ac0dec58ce440793367fbe0b3e56655cae7daf6981d4797cfd57adf322b14ac5a02709bfe2642be7db191e4392b3a71c6635d5d6e5cad83f58978dbc4e2bd81

data/app/jobs/index_firm_job.rb

@@ -4,6 +4,10 @@ class IndexFirmJob < ActiveJob::Base
   end
 
   def perform(firm)
-    FirmRepository.new.store(firm) if firm.publishable?
+    if firm.publishable?
+      FirmRepository.new.store(firm)
+    else
+      DeleteFirmJob.perform_later(firm.id)
+    end
   end
 end

data/app/models/firm.rb

@@ -126,6 +126,10 @@ class Firm < ActiveRecord::Base
            to: :main_office,
            allow_nil: true
 
+  # A heuristic that allows us to infer validity
+  #
+  # This method is basically a cheap way to answer the question: has this
+  # record ever been saved with validation enabled?
   def registered?
     email_address.present?
   end
@@ -195,7 +199,7 @@ class Firm < ActiveRecord::Base
   end
 
   def publishable?
-    valid? && main_office.present? && !missing_advisers?
+    registered? && offices.any? && !missing_advisers?
   end
 
   def missing_advisers?

data/app/models/principal.rb

@@ -71,35 +71,12 @@ class Principal < ActiveRecord::Base
     "#{first_name} #{last_name}"
   end
 
-  def next_onboarding_action
-    registered_firms = main_firm_with_trading_names.registered
-
-    case
-    when registered_firms.empty?
-      :complete_a_firm
-    when any_remote_firms?(registered_firms)
-      :onboarded
-    when needs_advisers?(registered_firms)
-      :complete_an_adviser
-    else
-      :onboarded
-    end
-  end
-
   def onboarded?
-    next_onboarding_action == :onboarded
+    main_firm_with_trading_names.any?(&:publishable?)
   end
 
   private
 
-  def any_remote_firms?(firm_list)
-    firm_list.any? { |f| f.primary_advice_method == :remote }
-  end
-
-  def needs_advisers?(firm_list)
-     firm_list.none? { |f| f.advisers.present? }
-  end
-
   def find_subsidiary(subsidiary)
     firm.subsidiaries.find_or_initialize_by(
       registered_name: subsidiary.name,

data/lib/mas/rad_core/version.rb

@@ -1,5 +1,5 @@
 module MAS
   module RadCore
-    VERSION = '0.0.80'
+    VERSION = '0.0.81'
   end
 end

data/spec/jobs/index_firm_job_spec.rb

@@ -1,6 +1,7 @@
 RSpec.describe IndexFirmJob, '#perform' do
   let(:repository) { instance_double(FirmRepository) }
-  let(:firm) { Firm.new }
+  let(:firm_id) { 3 }
+  let(:firm) { Firm.new(id: firm_id) }
 
   before do
     allow(FirmRepository).to receive(:new).and_return(repository)
@@ -26,5 +27,10 @@ RSpec.describe IndexFirmJob, '#perform' do
       expect(repository).not_to receive(:store).with(firm)
       described_class.new.perform(firm)
     end
+
+    it 'invokes the DeleteFirmJob to remove the firm from the directory' do
+      expect(DeleteFirmJob).to receive(:perform_later).with(firm_id)
+      described_class.new.perform(firm)
+    end
   end
 end

data/spec/models/firm_spec.rb

@@ -126,10 +126,7 @@ RSpec.describe Firm do
 
     context 'when the firm is not valid' do
       let(:firm) do
-        FactoryGirl.create(:firm).tap do |f|
-          f.email_address = nil
-          f.save(validate: false)
-        end
+        FactoryGirl.build(:invalid_firm).tap { |f| f.save(validate: false) }
       end
 
       it { is_expected.to be_falsey }

data/spec/models/principal_spec.rb

@@ -204,221 +204,35 @@ RSpec.describe Principal do
   end
 
   describe '#onboarded?' do
-    context 'when a principal has been onboarded' do
-      before :each do
-        principal.firm.update_attributes(FactoryGirl.attributes_for :onboarded_firm, fca_number: principal.fca_number)
-        create(:adviser, firm: principal.firm)
-      end
+    context 'when no firms are publishable' do
+      before do
+        FactoryGirl.build(:invalid_firm,
+                           fca_number: principal.fca_number,
+                           parent: principal.firm).save(validate: false)
 
-      it 'returns true' do
-        expect(principal).to be_onboarded
-      end
-    end
-
-    context 'when a principal has not been onboarded' do
-      before :each do
-        attrs = FactoryGirl.attributes_for :not_onboarded_firm, fca_number: principal.fca_number
-        principal.firm.update_attributes(attrs)
+        expect(principal.main_firm_with_trading_names).to have(2).items
+        expect(principal.main_firm_with_trading_names)
+          .to all(have_attributes(publishable?: false))
       end
 
       it 'returns false' do
-        expect(principal).not_to be_onboarded
-      end
-    end
-  end
-
-  describe '#next_onboarding_action' do
-    context 'when principal has no firms or trading names' do
-      before :each do
-        principal.firm.destroy
-        principal.reload
-        expect(principal.main_firm_with_trading_names).to be_empty
-      end
-
-      it 'returns :complete_a_firm' do
-        expect(principal.next_onboarding_action).to eql(:complete_a_firm)
-      end
-    end
-
-    context 'when principal only has a parent firm' do
-      before :each do
-        expect(principal.firm).not_to be_nil
-        expect(Firm.where(fca_number: principal.fca_number).count).to eql(1)
-      end
-
-      context 'and the parent firm is not registered' do
-        before :each do
-          expect(principal.firm).not_to be_registered
-        end
-
-        it 'returns :complete_a_firm' do
-          expect(principal.next_onboarding_action).to eql(:complete_a_firm)
-        end
-      end
-
-      context 'and the parent firm is registered' do
-        before :each do
-          principal.firm.update_column(:email_address, 'acme@example.com')
-          principal.reload
-          expect(principal.firm).to be_registered
-        end
-
-        context 'and the firm primarily gives remote advice' do
-          before :each do
-            principal.firm.in_person_advice_methods.destroy_all
-            principal.firm.other_advice_methods << create(:other_advice_method)
-            principal.reload
-          end
-
-          context 'and the firm has no advisers' do
-            before :each do
-              expect(principal.firm.advisers.any?).to eql(false)
-            end
-
-            it 'returns :onboarded' do
-              expect(principal.next_onboarding_action).to eql(:onboarded)
-            end
-          end
-
-          context 'and the firm has advisers' do
-            before :each do
-              create(:adviser, firm: principal.firm)
-              principal.reload
-              expect(principal.firm.advisers.any?).to eql(true)
-            end
-
-            it 'returns :onboarded' do
-              expect(principal.next_onboarding_action).to eql(:onboarded)
-            end
-          end
-        end
-
-        context 'and the firm primarily gives in-person advice' do
-          before :each do
-            principal.firm.in_person_advice_methods << create(:in_person_advice_method)
-            principal.reload
-          end
-
-          context 'and has at least one adviser' do
-            before :each do
-              create(:adviser, firm: principal.firm)
-              principal.reload
-            end
-
-            it 'returns :onboarded' do
-              expect(principal.next_onboarding_action).to eql(:onboarded)
-            end
-          end
-
-          context 'and does not have at least one adviser' do
-            before :each do
-              expect(principal.firm.advisers.any?).to eql(false)
-            end
-
-            it 'returns :complete_an_adviser' do
-              expect(principal.next_onboarding_action).to eql(:complete_an_adviser)
-            end
-          end
-        end
+        expect(principal.onboarded?).to be(false)
       end
     end
 
-    context 'when principal has a parent firm and a trading name' do
-      let(:parent_firm)   { principal.firm }
-      let!(:trading_name) { create(:firm_without_advisers, registered_name: 'cabbage', parent_id: parent_firm.id, fca_number: principal.fca_number) }
+    context 'when one firm is publishable' do
+      before do
+        FactoryGirl.create(:publishable_firm,
+                           fca_number: principal.fca_number,
+                           parent: principal.firm)
 
-      before :each do
-        parent_firm.update_column(:email_address, 'acme@example.com')
-        principal.reload
-        expect(Firm.where(fca_number: principal.fca_number).count).to eql(2)
+        expect(principal.main_firm_with_trading_names).to have(2).items
+        expect(principal.firm).not_to be_publishable
+        expect(principal.firm.trading_names.first).to be_publishable
       end
 
-      context 'and neither firm give in-person advice' do
-        before :each do
-          parent_firm.in_person_advice_methods.destroy_all
-          parent_firm.other_advice_methods << create(:other_advice_method)
-          trading_name.in_person_advice_methods.destroy_all
-          trading_name.other_advice_methods << create(:other_advice_method)
-          principal.reload
-        end
-
-        it_behaves_like 'at least one remote firm'
-      end
-
-      context 'if at least one firm gives remote advice' do
-        context 'parent firm gives remote advice' do
-          before :each do
-            parent_firm.in_person_advice_methods.destroy_all
-            parent_firm.other_advice_methods << create(:other_advice_method)
-            trading_name.in_person_advice_methods << create(:in_person_advice_method)
-            principal.reload
-          end
-
-          it_behaves_like 'at least one remote firm'
-        end
-
-        context 'trading name gives remote advice' do
-          before :each do
-            parent_firm.in_person_advice_methods << create(:in_person_advice_method)
-            trading_name.in_person_advice_methods.destroy_all
-            trading_name.other_advice_methods << create(:other_advice_method)
-            principal.reload
-          end
-
-          it_behaves_like 'at least one remote firm'
-        end
-      end
-
-      context 'and both firms give in-person advice' do
-        before :each do
-          parent_firm.in_person_advice_methods  << create(:in_person_advice_method)
-          trading_name.in_person_advice_methods << create(:in_person_advice_method)
-          principal.reload
-        end
-
-        context 'and neither firm has advisers' do
-          before :each do
-            expect(parent_firm.advisers.any?).to eql(false)
-            expect(trading_name.advisers.any?).to eql(false)
-          end
-
-          it 'returns :complete_an_adviser' do
-            expect(principal.next_onboarding_action).to eql(:complete_an_adviser)
-          end
-        end
-
-        context 'and parent firm has advisers' do
-          before :each do
-            create(:adviser, firm: parent_firm)
-            expect(trading_name.advisers.any?).to eql(false)
-          end
-
-          it 'returns :onboarded' do
-            expect(principal.next_onboarding_action).to eql(:onboarded)
-          end
-        end
-
-        context 'and trading name has advisers' do
-          before :each do
-            expect(parent_firm.advisers.any?).to eql(false)
-            create(:adviser, firm: trading_name)
-          end
-
-          it 'returns :onboarded' do
-            expect(principal.next_onboarding_action).to eql(:onboarded)
-          end
-        end
-
-        context 'and both firms have advisers' do
-          before :each do
-            create(:adviser, firm: parent_firm)
-            create(:adviser, firm: trading_name)
-          end
-
-          it 'returns :onboarded' do
-            expect(principal.next_onboarding_action).to eql(:onboarded)
-          end
-        end
+      it 'returns true' do
+        expect(principal.onboarded?).to be(true)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mas-rad_core
 version: !ruby/object:Gem::Version
-  version: 0.0.80
+  version: 0.0.81
 platform: ruby
 authors:
 - Ben Lovell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-18 00:00:00.000000000 Z
+date: 2015-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -414,7 +414,6 @@ files:
 - spec/spec_helper.rb
 - spec/support/field_length_validation_helpers.rb
 - spec/support/queue_spec_helper.rb
-- spec/support/shared_examples/at_least_one_remote_firm.rb
 - spec/support/shared_examples/friendly_named.rb
 - spec/support/shared_examples/geocodable_examples.rb
 - spec/support/shared_examples/reference_data.rb
@@ -541,7 +540,6 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/field_length_validation_helpers.rb
 - spec/support/queue_spec_helper.rb
-- spec/support/shared_examples/at_least_one_remote_firm.rb
 - spec/support/shared_examples/friendly_named.rb
 - spec/support/shared_examples/geocodable_examples.rb
 - spec/support/shared_examples/reference_data.rb

data/spec/support/shared_examples/at_least_one_remote_firm.rb

@@ -1,53 +0,0 @@
-##
-# Needs:
-#   principal    = instance of Principal with two firms attached (parent_firm and trading_name)
-#   parent_firm  = an instance of Firm with the same FCA Number as the Principal but no parent firm
-#   trading_name = an instance of Firm with the same FCA Number as the Principal and the parent_firm as the parent firm
-RSpec.shared_examples 'at least one remote firm' do
-  context 'and neither firm has advisers' do
-    before :each do
-      expect(parent_firm.advisers.any?).to eql(false)
-      expect(trading_name.advisers.any?).to eql(false)
-    end
-
-    it 'returns :onboarded' do
-      expect(principal.next_onboarding_action).to eql(:onboarded)
-    end
-  end
-
-  context 'and the parent firm has advisers' do
-    before :each do
-      create(:adviser, firm: parent_firm)
-      expect(trading_name.advisers.any?).to eql(false)
-      principal.reload
-    end
-
-    it 'returns :onboarded' do
-      expect(principal.next_onboarding_action).to eql(:onboarded)
-    end
-  end
-
-  context 'and the trading name has advisers' do
-    before :each do
-      expect(parent_firm.advisers.any?).to eql(false)
-      create(:adviser, firm: trading_name)
-      principal.reload
-    end
-
-    it 'returns :onboarded' do
-      expect(principal.next_onboarding_action).to eql(:onboarded)
-    end
-  end
-
-  context 'and both firms have advisers' do
-    before :each do
-      create(:adviser, firm: parent_firm)
-      create(:adviser, firm: trading_name)
-      principal.reload
-    end
-
-    it 'returns :onboarded' do
-      expect(principal.next_onboarding_action).to eql(:onboarded)
-    end
-  end
-end