coalescing_panda 4.0.1 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6db6071ede647b9348ff16bd8ae1f4b036380a13
-  data.tar.gz: cc7eb489080d12d423df6fa77dfa9ce7c7de04d9
+  metadata.gz: 3111ee81eb937deba10901dc83277496eb8f350e
+  data.tar.gz: a6fa5a91374898ebdd73bf45a4f1d865d16a5877
 SHA512:
-  metadata.gz: 85ad94225ab2dbe04009d80347415742fef921a1c6ba738fce8e56abed614d22944857d911dc128a996a96854e36e1c7cacaf91373510a6339192156e8cf882a
-  data.tar.gz: 9a28bb4f2a3c7506ad301d7c8ab12d292a72b913f34e155c64b076e48bb429683e1cd287d7d92f3a8893a68edb2531bf36fa8a7aa5b718720dc5213667d905c7
+  metadata.gz: 3dabeb94c51efd5872babf05e970748ca18f682f216161e7f0cac853d780c510d588feb6ddde09250175679116cfeac7db8cb6ff923b6d007c7450fea3ff1c55
+  data.tar.gz: 3568a3cbc4f85f3d2a17c189212a3956cfa21c8bfd3c74eea19fe5ff42af1b1bdb351d96d671a2c1f5ef7e3202643da193bc9e8f3682bd12d4ff7c14e9214932

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

@@ -27,7 +27,6 @@ class CoalescingPanda::Workers::CourseMiner
         percent_complete = (index/(options.count.nonzero? || 1).to_f * 100).round(1)
         batch.update_attributes(percent_complete: percent_complete)
       end
-      delete_removed_records
       batch.update_attributes(status: "Completed", percent_complete: 100)
     rescue => e
       batch.update_attributes(status: "Error", message: e.message)
@@ -73,25 +72,19 @@ class CoalescingPanda::Workers::CourseMiner
     end
   end
 
-  def delete_removed_records
-    course.sections.where.not(id: course_section_ids).destroy_all
-    course.enrollments.where.not(id: enrollment_ids).destroy_all
-    course.assignments.where.not(id: assignment_ids).destroy_all
-    course.groups.where.not(id: group_ids).destroy_all
-  end
-
   def sync_sections(collection)
-    collection.each do |values|
-      begin
+    begin
+      collection.each do |values|
         values['course_section_id'] = values['id'].to_s
         section = course.sections.where(canvas_section_id: values['course_section_id']).first_or_initialize
         section.assign_attributes(standard_attributes(section, values))
         section.sis_id = values['sis_section_id']
         section.save(validate: false)
         course_section_ids << section.id
-      rescue => e
-        Rails.logger.error "Error syncing sections: #{e}"
       end
+      course.sections.where.not(id: course_section_ids).destroy_all
+    rescue => e
+      Rails.logger.error "Error syncing sections: #{e}"
     end
   end
 
@@ -111,8 +104,8 @@ class CoalescingPanda::Workers::CourseMiner
   end
 
   def sync_enrollments(collection)
-    collection.each do |values|
-      begin
+    begin
+      collection.each do |values|
         values['canvas_enrollment_id'] = values['id'].to_s
         enrollment = course.enrollments.where(canvas_enrollment_id: values['canvas_enrollment_id']).first_or_initialize
         enrollment.section = course.sections.find_by(canvas_section_id: values['course_section_id'].to_s)
@@ -122,51 +115,73 @@ class CoalescingPanda::Workers::CourseMiner
         enrollment.assign_attributes(standard_attributes(enrollment, values))
         enrollment.save(validate: false)
         enrollment_ids << enrollment.id
-      rescue => e
-        Rails.logger.error "Error syncing enrollments: #{e}"
       end
+      course.enrollments.where.not(id: enrollment_ids).destroy_all
+    rescue => e
+      Rails.logger.error "Error syncing enrollments: #{e}"
     end
   end
 
   def sync_assignments(collection)
-    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.assign_attributes(standard_attributes(assignment, values))
-      assignment.save(validate: false)
-      assignment_ids << assignment.id
+    begin
+      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.assign_attributes(standard_attributes(assignment, values))
+        assignment.save(validate: false)
+        assignment_ids << assignment.id
+      end
+      course.assignments.where.not(id: assignment_ids).each do |assignment|
+        assignment.submissions.destroy_all
+        assignment.destroy!
+      end
+    rescue => e
+      Rails.logger.error "Error syncing assignments: #{e}"
     end
   end
 
   def sync_submissions(collection)
-    collection.each do |values|
-      values['canvas_submission_id'] = values['id'].to_s
-      submission = course.submissions.where(canvas_submission_id: values['canvas_submission_id']).first_or_initialize
-      submission.user = course.users.find_by(canvas_user_id: values['user_id'].to_s)
-      submission.assignment = course.assignments.find_by(canvas_assignment_id: values['assignment_id'].to_s)
-      submission.assign_attributes(standard_attributes(submission, values))
-      submission.save(validate: false)
+    begin
+      collection.each do |values|
+        values['canvas_submission_id'] = values['id'].to_s
+        submission = course.submissions.where(canvas_submission_id: values['canvas_submission_id']).first_or_initialize
+        submission.user = course.users.find_by(canvas_user_id: values['user_id'].to_s)
+        submission.assignment = course.assignments.find_by(canvas_assignment_id: values['assignment_id'].to_s)
+        submission.assign_attributes(standard_attributes(submission, values))
+        submission.save(validate: false)
+      end
+    rescue => e
+      Rails.logger.error "Error syncing submissions: #{e}"
     end
   end
 
   def sync_groups(collection)
-    collection.each do |values|
-      values['canvas_group_id'] = values['id'].to_s
-      group = course.groups.where(canvas_group_id: values['canvas_group_id']).first_or_initialize
-      group.assign_attributes(standard_attributes(group, values))
-      group.save(validate: false)
-      group_ids << group.id
+    begin
+      collection.each do |values|
+        values['canvas_group_id'] = values['id'].to_s
+        group = course.groups.where(canvas_group_id: values['canvas_group_id']).first_or_initialize
+        group.assign_attributes(standard_attributes(group, values))
+        group.save(validate: false)
+        group_ids << group.id
+      end
+      course.groups.where.not(id: group_ids).destroy_all
+    rescue => e
+      Rails.logger.error "Error syncing groups: #{e}"
     end
   end
 
   def sync_group_memberships(collection)
-    collection.each do |values|
-      values['canvas_group_membership_id'] = values['id'].to_s
-      group_membership = course.group_memberships.where(canvas_group_membership_id: values['canvas_group_membership_id']).first_or_initialize
-      group_membership.group = course.groups.find_by(canvas_group_id: values['group_id'].to_s)
-      group_membership.user = course.users.find_by(canvas_user_id: values['user_id'].to_s)
-      group_membership.assign_attributes(standard_attributes(group_membership, values))
-      group_membership.save(validate: false)
+    begin
+      collection.each do |values|
+        values['canvas_group_membership_id'] = values['id'].to_s
+        group_membership = course.group_memberships.where(canvas_group_membership_id: values['canvas_group_membership_id']).first_or_initialize
+        group_membership.group = course.groups.find_by(canvas_group_id: values['group_id'].to_s)
+        group_membership.user = course.users.find_by(canvas_user_id: values['user_id'].to_s)
+        group_membership.assign_attributes(standard_attributes(group_membership, values))
+        group_membership.save(validate: false)
+      end
+    rescue => e
+      Rails.logger.error "Error syncing group memberships: #{e}"
     end
   end
 

data/lib/coalescing_panda/version.rb

@@ -1,3 +1,3 @@
 module CoalescingPanda
-  VERSION = '4.0.1'
+  VERSION = '4.0.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coalescing_panda
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.0.2
 platform: ruby
 authors:
 - Nathan Mills