openstax_salesforce 7.0.0 → 7.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bdbcb2ca4eabdf7962da5946b5e6769d6b8642d30daa503265028255a693f158
-  data.tar.gz: e0572de4235bca3f219a5a2b650ffc83f8627ef43f438a2ebfa042ed8c169fbf
+  metadata.gz: 583953eef38f7cb4d3cc7c69d4186c8ce70c40d0a1d4cfe2deffb4532a30f3db
+  data.tar.gz: 7aa95b1f58e8b39dc4b2b5adfff5fb59a6d4b8f3acc5c11aaead9d6931707c9a
 SHA512:
-  metadata.gz: fa20d717b00457b204d9933eba0258d2fc404b2d204fc303f1772aecaf631acf5bd2b75c68defa4657b292734d7c3f9f66f82fb01d8a5d6c5d32add42051daa8
-  data.tar.gz: fd40c79d4e641a78d514b6cc76ca65d401d16b96fd36d33444cc3a437a08ef099f75dd3701ab12775e346c4599f279a57fce68f07616092889728469dc341788
+  metadata.gz: 8be9b66e18b856f8e381e23ba2d60f45a94920bc1a736b9da5996423ca4069ba6b9c8f38370d97cf1272395119096d2f865f3df285b337fff557331932261360
+  data.tar.gz: 2ac6a4b94054d6f8346da25022710890a92d28ab8515cd9213be0719caad7b6a8f84807fd2682debade62f62061461e0b136fb4c86c25b7a3e01b6881253a443

data/Rakefile

@@ -21,7 +21,15 @@ Bundler::GemHelper.install_tasks
 require 'rspec/core'
 require 'rspec/core/rake_task'
 
-desc 'Run all specs in spec directory (excluding plugin specs)'
-RSpec::Core::RakeTask.new :spec
+if defined?(RSpec)
+  desc 'Run factory specs.'
+  RSpec::Core::RakeTask.new(:factory_specs) do |t|
+    t.pattern = './spec/factories_spec.rb'
+  end
 
+  desc 'Run all specs in spec directory (excluding plugin specs)'
+  RSpec::Core::RakeTask.new :spec
+end
+
+task spec: :factory_specs
 task default: :spec

data/lib/openstax/salesforce/active_force.rb

@@ -1,12 +1,13 @@
-# Monkey patching
+# frozen_string_literal: true
 
+# Monkey patching
 module ActiveForce
   class << self
     # Use a lazy setting of the client so that migrations etc are in place
     # to allow the Client to be successfully instantiated.
     alias_method :original_sfdc_client, :sfdc_client
     def sfdc_client
-      if !original_sfdc_client.is_a?(OpenStax::Salesforce::Client)
+      unless original_sfdc_client.is_a?(OpenStax::Salesforce::Client)
         self.sfdc_client = OpenStax::Salesforce::Client.new
       end
       original_sfdc_client

data/lib/openstax/salesforce/client.rb

@@ -1,19 +1,22 @@
-module OpenStax::Salesforce
-  class Client < ::Restforce::Data::Client
-    def initialize
-      configuration = OpenStax::Salesforce.configuration
+module OpenStax
+  module Salesforce
+    # OpenStax Salesforce Client connection for Salesforce, inherits from Restforce Client
+    class Client < ::Restforce::Data::Client
+      def initialize
+        configuration = OpenStax::Salesforce.configuration
 
-      configuration.validate!
+        configuration.validate!
 
-      super(
-        username:       configuration.username,
-        password:       configuration.password,
-        security_token: configuration.security_token,
-        client_id:      configuration.consumer_key,
-        client_secret:  configuration.consumer_secret,
-        api_version:    configuration.api_version,
-        host:           configuration.login_domain
-      )
+        super(
+          username: configuration.username,
+          password: configuration.password,
+          security_token: configuration.security_token,
+          client_id: configuration.consumer_key,
+          client_secret: configuration.consumer_secret,
+          api_version: configuration.api_version,
+          host: configuration.login_domain
+        )
+      end
     end
   end
 end

data/lib/openstax/salesforce/remote/account_contact_relation.rb

@@ -1,15 +1,22 @@
-module OpenStax::Salesforce::Remote
-  class AccountContactRelation < ActiveForce::SObject
-    belongs_to :school, foreign_key: :school_id,
-                        model: OpenStax::Salesforce::Remote::School
+# frozen_string_literal: true
 
-    belongs_to :contact, foreign_key: :contact_id,
-                         model: OpenStax::Salesforce::Remote::Contact
+module OpenStax
+  module Salesforce
+    module Remote
+      # School/Contact relation object from Salesforce
+      class AccountContactRelation < ActiveForce::SObject
+        belongs_to :school, foreign_key: :school_id,
+                            model: OpenStax::Salesforce::Remote::School
 
-    field :contact_id, from: 'ContactId'
-    field :primary, from: 'IsDirect', as: :boolean
-    field :school_id, from: 'AccountId'
+        belongs_to :contact, foreign_key: :contact_id,
+                             model: OpenStax::Salesforce::Remote::Contact
 
-    self.table_name = 'AccountContactRelation'
+        field :contact_id, from: 'ContactId'
+        field :primary, from: 'IsDirect', as: :boolean
+        field :school_id, from: 'AccountId'
+
+        self.table_name = 'AccountContactRelation'
+      end
+    end
   end
 end

data/lib/openstax/salesforce/remote/book.rb

@@ -1,8 +1,15 @@
-module OpenStax::Salesforce::Remote
-  class Book < ActiveForce::SObject
-    field :name,                 from: "Name"
-    field :annualization_number, from: "Annualization_number__c", as: :decimal
+# frozen_string_literal: true
 
-    self.table_name = 'Book__c'
+module OpenStax
+  module Salesforce
+    module Remote
+      # Book object from Salesforce
+      class Book < ActiveForce::SObject
+        field :name,                 from: 'Name'
+        field :annualization_number, from: 'Annualization_number__c', as: :decimal
+
+        self.table_name = 'Book__c'
+      end
+    end
   end
 end

data/lib/openstax/salesforce/remote/campaign.rb

@@ -1,8 +1,15 @@
-module OpenStax::Salesforce::Remote
-  class Campaign < ActiveForce::SObject
-    field :is_active,                   from: "IsActive",              as: :boolean
-    field :name,                        from: "Name"
+# frozen_string_literal: true
 
-    self.table_name = 'Campaign'
+module OpenStax
+  module Salesforce
+    module Remote
+      # Campaign object from Salesforce
+      class Campaign < ActiveForce::SObject
+        field :is_active,                   from: 'IsActive', as: :boolean
+        field :name,                        from: 'Name'
+
+        self.table_name = 'Campaign'
+      end
+    end
   end
 end

data/lib/openstax/salesforce/remote/campaign_member.rb

@@ -1,39 +1,46 @@
-module OpenStax::Salesforce::Remote
-  class CampaignMember < ActiveForce::SObject
-    field :campaign_id,                                       from: "CampaignId"
-    field :contact_id,                                        from: "ContactId"
-    field :accounts_uuid,                                     from: "accounts_uuid__c"
-
-    field :pardot_reported_contact_id,                        from: "pardot_reported_contact_id__c"
-    field :pardot_reported_piaid,                             from: "pardot_reported_piaid__c"
-    field :pardot_reported_picid,                             from: "pardot_reported_picid__c"
-
-    field :first_teacher_contact_id,                          from: "first_teacher_contact_id__c"
-
-    field :arrived_marketing_page_from_pardot_at,             from: "arrived_marketing_page_from_pardot_at__c",    as: :datetime
-    field :arrived_marketing_page_not_from_pardot_at,         from: "arrived_marketing_page_not_from_pardot_a__c", as: :datetime
-    field :first_arrived_my_courses_at,                       from: "first_arrived_my_courses_at__c",              as: :datetime
-    field :preview_created_at,                                from: "preview_created_at__c",                       as: :datetime
-    field :real_course_created_at,                            from: "real_course_created_at__c",                   as: :datetime
-    field :like_preview_ask_later_count,                      from: "like_preview_ask_later_count__c",             as: :int
-    field :like_preview_yes_at,                               from: "like_preview_yes_at__c",                      as: :datetime
-    field :latest_adoption_decision,                          from: "latest_adoption_decision__c",                 as: :picklist
-    field :latest_adoption_decision_at,                       from: "latest_adoption_decision_at__c",              as: :datetime
-
-    field :estimated_enrollment, from: "Estimated_Enrollment__c", as: :int
-    field :ignored_osas, from: "Ignored_OSAs__c", as: :boolean
-
-    field :percent_enrolled, from: "Percent_Enrolled__c", as: :percent
-    field :school_type, from: "School_Type__c"
-    field :students_registered, from: "Students_Registered__c", as: :int
-    field :students_reported_by_teacher, from: "Students_Reported_by_Teacher__c", as: :int
-    field :students_with_work, from: "Students_with_work__c", as: :int
-    field :sync_field, from: "SyncField__c", as: :datetime
-
-    belongs_to :contact, model: OpenStax::Salesforce::Remote::Contact
-    belongs_to :first_teacher_contact, model: OpenStax::Salesforce::Remote::Contact
-    belongs_to :pardot_reported_contact, model: OpenStax::Salesforce::Remote::Contact
-
-    self.table_name = 'CampaignMember'
+# frozen_string_literal: true
+
+module OpenStax
+  module Salesforce
+    module Remote
+      # CampaignMember object from Salesforce
+      class CampaignMember < ActiveForce::SObject
+        field :campaign_id,                                       from: 'CampaignId'
+        field :contact_id,                                        from: 'ContactId'
+        field :accounts_uuid,                                     from: 'accounts_uuid__c'
+
+        field :pardot_reported_contact_id,                        from: 'pardot_reported_contact_id__c'
+        field :pardot_reported_piaid,                             from: 'pardot_reported_piaid__c'
+        field :pardot_reported_picid,                             from: 'pardot_reported_picid__c'
+
+        field :first_teacher_contact_id,                          from: 'first_teacher_contact_id__c'
+
+        field :arrived_marketing_page_from_pardot_at,             from: 'arrived_marketing_page_from_pardot_at__c',    as: :datetime
+        field :arrived_marketing_page_not_from_pardot_at,         from: 'arrived_marketing_page_not_from_pardot_a__c', as: :datetime
+        field :first_arrived_my_courses_at,                       from: 'first_arrived_my_courses_at__c',              as: :datetime
+        field :preview_created_at,                                from: 'preview_created_at__c',                       as: :datetime
+        field :real_course_created_at,                            from: 'real_course_created_at__c',                   as: :datetime
+        field :like_preview_ask_later_count,                      from: 'like_preview_ask_later_count__c',             as: :int
+        field :like_preview_yes_at,                               from: 'like_preview_yes_at__c',                      as: :datetime
+        field :latest_adoption_decision,                          from: 'latest_adoption_decision__c',                 as: :picklist
+        field :latest_adoption_decision_at,                       from: 'latest_adoption_decision_at__c',              as: :datetime
+
+        field :estimated_enrollment, from: 'Estimated_Enrollment__c', as: :int
+        field :ignored_osas, from: 'Ignored_OSAs__c', as: :boolean
+
+        field :percent_enrolled, from: 'Percent_Enrolled__c', as: :percent
+        field :school_type, from: 'School_Type__c'
+        field :students_registered, from: 'Students_Registered__c', as: :int
+        field :students_reported_by_teacher, from: 'Students_Reported_by_Teacher__c', as: :int
+        field :students_with_work, from: 'Students_with_work__c', as: :int
+        field :sync_field, from: 'SyncField__c', as: :datetime
+
+        belongs_to :contact, model: OpenStax::Salesforce::Remote::Contact
+        belongs_to :first_teacher_contact, model: OpenStax::Salesforce::Remote::Contact
+        belongs_to :pardot_reported_contact, model: OpenStax::Salesforce::Remote::Contact
+
+        self.table_name = 'CampaignMember'
+      end
+    end
   end
 end

data/lib/openstax/salesforce/remote/contact.rb

@@ -1,29 +1,36 @@
-module OpenStax::Salesforce::Remote
-  class Contact < ActiveForce::SObject
-    belongs_to :school, foreign_key: :school_id,
-                        model: OpenStax::Salesforce::Remote::School
+# frozen_string_literal: true
 
-    field :id,                           from: 'Id'
-    field :name,                         from: 'Name'
-    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 :confirmed_emails,             from: 'Confirmed_Emails__c'
-    field :adoption_status,              from: 'Adoption_Status__c'
-    field :grant_tutor_access,           from: 'Grant_Tutor_Access__c', as: :boolean
-    field :b_r_i_marketing,              from: 'BRI_Marketing__c', as: :boolean # Bill of Rights Institute (book) marketing
-    field :title_1_school,               from: 'Title_1_school__c', as: :boolean
-    field :accounts_uuid,                from: 'Accounts_UUID__c'
-    field :lead_source,                  from: 'LeadSource'
+module OpenStax
+  module Salesforce
+    module Remote
+      # Contact object from Salesforce
+      class Contact < ActiveForce::SObject
+        belongs_to :school, foreign_key: :school_id,
+                            model: OpenStax::Salesforce::Remote::School
 
-    self.table_name = 'Contact'
+        field :id,                           from: 'Id'
+        field :name,                         from: 'Name'
+        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 :confirmed_emails,             from: 'Confirmed_Emails__c'
+        field :adoption_status,              from: 'Adoption_Status__c'
+        field :grant_tutor_access,           from: 'Grant_Tutor_Access__c', as: :boolean
+        field :b_r_i_marketing,              from: 'BRI_Marketing__c', as: :boolean # Bill of Rights Institute (book) marketing
+        field :title_1_school,               from: 'Title_1_school__c', as: :boolean
+        field :accounts_uuid,                from: 'Accounts_UUID__c'
+        field :lead_source,                  from: 'LeadSource'
+
+        self.table_name = 'Contact'
+      end
+    end
   end
 end

data/lib/openstax/salesforce/remote/lead.rb

@@ -1,73 +1,80 @@
-module OpenStax::Salesforce::Remote
-  class Lead < ActiveForce::SObject
+# frozen_string_literal: true
 
-    VALID_VERIFICATION_STATUSES = %w[
-      pending_faculty
-      confirmed_faculty
-      rejected_faculty
-    ].freeze
+module OpenStax
+  module Salesforce
+    module Remote
+      # Lead object from Salesforce
+      class Lead < ActiveForce::SObject
 
-    VALID_WHO_CHOOSES_BOOKS = %w[instructor committee coordinator].freeze
+        VALID_VERIFICATION_STATUSES = %w[
+          pending_faculty
+          confirmed_faculty
+          rejected_faculty
+        ].freeze
 
-    field :id,                  from: 'Id'
-    field :name,                from: 'Name'
-    field :first_name,          from: 'FirstName'
-    field :last_name,           from: 'LastName'
-    field :salutation,          from: 'Salutation'
-    field :title,               from: 'Title'
-    field :subject,             from: 'Subject__c'
-    field :school,              from: 'Company'
-    field :city,                from: 'City'
-    field :state,               from: 'State'
-    field :state_code,          from: 'StateCode'
-    field :country,             from: 'Country'
-    field :phone,               from: 'Phone'
-    field :website,             from: 'Website'
-    field :status,              from: 'Status'
-    field :email,               from: 'Email'
-    field :source,              from: 'LeadSource'
-    field :newsletter,          from: 'Newsletter__c'
-    field :newsletter_opt_in,   from: 'Newsletter_Opt_In__c'
-    field :adoption_status,     from: 'Adoption_Status__c'
-    field :adoption_json,       from: 'AdoptionsJSON__c'
-    field :num_students,        from: 'Number_of_Students__c'
-    field :os_accounts_id,      from: 'Accounts_ID__c'
-    field :accounts_uuid,       from: 'Accounts_UUID__c'
-    field :application_source,  from: 'Application_Source__c'
-    field :role,                from: 'Role__c'
-    field :position,            from: 'Position__c'
-    field :who_chooses_books,   from: 'who_chooses_books__c'
-    field :verification_status, from: 'FV_Status__c'
-    field :b_r_i_marketing,     from: 'BRI_Marketing__c', as: :boolean # Bill of Rights Institute (book) marketing
-    field :title_1_school,      from: 'Title_1_school__c', as: :boolean
-    field :sheerid_school_name, from: 'SheerID_School_Name__c'
-    field :instant_conversion,  from: 'Instant_Conversion__c', as: :boolean
+        VALID_WHO_CHOOSES_BOOKS = %w[instructor committee coordinator].freeze
 
-    # These 2 fields both hold the Account (School) ID, but have different data types and uses in SF
-    field :account_id,          from: 'Account_ID__c'
-    field :school_id,           from: 'School__c'
+        field :id,                  from: 'Id'
+        field :name,                from: 'Name'
+        field :first_name,          from: 'FirstName'
+        field :last_name,           from: 'LastName'
+        field :salutation,          from: 'Salutation'
+        field :title,               from: 'Title'
+        field :subject,             from: 'Subject__c'
+        field :school,              from: 'Company'
+        field :city,                from: 'City'
+        field :state,               from: 'State'
+        field :state_code,          from: 'StateCode'
+        field :country,             from: 'Country'
+        field :phone,               from: 'Phone'
+        field :website,             from: 'Website'
+        field :status,              from: 'Status'
+        field :email,               from: 'Email'
+        field :source,              from: 'LeadSource'
+        field :newsletter,          from: 'Newsletter__c'
+        field :newsletter_opt_in,   from: 'Newsletter_Opt_In__c'
+        field :adoption_status,     from: 'Adoption_Status__c'
+        field :adoption_json,       from: 'AdoptionsJSON__c'
+        field :num_students,        from: 'Number_of_Students__c'
+        field :os_accounts_id,      from: 'Accounts_ID__c'
+        field :accounts_uuid,       from: 'Accounts_UUID__c'
+        field :application_source,  from: 'Application_Source__c'
+        field :role,                from: 'Role__c'
+        field :position,            from: 'Position__c'
+        field :who_chooses_books,   from: 'who_chooses_books__c'
+        field :verification_status, from: 'FV_Status__c'
+        field :b_r_i_marketing,     from: 'BRI_Marketing__c', as: :boolean # Bill of Rights Institute (book) marketing
+        field :title_1_school,      from: 'Title_1_school__c', as: :boolean
+        field :sheerid_school_name, from: 'SheerID_School_Name__c'
+        field :instant_conversion,  from: 'Instant_Conversion__c', as: :boolean
 
-    validates(:last_name, presence: true)
-    validates(:school, presence: true)
-    validates(
-      :verification_status,
-      allow_blank: true,
-      inclusion: {
-        in: VALID_VERIFICATION_STATUSES,
-        message: "must be either #{VALID_VERIFICATION_STATUSES.join(' or ')}"
-      }
-    )
+        # These 2 fields both hold the Account (School) ID, but have different data types and uses in SF
+        field :account_id,          from: 'Account_ID__c'
+        field :school_id,           from: 'School__c'
 
-    validates(
-      :who_chooses_books,
-      allow_blank: true,
-      inclusion: {
-        in: VALID_WHO_CHOOSES_BOOKS,
-        message: "must be either #{VALID_WHO_CHOOSES_BOOKS.join(' or ')}"
-      }
-    )
+        validates(:last_name, presence: true)
+        validates(:school, presence: true)
+        validates(
+          :verification_status,
+          allow_blank: true,
+          inclusion: {
+            in: VALID_VERIFICATION_STATUSES,
+            message: "must be either #{VALID_VERIFICATION_STATUSES.join(' or ')}"
+          }
+        )
 
-    self.table_name = 'Lead'
+        validates(
+          :who_chooses_books,
+          allow_blank: true,
+          inclusion: {
+            in: VALID_WHO_CHOOSES_BOOKS,
+            message: "must be either #{VALID_WHO_CHOOSES_BOOKS.join(' or ')}"
+          }
+        )
 
+        self.table_name = 'Lead'
+
+      end
+    end
   end
 end

data/lib/openstax/salesforce/remote/opportunity.rb

@@ -1,31 +1,70 @@
-module OpenStax::Salesforce::Remote
-  class Opportunity < ActiveForce::SObject
-    field :term_year,                    from: "TermYear__c"
-    field :book_name,                    from: "Book_Text__c"
-    field :contact_id,                   from: "Contact__c"
-    field :renewal_status,               from: "Renewal_Status__c"
-    field :close_date,                   from: "CloseDate", as: :datetime
-    field :stage_name,                   from: "StageName"
-    field :type,                         from: "Type"
-    field :number_of_students,           from: "Students__c"
-    field :student_number_status,        from: "Student_No_Status__c"
-    field :time_period,                  from: "Time_Period__c"
-    field :class_start_date,             from: "Class_Start_Date__c",  as: :datetime
-    field :renewal_class_start_date,     from: "CSDInput__c",  as: :datetime
-    field :school_id,                    from: "AccountId"
-    field :book_id,                      from: "Book__c"
-    field :contact_id,                   from: "Contact__c"
-    field :os_accounts_id,               from: "OS_Accounts_ID__c"
-    field :accounts_uuid,                from: 'Accounts_UUID__c'
-    field :name,                         from: "Name"
-    field :record_type_name,             from: "Opportunity_Record_Type_Name__c"
-    field :record_type_id,               from: "RecordTypeId"
-
-
-    self.table_name = 'Opportunity'
-
-    def term_year_object
-      @term_year_object ||= OpenStax::Salesforce::Remote::TermYear.from_string(term_year)
+# frozen_string_literal: true
+
+module OpenStax
+  module Salesforce
+    module Remote
+      # Opportunity object from Salesforce
+      class Opportunity < ActiveForce::SObject
+
+        belongs_to :record_type, foreign_key: :record_type_id, model: OpenStax::Salesforce::Remote::RecordType
+        belongs_to :book, foreign_key: :book_id, model: OpenStax::Salesforce::Remote::Book
+        belongs_to :school, foreign_key: :school_id, model: OpenStax::Salesforce::Remote::School
+
+        VALID_STAGE_NAMES = [
+          'Confirmed Adoption Won',
+          'Closed Lost'
+        ].freeze
+
+        VALID_TYPES = [
+          'New Business',
+          'Renewal',
+          'Renewal - Verified'
+        ].freeze
+
+        field :term_year,                    from: 'TermYear__c'
+        field :book_name,                    from: 'Book_Text__c'
+        field :contact_id,                   from: 'Contact__c'
+        field :close_date,                   from: 'CloseDate', as: :datetime
+        field :stage_name,                   from: 'StageName'
+        field :type,                         from: 'Type'
+        field :number_of_students,           from: 'Students__c'
+        field :student_number_status,        from: 'Student_No_Status__c'
+        field :time_period,                  from: 'Time_Period__c'
+        field :class_start_date,             from: 'Class_Start_Date__c',  as: :datetime
+        field :renewal_class_start_date,     from: 'CSDInput__c',  as: :datetime
+        field :school_id,                    from: 'AccountId'
+        field :book_id,                      from: 'Book__c'
+        field :contact_id,                   from: 'Contact__c'
+        field :os_accounts_id,               from: 'OS_Accounts_ID__c'
+        field :accounts_uuid,                from: 'Accounts_UUID__c'
+        field :name,                         from: 'Name'
+        field :record_type_name,             from: 'Opportunity_Record_Type_Name__c'
+        field :record_type_id,               from: 'RecordTypeId'
+
+        validates(
+          :stage_name,
+          allow_blank: false,
+          inclusion: {
+            in: VALID_STAGE_NAMES,
+            message: "must be either #{VALID_STAGE_NAMES.join(' or ')}"
+          }
+        )
+
+        validates(
+          :type,
+          allow_blank: false,
+          inclusion: {
+            in: VALID_TYPES,
+            message: "must be either #{VALID_TYPES.join(' or ')}"
+          }
+        )
+
+        self.table_name = 'Opportunity'
+
+        def term_year_object
+          @term_year_object ||= OpenStax::Salesforce::Remote::TermYear.from_string(term_year)
+        end
+      end
     end
   end
 end

data/lib/openstax/salesforce/remote/school.rb

@@ -1,21 +1,28 @@
-module OpenStax::Salesforce::Remote
-  class School < ActiveForce::SObject
-    field :id,                      from: 'Id'
-    field :name,                    from: 'Name'
-    field :city,                    from: 'BillingCity'
-    field :state,                   from: 'BillingState'
-    field :country,                 from: 'BillingCountry'
-    field :type,                    from: 'Type'
-    field :school_location,         from: 'School_Location__c'
-    field :sheerid_school_name,     from: 'SheerID_School_Name__c'
-    field :is_kip,                  from: 'K_I_P__c',        as: :boolean
-    field :is_child_of_kip,         from: 'child_of_kip__c', as: :boolean
-    field :total_school_enrollment, from: 'Total_School_Enrollment__c', as: :integer
+# frozen_string_literal: true
 
-    self.table_name = 'Account'
+module OpenStax
+  module Salesforce
+    module Remote
+      # School object from Salesforce
+      class School < ActiveForce::SObject
+        field :id,                      from: 'Id'
+        field :name,                    from: 'Name'
+        field :city,                    from: 'BillingCity'
+        field :state,                   from: 'BillingState'
+        field :country,                 from: 'BillingCountry'
+        field :type,                    from: 'Type'
+        field :school_location,         from: 'School_Location__c'
+        field :sheerid_school_name,     from: 'SheerID_School_Name__c'
+        field :is_kip,                  from: 'K_I_P__c',        as: :boolean
+        field :is_child_of_kip,         from: 'child_of_kip__c', as: :boolean
+        field :total_school_enrollment, from: 'Total_School_Enrollment__c', as: :integer
 
-    def self.query
-      super.where("RecordType.Name = 'School'")
+        self.table_name = 'Account'
+
+        def self.query
+          super.where("RecordType.Name = 'School'")
+        end
+      end
     end
   end
 end

data/lib/openstax/salesforce/remote/tutor_course_period.rb

@@ -1,32 +1,32 @@
 module OpenStax::Salesforce::Remote
   class TutorCoursePeriod < ActiveForce::SObject
-    field :num_teachers,              from: "Active_Teachers__c", as: :int
-    field :base_year,                 from: "Base_Year__c", as: :int
-    field :book_name,                 from: "Book_Name__c"
-    field :contact_id,                from: "Contact__c"
-    field :course_code,               from: "Course_Code__c"
-    field :course_name,               from: "Course_Name__c"
-    field :course_start_date,         from: "Course_Start_Date__c", as: :date
-    field :created_at,                from: "E_Created_Date__c", as: :datetime
-    field :teacher_email,             from: "Email__c"
-    field :error,                     from: "Error__c"
-    field :estimated_enrollment,      from: "Estimated_Enrollment__c", as: :int
-    field :course_id,                 from: "External_ID__c"
-    field :course_uuid,               from: "External_UUID__c"
-    field :latest_adoption_decision,  from: "Latest_Adoption_Decision__c"
-    field :does_cost,                 from: "Paid_Course__c", as: :boolean
-    field :is_research,               from: "Research_Project__c", as: :boolean
-    field :num_periods,               from: "Sections__c", as: :int
-    field :status,                    from: "Status__c", as: :picklist
-    field :num_students_comped,       from: "Students_Comped__c", as: :int
-    field :num_students_dropped,      from: "Students_Dropped__c", as: :int
-    field :num_students_paid,         from: "Students_Paid__c", as: :int
-    field :num_students_refunded,     from: "Students_Refunded__c", as: :int
-    field :num_students,              from: "Students_Using__c", as: :int
-    field :num_students_with_work,    from: "Students_With_Work__c", as: :int
-    field :period_uuid,               from: "Period_UUID__c"
-    field :term,                      from: "Term__c"
-    field :is_pilot,                  from: "Tutor_Pilot__c", as: :boolean
+    field :num_teachers,              from: 'Active_Teachers__c', as: :int
+    field :base_year,                 from: 'Base_Year__c', as: :int
+    field :book_name,                 from: 'Book_Name__c'
+    field :contact_id,                from: 'Contact__c'
+    field :course_code,               from: 'Course_Code__c'
+    field :course_name,               from: 'Course_Name__c'
+    field :course_start_date,         from: 'Course_Start_Date__c', as: :date
+    field :created_at,                from: 'E_Created_Date__c', as: :datetime
+    field :teacher_email,             from: 'Email__c'
+    field :error,                     from: 'Error__c'
+    field :estimated_enrollment,      from: 'Estimated_Enrollment__c', as: :int
+    field :course_id,                 from: 'External_ID__c'
+    field :course_uuid,               from: 'External_UUID__c'
+    field :latest_adoption_decision,  from: 'Latest_Adoption_Decision__c'
+    field :does_cost,                 from: 'Paid_Course__c', as: :boolean
+    field :is_research,               from: 'Research_Project__c', as: :boolean
+    field :num_periods,               from: 'Sections__c', as: :int
+    field :status,                    from: 'Status__c', as: :picklist
+    field :num_students_comped,       from: 'Students_Comped__c', as: :int
+    field :num_students_dropped,      from: 'Students_Dropped__c', as: :int
+    field :num_students_paid,         from: 'Students_Paid__c', as: :int
+    field :num_students_refunded,     from: 'Students_Refunded__c', as: :int
+    field :num_students,              from: 'Students_Using__c', as: :int
+    field :num_students_with_work,    from: 'Students_With_Work__c', as: :int
+    field :period_uuid,               from: 'Period_UUID__c'
+    field :term,                      from: 'Term__c'
+    field :is_pilot,                  from: 'Tutor_Pilot__c', as: :boolean
 
     self.table_name = 'Tutor_Course__c'
 
@@ -41,9 +41,9 @@ module OpenStax::Salesforce::Remote
       self.num_teachers = 0
     end
 
-    STATUS_APPROVED = "Approved"
-    STATUS_ARCHIVED = "ArchivedPeriod"
-    STATUS_DROPPED  = "Dropped"
-    STATUS_PREVIEW = "Preview"
+    STATUS_APPROVED = 'Approved'.freeze
+    STATUS_ARCHIVED = 'ArchivedPeriod'.freeze
+    STATUS_DROPPED  = 'Dropped'.freeze
+    STATUS_PREVIEW = 'Preview'.freeze
   end
 end

data/lib/openstax/salesforce/spec_helpers.rb

@@ -72,36 +72,30 @@ module OpenStax::Salesforce::SpecHelpers
       @unique_token = nil
     end
 
-    def new_contact(first_name: nil, last_name: nil, school_name: "JP University",
-                    email: nil, email_alt: nil, faculty_verified: nil, school_type: nil)
+    def new_contact(first_name: nil, last_name: nil, school_name: "RSpec University",
+                    email: nil, faculty_verified: nil)
       ensure_schools_exist([school_name])
 
       Contact.new(
         first_name: first_name || Faker::Name.first_name,
-        last_name: last_name!(last_name),
+        last_name: last_name || Faker::Name.last_name,
         school_id: school_id(school_name),
-        email: email,
-        email_alt: email_alt,
-        faculty_verified: faculty_verified,
-        school_type: school_type
+        email: email || Faker::Internet.safe_email,
+        faculty_verified: faculty_verified
       ).tap do |contact|
-        unless contact.save
-          raise "Could not save SF contact: #{contact.errors}"
-        end
+        raise "Could not save SF contact: #{contact.errors}" unless contact.save
       end
     end
 
-    def new_lead(email:, status: nil, last_name: nil, source: nil, school_name: "JP University")
+    def new_lead(email:, status: nil, last_name: nil, source: nil)
       Lead.new(
         email: email,
         status: status,
         last_name: last_name!(last_name),
-        school: school_name,
+        school: 'RSpec University',
         source: source
       ).tap do |lead|
-        unless lead.save
-          raise "Could not save SF lead: #{lead.errors}"
-        end
+        raise "Could not save SF lead: #{lead.errors}" unless lead.save
       end
     end
 
@@ -109,9 +103,7 @@ module OpenStax::Salesforce::SpecHelpers
       Campaign.new(
         name: name
       ).tap do |campaign|
-        unless campaign.save
-          raise "Could not save SF Campaign: #{campaign.errors}"
-        end
+        raise "Could not save SF Campaign: #{campaign.errors}" unless campaign.save
       end
     end
 
@@ -120,9 +112,7 @@ module OpenStax::Salesforce::SpecHelpers
         contact_id: contact_id,
         campaign_id: campaign_id
       ).tap do |campaign_member|
-        unless campaign_member.save
-          raise "Could not save SF Campaign Member: #{campaign_member.errors}"
-        end
+        raise "Could not save SF Campaign Member: #{campaign_member.errors}" unless campaign_member.save
       end
     end
 

data/lib/openstax/salesforce/version.rb

@@ -1,5 +1,5 @@
 module OpenStax
   module Salesforce
-    VERSION = '7.0.0'
+    VERSION = '7.1.0'
   end
 end

data/lib/openstax_salesforce.rb

@@ -7,6 +7,7 @@ require "openstax/salesforce/engine"
 require "openstax/salesforce/client"
 
 require "openstax/salesforce/remote/term_year"
+require "openstax/salesforce/remote/record_type"
 require "openstax/salesforce/remote/book"
 require "openstax/salesforce/remote/school"
 require "openstax/salesforce/remote/opportunity"
@@ -16,7 +17,6 @@ require "openstax/salesforce/remote/lead"
 require "openstax/salesforce/remote/campaign"
 require "openstax/salesforce/remote/campaign_member"
 require "openstax/salesforce/remote/account_contact_relation"
-require "openstax/salesforce/remote/record_type"
 
 module OpenStax
   module Salesforce

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: openstax_salesforce
 version: !ruby/object:Gem::Version
-  version: 7.0.0
+  version: 7.1.0
 platform: ruby
 authors:
 - JP Slavinsky
 - Dante Soares
+- Michael Harrison
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-16 00:00:00.000000000 Z
+date: 2022-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -131,7 +132,7 @@ dependencies:
         version: '0'
 description: Interface gem for accessing OpenStax's Salesforce instance
 email:
-- jps@kindlinglabs.com
+- mwharrison@rice.edu
 executables: []
 extensions: []
 extra_rdoc_files: []