coalescing_panda 3.1.5 → 3.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99ae7fd46a00f12688336f1d8013bc68d6ed58fd
-  data.tar.gz: 7cff2c9b34463d0dc575a4703c7fba4e95792415
+  metadata.gz: d9c022228a8c58d846f1f26d4dbf45ae01304489
+  data.tar.gz: cda8d6e744fbf39460a5a385f2cf8d4c704f2604
 SHA512:
-  metadata.gz: 67ce91be318eb336ec0a1da1402e0f27c064ff221f5b2a6d45d4b8ec2aa8cb2afc8516c3207088813e634f0378adfd93dba2dbd672b1be577b471359c8816fbf
-  data.tar.gz: 3534590ee35db4ee8deed87d9ac95a06b36d9cb3148eec8ea0d9584397ae09d50835c5cb86422260e4b652790f465b9bccced8bf65f5825eb0b180ffe9301019
+  metadata.gz: 45729e76b2685b919295954f10a0d0963ed85ae3d694df9e7e0e254ed6616919012c4e3595c2485545292f594bc09bd699608dfa3ab8acfbc2b9a252084adf4d
+  data.tar.gz: 6c2756e80ab8232506cc9dfb4268674d81acb9e4bba6c1f4d8e406088a40ac15742f4445ec020fe94836f399b1555d33cef10358e764825f011d0a01480290c2

data/app/models/coalescing_panda/assignment.rb

@@ -4,5 +4,8 @@ module CoalescingPanda
     has_many :submissions, foreign_key: :coalescing_panda_assignment_id, class_name: 'CoalescingPanda::Submission'
 
     delegate :account, to: :course
+
+    validates :coalescing_panda_course_id, presence: true
+    validates :canvas_assignment_id, presence: true
   end
 end

data/app/models/coalescing_panda/course.rb

@@ -7,5 +7,8 @@ module CoalescingPanda
     has_many :assignments, foreign_key: :coalescing_panda_course_id, class_name: 'CoalescingPanda::Assignment'
     has_many :submissions, through: :assignments
     has_many :users, through: :sections, source: :users, class_name: 'CoalescingPanda::User'
+
+    validates :coalescing_panda_lti_account_id, presence: true
+    validates :canvas_course_id, presence: true
   end
 end

data/app/models/coalescing_panda/enrollment.rb

@@ -4,5 +4,9 @@ module CoalescingPanda
     belongs_to :section, foreign_key: :coalescing_panda_section_id, class_name: 'CoalescingPanda::Section'
 
     delegate :account, to: :section
+
+    validates :coalescing_panda_user_id, presence: true
+    validates :coalescing_panda_section_id, presence: true
+    validates :canvas_enrollment_id, presence: true
   end
 end

data/app/models/coalescing_panda/lti_account.rb

@@ -13,6 +13,8 @@ module CoalescingPanda
 
     serialize :settings
 
+    validates :canvas_account_id, presence: true
+
     def validate_nonce(nonce, timestamp)
       cleanup_nonce
       if timestamp > 15.minutes.ago

data/app/models/coalescing_panda/section.rb

@@ -5,5 +5,8 @@ module CoalescingPanda
     has_many :users, through: :enrollments, class_name: 'CoalescingPanda::User'
 
     delegate :account, to: :course
+
+    validates :coalescing_panda_course_id, presence: true
+    validates :canvas_section_id, presence: true
   end
 end

data/app/models/coalescing_panda/submission.rb

@@ -4,5 +4,9 @@ module CoalescingPanda
     belongs_to :assignment, foreign_key: :coalescing_panda_assignment_id, class_name: 'CoalescingPanda::Assignment'
 
     delegate :account, to: :assignment
+
+    validates :coalescing_panda_user_id, presence: true
+    validates :coalescing_panda_assignment_id, presence: true
+    validates :canvas_submission_id, presence: true
   end
 end

data/app/models/coalescing_panda/term.rb

@@ -2,5 +2,7 @@ module CoalescingPanda
   class Term < ActiveRecord::Base
     belongs_to :account, foreign_key: :coalescing_panda_lti_account_id, class_name: 'CoalescingPanda::LtiAccount'
     has_many :courses, foreign_key: :coalescing_panda_term_id, class_name: 'CoalescingPanda::Course'
+
+    validates :coalescing_panda_lti_account_id, presence: true
   end
 end

data/app/models/coalescing_panda/user.rb

@@ -7,5 +7,8 @@ module CoalescingPanda
     has_many :courses, through: :sections
 
     store :roles
+
+    validates :coalescing_panda_lti_account_id, presence: true
+    validates :canvas_user_id, presence: true
   end
 end

data/app/models/coalescing_panda/workers/course_miner.rb

@@ -68,6 +68,7 @@ class CoalescingPanda::Workers::CourseMiner
       canvas_id_key = "canvas_#{model_key.to_s.singularize}_id"
       values[canvas_id_key] = values["id"]
       values['workflow_state'] = values["enrollment_state"] if values.has_key?('enrollment_state')
+      values['enrollment_type'] = values['type'] if model_key == :enrollments
       if model_key == :users
         record = account.send(model_key).where("#{canvas_id_key} = ?", values['id'].to_s).first_or_initialize
       else

data/db/migrate/20131118211442_create_coalescing_panda_lti_accounts.rb

@@ -6,6 +6,8 @@ class CreateCoalescingPandaLtiAccounts < ActiveRecord::Migration
       t.string :secret
       t.string :oauth2_client_id
       t.string :oauth2_client_key
+      t.string :canvas_account_id
+      t.text :settings
 
       t.timestamps
     end

data/db/migrate/20141119225319_create_coalescing_panda_terms.rb

@@ -1,11 +1,11 @@
 class CreateCoalescingPandaTerms < ActiveRecord::Migration
   def change
     create_table :coalescing_panda_terms do |t|
-      t.belongs_to :coalescing_panda_lti_account
+      t.belongs_to :coalescing_panda_lti_account, null: false
       t.string :name
       t.string :code
       t.string :sis_id
-      t.string :canvas_term_id
+      t.string :canvas_term_id, null: false
       t.datetime :start_at
       t.datetime :end_at
       t.string :workflow_state
@@ -13,7 +13,7 @@ class CreateCoalescingPandaTerms < ActiveRecord::Migration
       t.timestamps
     end
 
-    add_index :coalescing_panda_terms, :canvas_term_id
+    add_index :coalescing_panda_terms, [:canvas_term_id, :coalescing_panda_lti_account_id], name: :index_terms_account, unique: true
     add_index :coalescing_panda_terms, :sis_id
   end
 end

data/db/migrate/20141119225721_create_coalescing_panda_courses.rb

@@ -1,10 +1,10 @@
 class CreateCoalescingPandaCourses < ActiveRecord::Migration
   def change
     create_table :coalescing_panda_courses do |t|
-      t.belongs_to :coalescing_panda_lti_account
+      t.belongs_to :coalescing_panda_lti_account, null: false
       t.belongs_to :coalescing_panda_term
       t.string :name
-      t.string :canvas_course_id
+      t.string :canvas_course_id, null: false
       t.string :sis_id
       t.datetime :start_at
       t.datetime :conclude_at
@@ -14,9 +14,8 @@ class CreateCoalescingPandaCourses < ActiveRecord::Migration
       t.timestamps
     end
 
-    add_index :coalescing_panda_courses, :coalescing_panda_lti_account_id, name: :index_courses_account
-    add_index :coalescing_panda_courses, :coalescing_panda_term_id, name: :index_courses_term
-    add_index :coalescing_panda_courses, :canvas_course_id
+    add_index :coalescing_panda_courses, [:coalescing_panda_lti_account_id, :canvas_course_id], name: :index_courses_account, unique: true
+    add_index :coalescing_panda_courses, [:coalescing_panda_term_id, :canvas_course_id], name: :index_courses_term, unique: true
     add_index :coalescing_panda_courses, :sis_id
   end
 end

data/db/migrate/20141120151432_create_coalescing_panda_sections.rb

@@ -1,9 +1,9 @@
 class CreateCoalescingPandaSections < ActiveRecord::Migration
   def change
     create_table :coalescing_panda_sections do |t|
-      t.belongs_to :coalescing_panda_course
+      t.belongs_to :coalescing_panda_course, null: false
       t.string :name
-      t.string :canvas_section_id
+      t.string :canvas_section_id, null: false
       t.string :sis_id
       t.string :workflow_state
       t.datetime :start_at
@@ -12,8 +12,7 @@ class CreateCoalescingPandaSections < ActiveRecord::Migration
       t.timestamps
     end
 
-    add_index :coalescing_panda_sections, :coalescing_panda_course_id
-    add_index :coalescing_panda_sections, :canvas_section_id
+    add_index :coalescing_panda_sections, [:coalescing_panda_course_id, :canvas_section_id], name: :index_sections_course, unique: true
     add_index :coalescing_panda_sections, :sis_id
   end
 end

data/db/migrate/20141120151940_create_coalescing_panda_assignments.rb

@@ -1,11 +1,10 @@
 class CreateCoalescingPandaAssignments < ActiveRecord::Migration
   def change
     create_table :coalescing_panda_assignments do |t|
-      t.belongs_to :coalescing_panda_course
+      t.belongs_to :coalescing_panda_course, null: false
       t.string :name
       t.string :description
-      t.string :canvas_assignment_id
-      t.string :sis_id
+      t.string :canvas_assignment_id, null: false
       t.string :workflow_state
       t.float :points_possible
       t.datetime :due_at
@@ -15,8 +14,6 @@ class CreateCoalescingPandaAssignments < ActiveRecord::Migration
       t.timestamps
     end
 
-    add_index :coalescing_panda_assignments, :coalescing_panda_course_id, name: :index_assignments_course
-    add_index :coalescing_panda_assignments, :canvas_assignment_id
-    add_index :coalescing_panda_assignments, :sis_id
+    add_index :coalescing_panda_assignments, [:coalescing_panda_course_id, :canvas_assignment_id], name: :index_assignments_course, unique: true
   end
 end

data/db/migrate/20141120152458_create_coalescing_panda_users.rb

@@ -1,19 +1,18 @@
 class CreateCoalescingPandaUsers < ActiveRecord::Migration
   def change
     create_table :coalescing_panda_users do |t|
-      t.belongs_to :coalescing_panda_lti_account
+      t.belongs_to :coalescing_panda_lti_account, null: false
       t.string :name
       t.string :email
       t.string :roles
       t.string :workflow_state
       t.string :sis_id
-      t.string :canvas_user_id
+      t.string :canvas_user_id, null: false
 
       t.timestamps
     end
 
-    add_index :coalescing_panda_users, :coalescing_panda_lti_account_id, name: :index_users_account
-    add_index :coalescing_panda_users, :canvas_user_id
+    add_index :coalescing_panda_users, [:coalescing_panda_lti_account_id, :canvas_user_id], name: :index_users_account, unique: true
     add_index :coalescing_panda_users, :sis_id
   end
 end

data/db/migrate/20141120152546_create_coalescing_panda_submissions.rb

@@ -1,19 +1,19 @@
 class CreateCoalescingPandaSubmissions < ActiveRecord::Migration
   def change
     create_table :coalescing_panda_submissions do |t|
-      t.belongs_to :coalescing_panda_user
-      t.belongs_to :coalescing_panda_assignment
+      t.belongs_to :coalescing_panda_user, null: false
+      t.belongs_to :coalescing_panda_assignment, null: false
       t.string :url
       t.string :grade
       t.string :score
       t.datetime :submitted_at
       t.string :workflow_state
-      t.string :canvas_submission_id
+      t.string :canvas_submission_id, null: false
 
       t.timestamps
     end
 
-    add_index :coalescing_panda_submissions, [:coalescing_panda_user_id, :coalescing_panda_assignment_id], name: :index_submissions_user_and_assignment
+    add_index :coalescing_panda_submissions, [:coalescing_panda_user_id, :coalescing_panda_assignment_id, :canvas_submission_id], name: :index_submissions_user_and_assignment, unique: true
     add_index :coalescing_panda_submissions, :canvas_submission_id
   end
 end

data/db/migrate/20141120153135_create_coalescing_panda_enrollments.rb

@@ -1,19 +1,19 @@
 class CreateCoalescingPandaEnrollments < ActiveRecord::Migration
   def change
     create_table :coalescing_panda_enrollments do |t|
-      t.belongs_to :coalescing_panda_user
-      t.belongs_to :coalescing_panda_section
+      t.belongs_to :coalescing_panda_user, null: false
+      t.belongs_to :coalescing_panda_section, null: false
       t.string :workflow_state
       t.string :sis_id
-      t.string :canvas_enrollment_id
+      t.string :canvas_enrollment_id, null: false
+      t.string :enrollment_type
       t.datetime :start_at
       t.datetime :end_at
 
       t.timestamps
     end
 
-    add_index :coalescing_panda_enrollments, [:coalescing_panda_user_id, :coalescing_panda_section_id], name: :index_enrollments_user_and_assignment
-    add_index :coalescing_panda_enrollments, :canvas_enrollment_id
+    add_index :coalescing_panda_enrollments, [:coalescing_panda_user_id, :coalescing_panda_section_id, :enrollment_type], name: :index_enrollments_user_and_assignment, unique: true
     add_index :coalescing_panda_enrollments, :sis_id
   end
 end

data/lib/coalescing_panda/version.rb

@@ -1,3 +1,3 @@
 module CoalescingPanda
-  VERSION = '3.1.5'
+  VERSION = '3.1.6'
 end

data/spec/dummy/app/models/account.rb

@@ -0,0 +1,7 @@
+
+      class Account < CoalescingPanda::LtiAccount
+        has_many :terms, foreign_key: :coalescing_panda_lti_account_id, class_name: 'Term'
+has_many :courses, foreign_key: :coalescing_panda_lti_account_id, class_name: 'Course'
+has_many :users, foreign_key: :coalescing_panda_lti_account_id, class_name: 'User'
+      end
+    

data/spec/dummy/db/schema.rb

@@ -11,14 +11,13 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20141125185516) do
+ActiveRecord::Schema.define(version: 20141124160857) do
 
   create_table "coalescing_panda_assignments", force: true do |t|
-    t.integer  "coalescing_panda_course_id"
+    t.integer  "coalescing_panda_course_id", null: false
     t.string   "name"
     t.string   "description"
-    t.string   "canvas_assignment_id"
-    t.string   "sis_id"
+    t.string   "canvas_assignment_id",       null: false
     t.string   "workflow_state"
     t.float    "points_possible"
     t.datetime "due_at"
@@ -28,9 +27,7 @@ ActiveRecord::Schema.define(version: 20141125185516) do
     t.datetime "updated_at"
   end
 
-  add_index "coalescing_panda_assignments", ["canvas_assignment_id"], name: "index_coalescing_panda_assignments_on_canvas_assignment_id"
-  add_index "coalescing_panda_assignments", ["coalescing_panda_course_id"], name: "index_assignments_course"
-  add_index "coalescing_panda_assignments", ["sis_id"], name: "index_coalescing_panda_assignments_on_sis_id"
+  add_index "coalescing_panda_assignments", ["coalescing_panda_course_id", "canvas_assignment_id"], name: "index_assignments_course", unique: true
 
   create_table "coalescing_panda_canvas_api_auths", force: true do |t|
     t.string   "user_id"
@@ -49,10 +46,10 @@ ActiveRecord::Schema.define(version: 20141125185516) do
   end
 
   create_table "coalescing_panda_courses", force: true do |t|
-    t.integer  "coalescing_panda_lti_account_id"
+    t.integer  "coalescing_panda_lti_account_id", null: false
     t.integer  "coalescing_panda_term_id"
     t.string   "name"
-    t.string   "canvas_course_id"
+    t.string   "canvas_course_id",                null: false
     t.string   "sis_id"
     t.datetime "start_at"
     t.datetime "conclude_at"
@@ -62,26 +59,24 @@ ActiveRecord::Schema.define(version: 20141125185516) do
     t.datetime "updated_at"
   end
 
-  add_index "coalescing_panda_courses", ["canvas_course_id"], name: "index_coalescing_panda_courses_on_canvas_course_id"
-  add_index "coalescing_panda_courses", ["coalescing_panda_lti_account_id"], name: "index_courses_account"
-  add_index "coalescing_panda_courses", ["coalescing_panda_term_id"], name: "index_courses_term"
+  add_index "coalescing_panda_courses", ["coalescing_panda_lti_account_id", "canvas_course_id"], name: "index_courses_account", unique: true
+  add_index "coalescing_panda_courses", ["coalescing_panda_term_id", "canvas_course_id"], name: "index_courses_term", unique: true
   add_index "coalescing_panda_courses", ["sis_id"], name: "index_coalescing_panda_courses_on_sis_id"
 
   create_table "coalescing_panda_enrollments", force: true do |t|
-    t.integer  "coalescing_panda_user_id"
-    t.integer  "coalescing_panda_section_id"
+    t.integer  "coalescing_panda_user_id",    null: false
+    t.integer  "coalescing_panda_section_id", null: false
     t.string   "workflow_state"
     t.string   "sis_id"
-    t.string   "canvas_enrollment_id"
+    t.string   "canvas_enrollment_id",        null: false
+    t.string   "enrollment_type"
     t.datetime "start_at"
     t.datetime "end_at"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "type"
   end
 
-  add_index "coalescing_panda_enrollments", ["canvas_enrollment_id"], name: "index_coalescing_panda_enrollments_on_canvas_enrollment_id"
-  add_index "coalescing_panda_enrollments", ["coalescing_panda_user_id", "coalescing_panda_section_id"], name: "index_enrollments_user_and_assignment"
+  add_index "coalescing_panda_enrollments", ["coalescing_panda_user_id", "coalescing_panda_section_id", "enrollment_type"], name: "index_enrollments_user_and_assignment", unique: true
   add_index "coalescing_panda_enrollments", ["sis_id"], name: "index_coalescing_panda_enrollments_on_sis_id"
 
   create_table "coalescing_panda_lti_accounts", force: true do |t|
@@ -90,10 +85,10 @@ ActiveRecord::Schema.define(version: 20141125185516) do
     t.string   "secret"
     t.string   "oauth2_client_id"
     t.string   "oauth2_client_key"
+    t.string   "canvas_account_id"
+    t.text     "settings"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.text     "settings"
-    t.string   "canvas_account_id"
   end
 
   create_table "coalescing_panda_lti_nonces", force: true do |t|
@@ -103,9 +98,9 @@ ActiveRecord::Schema.define(version: 20141125185516) do
   end
 
   create_table "coalescing_panda_sections", force: true do |t|
-    t.integer  "coalescing_panda_course_id"
+    t.integer  "coalescing_panda_course_id", null: false
     t.string   "name"
-    t.string   "canvas_section_id"
+    t.string   "canvas_section_id",          null: false
     t.string   "sis_id"
     t.string   "workflow_state"
     t.datetime "start_at"
@@ -114,8 +109,7 @@ ActiveRecord::Schema.define(version: 20141125185516) do
     t.datetime "updated_at"
   end
 
-  add_index "coalescing_panda_sections", ["canvas_section_id"], name: "index_coalescing_panda_sections_on_canvas_section_id"
-  add_index "coalescing_panda_sections", ["coalescing_panda_course_id"], name: "index_coalescing_panda_sections_on_coalescing_panda_course_id"
+  add_index "coalescing_panda_sections", ["coalescing_panda_course_id", "canvas_section_id"], name: "index_sections_course", unique: true
   add_index "coalescing_panda_sections", ["sis_id"], name: "index_coalescing_panda_sections_on_sis_id"
 
   create_table "coalescing_panda_sessions", force: true do |t|
@@ -126,27 +120,27 @@ ActiveRecord::Schema.define(version: 20141125185516) do
   end
 
   create_table "coalescing_panda_submissions", force: true do |t|
-    t.integer  "coalescing_panda_user_id"
-    t.integer  "coalescing_panda_assignment_id"
+    t.integer  "coalescing_panda_user_id",       null: false
+    t.integer  "coalescing_panda_assignment_id", null: false
     t.string   "url"
     t.string   "grade"
     t.string   "score"
     t.datetime "submitted_at"
     t.string   "workflow_state"
-    t.string   "canvas_submission_id"
+    t.string   "canvas_submission_id",           null: false
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
   add_index "coalescing_panda_submissions", ["canvas_submission_id"], name: "index_coalescing_panda_submissions_on_canvas_submission_id"
-  add_index "coalescing_panda_submissions", ["coalescing_panda_user_id", "coalescing_panda_assignment_id"], name: "index_submissions_user_and_assignment"
+  add_index "coalescing_panda_submissions", ["coalescing_panda_user_id", "coalescing_panda_assignment_id", "canvas_submission_id"], name: "index_submissions_user_and_assignment", unique: true
 
   create_table "coalescing_panda_terms", force: true do |t|
-    t.integer  "coalescing_panda_lti_account_id"
+    t.integer  "coalescing_panda_lti_account_id", null: false
     t.string   "name"
     t.string   "code"
     t.string   "sis_id"
-    t.string   "canvas_term_id"
+    t.string   "canvas_term_id",                  null: false
     t.datetime "start_at"
     t.datetime "end_at"
     t.string   "workflow_state"
@@ -154,23 +148,22 @@ ActiveRecord::Schema.define(version: 20141125185516) do
     t.datetime "updated_at"
   end
 
-  add_index "coalescing_panda_terms", ["canvas_term_id"], name: "index_coalescing_panda_terms_on_canvas_term_id"
+  add_index "coalescing_panda_terms", ["canvas_term_id", "coalescing_panda_lti_account_id"], name: "index_terms_account", unique: true
   add_index "coalescing_panda_terms", ["sis_id"], name: "index_coalescing_panda_terms_on_sis_id"
 
   create_table "coalescing_panda_users", force: true do |t|
-    t.integer  "coalescing_panda_lti_account_id"
+    t.integer  "coalescing_panda_lti_account_id", null: false
     t.string   "name"
     t.string   "email"
     t.string   "roles"
     t.string   "workflow_state"
     t.string   "sis_id"
-    t.string   "canvas_user_id"
+    t.string   "canvas_user_id",                  null: false
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  add_index "coalescing_panda_users", ["canvas_user_id"], name: "index_coalescing_panda_users_on_canvas_user_id"
-  add_index "coalescing_panda_users", ["coalescing_panda_lti_account_id"], name: "index_users_account"
+  add_index "coalescing_panda_users", ["coalescing_panda_lti_account_id", "canvas_user_id"], name: "index_users_account", unique: true
   add_index "coalescing_panda_users", ["sis_id"], name: "index_coalescing_panda_users_on_sis_id"
 
   create_table "delayed_jobs", force: true do |t|