app/models/openstax/accounts/account.rb in openstax_accounts-9.0.5 vs app/models/openstax/accounts/account.rb in openstax_accounts-9.1.0

@@ -10,26 +10,18 @@
       :full_name,
       :title,
       :self_reported_role,
       :faculty_status,
       :school_type,
-      :school_location,
       :salesforce_contact_id,
       :support_identifier,
-      :is_test,
-      :is_kip
+      :is_test
     ]
 
     attr_accessor :syncing
 
-    enum faculty_status: [
-      :no_faculty_info,
-      :pending_faculty,
-      :confirmed_faculty,
-      :rejected_faculty
-    ]
-
+    enum faculty_status: [:no_faculty_info, :pending_faculty, :confirmed_faculty, :rejected_faculty]
     enum role: [
       :unknown_role,
       :student,
       :instructor,
       :administrator,
@@ -37,26 +29,12 @@
       :designer,
       :other,
       :adjunct,
       :homeschool
     ]
+    enum school_type: [:unknown_school_type, :other_school_type, :college]
 
-    enum school_type: [
-      :unknown_school_type,
-      :other_school_type,
-      :college,
-      :high_school,
-      :k12_school,
-      :home_school
-    ]
-
-    enum school_location: [
-      :unknown_school_location,
-      :domestic_school,
-      :foreign_school
-    ]
-
-    validates :faculty_status, :role, :school_type, :school_location, presence: true
+    validates :faculty_status, :role, :school_type, presence: true
 
     validates :uuid, presence: true, uniqueness: true
     validates :support_identifier, uniqueness: { allow_nil: true }
 
     before_update :update_openstax_accounts, if: :should_send_updates_to_accounts?