Merge branch 'main' into phone-number-optional

openstax · Jan 24, 2024 · f9cda12 · f9cda12
2 parents 8b93957 + 351c23c
commit f9cda12
Show file tree

Hide file tree

Showing 15 changed files with 11 additions and 396 deletions.
diff --git a/Gemfile b/Gemfile
@@ -182,10 +182,6 @@ gem 'oj_mimic_json'
 # CORS for local testing/dev
 gem 'rack-cors'
 
-# Salesforce streaming API
-gem 'cookiejar', git: 'https://github.com/MissionCapital/cookiejar.git'
-gem 'faye', '0.8.9'
-
 gem 'blazer'
 
 group :development, :test do

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,9 +1,3 @@
-GIT
-  remote: https://github.com/MissionCapital/cookiejar.git
-  revision: 68eecc8415338c6e9d636c4f7e4d2e13547e20a2
-  specs:
-    cookiejar (0.3.2)
-
 GIT
   remote: https://github.com/openstax/intl-tel-input-rails.git
   revision: 3a63a495822d90bc9ca93e9541ef252fd7a0b50b
@@ -252,14 +246,6 @@ GEM
       dry-equalizer (~> 0.2)
       dry-logic (~> 0.4.2)
       dry-types (~> 0.13.1)
-    em-http-request (1.1.7)
-      addressable (>= 2.3.4)
-      cookiejar (!= 0.3.1)
-      em-socksify (>= 0.3)
-      eventmachine (>= 1.0.3)
-      http_parser.rb (>= 0.6.0)
-    em-socksify (0.3.2)
-      eventmachine (>= 1.0.0.beta.4)
     em-websocket (0.5.1)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
@@ -286,16 +272,6 @@ GEM
       faraday (>= 0.8)
     faraday_middleware (1.0.0)
       faraday (~> 1.0)
-    faye (0.8.9)
-      cookiejar (>= 0.3.0)
-      em-http-request (>= 0.3.0)
-      eventmachine (>= 0.12.0)
-      faye-websocket (>= 0.4.0)
-      rack (>= 1.0.0)
-      yajl-ruby (>= 1.0.0)
-    faye-websocket (0.11.1)
-      eventmachine (>= 0.12.0)
-      websocket-driver (>= 0.5.1)
     ffi (1.15.4)
     fine_print (6.0.1)
       action_interceptor
@@ -761,7 +737,6 @@ GEM
     will_paginate (3.3.0)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    yajl-ruby (1.4.2)
 
 PLATFORMS
   ruby
@@ -790,7 +765,6 @@ DEPENDENCIES
   codecov
   coffee-rails (= 5.0.0)
   compass-rails (~> 3.1.0)
-  cookiejar!
   database_cleaner
   db-query-matchers
   debase
@@ -806,7 +780,6 @@ DEPENDENCIES
   fakeredis
   faraday (~> 1.0.0)
   faraday_middleware (~> 1.0.0)
-  faye (= 0.8.9)
   fine_print
   font-awesome-rails
   guard-livereload (~> 2.5)

diff --git a/app/models/push_topic.rb b/app/models/push_topic.rb
diff --git a/app/models/salesforce_streaming_replay.rb b/app/models/salesforce_streaming_replay.rb
diff --git a/app/services/contact_parser.rb b/app/services/contact_parser.rb
diff --git a/app/services/lead_parser.rb b/app/services/lead_parser.rb
diff --git a/app/services/salesforce_contact_replay_handler.rb b/app/services/salesforce_contact_replay_handler.rb
diff --git a/app/services/salesforce_subscriber.rb b/app/services/salesforce_subscriber.rb
diff --git a/db/migrate/20240123173834_drop_streaming_tables.rb b/db/migrate/20240123173834_drop_streaming_tables.rb
@@ -0,0 +1,10 @@
+class DropStreamingTables < ActiveRecord::Migration[5.2]
+  def up
+    drop_table :salesforce_streaming_replays
+    drop_table :push_topics
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end