From f1ce4816e415f8e38e8d86d160e56cbae66977fa Mon Sep 17 00:00:00 2001 From: Michael Volo Date: Wed, 7 May 2025 01:31:27 -0500 Subject: [PATCH 1/6] remove unused Contact fields for clean up --- lib/openstax/salesforce/remote/contact.rb | 6 ------ lib/openstax/salesforce/version.rb | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/lib/openstax/salesforce/remote/contact.rb b/lib/openstax/salesforce/remote/contact.rb index 288ae79..7387fd0 100644 --- a/lib/openstax/salesforce/remote/contact.rb +++ b/lib/openstax/salesforce/remote/contact.rb @@ -13,21 +13,15 @@ class Contact < ActiveForce::SObject field :first_name, from: 'FirstName' field :last_name, from: 'LastName' field :email, from: 'Email' - field :email_alt, from: 'Email_alt__c' - field :faculty_confirmed_date, from: 'Faculty_Confirmed_Date__c', as: :datetime field :faculty_verified, from: 'FV_Status__c' field :last_modified_at, from: 'LastModifiedDate' field :school_id, from: 'AccountId' field :school_type, from: 'School_Type__c' - field :send_faculty_verification_to, from: 'SendFacultyVerificationTo__c' field :all_emails, from: 'All_Emails__c' field :adoption_status, from: 'Adoption_Status__c' - field :grant_tutor_access, from: 'Grant_Tutor_Access__c', as: :boolean - field :title_1_school, from: 'Title_1_school__c', as: :boolean field :accounts_uuid, from: 'Accounts_UUID__c' field :lead_source, from: 'LeadSource' field :signup_date, from: 'Signup_Date__c', as: :datetime - field :renewal_eligible, from: 'Renewal_Eligible__c', as: :boolean field :assignable_interest, from: 'Assignable_Interest__c' field :assignable_adoption_date, from: 'Assignable_Adoption_Date__c', as: :datetime diff --git a/lib/openstax/salesforce/version.rb b/lib/openstax/salesforce/version.rb index dc3b74b..8708ea6 100644 --- a/lib/openstax/salesforce/version.rb +++ b/lib/openstax/salesforce/version.rb @@ -1,5 +1,5 @@ module OpenStax module Salesforce - VERSION = '8.1.0' + VERSION = '8.2.0' end end From c51d5dff4a34417bf3856dc42caee1eeb1eafe67 Mon Sep 17 00:00:00 2001 From: Michael Volo Date: Wed, 7 May 2025 12:01:58 -0500 Subject: [PATCH 2/6] update specs --- spec/factories/account_contact_relation.rb | 0 spec/factories/contact.rb | 5 ----- 2 files changed, 5 deletions(-) delete mode 100644 spec/factories/account_contact_relation.rb diff --git a/spec/factories/account_contact_relation.rb b/spec/factories/account_contact_relation.rb deleted file mode 100644 index e69de29..0000000 diff --git a/spec/factories/contact.rb b/spec/factories/contact.rb index b56bed4..0027b89 100644 --- a/spec/factories/contact.rb +++ b/spec/factories/contact.rb @@ -6,8 +6,6 @@ first_name { Faker::Name.first_name } last_name { Faker::Name.last_name } email { Faker::Internet.email } - email_alt { Faker::Internet.email } - faculty_confirmed_date { Faker::Date.between(from: '2016-09-23', to: '2019-09-25') } last_modified_at { Faker::Date.between(from: '2016-09-23', to: '2020-03-25') } faculty_verified { %w[pending_faculty confirmed_faculty rejected_faculty].sample } school_type do @@ -17,14 +15,11 @@ 'Technical/Community College (2)', 'Career School/For-Profit (2)'].sample end - send_faculty_verification_to { Faker::Internet.email } all_emails { Faker::Internet.email } adoption_status { ['Confirmed Adoption Won', 'Confirmed Adoption Recommend', 'High Interest In Using', 'Not Using'].sample } - grant_tutor_access { Faker::Boolean.boolean } accounts_uuid { Faker::Internet.uuid } lead_source { 'Account Creation' } signup_date { DateTime.now } - renewal_eligible { Faker::Boolean.boolean } assignable_interest { ['Interested', 'Demo', 'Fully Integrated'].sample } assignable_adoption_date { Faker::Date.backward } end From c632a424114c98cc493889bb560174fabc146f07 Mon Sep 17 00:00:00 2001 From: Michael Volo Date: Wed, 7 May 2025 12:08:19 -0500 Subject: [PATCH 3/6] put it back --- spec/factories/account_contact_relation.rb | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 spec/factories/account_contact_relation.rb diff --git a/spec/factories/account_contact_relation.rb b/spec/factories/account_contact_relation.rb new file mode 100644 index 0000000..e69de29 From a23bbf797506d86e475954313442b314caa30993 Mon Sep 17 00:00:00 2001 From: Michael Volo Date: Mon, 12 May 2025 11:43:25 -0500 Subject: [PATCH 4/6] pin concurrent-ruby --- openstax_salesforce.gemspec | 1 + 1 file changed, 1 insertion(+) diff --git a/openstax_salesforce.gemspec b/openstax_salesforce.gemspec index f3011bd..4cfc82c 100644 --- a/openstax_salesforce.gemspec +++ b/openstax_salesforce.gemspec @@ -21,6 +21,7 @@ Gem::Specification.new do |s| s.add_dependency 'openstax_active_force' s.add_development_dependency 'sqlite3', '< 2' + s.add_development_dependency 'concurrent-ruby', '1.3.4' s.add_development_dependency 'rspec-rails' s.add_development_dependency 'sprockets' s.add_development_dependency 'factory_bot_rails' From c0782f8789d9108e834f07a01e6ab2dca8f3be52 Mon Sep 17 00:00:00 2001 From: Michael Volo Date: Mon, 12 May 2025 11:44:09 -0500 Subject: [PATCH 5/6] version bump --- lib/openstax/salesforce/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/openstax/salesforce/version.rb b/lib/openstax/salesforce/version.rb index 8708ea6..0349b9f 100644 --- a/lib/openstax/salesforce/version.rb +++ b/lib/openstax/salesforce/version.rb @@ -1,5 +1,5 @@ module OpenStax module Salesforce - VERSION = '8.2.0' + VERSION = '8.3.0' end end From 91afc1e27f0204104c7a5aad1817c59eff7bf1d9 Mon Sep 17 00:00:00 2001 From: Michael Volo Date: Mon, 12 May 2025 11:45:40 -0500 Subject: [PATCH 6/6] already updated version --- lib/openstax/salesforce/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/openstax/salesforce/version.rb b/lib/openstax/salesforce/version.rb index 0349b9f..8708ea6 100644 --- a/lib/openstax/salesforce/version.rb +++ b/lib/openstax/salesforce/version.rb @@ -1,5 +1,5 @@ module OpenStax module Salesforce - VERSION = '8.3.0' + VERSION = '8.2.0' end end