bridge_cache 0.0.14 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec85e8d9190a1f04068b83e61e8ff1f89c62f73f
-  data.tar.gz: 08d8ed00a2b7780051359995510b6ab4ea9b37cb
+  metadata.gz: aabfd5b6e097a79f0d6e9a801d1b640a93665bb0
+  data.tar.gz: e86a1c866dd4a53dd2adcfa4f2d5c1bdde3cfac6
 SHA512:
-  metadata.gz: 32e16bac569d101fb386d8590961564bc79dc62b130795cfa35f5fee6165aed4df01b29eeec2abab16b63a95235263714a58c75ddc5e60c74c8e193c08a614b0
-  data.tar.gz: 8ef8c95858d5957766f53731e2b887dc2cd7badce0232ef26533e12369c1ac7c3b0ee8d72a2a53b8036ad22e27801a1ec4a543a99be7141304db35f22c561cfb
+  metadata.gz: d34d52bb7ff2ce2cb3515c3de155876842b6f1e1e5acadb51d5cc6fb90a6e6068e7621173d3663df8eacc018bb2cffde4fdce7d99549396d4735b7b159e0fa0d
+  data.tar.gz: 45e06a4115b2e60ecd199cc8f470e9fabca9d21de8688c051d64365df367f379433b9513f264317b3cbbca70a0d361cf3cc8332ef333f79ca686fdc3f275cedb

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

@@ -9,7 +9,7 @@ module BridgeCache::Jobs
         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
+      elsif remote_data.status == BridgeBlueprint::Constants::STATUS_FAILED || remote_data.status == BridgeBlueprint::Constants::STATUS_NOT_FOUND
         raise 'Bridge data dump download failed'
       end
     end

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

@@ -4,6 +4,7 @@ module BridgeCache::Jobs
 
     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)
+      models = (['domain', 'affiliated_sub_account'] + models).uniq
       data.start_data_report
       BridgeCache::Jobs::ImportCheck
         .set(queue: self.queue_name, wait: 30.seconds)

data/app/models/bridge_cache/affiliated_sub_account.rb

@@ -0,0 +1,16 @@
+module BridgeCache
+  class AffiliatedSubAccount < ActiveRecord::Base
+    extend BridgeCache::Data::BridgeModel
+
+    before_save :fix_item_type
+
+    belongs_to :item, polymorphic: true, optional: true
+    belongs_to :domain, foreign_key: :domain_id, primary_key: :bridge_id, class_name: 'BridgeCache::Domain', optional: true
+
+    private
+
+    def fix_item_type
+      self.item_type = "BridgeCache::#{self.item_type}"
+    end
+  end
+end

data/app/models/bridge_cache/course_template.rb

@@ -7,6 +7,8 @@ module BridgeCache
     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'
     has_many :group_enrollments, foreign_key: :course_template_id, primary_key: :bridge_id, class_name: 'BridgeCache::GroupEnrollment'
+    has_many :affiliated_sub_accounts, primary_key: :bridge_id, class_name: 'BridgeCache::AffiliatedSubAccount', as: :item
+    has_many :domains, through: :affiliated_sub_accounts
 
   end
 end

data/db/migrate/20171017211850_create_affiliated_sub_accounts.rb

@@ -0,0 +1,15 @@
+class CreateAffiliatedSubAccounts < ActiveRecord::Migration[5.1]
+  def change
+    create_table :bridge_cache_affiliated_sub_accounts do |t|
+      t.integer :bridge_id
+      t.integer :item_id
+      t.string :item_type
+      t.integer :domain_id
+      t.datetime :deleted_at
+      t.datetime :created_at
+      t.datetime :updated_at
+      t.integer :state
+      t.integer :sources_count
+    end
+  end
+end

data/lib/bridge_cache/version.rb

@@ -1,3 +1,3 @@
 module BridgeCache
-  VERSION = "0.0.14"
+  VERSION = "0.0.16"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bridge_cache
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.16
 platform: ruby
 authors:
 - jshaffer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-29 00:00:00.000000000 Z
+date: 2017-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -164,6 +164,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: shoulda-matchers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A mountable engine for bridge data storage
 email:
 - jshaffer@instructure.com
@@ -187,6 +201,7 @@ files:
 - app/lib/bridge_cache/plugins/csv_dump.rb
 - app/lib/bridge_cache/plugins/data_transform.rb
 - app/lib/bridge_cache/utils/worker_helper.rb
+- app/models/bridge_cache/affiliated_sub_account.rb
 - app/models/bridge_cache/application_record.rb
 - app/models/bridge_cache/course_template.rb
 - app/models/bridge_cache/custom_field.rb
@@ -222,6 +237,7 @@ files:
 - db/migrate/20170523164248_create_bridge_cache_group_enrollments.rb
 - db/migrate/20170523165014_create_bridge_cache_memberships.rb
 - db/migrate/20170615145554_create_bridge_cache_learner_custom_field_values.rb
+- db/migrate/20171017211850_create_affiliated_sub_accounts.rb
 - lib/bridge_cache.rb
 - lib/bridge_cache/engine.rb
 - lib/bridge_cache/version.rb
@@ -246,7 +262,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: A mountable engine for bridge data storage