bridge_cache 0.3.24 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ddd897b93770631f634da81ca375db229eb2a17b0c3cfb45e3b68f32e548870b
-  data.tar.gz: 5247e9bce54f7fd1c6842ef0e51e8de92978e639f68f7deb7566f5d7c3fe3351
+  metadata.gz: 20d625d32aaeeebb6b342e4797c023cd2ad15ae290aad3bb509271f893840e32
+  data.tar.gz: c4d02bed9510bf321be492d54586dbfe6b8d959482036fd513abd70d1b24f609
 SHA512:
-  metadata.gz: af51f021bf447472bc3e99e14f87bf214ec586391e0a64a5a139cf100b6d054ebbf4739330b2e9e6800dc09385dd536fb92ed965977b3678a22373fb435c2ca0
-  data.tar.gz: 8b56835e0e756d0404cee46f3245f01b0f00a9503b82d0780887135ccaa3e7fb33f80e6fb87d54d20deb77c8bb2c1e4cb100bcc49a2a04d4eb01399b1c348767
+  metadata.gz: 361198f2e25755295076b94dafa8c5ee662127f65a3bc2d851874ed2745efac1a692220be8a6273cbaa3ca28a1f899008b031cf9cbb935dd82b6fb81d608e84a
+  data.tar.gz: b1f1e5ae985a23381d593511244e7168952dadffc99d5e50893f4e1197dcc9f52d502bce3392dd091c2da6bc431767bcf4953035714ad057c0eada671b5eb88e

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

@@ -1,4 +1,4 @@
-# rubocop:disable Metrics/AbcSize,Metrics/MethodLength
+# rubocop:disable Metrics/AbcSize,Metrics/MethodLength,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
 module BridgeCache
   module Jobs
     class ImportCheck < ActiveJob::Base
@@ -17,8 +17,11 @@ module BridgeCache
       def perform(account_settings, attempts, chain = [], retries = 0)
         @account_settings = account_settings.with_indifferent_access
 
-        if attempts > max_import_attempts
-          Rails.logger.fatal("Bridge data dump failed to download after #{(max_import_attempts * 30) / 60} minutes")
+        if spent_time > 90 && remote_data.status == BridgeBlueprint::Constants::STATUS_PENDING
+          Rails.logger.fatal("Bridge data dump stucked to download after #{spent_time} minutes. Starting again.")
+          BridgeCache::Jobs::ImportStart.set(queue: queue_name).perform_later(@account_settings, chain, retries - 1)
+        elsif attempts > max_import_attempts
+          Rails.logger.fatal("Bridge data dump failed to download after #{spent_time} minutes")
         elsif remote_data.status == BridgeBlueprint::Constants::STATUS_COMPLETE
           BridgeCache::Jobs::ImportData.set(queue: queue_name).perform_later(@account_settings, chain)
         elsif remote_data.status == BridgeBlueprint::Constants::STATUS_PENDING
@@ -32,7 +35,11 @@ module BridgeCache
           BridgeCache::Jobs::ImportStart.set(queue: queue_name).perform_later(@account_settings, chain, retries - 1)
         end
       end
+
+      def spent_time
+        (max_import_attempts * 30) / 60
+      end
     end
   end
 end
-# rubocop:enable Metrics/AbcSize,Metrics/MethodLength
+# rubocop:enable Metrics/AbcSize,Metrics/MethodLength,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity

data/db/migrate/20201102153622_change_external_course_id_to_string.rb

@@ -1,5 +1,7 @@
 class ChangeExternalCourseIdToString < ActiveRecord::Migration[5.1]
   def change
+    return unless BridgeCache.use_internal_database
+    
     change_column :bridge_cache_course_templates, :external_course_id, :string
   end
 end

data/db/migrate/20230607141402_add_tags_and_relevance_to_affiliations.rb

@@ -0,0 +1,8 @@
+class AddTagsAndRelevanceToAffiliations < ActiveRecord::Migration[5.1]
+  def change
+    return unless BridgeCache.use_internal_database
+
+    add_column :bridge_cache_affiliated_sub_accounts, :share_tags, :boolean
+    add_column :bridge_cache_affiliated_sub_accounts, :share_group_relevance, :boolean
+  end
+end

data/lib/bridge_cache/version.rb

@@ -1,3 +1,3 @@
 module BridgeCache
-  VERSION = '0.3.24'.freeze
+  VERSION = '0.4.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bridge_cache
 version: !ruby/object:Gem::Version
-  version: 0.3.24
+  version: 0.4.2
 platform: ruby
 authors:
 - jshaffer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-14 00:00:00.000000000 Z
+date: 2023-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-import
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 5.2.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 5.2.4.3
 - !ruby/object:Gem::Dependency
   name: rein
   requirement: !ruby/object:Gem::Requirement
@@ -277,6 +277,7 @@ files:
 - 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
+- db/migrate/20230607141402_add_tags_and_relevance_to_affiliations.rb
 - lib/bridge_cache.rb
 - lib/bridge_cache/engine.rb
 - lib/bridge_cache/version.rb
@@ -300,7 +301,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: A mountable engine for bridge data storage