bridge_cache 0.3.13 → 0.3.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7807b753535e358a21d211239f0c1537571db6b37f7b19a6d2aa743555c6679b
-  data.tar.gz: 41e76d02062ddc156b46da6bb510eb5b9284d96e6768a14c4a807e9df357b24a
+  metadata.gz: 4e0ef250eb9395352435e1651e2e2f64c9233ec7446dde9d93525c0cf26b7542
+  data.tar.gz: a7b54fef68c133c6a6012ccbf7ab7df18ecc73dadca293695456250dcd10c644
 SHA512:
-  metadata.gz: 69ae469063b9800572c05a0506e75d42b51d38a006359623d672c8cb4cf54088ef9d74139c681ca0cf9bb25efdcc1fa1ccd8b4e2f64aa0088b48c44eeaaa6c29
-  data.tar.gz: ddf4529b3865166164e3be8cdebd0a27a499f39a18163ea9a1c6cfb17f61b5c51b2c362d7bbfcdd12cae19551cc18e9e39a0190ddec02dddbcff6bc152b7ea81
+  metadata.gz: '05824d1406cec5c682f470d4cb4d3710ecff169a95add65899e345379b5f72317ed645548e04e4f276da1b72124c07ed40d3eb8fc6eb76c5490ecd5a31942008'
+  data.tar.gz: 166dc215b08233ff207146b5a6d9b831de4e5f6747c4a94a84278f4c561ea740c4ebb11af4b5e8b9a839f21cee36b52e9184f892af33373a77cdf863f8c33775

data/app/lib/bridge_cache/jobs/import_check.rb

@@ -5,17 +5,24 @@ module BridgeCache::Jobs
 
     ATTEMPTS_THRESHOLD = 30
 
-    def perform(account_settings, attempts, chain = [])
-      account_settings = account_settings.with_indifferent_access
-      remote_data = BridgeBlueprint::RemoteData.new(account_settings[:url], account_settings[:api_key], account_settings[:api_secret])
+    def remote_data
+      @remote_data ||= BridgeBlueprint::RemoteData.new(@account_settings[:url], @account_settings[:api_key], @account_settings[:api_secret])
+    end
+
+    def perform(account_settings, attempts, chain = [], retries = 0)
+      @account_settings = account_settings.with_indifferent_access
       if attempts > ATTEMPTS_THRESHOLD
         Rails.logger.fatal("Bridge data dump failed to download after #{(ATTEMPTS_THRESHOLD * 30) / 60} minutes")
       elsif remote_data.status == BridgeBlueprint::Constants::STATUS_COMPLETE
-        BridgeCache::Jobs::ImportData.set(queue: queue_name).perform_later(account_settings, chain)
+        BridgeCache::Jobs::ImportData.set(queue: queue_name).perform_later(@account_settings, chain)
       elsif remote_data.status == BridgeBlueprint::Constants::STATUS_PENDING
-        BridgeCache::Jobs::ImportCheck.set(queue: queue_name, wait: 30.seconds).perform_later(account_settings, attempts + 1, chain)
+        BridgeCache::Jobs::ImportCheck.set(queue: queue_name, wait: 30.seconds).perform_later(@account_settings, attempts + 1, chain)
       elsif remote_data.status == BridgeBlueprint::Constants::STATUS_FAILED || remote_data.status == BridgeBlueprint::Constants::STATUS_NOT_FOUND
-        raise 'Bridge data dump download failed'
+        if retries < 1
+          raise 'Bridge data dump download failed'
+        else
+          BridgeCache::Jobs::ImportStart.set(queue: queue_name).perform_later(@account_settings, chain, retries - 1)
+        end
       end
     end
   end

data/app/lib/bridge_cache/jobs/import_data.rb

@@ -10,7 +10,8 @@ module BridgeCache::Jobs
         path = "#{dir}/data_dump"
         remote_data.store_file(path)
         import = BridgeBlueprint::DataDump.new(path)
-        BridgeCache.resolved_models(account_settings[:is_subaccount]).each do |model|
+        models = account_settings[:models] || BridgeCache.resolved_models(account_settings[:is_subaccount])
+        models.each do |model|
           ids = []
           ids << BridgeCache::Plugins::CSVDump.bulk_import(import, model)
           BridgeCache::Jobs::CleanupJob.set(queue: queue_name).perform_later(model, ids)

data/app/lib/bridge_cache/jobs/import_start.rb

@@ -2,7 +2,7 @@ module BridgeCache::Jobs
   class ImportStart < ActiveJob::Base
     queue_as :default
 
-    def perform(account_settings, chain = [])
+    def perform(account_settings, chain = [], retries = 0)
       data = BridgeBlueprint::RemoteData.new(account_settings[:url], account_settings[:api_key], account_settings[:api_secret])
       data.start_data_report
       BridgeCache::Jobs::ImportCheck
@@ -10,7 +10,8 @@ module BridgeCache::Jobs
         .perform_later(
           account_settings,
           0,
-          chain
+          chain,
+          retries
         )
     end
   end

data/db/migrate/20180925210056_add_bridge_timestamps_to_bridge_models.rb

@@ -1,5 +1,6 @@
 class AddBridgeTimestampsToBridgeModels < ActiveRecord::Migration[5.1]
   def change
+    return unless BridgeCache.use_internal_database
     add_column :bridge_cache_affiliated_sub_accounts, :bridge_created_at, :datetime
     add_column :bridge_cache_course_templates, :bridge_created_at, :datetime
     add_column :bridge_cache_custom_fields, :bridge_created_at, :datetime

data/db/migrate/20200717142423_add_hris_id_to_bridge_cache_users.rb

@@ -0,0 +1,6 @@
+class AddHrisIdToBridgeCacheUsers < ActiveRecord::Migration[5.1]
+  def change
+    return unless BridgeCache.use_internal_database
+    add_column :bridge_cache_users, :hris_id, :string
+  end
+end

data/db/migrate/20201102153622_change_external_course_id_to_string.rb

@@ -0,0 +1,5 @@
+class ChangeExternalCourseIdToString < ActiveRecord::Migration[5.1]
+  def change
+    change_column :bridge_cache_course_templates, :external_course_id, :string
+  end
+end

data/lib/bridge_cache/version.rb

@@ -1,3 +1,3 @@
 module BridgeCache
-  VERSION = '0.3.13'.freeze
+  VERSION = '0.3.19'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bridge_cache
 version: !ruby/object:Gem::Version
-  version: 0.3.13
+  version: 0.3.19
 platform: ruby
 authors:
 - jshaffer
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-08-05 00:00:00.000000000 Z
+date: 2020-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-import
@@ -56,20 +56,14 @@ dependencies:
   name: rein
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.4'
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.4'
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.4.0
 - !ruby/object:Gem::Dependency
@@ -267,6 +261,8 @@ files:
 - db/migrate/20180801162929_create_bridge_cache_hosts.rb
 - db/migrate/20180925210056_add_bridge_timestamps_to_bridge_models.rb
 - db/migrate/20190801163930_create_user_course_visits.rb
+- db/migrate/20200717142423_add_hris_id_to_bridge_cache_users.rb
+- db/migrate/20201102153622_change_external_course_id_to_string.rb
 - lib/bridge_cache.rb
 - lib/bridge_cache/engine.rb
 - lib/bridge_cache/version.rb
@@ -275,7 +271,7 @@ homepage: https://www.getbridge.com
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -291,7 +287,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: A mountable engine for bridge data storage
 test_files: []