bridge_cache 0.3.12 → 0.3.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0573e8b2dab09f996d9c50684caa54315f513cad
-  data.tar.gz: 13e926999fb8ee084b8e9520b05dc2a9e59bb639
+SHA256:
+  metadata.gz: 0dd1fe1e90aad155eaa304b9fad18ee2846e410b4255f7d69be0a580d9a2fde0
+  data.tar.gz: '02239747587e0856884680bed5234f88e35ae8cdb7118ad4a2458f19196c9b9f'
 SHA512:
-  metadata.gz: 866ebb006ee76bdc04a4ec4e5bb7cc42f9a324871918ced97e7b89e11d5628811ed67a0721a763f1b487c3c4fbd7aa8a968541edeb987a8d922a21baf1420e6e
-  data.tar.gz: b4ced2a49b928c50d51c6ae1213e63e17e1c07ad84a22309412c7eb0aecd70ce49d395bd6b08f650a8881b40712bbbf0d9dc98dc225c75bde95a2f379e448ef9
+  metadata.gz: 83ce65775f28119f37cd88f66aee9cd4effcad429538dc15e2aef88f79463ada2278da42e63350af6620721d2cddda340889f21a85c2d3f9bba2ca21e6308448
+  data.tar.gz: e8d759746b5bcd2f5606b61141f1da9ab8e0646d5e796420e96f9c397d8db064138750308ca9651177cd40c6007f795269fb1e863ba583c3853d708569f20ad2

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/plugins/csv_dump.rb

@@ -16,7 +16,7 @@ module BridgeCache::Plugins
         row = remove_bad_columns(klass, BridgeCache::Plugins::DataTransform.set_bridge_id(row).to_h)
         row = klass.format_import_row(row)
         rows << csv_column_names.map { |column| row[column] }
-        ids << row['bridge_id']
+        ids << row['bridge_id'] if row['bridge_id'].present? # Some CSV's do not have an ID column
 
         if rows.length >= BridgeCache.batch_size
           perform_bulk_import(klass, database_column_names, rows)

data/app/models/bridge_cache/user_course_visit.rb

@@ -0,0 +1,23 @@
+module BridgeCache
+  class UserCourseVisit < BridgeBaseModel
+    extend BridgeCache::Data::BridgeModel
+
+    def self.for_domain(domain_id)
+      joins(:course_template).merge(BridgeCache::CourseTemplate.for_domain(domain_id))
+    end
+
+    belongs_to :user, foreign_key: :user_id, primary_key: BridgeCache.primary_key, class_name: BridgeCache::User.name, optional: true
+    belongs_to :enrollment, foreign_key: :enrollment_id, primary_key: BridgeCache.primary_key, class_name: BridgeCache::Enrollment.name, optional: true
+    belongs_to :course_template, foreign_key: :course_template_id, primary_key: BridgeCache.primary_key, class_name: BridgeCache::CourseTemplate.name, optional: true
+
+    def self.unique_column_names
+      %w[token]
+    end
+
+    def self.csv_mapping
+      mapping = super
+      mapping.delete('bridge_id')
+      mapping
+    end
+  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/20190801163930_create_user_course_visits.rb

@@ -0,0 +1,25 @@
+class CreateUserCourseVisits < ActiveRecord::Migration[5.1]
+  def change
+    return unless BridgeCache.use_internal_database
+    create_table :bridge_cache_user_course_visits do |t|
+      t.string :token
+      t.datetime :date
+      t.integer :user_id, limit: 8
+      t.integer :account_id, limit: 8
+      t.integer :seconds
+      t.datetime :last_updated
+      t.integer :course_template_id, limit: 8
+      t.integer :enrollment_id, limit: 8
+      t.integer :tracked_seconds
+      t.datetime :bridge_created_at
+      t.datetime :bridge_updated_at
+      t.timestamps
+    end
+    add_unique_constraint :bridge_cache_user_course_visits, [:token], deferrable: false, name: 'bridge_cache_uc_visits_uniq_token'
+    add_index :bridge_cache_user_course_visits, :token
+    add_index :bridge_cache_user_course_visits, :enrollment_id
+    add_index :bridge_cache_user_course_visits, :user_id
+    add_index :bridge_cache_user_course_visits, :course_template_id
+    add_index :bridge_cache_user_course_visits, :updated_at
+  end
+end

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.12'.freeze
+  VERSION = '0.3.17'.freeze
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: bridge_cache
 version: !ruby/object:Gem::Version
-  version: 0.3.12
+  version: 0.3.17
 platform: ruby
 authors:
 - jshaffer
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-05-03 00:00:00.000000000 Z
+date: 2020-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-import
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.22.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.22.0
 - !ruby/object:Gem::Dependency
@@ -42,63 +42,34 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
   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
-  name: actionmailer
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.1.4
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.4
+        version: 3.4.0
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.1.4
@@ -106,9 +77,6 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.1.4
@@ -116,9 +84,6 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.2
@@ -126,39 +91,13 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.2
-- !ruby/object:Gem::Dependency
-  name: byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '9.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 9.1.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '9.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 9.1.0
 - !ruby/object:Gem::Dependency
   name: combustion
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.7'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.0
@@ -166,9 +105,6 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.7'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.0
@@ -176,9 +112,6 @@ dependencies:
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.2
@@ -186,9 +119,6 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.2
@@ -196,9 +126,6 @@ dependencies:
   name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.8'
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.8.2
@@ -206,9 +133,6 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.8'
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.8.2
@@ -216,9 +140,6 @@ dependencies:
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.21'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.21.0
@@ -226,9 +147,6 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.21'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.21.0
@@ -236,9 +154,6 @@ dependencies:
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.7'
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.7.2
@@ -246,9 +161,6 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.7'
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.7.2
@@ -256,9 +168,6 @@ dependencies:
   name: shoulda-matchers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.2
@@ -266,9 +175,6 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.2
@@ -324,6 +230,7 @@ files:
 - app/models/bridge_cache/tag.rb
 - app/models/bridge_cache/tagging.rb
 - app/models/bridge_cache/user.rb
+- app/models/bridge_cache/user_course_visit.rb
 - app/views/layouts/bridge_cache/application.html.erb
 - config/routes.rb
 - db/migrate/20170517203244_create_bridge_cache_domains.rb
@@ -353,6 +260,9 @@ files:
 - db/migrate/20180406204906_add_uniq_constraints.rb
 - 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
@@ -361,7 +271,7 @@ homepage: https://www.getbridge.com
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -376,9 +286,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.1
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: A mountable engine for bridge data storage
 test_files: []