coalescing_panda 4.0.2 → 4.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3111ee81eb937deba10901dc83277496eb8f350e
-  data.tar.gz: a6fa5a91374898ebdd73bf45a4f1d865d16a5877
+  metadata.gz: c416f5ba3e29b409e62db9851120231f37b84087
+  data.tar.gz: d542133873f5f8b0e7c9eaa78cdbeb224ae17515
 SHA512:
-  metadata.gz: 3dabeb94c51efd5872babf05e970748ca18f682f216161e7f0cac853d780c510d588feb6ddde09250175679116cfeac7db8cb6ff923b6d007c7450fea3ff1c55
-  data.tar.gz: 3568a3cbc4f85f3d2a17c189212a3956cfa21c8bfd3c74eea19fe5ff42af1b1bdb351d96d671a2c1f5ef7e3202643da193bc9e8f3682bd12d4ff7c14e9214932
+  metadata.gz: efad447c43b7c9648c010c940dd591fabd76fc128046647b813bec25a701630e84d45ef337a92d31dd8b71876d8bada67b4d80761327e160aec30515bf529f5b
+  data.tar.gz: b8610970bdfa070cc993280f2ee98217c438ffc593a0745cf9ae7afc544a09200e765ec3f7d7dce865caf648c599cd8a28b6b4b6cdf8a1895deb87a27a791e9e

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!!
 
-  attr_accessor :options, :account, :course, :batch, :course_section_ids, :enrollment_ids, :assignment_ids, :group_ids
+  attr_accessor :options, :account, :course, :batch, :course_section_ids, :enrollment_ids, :assignment_ids, :group_ids, :user_ids
 
   def initialize(course, options = [])
     @course = course
@@ -12,6 +12,7 @@ class CoalescingPanda::Workers::CourseMiner
     @enrollment_ids = []
     @assignment_ids = []
     @group_ids = []
+    @user_ids = []
   end
 
   def api_client
@@ -89,17 +90,26 @@ class CoalescingPanda::Workers::CourseMiner
   end
 
   def sync_users(collection)
-    collection.each do |values|
-      begin
+    begin
+      collection.each do |values|
         values['canvas_user_id'] = values["id"].to_s
         user = account.users.where(canvas_user_id: values['canvas_user_id']).first_or_initialize
         user.coalescing_panda_lti_account_id = account.id
         user.assign_attributes(standard_attributes(user, values))
         user.sis_id = values['sis_user_id'].to_s
+        user_ids << user.id
         user.save(validate: false)
-      rescue => e
-        Rails.logger.error "Error syncing users: #{e}"
       end
+      removed_users = course.users.where.not(id: user_ids)
+      removed_users.each do |user|
+        user.enrollments.each do |enrollment|
+          course.submissions.where(coalescing_panda_user_id: enrollment.user.id).destroy_all
+          enrollment.destroy
+        end
+      end
+      removed_users.destroy_all
+    rescue => e
+      Rails.logger.error "Error syncing users: #{e}"
     end
   end
 
@@ -116,7 +126,11 @@ class CoalescingPanda::Workers::CourseMiner
         enrollment.save(validate: false)
         enrollment_ids << enrollment.id
       end
-      course.enrollments.where.not(id: enrollment_ids).destroy_all
+      removed_enrollments = course.enrollments.where.not(id: enrollment_ids)
+      removed_enrollments.each do |enrollment|
+        course.submissions.where(coalescing_panda_user_id: enrollment.user.id).destroy_all
+      end
+      removed_enrollments.destroy_all
     rescue => e
       Rails.logger.error "Error syncing enrollments: #{e}"
     end

data/lib/coalescing_panda/version.rb

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

metadata

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