coalescing_panda 4.1.0 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 049b4be87e2a94883db4321af5513b3de1292d95
-  data.tar.gz: 18cb2a2a9965e4d80e96e8bb5c2d342c4a1e7911
+  metadata.gz: 525ed1c66b5491a7b55eaaa5010424ab68c5ad80
+  data.tar.gz: f4505d9681606087338a9493592a56f877b82247
 SHA512:
-  metadata.gz: a71dcd02c993571e306894b3ba2a19ece4877ef108fb7475811a113d7c1442d38f2dfea109c94fb17dd43f5a63e18300dcfd805fc5411cc302fc3118858ade05
-  data.tar.gz: 38e4fc6d47585987d5611fa1544ca6792d357de01c9c8b18d169cd9fca210635434c4f161410de7c04ef367454d3642e77f16667927550805e4c383e108c3f06
+  metadata.gz: 638088308a6bfb0e6236e1cd421697d3aa7e2edac77f43dc2dc2a04007f9bc47e5f9264a1d757f6f6bffc77ad0af4a578683f5813f30f727ae81d0c5a4440820
+  data.tar.gz: 93ab82f7ae7f20991071081fa8d7e2767fbb507557e043d1c30139a8cf42d2b685a3e0036073edb0b04f9fb2e1a6d0be7ba3a88168925dad4f0e895c19d87e8e

data/app/models/coalescing_panda/assignment.rb

@@ -1,6 +1,7 @@
 module CoalescingPanda
   class Assignment < ActiveRecord::Base
     belongs_to :course, foreign_key: :coalescing_panda_course_id, class_name: 'CoalescingPanda::Course'
+    belongs_to :assignment_group, foreign_key: :coalescing_panda_assignment_group_id, class_name: 'CoalescingPanda::AssignmentGroup'
     has_many :submissions, foreign_key: :coalescing_panda_assignment_id, class_name: 'CoalescingPanda::Submission', dependent: :destroy
 
     delegate :account, to: :course

data/app/models/coalescing_panda/assignment_group.rb

@@ -0,0 +1,11 @@
+module CoalescingPanda
+  class AssignmentGroup < ActiveRecord::Base
+    belongs_to :course, foreign_key: :coalescing_panda_course_id, class_name: 'CoalescingPanda::Course'
+    has_many :assignments, foreign_key: :coalescing_panda_assignment_group_id, class_name: 'CoalescingPanda::Assignment', dependent: :destroy
+
+    delegate :account, to: :course
+
+    validates :coalescing_panda_course_id, presence: true
+    validates :canvas_assignment_group_id, presence: true
+  end
+end

data/app/models/coalescing_panda/course.rb

@@ -10,6 +10,7 @@ module CoalescingPanda
     has_many :groups, :as => :context, class_name: 'CoalescingPanda::Group', dependent: :destroy
     has_many :group_memberships, through: :groups, source: :group_memberships, class_name: 'CoalescingPanda::GroupMembership', dependent: :destroy
     has_many :canvas_batches, as: :context, dependent: :destroy
+    has_many :assignment_groups, foreign_key: :coalescing_panda_course_id, class_name: 'CoalescingPanda::AssignmentGroup', dependent: :destroy
 
     validates :coalescing_panda_lti_account_id, presence: true
     validates :canvas_course_id, presence: true

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

@@ -1,7 +1,7 @@
 class CoalescingPanda::Workers::CourseMiner
-  SUPPORTED_MODELS = [:sections, :users, :enrollments, :assignments, :submissions, :groups, :group_memberships] #ORDER MATTERS!!
+  SUPPORTED_MODELS = [:sections, :users, :enrollments, :assignment_groups, :assignments, :submissions, :groups, :group_memberships] #ORDER MATTERS!!
 
-  attr_accessor :options, :account, :course, :batch, :course_section_ids, :enrollment_ids, :assignment_ids, :group_ids, :user_ids
+  attr_accessor :options, :account, :course, :batch, :course_section_ids, :enrollment_ids, :assignment_ids, :assignment_group_ids, :group_ids, :user_ids
 
   def initialize(course, options = [])
     @course = course
@@ -11,6 +11,7 @@ class CoalescingPanda::Workers::CourseMiner
     @course_section_ids = []
     @enrollment_ids = []
     @assignment_ids = []
+    @assignment_group_ids = []
     @group_ids = []
     @user_ids = []
   end
@@ -37,6 +38,9 @@ class CoalescingPanda::Workers::CourseMiner
 
   def process_api_data(key)
     case key
+    when :assignment_groups
+      collection = api_client.list_assignment_groups(course.canvas_course_id).all_pages!
+      sync_assignment_groups(collection)
     when :sections
       collection = api_client.course_sections(course.canvas_course_id).all_pages!
       sync_sections(collection)
@@ -73,6 +77,21 @@ class CoalescingPanda::Workers::CourseMiner
     end
   end
 
+  def sync_assignment_groups(collection)
+    begin
+      collection.each do |values|
+        values['canvas_assignment_group_id'] = values['id'].to_s
+        assignment_group = course.assignment_groups.where(canvas_assignment_group_id: values['canvas_assignment_group_id']).first_or_initialize
+        assignment_group.assign_attributes(standard_attributes(assignment_group, values))
+        assignment_group.save(validate: false)
+        assignment_group_ids << assignment_group.id
+      end
+      course.assignment_groups.where.not(id: assigment_group_ids).destroy_all
+    rescue => e
+      Rails.logger.error "Error syncing assignment groups: #{e}"
+    end
+  end
+
   def sync_sections(collection)
     begin
       collection.each do |values|
@@ -141,6 +160,8 @@ class CoalescingPanda::Workers::CourseMiner
       collection.each do |values|
         values['canvas_assignment_id'] = values['id'].to_s
         assignment = course.assignments.where(canvas_assignment_id: values['canvas_assignment_id']).first_or_initialize
+        assignment_group = course.assignment_groups.find_by(canvas_assignment_group_id: values['assignment_group_id'])
+        assignment.coalescing_panda_assignment_group_id = assignment_group.id if assignment_group
         assignment.assign_attributes(standard_attributes(assignment, values))
         assignment.save(validate: false)
         assignment_ids << assignment.id

data/db/migrate/20150506183335_create_coalescing_panda_assignment_groups.rb

@@ -0,0 +1,18 @@
+class CreateCoalescingPandaAssignmentGroups < ActiveRecord::Migration
+  def change
+    create_table :coalescing_panda_assignment_groups do |t|
+      t.belongs_to :coalescing_panda_course, null: false
+      t.belongs_to :context, polymorphic: true
+      t.string :canvas_assignment_group_id
+      t.string :name
+      t.integer :position
+      t.float :group_weight
+      t.string :workflow_state
+
+      t.timestamps
+    end
+
+    add_index :coalescing_panda_assignment_groups, [:coalescing_panda_course_id, :canvas_assignment_group_id], name: :index_assignment_group_course, unique: true
+    add_index :coalescing_panda_assignment_groups, [:canvas_assignment_group_id, :context_id, :context_type], name: :index_assignment_group_context, unique: true
+  end
+end

data/db/migrate/20150506192717_add_assignment_group_id_to_assignments.rb

@@ -0,0 +1,5 @@
+class AddAssignmentGroupIdToAssignments < ActiveRecord::Migration
+  def change
+    add_column :coalescing_panda_assignments, :coalescing_panda_assignment_group_id, :integer
+  end
+end

data/lib/coalescing_panda/version.rb

@@ -1,3 +1,3 @@
 module CoalescingPanda
-  VERSION = '4.1.0'
+  VERSION = '4.1.1'
 end

data/spec/dummy/db/schema.rb

@@ -11,14 +11,30 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150210180516) do
+ActiveRecord::Schema.define(version: 20150506192717) do
 
-  create_table "coalescing_panda_assignments", force: true do |t|
-    t.integer  "coalescing_panda_course_id",        null: false
+  create_table "coalescing_panda_assignment_groups", force: :cascade do |t|
+    t.integer  "coalescing_panda_course_id", null: false
+    t.integer  "context_id"
+    t.string   "context_type"
+    t.string   "canvas_assignment_group_id"
     t.string   "name"
-    t.text     "description"
-    t.string   "canvas_assignment_id",              null: false
+    t.integer  "position"
+    t.float    "group_weight"
     t.string   "workflow_state"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "coalescing_panda_assignment_groups", ["canvas_assignment_group_id", "context_id", "context_type"], name: "index_assignment_group_context", unique: true
+  add_index "coalescing_panda_assignment_groups", ["coalescing_panda_course_id", "canvas_assignment_group_id"], name: "index_assignment_group_course", unique: true
+
+  create_table "coalescing_panda_assignments", force: :cascade do |t|
+    t.integer  "coalescing_panda_course_id",                       null: false
+    t.string   "name",                                 limit: 255
+    t.text     "description"
+    t.string   "canvas_assignment_id",                 limit: 255, null: false
+    t.string   "workflow_state",                       limit: 255
     t.float    "points_possible"
     t.datetime "due_at"
     t.datetime "unlock_at"
@@ -29,38 +45,39 @@ ActiveRecord::Schema.define(version: 20150210180516) do
     t.integer  "group_category_id"
     t.boolean  "grade_group_students_individually"
     t.boolean  "published"
+    t.integer  "coalescing_panda_assignment_group_id"
   end
 
   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"
-    t.string   "api_domain"
-    t.string   "api_token"
+  create_table "coalescing_panda_canvas_api_auths", force: :cascade do |t|
+    t.string   "user_id",    limit: 255
+    t.string   "api_domain", limit: 255
+    t.string   "api_token",  limit: 255
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  create_table "coalescing_panda_canvas_batches", force: true do |t|
-    t.float    "percent_complete", default: 0.0
-    t.string   "status"
+  create_table "coalescing_panda_canvas_batches", force: :cascade do |t|
+    t.float    "percent_complete",             default: 0.0
+    t.string   "status",           limit: 255
     t.text     "message"
     t.datetime "created_at"
     t.datetime "updated_at"
     t.integer  "context_id"
-    t.string   "context_type"
+    t.string   "context_type",     limit: 255
   end
 
-  create_table "coalescing_panda_courses", force: true do |t|
-    t.integer  "coalescing_panda_lti_account_id", null: false
+  create_table "coalescing_panda_courses", force: :cascade do |t|
+    t.integer  "coalescing_panda_lti_account_id",             null: false
     t.integer  "coalescing_panda_term_id"
-    t.string   "name"
-    t.string   "canvas_course_id",                null: false
-    t.string   "sis_id"
+    t.string   "name",                            limit: 255
+    t.string   "canvas_course_id",                limit: 255, null: false
+    t.string   "sis_id",                          limit: 255
     t.datetime "start_at"
     t.datetime "conclude_at"
-    t.string   "workflow_state"
-    t.string   "course_code"
+    t.string   "workflow_state",                  limit: 255
+    t.string   "course_code",                     limit: 255
     t.datetime "created_at"
     t.datetime "updated_at"
   end
@@ -69,13 +86,13 @@ ActiveRecord::Schema.define(version: 20150210180516) do
   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",    null: false
-    t.integer  "coalescing_panda_section_id", null: false
-    t.string   "workflow_state"
-    t.string   "sis_id"
-    t.string   "canvas_enrollment_id",        null: false
-    t.string   "enrollment_type"
+  create_table "coalescing_panda_enrollments", force: :cascade do |t|
+    t.integer  "coalescing_panda_user_id",                null: false
+    t.integer  "coalescing_panda_section_id",             null: false
+    t.string   "workflow_state",              limit: 255
+    t.string   "sis_id",                      limit: 255
+    t.string   "canvas_enrollment_id",        limit: 255, null: false
+    t.string   "enrollment_type",             limit: 255
     t.datetime "start_at"
     t.datetime "end_at"
     t.datetime "created_at"
@@ -85,51 +102,51 @@ ActiveRecord::Schema.define(version: 20150210180516) do
   add_index "coalescing_panda_enrollments", ["coalescing_panda_user_id", "coalescing_panda_section_id", "enrollment_type"], name: "index_enrollments_user_and_section", unique: true
   add_index "coalescing_panda_enrollments", ["sis_id"], name: "index_coalescing_panda_enrollments_on_sis_id"
 
-  create_table "coalescing_panda_group_memberships", force: true do |t|
+  create_table "coalescing_panda_group_memberships", force: :cascade do |t|
     t.integer  "coalescing_panda_group_id"
     t.integer  "coalescing_panda_user_id"
-    t.string   "canvas_group_membership_id"
-    t.string   "workflow_state"
+    t.string   "canvas_group_membership_id", limit: 255
+    t.string   "workflow_state",             limit: 255
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  create_table "coalescing_panda_groups", force: true do |t|
+  create_table "coalescing_panda_groups", force: :cascade do |t|
     t.integer  "context_id"
-    t.string   "context_type"
-    t.string   "description"
-    t.string   "group_category_id"
-    t.string   "canvas_group_id"
-    t.string   "name"
+    t.string   "context_type",      limit: 255
+    t.string   "description",       limit: 255
+    t.string   "group_category_id", limit: 255
+    t.string   "canvas_group_id",   limit: 255
+    t.string   "name",              limit: 255
     t.integer  "members_count"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  create_table "coalescing_panda_lti_accounts", force: true do |t|
-    t.string   "name"
-    t.string   "key"
-    t.string   "secret"
-    t.string   "oauth2_client_id"
-    t.string   "oauth2_client_key"
-    t.string   "canvas_account_id"
+  create_table "coalescing_panda_lti_accounts", force: :cascade do |t|
+    t.string   "name",              limit: 255
+    t.string   "key",               limit: 255
+    t.string   "secret",            limit: 255
+    t.string   "oauth2_client_id",  limit: 255
+    t.string   "oauth2_client_key", limit: 255
+    t.string   "canvas_account_id", limit: 255
     t.text     "settings"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  create_table "coalescing_panda_lti_nonces", force: true do |t|
+  create_table "coalescing_panda_lti_nonces", force: :cascade do |t|
     t.integer  "coalescing_panda_lti_account_id"
-    t.string   "nonce"
+    t.string   "nonce",                           limit: 255
     t.datetime "timestamp"
   end
 
-  create_table "coalescing_panda_sections", force: true do |t|
-    t.integer  "coalescing_panda_course_id", null: false
-    t.string   "name"
-    t.string   "canvas_section_id",          null: false
-    t.string   "sis_id"
-    t.string   "workflow_state"
+  create_table "coalescing_panda_sections", force: :cascade do |t|
+    t.integer  "coalescing_panda_course_id",             null: false
+    t.string   "name",                       limit: 255
+    t.string   "canvas_section_id",          limit: 255, null: false
+    t.string   "sis_id",                     limit: 255
+    t.string   "workflow_state",             limit: 255
     t.datetime "start_at"
     t.datetime "end_at"
     t.datetime "created_at"
@@ -139,22 +156,22 @@ ActiveRecord::Schema.define(version: 20150210180516) do
   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|
-    t.string   "token"
+  create_table "coalescing_panda_sessions", force: :cascade do |t|
+    t.string   "token",      limit: 255
     t.text     "data"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  create_table "coalescing_panda_submissions", force: true do |t|
-    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"
+  create_table "coalescing_panda_submissions", force: :cascade do |t|
+    t.integer  "coalescing_panda_user_id",                   null: false
+    t.integer  "coalescing_panda_assignment_id",             null: false
+    t.string   "url",                            limit: 255
+    t.string   "grade",                          limit: 255
+    t.string   "score",                          limit: 255
     t.datetime "submitted_at"
-    t.string   "workflow_state"
-    t.string   "canvas_submission_id",           null: false
+    t.string   "workflow_state",                 limit: 255
+    t.string   "canvas_submission_id",           limit: 255, null: false
     t.datetime "created_at"
     t.datetime "updated_at"
   end
@@ -162,15 +179,15 @@ ActiveRecord::Schema.define(version: 20150210180516) do
   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", "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", null: false
-    t.string   "name"
-    t.string   "code"
-    t.string   "sis_id"
-    t.string   "canvas_term_id",                  null: false
+  create_table "coalescing_panda_terms", force: :cascade do |t|
+    t.integer  "coalescing_panda_lti_account_id",             null: false
+    t.string   "name",                            limit: 255
+    t.string   "code",                            limit: 255
+    t.string   "sis_id",                          limit: 255
+    t.string   "canvas_term_id",                  limit: 255, null: false
     t.datetime "start_at"
     t.datetime "end_at"
-    t.string   "workflow_state"
+    t.string   "workflow_state",                  limit: 255
     t.datetime "created_at"
     t.datetime "updated_at"
   end
@@ -178,14 +195,14 @@ ActiveRecord::Schema.define(version: 20150210180516) do
   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", null: false
-    t.string   "name"
-    t.string   "email"
-    t.string   "roles"
-    t.string   "workflow_state"
-    t.string   "sis_id"
-    t.string   "canvas_user_id",                  null: false
+  create_table "coalescing_panda_users", force: :cascade do |t|
+    t.integer  "coalescing_panda_lti_account_id",             null: false
+    t.string   "name",                            limit: 255
+    t.string   "email",                           limit: 255
+    t.string   "roles",                           limit: 255
+    t.string   "workflow_state",                  limit: 255
+    t.string   "sis_id",                          limit: 255
+    t.string   "canvas_user_id",                  limit: 255, null: false
     t.datetime "created_at"
     t.datetime "updated_at"
   end
@@ -193,16 +210,16 @@ ActiveRecord::Schema.define(version: 20150210180516) do
   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|
-    t.integer  "priority",   default: 0, null: false
-    t.integer  "attempts",   default: 0, null: false
-    t.text     "handler",                null: false
+  create_table "delayed_jobs", force: :cascade do |t|
+    t.integer  "priority",               default: 0, null: false
+    t.integer  "attempts",               default: 0, null: false
+    t.text     "handler",                            null: false
     t.text     "last_error"
     t.datetime "run_at"
     t.datetime "locked_at"
     t.datetime "failed_at"
-    t.string   "locked_by"
-    t.string   "queue"
+    t.string   "locked_by",  limit: 255
+    t.string   "queue",      limit: 255
     t.datetime "created_at"
     t.datetime "updated_at"
   end