bridge_cache 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07fea4f39114b3ebd89681fc161b102aa38084e8
-  data.tar.gz: 7470148ae9f315a9d8934ac876a5cc4fe9e51b14
+  metadata.gz: e5045ed7ca30bd85e45e9de0132e62bd51897b64
+  data.tar.gz: e209c97121ffe249951b61544d50c521276741ae
 SHA512:
-  metadata.gz: ac00747411dd23c9ca6393957f932f69e991e99458550c1b83360732ec5a20d3150d932a75d3fe787d28de0f39d00be3ae408bc90888292fc6e26dc50f41312a
-  data.tar.gz: 04c3008fe94fb312df966f72c28bc539d43a84854cd81b5f756e89b2fc0cedfdec000227ebe9d8e6beea5d507c24b959de0db7b1eaca2fa1896e748140e50704
+  metadata.gz: '0138bba40a8c262f455fb0f2a23c2b5e7c75bad96b5f6e01aefdadb7bd62ba93fbc680862545816f04209f79cf8879f1d650bf54a1a3e042c7bcc6cc8ea30d90'
+  data.tar.gz: f1a7838f7b39db4f3828c4842063ef16caf2ee5ae5082715fe2d46d9c5e1d365fc236828c1a50a494601a659e0b401be7880d209571410a5eb52db0d0e022310

data/app/models/bridge_cache/course_template.rb

@@ -2,9 +2,9 @@ module BridgeCache
   class CourseTemplate < ActiveRecord::Base
     extend BridgeCache::Data::BridgeModel
 
-    belongs_to :user, foreign_key: :user_id, primary_key: :bridge_id, class_name: 'BridgeCache::User'
-    belongs_to :domain, foreign_key: :domain_id, primary_key: :bridge_id, class_name: 'BridgeCache::Domain'
-    belongs_to :sub_account, foreign_key: :sub_account_id, primary_key: :bridge_id, class_name: 'BridgeCache::Domain'
+    belongs_to :user, foreign_key: :user_id, primary_key: :bridge_id, class_name: 'BridgeCache::User', optional: true
+    belongs_to :domain, foreign_key: :domain_id, primary_key: :bridge_id, class_name: 'BridgeCache::Domain', optional: true
+    belongs_to :sub_account, foreign_key: :sub_account_id, primary_key: :bridge_id, class_name: 'BridgeCache::Domain', optional: true
     has_many :enrollments, foreign_key: :course_template_id, primary_key: :bridge_id, class_name: 'BridgeCache::Enrollment'
 
   end

data/app/models/bridge_cache/custom_field.rb

@@ -2,7 +2,7 @@ module BridgeCache
   class CustomField < ActiveRecord::Base
     extend BridgeCache::Data::BridgeModel
 
-    belongs_to :domain, foreign_key: :domain_id, primary_key: :bridge_id, class_name: 'BridgeCache::Domain'
+    belongs_to :domain, foreign_key: :domain_id, primary_key: :bridge_id, class_name: 'BridgeCache::Domain', optional: true
 
   end
 end

data/app/models/bridge_cache/domain.rb

@@ -3,10 +3,10 @@ module BridgeCache
     extend BridgeCache::Data::BridgeModel
 
     has_many :domain_children, primary_key: 'bridge_id', foreign_key: 'parent_id', class_name: 'BridgeCache::Domain'
-    belongs_to :domain_parent, primary_key: 'bridge_id', foreign_key: 'parent_id', class_name: 'BridgeCache::Domain'
+    belongs_to :domain_parent, primary_key: 'bridge_id', foreign_key: 'parent_id', class_name: 'BridgeCache::Domain', optional: true
 
     has_many :domain_ownees, primary_key: 'bridge_id', foreign_key: 'owner_id', class_name: 'BridgeCache::Domain'
-    belongs_to :domain_owner, primary_key: 'bridge_id', foreign_key: 'owner_id', class_name: 'BridgeCache::Domain'
+    belongs_to :domain_owner, primary_key: 'bridge_id', foreign_key: 'owner_id', class_name: 'BridgeCache::Domain', optional: true
 
     has_many :programs, primary_key: 'bridge_id', foreign_key: 'domain_id', class_name: 'BridgeCache::Program'
     has_many :course_templates, primary_key: 'bridge_id', foreign_key: 'domain_id', class_name: 'BridgeCache::CourseTemplate'

data/app/models/bridge_cache/enrollment.rb

@@ -2,8 +2,8 @@ module BridgeCache
   class Enrollment < ActiveRecord::Base
     extend BridgeCache::Data::BridgeModel
 
-    belongs_to :user, foreign_key: :user_id, primary_key: :bridge_id, class_name: 'BridgeCache::User'
-    belongs_to :course_template, foreign_key: :course_template_id, primary_key: :bridge_id, class_name: 'BridgeCache::CourseTemplate'
+    belongs_to :user, foreign_key: :user_id, primary_key: :bridge_id, class_name: 'BridgeCache::User', optional: true
+    belongs_to :course_template, foreign_key: :course_template_id, primary_key: :bridge_id, class_name: 'BridgeCache::CourseTemplate', optional: true
 
   end
 end

data/app/models/bridge_cache/grant.rb

@@ -2,8 +2,8 @@ module BridgeCache
   class Grant < ActiveRecord::Base
     extend BridgeCache::Data::BridgeModel
 
-    belongs_to :user, foreign_key: :user_id, primary_key: :bridge_id, class_name: 'BridgeCache::User'
-    belongs_to :domain, foreign_key: :domain_id, primary_key: :bridge_id, class_name: 'BridgeCache::Domain'
+    belongs_to :user, foreign_key: :user_id, primary_key: :bridge_id, class_name: 'BridgeCache::User', optional: true
+    belongs_to :domain, foreign_key: :domain_id, primary_key: :bridge_id, class_name: 'BridgeCache::Domain', optional: true
 
   end
 end

data/app/models/bridge_cache/group.rb

@@ -4,7 +4,7 @@ module BridgeCache
 
     self.inheritance_column = nil
 
-    belongs_to :user, foreign_key: :user_id, primary_key: :bridge_id, class_name: 'BridgeCache::User'
+    belongs_to :user, foreign_key: :user_id, primary_key: :bridge_id, class_name: 'BridgeCache::User', optional: true
     has_many :program_group_enrollments, foreign_key: :group_id, primary_key: :bridge_id, class_name: 'BridgeCache::ProgramGroupEnrollment'
 
   end

data/app/models/bridge_cache/program.rb

@@ -2,8 +2,8 @@ module BridgeCache
   class Program < ActiveRecord::Base
     extend BridgeCache::Data::BridgeModel
 
-    belongs_to :domain, foreign_key: :domain_id, primary_key: :bridge_id, class_name: 'BridgeCache::Domain'
-    belongs_to :sub_account, foreign_key: :sub_account_id, primary_key: :bridge_id, class_name: 'BridgeCache::Domain'
+    belongs_to :domain, foreign_key: :domain_id, primary_key: :bridge_id, class_name: 'BridgeCache::Domain', optional: true
+    belongs_to :sub_account, foreign_key: :sub_account_id, primary_key: :bridge_id, class_name: 'BridgeCache::Domain', optional: true
     has_many :program_items, foreign_key: :program_id, primary_key: :bridge_id, class_name: 'BridgeCache::ProgramItem'
     has_many :program_enrollments, foreign_key: :program_id, primary_key: :bridge_id, class_name: 'BridgeCache::ProgramEnrollment'
     has_many :program_group_enrollments, foreign_key: :program_id, primary_key: :bridge_id, class_name: 'BridgeCache::ProgramGroupEnrollment'

data/app/models/bridge_cache/program_enrollment.rb

@@ -2,8 +2,8 @@ module BridgeCache
   class ProgramEnrollment < ActiveRecord::Base
     extend BridgeCache::Data::BridgeModel
 
-    belongs_to :user, foreign_key: :user_id, primary_key: :bridge_id, class_name: 'BridgeCache::User'
-    belongs_to :program, foreign_key: :program_id, primary_key: :bridge_id, class_name: 'BridgeCache::Program'
+    belongs_to :user, foreign_key: :user_id, primary_key: :bridge_id, class_name: 'BridgeCache::User', optional: true
+    belongs_to :program, foreign_key: :program_id, primary_key: :bridge_id, class_name: 'BridgeCache::Program', optional: true
 
   end
 end

data/app/models/bridge_cache/program_group_enrollment.rb

@@ -2,8 +2,8 @@ module BridgeCache
   class ProgramGroupEnrollment < ActiveRecord::Base
     extend BridgeCache::Data::BridgeModel
 
-    belongs_to :group, foreign_key: :group_id, primary_key: :bridge_id, class_name: 'BridgeCache::Group'
-    belongs_to :program, foreign_key: :program_id, primary_key: :bridge_id, class_name: 'BridgeCache::Program'
+    belongs_to :group, foreign_key: :group_id, primary_key: :bridge_id, class_name: 'BridgeCache::Group', optional: true
+    belongs_to :program, foreign_key: :program_id, primary_key: :bridge_id, class_name: 'BridgeCache::Program', optional: true
 
   end
 end

data/app/models/bridge_cache/program_item.rb

@@ -2,7 +2,7 @@ module BridgeCache
   class ProgramItem < ActiveRecord::Base
     extend BridgeCache::Data::BridgeModel
 
-    belongs_to :program, foreign_key: :program_id, primary_key: :bridge_id, class_name: 'BridgeCache::Program'
+    belongs_to :program, foreign_key: :program_id, primary_key: :bridge_id, class_name: 'BridgeCache::Program', optional: true
 
   end
 end

data/app/models/bridge_cache/tagging.rb

@@ -2,8 +2,8 @@ module BridgeCache
   class Tagging < ActiveRecord::Base
     extend BridgeCache::Data::BridgeModel
 
-    belongs_to :tag, foreign_key: :tag_id, primary_key: :bridge_id, class_name: 'BridgeCache::Tag'
-    belongs_to :user, foreign_key: :tagger_id, primary_key: :bridge_id, class_name: 'BridgeCache::User'
+    belongs_to :tag, foreign_key: :tag_id, primary_key: :bridge_id, class_name: 'BridgeCache::Tag', optional: true
+    belongs_to :user, foreign_key: :tagger_id, primary_key: :bridge_id, class_name: 'BridgeCache::User', optional: true
 
   end
 end

data/app/models/bridge_cache/user.rb

@@ -2,8 +2,8 @@ module BridgeCache
   class User < ActiveRecord::Base
     extend BridgeCache::Data::BridgeModel
 
-    belongs_to :domain, foreign_key: :domain_id, primary_key: :bridge_id, class_name: 'BridgeCache::Domain'
-    belongs_to :sub_account, foreign_key: :sub_account_id, primary_key: :bridge_id, class_name: 'BridgeCache::Domain'
+    belongs_to :domain, foreign_key: :domain_id, primary_key: :bridge_id, class_name: 'BridgeCache::Domain', optional: true
+    belongs_to :sub_account, foreign_key: :sub_account_id, primary_key: :bridge_id, class_name: 'BridgeCache::Domain', optional: true
     has_many :enrollments, foreign_key: :user_id, primary_key: :bridge_id, class_name: 'BridgeCache::Enrollment'
     has_many :course_templates, foreign_key: :user_id, primary_key: :bridge_id, class_name: 'BridgeCache::CourseTemplate'
     has_many :taggings, foreign_key: :user_id, primary_key: :bridge_id, class_name: 'BridgeCache::Tagging'

data/lib/bridge_cache/jobs/import_check.rb

@@ -0,0 +1,17 @@
+module BridgeCache::Jobs
+  class ImportCheck < ActiveJob::Base
+    queue_as :default
+    include BridgeCache::Utils::WorkerHelper
+
+    def perform(bridge_base_url, bridge_api_key, bridge_api_secret, models, chain = [])
+      remote_data = BridgeBlueprint::RemoteData.new(bridge_base_url, bridge_api_key, bridge_api_secret)
+      if remote_data.status == BridgeBlueprint::Constants::STATUS_COMPLETE
+        BridgeCache::Jobs::ImportData.set(queue: self.queue_name).perform_later(bridge_base_url, bridge_api_key, bridge_api_secret, models, chain)
+      elsif remote_data.status == BridgeBlueprint::Constants::STATUS_PENDING
+        BridgeCache::Jobs::ImportCheck.set(queue: self.queue_name, wait: 30.seconds).perform_later(bridge_base_url, bridge_api_key, bridge_api_secret, models, chain)
+      elsif remote_data.status == BridgeBlueprint::Constants::STATUS_FAILED || remote_data.status == BridgeBluePrint::Constants::STATUS_NOT_FOUND
+        raise 'Bridge data dump download failed'
+      end
+    end
+  end
+end

data/lib/bridge_cache/jobs/import_data.rb

@@ -0,0 +1,19 @@
+module BridgeCache::Jobs
+  class ImportData < ActiveJob::Base
+    queue_as :default
+
+    def perform(bridge_base_url, bridge_api_key, bridge_api_secret, models, chain = [])
+      remote_data = BridgeBlueprint::RemoteData.new(bridge_base_url, bridge_api_key, bridge_api_secret)
+      Dir.mktmpdir do |dir|
+        path = "#{dir}/data_dump"
+        remote_data.store_file(path)
+        import = BridgeBlueprint::DataDump.new(path)
+        models.each do |model|
+          import.each_row(model.pluralize) do |row|
+            BridgeCache::Jobs::ImportRow.set(queue: self.queue_name).perform_later(model, row.to_h)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/bridge_cache/jobs/import_row.rb

@@ -0,0 +1,9 @@
+module BridgeCache::Jobs
+  class ImportRow < ActiveJob::Base
+    queue_as :default
+
+    def perform(model, row, chain = [])
+      "BridgeCache::#{model.camelcase}".constantize.create_from_csv_row(row)
+    end
+  end
+end

data/lib/bridge_cache/jobs/import_start.rb

@@ -0,0 +1,19 @@
+module BridgeCache::Jobs
+  class ImportStart < ActiveJob::Base
+    queue_as :default
+
+    def perform(bridge_base_url, bridge_api_key, bridge_api_secret, models, chain = [])
+      data = BridgeBlueprint::RemoteData.new(bridge_base_url, bridge_api_key, bridge_api_secret)
+      data.start_data_report
+      BridgeCache::Jobs::ImportCheck
+        .set(queue: self.queue_name, wait: 30.seconds)
+        .perform_later(
+          bridge_base_url,
+          bridge_api_key,
+          bridge_api_secret,
+          models,
+          chain
+        )
+    end
+  end
+end

data/lib/bridge_cache/plugins/csv_dump.rb

@@ -27,7 +27,7 @@ module BridgeCache::Plugins
 
     def self.dump_row(clazz, row)
       instance = initialze_row(clazz, row)
-      dump_rows([instance])
+      dump_rows(clazz, [instance])
     end
 
     private

data/lib/bridge_cache/utils/worker_helper.rb

@@ -0,0 +1,12 @@
+module BridgeCache::Utils
+  module WorkerHelper
+    def self.invoke_next(job_chain, params = [])
+      job_chain ||= []
+      job = job_chain.shift
+      if job
+        job_class = Object.const_get(job[:job].classify)
+        job_class.perform_later(*(job[:params].concat(params)))
+      end
+    end
+  end
+end

data/lib/bridge_cache/version.rb

@@ -1,3 +1,3 @@
 module BridgeCache
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,29 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: bridge_cache
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - jshaffer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-22 00:00:00.000000000 Z
+date: 2017-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   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: bridge_blueprint
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
 - !ruby/object:Gem::Dependency
   name: actionmailer
   requirement: !ruby/object:Gem::Requirement
@@ -195,8 +209,13 @@ files:
 - lib/bridge_cache.rb
 - lib/bridge_cache/data/bridge_model.rb
 - lib/bridge_cache/engine.rb
+- lib/bridge_cache/jobs/import_check.rb
+- lib/bridge_cache/jobs/import_data.rb
+- lib/bridge_cache/jobs/import_row.rb
+- lib/bridge_cache/jobs/import_start.rb
 - lib/bridge_cache/plugins/csv_dump.rb
 - lib/bridge_cache/plugins/data_transform.rb
+- lib/bridge_cache/utils/worker_helper.rb
 - lib/bridge_cache/version.rb
 - lib/tasks/bridge_cache_tasks.rake
 - test/bridge_cache_test.rb