Salesforce sync redesign

Gemfile

@@ -155,7 +155,8 @@ gem 'will_paginate'
 gem 'chronic'
 
 # Salesforce
-gem 'openstax_salesforce'
+gem 'restforce'
+gem 'openstax_active_force'
 
 # Allows 'ap' alternative to 'pp', used in a mailer
 gem 'awesome_print'

Gemfile.lock

@@ -518,10 +518,6 @@ GEM
       rails (>= 3.0)
     openstax_rescue_from (4.3.0)
       rails (>= 3.1, < 7.0)
-    openstax_salesforce (8.3.0)
-      openstax_active_force
-      rails (>= 5.0, < 7.0)
-      restforce
     openstax_transaction_isolation (2.0.0)
       activerecord (>= 6)
     openstax_transaction_retry (2.0.0)
@@ -876,11 +872,11 @@ DEPENDENCIES
   omniauth-google-oauth2
   omniauth-identity
   omniauth-twitter
+  openstax_active_force
   openstax_api
   openstax_healthcheck
   openstax_path_prefixer!
   openstax_rescue_from
-  openstax_salesforce
   openstax_transaction_isolation
   openstax_transaction_retry
   openstax_utilities
@@ -903,6 +899,7 @@ DEPENDENCIES
   recaptcha
   redis-rails
   representable
+  restforce
   rexml
   rspec-instafail
   rspec-rails

app/controllers/admin/salesforce_drift_findings_controller.rb

@@ -0,0 +1,17 @@
+module Admin
+  class SalesforceDriftFindingsController < BaseController
+    def index
+      scope = SalesforceDriftFinding.open.includes(:user).order(last_seen_at: :desc)
+      scope = scope.where(category: params[:category]) if params[:category].present?
+      scope = scope.where(user_id: params[:user_id])   if params[:user_id].present?
+      @findings = scope.limit(500)
+      @categories = SalesforceDriftFinding.open.distinct.pluck(:category).sort
+    end
+
+    def update
+      finding = SalesforceDriftFinding.find(params[:id])
+      finding.resolve!
+      redirect_to admin_salesforce_drift_findings_path, notice: 'Finding marked resolved.'
+    end
+  end
+end

app/controllers/admin/users_controller.rb

@@ -12,6 +12,14 @@ def js_search
 
     def index; end
 
+    def edit
+      @salesforce_timeline = SecurityLog
+                               .where(user_id: @user.id)
+                               .where("event_type LIKE 'salesforce_%'")
+                               .order(created_at: :asc)
+                               .limit(500)
+    end
+
     # Used by full console page
     def search
       security_log :users_searched_by_admin, search: params[:search]
@@ -108,7 +116,7 @@ def change_salesforce_contact
       end
 
       begin
-        contact = OpenStax::Salesforce::Remote::Contact.find(new_id)
+        contact = Salesforce::Records::Contact.find(new_id)
 
         if contact.present?
           # The contact really exists, so save its ID to the User

app/models/salesforce_drift_finding.rb

@@ -0,0 +1,43 @@
+class SalesforceDriftFinding < ApplicationRecord
+  belongs_to :user, optional: true
+
+  validates :category, presence: true
+  validates :first_seen_at, presence: true
+  validates :last_seen_at, presence: true
+
+  scope :open,         -> { where(resolved_at: nil) }
+  scope :resolved,     -> { where.not(resolved_at: nil) }
+  scope :for_category, ->(c) { where(category: c) }
+
+  # Upsert an open finding: if a matching open finding already exists, bump
+  # its last_seen_at (and details, when provided); otherwise create one.
+  def self.upsert_finding!(category:, user: nil, record_type: nil, record_id: nil, details: {})
+    existing = open.find_by(
+      user_id: user&.id,
+      category: category,
+      salesforce_record_type: record_type,
+      salesforce_record_id: record_id
+    )
+
+    if existing
+      attrs = { last_seen_at: Time.current }
+      attrs[:details] = details if details.present?
+      existing.update!(attrs)
+      existing
+    else
+      create!(
+        user: user,
+        category: category,
+        salesforce_record_type: record_type,
+        salesforce_record_id: record_id,
+        details: details,
+        first_seen_at: Time.current,
+        last_seen_at: Time.current
+      )
+    end
+  end
+
+  def resolve!
+    update!(resolved_at: Time.current)
+  end
+end

app/models/security_log.rb

@@ -113,6 +113,29 @@ class SecurityLog < ApplicationRecord
     user_already_has_contact_not_creating_lead
     creating_new_salesforce_lead
     salesforce_lead_save_failed
+    salesforce_lookup_started
+    salesforce_lookup_matched_by_stored_id
+    salesforce_lookup_matched_by_uuid
+    salesforce_lookup_matched_by_email
+    salesforce_lookup_stored_id_disowned
+    salesforce_lookup_email_collision
+    salesforce_upsert_lead_begin
+    salesforce_upsert_lead_saved
+    salesforce_upsert_lead_save_failed
+    salesforce_upsert_lead_skipped_user_has_contact
+    salesforce_lead_id_persist_retry
+    salesforce_lead_id_persist_failed
+    salesforce_stale_contact_id_cleared
+    salesforce_contact_skipped_merged_or_deleted
+    salesforce_contact_id_swapped
+    salesforce_contact_id_conflict
+    salesforce_user_school_not_cached
+    salesforce_reconcile_user_ok
+    salesforce_reconcile_contact_id_cleared
+    salesforce_reconcile_followed_merge
+    salesforce_reconcile_attached_from_conversion
+    salesforce_link_restored_by_reconcile
+    salesforce_contact_id_orphaned
   ]
 
   json_serialize :event_data, Hash

app/models/user.rb

@@ -162,11 +162,11 @@ class User < ApplicationRecord
   attribute :is_not_gdpr_location, :boolean, default: nil
 
   def lead
-    OpenStax::Salesforce::Remote::Lead.find_by(email: best_email_address_for_salesforce)
+    Salesforce::Records::Lead.find_by(email: best_email_address_for_salesforce)
   end
 
   def contact
-    OpenStax::Salesforce::Remote::Contact.find(salesforce_contact_id)
+    Salesforce::Records::Contact.find(salesforce_contact_id)
   end
 
   def most_accurate_school_name