Update join column names.

We changed the join FK column names so that's it.

Author: fspeirs

app/jobs/salesforce/role_sync_job.rb

@@ -6,8 +6,8 @@ class RoleSyncJob < SalesforceSyncJob
 
     FIELD_MAPPINGS = {
       affiliation_id__c: :id,
-      contact__c: :user_id,
-      editor__c: :school_id,
+      contact__r__pi_accounts_unique_id__c: :user_id,
+      editor__r__editoruuid__c: :school_id,
       roletype__c: :role,
       createdat__c: :created_at,
       updatedat__c: :updated_at

spec/jobs/salesforce/role_sync_job_spec.rb

@@ -5,53 +5,43 @@
 RSpec.describe Salesforce::RoleSyncJob do
   subject(:perform_job) { described_class.perform_now(role_id: role.id) }
 
-  context 'when the job has run' do
-    let(:role) { create(:role) }
-    let(:sf_role) { Salesforce::Role.find(role.id) }
+  let(:role) { create(:role) }
+  let(:sf_role) { instance_double(Salesforce::Role) }
+  let(:synced_attributes) { {} }
+
+  before do
+    allow(Salesforce::Role).to receive(:find_or_initialize_by).with(affiliation_id__c: role.id).and_return(sf_role)
+    allow(sf_role).to receive(:attributes=) { |attrs| synced_attributes.merge!(attrs) }
+    allow(sf_role).to receive(:save!)
+  end
 
+  context 'when the job has run' do
     before { perform_job }
 
-    it 'syncs the standard mappings' do
-      described_class::FIELD_MAPPINGS.each do |sf_field, field|
-        sf_value = sf_role.send(sf_field)
-        role_value = role.send(field)
-        column = Salesforce::Role.column_for_attribute(sf_field)
-
-        expected = if role_value.is_a?(String) && column.limit
-                     role_value.truncate(column.limit, omission: '…')
-                   elsif column.type == :string
-                     role_value.to_s
-                   else
-                     role_value
-                   end
-
-        expect(sf_value).to eq(expected), "Expected #{sf_field} to be #{expected.inspect} but was #{sf_value.inspect}"
+    it 'syncs all FIELD_MAPPINGS to the correct role values' do
+      described_class::FIELD_MAPPINGS.each do |sf_field, role_field|
+        expect(synced_attributes[sf_field]).to eq(role.send(role_field)),
+          "Expected #{sf_field} to equal role.#{role_field}"
       end
     end
+
+    it 'saves the Salesforce record' do
+      expect(sf_role).to have_received(:save!)
+    end
   end
 
   context 'when the Salesforce role fails to save' do
-    let(:role) { create(:role) }
-    let(:sf_role) { instance_double(Salesforce::Role) }
-
-    before do
-      allow(Salesforce::Role).to receive(:find_or_initialize_by).with(affiliation_id__c: role.id).and_return(sf_role)
-      allow(sf_role).to receive(:attributes=)
-      allow(sf_role).to receive(:save!).and_raise(ActiveRecord::RecordInvalid)
-    end
+    before { allow(sf_role).to receive(:save!).and_raise(ActiveRecord::RecordInvalid) }
 
     it 'raises an error' do
       expect { perform_job }.to raise_error ActiveRecord::RecordInvalid
     end
   end
 
   context 'when SALESFORCE_ENABLED is false' do
-    let(:role) { create(:role) }
-
     before { stub_const('ENV', ENV.to_h.merge('SALESFORCE_ENABLED' => 'false')) }
 
     it 'discards the job without syncing' do
-      allow(Salesforce::Role).to receive(:find_or_initialize_by)
       perform_job
       expect(Salesforce::Role).not_to have_received(:find_or_initialize_by)
     end