mas-rad_core 0.0.79 → 0.0.80

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 521b22a5badf25b6ce05404aa5c17be7bbbd4dae
-  data.tar.gz: b6e4c36d334ba2ee984007c5703e3557ecd7884d
+  metadata.gz: 439f2ddeb557336ca2337cfbf574b802cb70d4bb
+  data.tar.gz: e3bbba73a760d498ffaa5ac78cc9fb7a41bd2e3a
 SHA512:
-  metadata.gz: 6eccaa43a5482ef5619be1f43d8eae4a568b9b5e7d5de29948b3e1f2fbe3f491500c77aa9b03663432b5e21eea0253dc668a20d43cfcc4b162b62d0d42027e36
-  data.tar.gz: ef809c8c824fe1af9e6d1ae52599bc3f78f20c3e4fff63a9fea97acf9585e6728c74be9362ca88b0f70f8d563728563149cab36d671f223fe7ed8d0c727328cf
+  metadata.gz: c65f5254b56b84ef07cc0482a0fc63a5ae55a6e7fbcc63fcb11af08ae64a946e045c174cb59d851787fb31e9af6757dd33f160e4c1a4e1da9a885b49f303f7c1
+  data.tar.gz: 0cbbb811bb47b2e00fec9b4d7292ba386c31cfba517c80974636d0bbd7180351e7df8113aabfb8af46d1f33ff8be8dc0a908da301fd8fea01b38a10b21c27440

data/app/models/adviser.rb

@@ -31,9 +31,9 @@ class Adviser < ActiveRecord::Base
 
   validate :match_reference_number
 
+  after_save :flag_changes_for_after_commit
   after_commit :geocode_and_reindex_firm
-  after_commit :reindex_old_firm, if: :firm_id_changed?
-
+  after_commit :reindex_old_firm
   scope :sorted_by_name, -> { order(:name) }
 
   def self.on_firms_with_fca_number(fca_number)
@@ -63,6 +63,13 @@ class Adviser < ActiveRecord::Base
 
   private
 
+  # All record of what changed is gone by the time we get to the after_commit
+  # hooks. So we cannot use #firm_id_changed? at that point. To work around
+  # this we flag any important changes here to be actioned later.
+  def flag_changes_for_after_commit
+    @old_firm_id = firm_id_change.first if firm_id_changed?
+  end
+
   def geocode_and_reindex_firm
     if destroyed?
       firm.geocode_and_reindex
@@ -72,7 +79,8 @@ class Adviser < ActiveRecord::Base
   end
 
   def reindex_old_firm
-    IndexFirmJob.perform_later(Firm.find(attribute_was(:firm_id)))
+    IndexFirmJob.perform_later(Firm.find(@old_firm_id)) if @old_firm_id.present?
+    @old_firm_id = nil
   end
 
   def upcase_postcode

data/app/models/firm.rb

@@ -109,7 +109,7 @@ class Firm < ActiveRecord::Base
   validates :investment_sizes,
     length: { minimum: 1 }
 
-  after_save :publish_to_elastic_search
+  after_commit :publish_to_elastic_search, unless: :destroyed?
   after_commit :delete_elastic_search_entry, if: :destroyed?
 
   def publish_to_elastic_search
@@ -195,7 +195,11 @@ class Firm < ActiveRecord::Base
   end
 
   def publishable?
-    main_office.present?
+    valid? && main_office.present? && !missing_advisers?
+  end
+
+  def missing_advisers?
+    (primary_advice_method == :local) && advisers.empty?
   end
 
   private

data/lib/mas/rad_core/version.rb

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

data/spec/factories/adviser.rb

@@ -12,7 +12,7 @@ FactoryGirl.define do
     travel_distance '650'
     latitude  { Faker::Address.latitude.to_f.round(6) }
     longitude { Faker::Address.longitude.to_f.round(6) }
-    firm
+    firm factory: :firm_without_advisers
 
     after(:build) do |a, evaluator|
       if a.reference_number? && evaluator.create_linked_lookup_advisor

data/spec/factories/firm.rb

@@ -1,7 +1,7 @@
 FactoryGirl.define do
   sequence(:registered_name) { |n| "Financial Advice #{n} Ltd." }
 
-  factory :firm, aliases: [:publishable_firm] do
+  factory :firm, aliases: [:publishable_firm, :onboarded_firm] do
     fca_number
     registered_name
     email_address { Faker::Internet.email }
@@ -34,24 +34,27 @@ FactoryGirl.define do
       firm.reload
     end
 
-    factory :onboarded_firm, traits: [:with_advisers] do
+    transient do
       advisers_count 1
     end
 
-    factory :not_onboarded_firm, traits: [:invalid]
+    after(:create) do |firm, evaluator|
+      create_list(:adviser, evaluator.advisers_count, firm: firm)
+    end
 
     factory :trading_name, aliases: [:subsidiary] do
       parent factory: Firm
     end
 
     factory :firm_with_advisers, traits: [:with_advisers]
+    factory :firm_without_advisers, traits: [:without_advisers]
     factory :firm_with_offices, traits: [:with_offices]
     factory :firm_with_principal, traits: [:with_principal]
     factory :firm_with_no_business_split, traits: [:with_no_business_split]
     factory :firm_with_remote_advice, traits: [:with_remote_advice]
     factory :firm_with_subsidiaries, traits: [:with_trading_names]
     factory :firm_with_trading_names, traits: [:with_trading_names]
-    factory :invalid_firm, traits: [:invalid]
+    factory :invalid_firm, traits: [:invalid], aliases: [:not_onboarded_firm]
 
     trait :invalid do
       email_address nil
@@ -67,13 +70,11 @@ FactoryGirl.define do
     end
 
     trait :with_advisers do
-      transient do
-        advisers_count 3
-      end
+      advisers_count 3
+    end
 
-      after(:create) do |firm, evaluator|
-        create_list(:adviser, evaluator.advisers_count, firm: firm)
-      end
+    trait :without_advisers do
+      advisers_count 0
     end
 
     trait :with_principal do

data/spec/models/adviser_spec.rb

@@ -154,6 +154,23 @@ RSpec.describe Adviser do
     end
   end
 
+  describe 'after_save :flag_changes_for_after_commit' do
+    let(:original_firm) { create(:firm) }
+    let(:receiving_firm) { create(:firm) }
+    subject { create(:adviser, firm: original_firm) }
+
+    before do
+      subject.firm = receiving_firm
+      subject.save!
+    end
+
+    context 'when the firm has changed' do
+      it 'stores the original firm id so it can be reindexed in an after_commit hook' do
+        expect(subject.old_firm_id).to eq(original_firm.id)
+      end
+    end
+  end
+
   describe 'after_commit :reindex_old_firm' do
     let(:original_firm) { create(:firm) }
     let(:receiving_firm) { create(:firm) }
@@ -165,19 +182,19 @@ RSpec.describe Adviser do
     end
 
     context 'when the firm has changed' do
-      it 'triggers reindexing of the original firm the first time' do
+      it 'triggers reindexing of the adviser and new firm' do
+        expect(GeocodeAdviserJob).to receive(:perform_later).with(subject)
         subject.firm = receiving_firm
         save_with_commit_callback(subject)
-        expect(queue_contains_a_job_for(IndexFirmJob)).to be_truthy
       end
 
-      it 'does not trigger reindexing of the original firm thereafter' do
+      it 'triggers reindexing of the original firm (once)' do
+        expect(IndexFirmJob).to receive(:perform_later).once().with(original_firm)
         subject.firm = receiving_firm
         save_with_commit_callback(subject)
 
-        clear_job_queue
+        # Trigger a second time
         subject.run_callbacks(:commit)
-        expect(queue_contains_a_job_for(IndexFirmJob)).to be_falsey
       end
     end
   end
@@ -229,10 +246,12 @@ RSpec.describe Adviser do
 
   describe '#on_firms_with_fca_number' do
     it 'returns advisers on firm and its trading names' do
-      firm = FactoryGirl.create(:firm)
-      trading_name = FactoryGirl.create(:trading_name, fca_number: firm.fca_number)
-      advisers = [FactoryGirl.create(:adviser, firm_id: firm.id),
-                  FactoryGirl.create(:adviser, firm_id: trading_name.id)]
+      firm = FactoryGirl.create(:firm_with_advisers, advisers_count: 1)
+      trading_name = FactoryGirl.create(:trading_name,
+                                        :with_advisers,
+                                        advisers_count: 1,
+                                        fca_number: firm.fca_number)
+      advisers = [firm.advisers.first, trading_name.advisers.first]
 
       returned_advisers = Adviser.on_firms_with_fca_number(firm.fca_number)
       expect(returned_advisers.length).to eq(2)

data/spec/models/firm_factory_spec.rb

@@ -23,13 +23,13 @@ RSpec.describe 'Firm factory' do
     specify 'associations' do
       expect(subject.principal).not_to be_present
       expect(subject).to have(1).offices
-      expect(subject).to have(:no).advisers
+      expect(subject).to have(1).advisers
       expect(subject).to have(:no).trading_names
     end
   end
 
-  describe 'factory :onboarded_firm' do
-    let(:factory) { :onboarded_firm }
+  describe 'factory :firm_with_advisers' do
+    let(:factory) { :firm_with_advisers }
 
     specify 'expected status' do
       expect(subject).to be_persisted
@@ -42,37 +42,18 @@ RSpec.describe 'Firm factory' do
     specify 'associations' do
       expect(subject.principal).not_to be_present
       expect(subject).to have(1).offices
-      expect(subject).to have(1).advisers
-      expect(subject).to have(:no).trading_names
-    end
-  end
-
-  describe 'factory :not_onboarded_firm' do
-    let(:factory) { :not_onboarded_firm }
-
-    specify 'expected status' do
-      expect(subject).not_to be_persisted
-      expect(subject).not_to be_valid
-      expect(subject).not_to be_publishable
-      expect(subject).not_to be_trading_name
-      expect(subject.primary_advice_method).to be(:local)
-    end
-
-    specify 'associations' do
-      expect(subject.principal).not_to be_present
-      expect(subject).to have(:no).offices
-      expect(subject).to have(:no).advisers
+      expect(subject).to have(3).advisers
       expect(subject).to have(:no).trading_names
     end
   end
 
-  describe 'factory :firm_with_advisers' do
-    let(:factory) { :firm_with_advisers }
+  describe 'factory :firm_without_advisers' do
+    let(:factory) { :firm_without_advisers }
 
     specify 'expected status' do
       expect(subject).to be_persisted
       expect(subject).to be_valid
-      expect(subject).to be_publishable
+      expect(subject).not_to be_publishable
       expect(subject).not_to be_trading_name
       expect(subject.primary_advice_method).to be(:local)
     end
@@ -80,7 +61,7 @@ RSpec.describe 'Firm factory' do
     specify 'associations' do
       expect(subject.principal).not_to be_present
       expect(subject).to have(1).offices
-      expect(subject).to have(3).advisers
+      expect(subject).to have(0).advisers
       expect(subject).to have(:no).trading_names
     end
   end
@@ -99,7 +80,7 @@ RSpec.describe 'Firm factory' do
     specify 'associations' do
       expect(subject.principal).not_to be_present
       expect(subject).to have(3).offices
-      expect(subject).to have(:no).advisers
+      expect(subject).to have(1).advisers
       expect(subject).to have(:no).trading_names
     end
   end
@@ -118,7 +99,7 @@ RSpec.describe 'Firm factory' do
     specify 'associations' do
       expect(subject.principal).not_to be_present
       expect(subject).to have(1).offices
-      expect(subject).to have(:no).advisers
+      expect(subject).to have(1).advisers
 
       expect(subject).to have(3).trading_names
       expect(subject.trading_names).to all(have_attributes(fca_number: subject.fca_number))
@@ -146,7 +127,7 @@ RSpec.describe 'Firm factory' do
       # expect(subject.principal.firm).to eq(subject)
 
       expect(subject).to have(1).offices
-      expect(subject).to have(:no).advisers
+      expect(subject).to have(1).advisers
       expect(subject).to have(:no).trading_names
     end
   end
@@ -165,7 +146,7 @@ RSpec.describe 'Firm factory' do
     specify 'associations' do
       expect(subject.principal).not_to be_present
       expect(subject).to have(1).offices
-      expect(subject).to have(:no).advisers
+      expect(subject).to have(1).advisers
       expect(subject).to have(:no).trading_names
     end
   end

data/spec/models/firm_spec.rb

@@ -117,16 +117,65 @@ RSpec.describe Firm do
   end
 
   describe '#publishable?' do
-    subject { create(:firm, offices_count: offices_count) }
+    let(:firm) { FactoryGirl.create(:firm) }
+    subject { firm.publishable? }
+
+    context 'when the firm is valid, has a main office and is not missing advisers' do
+      it { is_expected.to be_truthy }
+    end
+
+    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
+      end
+
+      it { is_expected.to be_falsey }
+    end
 
     context 'when the firm has no main office' do
-      let(:offices_count) { 0 }
-      it { expect(subject).not_to be_publishable }
+      let(:firm) { FactoryGirl.create(:firm, offices_count: 0) }
+
+      it { is_expected.to be_falsey }
     end
 
-    context 'when the firm has a main office' do
-      let(:offices_count) { 1 }
-      it { expect(subject).to be_publishable }
+    context 'when the firm is missing advisers' do
+      before { allow(firm).to receive(:missing_advisers?).and_return(true) }
+
+      it { is_expected.to be_falsey }
+    end
+  end
+
+  describe '#missing_advisers?' do
+    let(:factory) { :firm }
+    subject { FactoryGirl.create(factory, advisers_count: advisers_count).missing_advisers? }
+
+    context 'when the firm offers face-to-face advice' do
+      context 'when the firm has advisers' do
+        let(:advisers_count) { 1 }
+        it { is_expected.to be_falsey }
+      end
+
+      context 'when the firm has no advisers' do
+        let(:advisers_count) { 0 }
+        it { is_expected.to be_truthy }
+      end
+    end
+
+    context 'when the firm offers remote advice' do
+      let(:factory) { :firm_with_remote_advice }
+
+      context 'when the firm has advisers' do
+        let(:advisers_count) { 1 }
+        it { is_expected.to be_falsey }
+      end
+
+      context 'when the firm has no advisers' do
+        let(:advisers_count) { 0 }
+        it { is_expected.to be_falsey }
+      end
     end
   end
 
@@ -395,6 +444,7 @@ RSpec.describe Firm do
       it 'the firm is published' do
         allow(IndexFirmJob).to receive(:perform_later)
         firm = create :firm
+        firm.run_callbacks(:commit)
         expect(IndexFirmJob).to have_received(:perform_later).with(firm)
       end
     end
@@ -404,6 +454,7 @@ RSpec.describe Firm do
         firm = create :firm
         allow(IndexFirmJob).to receive(:perform_later)
         firm.update_attributes(email_address: 'bill@example.com')
+        firm.run_callbacks(:commit)
         expect(IndexFirmJob).to have_received(:perform_later).with(firm)
       end
     end
@@ -476,8 +527,9 @@ RSpec.describe Firm do
           firm.run_callbacks(:commit)
         end
 
-        it 'does not trigger geocoding of the firm' do
+        it 'does not trigger geocoding/reindexing of the firm' do
           expect(GeocodeFirmJob).not_to receive(:perform_later)
+          expect(IndexFirmJob).not_to receive(:perform_later)
           adviser = firm.advisers.first
           office = firm.offices.first
           firm.destroy

data/spec/models/principal_spec.rb

@@ -325,7 +325,7 @@ RSpec.describe Principal do
 
     context 'when principal has a parent firm and a trading name' do
       let(:parent_firm)   { principal.firm }
-      let!(:trading_name) { create(:firm, registered_name: 'cabbage', parent_id: parent_firm.id, fca_number: principal.fca_number) }
+      let!(:trading_name) { create(:firm_without_advisers, registered_name: 'cabbage', parent_id: parent_firm.id, fca_number: principal.fca_number) }
 
       before :each do
         parent_firm.update_column(:email_address, 'acme@example.com')

data/spec/serializers/firm_serializer_spec.rb

@@ -1,6 +1,6 @@
 RSpec.describe FirmSerializer do
   let(:firm) do
-    create(:firm, principal: create(:principal)) { |f| create(:adviser, firm: f) }
+    FactoryGirl.create(:firm_with_principal)
   end
 
   describe 'the serialized json' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mas-rad_core
 version: !ruby/object:Gem::Version
-  version: 0.0.79
+  version: 0.0.80
 platform: ruby
 authors:
 - Ben Lovell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-09 00:00:00.000000000 Z
+date: 2015-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails