coalescing_panda 4.5.3 → 4.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b4aede28621dfdb6cd92e5ba3fa0c9e9a4e0d7c
-  data.tar.gz: 52c623c17029c425d57a989b28385c078eae11fe
+  metadata.gz: e9e2654ffb761e47c42f91c6ca0ec48175d28ae6
+  data.tar.gz: 54ec67cd8f91046779930dd3d0daf2e62caee131
 SHA512:
-  metadata.gz: ba9772fea35da103ec7c34d0769031073373195026dd46f87f5bd7608fedeb6bb51d817856a2cb8b4ed93648f2eeabfd868382ee5e573d197cad57c3f45c7f4e
-  data.tar.gz: acb282dafdc80b8228bb9033260cfd529d64c7201d896e11a0268a51b2cedaa0fe0796c09f8c2ebeda437d2a9e62137b9e5451e6df95c49192506e24ae1beeda
+  metadata.gz: 4e90d9021c91fd66e510f4427d63067c6811f3a520d31d49c192a8db00bd5c90c6c6986a834c3c3950dd79ea9fafebf031dc748e07f0ac7125b688d764f4f8fc
+  data.tar.gz: 3cd47f43554ee4d5419a092e3a432eb054b2a98e7ef679aa0ae3635d29486de5cd71a5acfcf6150e714b471c56d5faf409a6c3d96c0f6a2bdad0d891aeeb2fae

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

@@ -65,36 +65,33 @@ class CoalescingPanda::Workers::CourseMiner
     should_download
   end
 
+  DEFAULT_PARAMS = { 'per_page' => 100 }.freeze
+
   def process_api_data(key)
     case key
     when :assignment_groups
-      collection = api_client.list_assignment_groups(course.canvas_course_id).all_pages!
+      collection = api_client.list_assignment_groups(course.canvas_course_id, DEFAULT_PARAMS).all_pages!
       sync_assignment_groups(collection)
     when :sections
-      collection = api_client.course_sections(course.canvas_course_id).all_pages!
+      collection = api_client.course_sections(course.canvas_course_id, DEFAULT_PARAMS).all_pages!
       sync_sections(collection)
     when :users
-      collection = api_client.list_course_users(course.canvas_course_id, {'enrollment_state' => enrollment_states}).all_pages!
+      collection = api_client.list_course_users(course.canvas_course_id, DEFAULT_PARAMS.merge({'enrollment_state' => enrollment_states})).all_pages!
       sync_users(collection)
     when :enrollments
-      collection = api_client.course_enrollments(course.canvas_course_id, {'state' => enrollment_states}).all_pages!
+      collection = api_client.course_enrollments(course.canvas_course_id, DEFAULT_PARAMS.merge({'state' => enrollment_states})).all_pages!
       sync_enrollments(collection)
     when :assignments
-      collection = api_client.assignments(course.canvas_course_id).all_pages!
+      collection = api_client.assignments(course.canvas_course_id, DEFAULT_PARAMS).all_pages!
       sync_assignments(collection)
     when :submissions
-      collection = []
-      course.assignments.each do |assignment|
-        api_client.get_course_submissions(course.canvas_course_id, assignment.canvas_assignment_id).all_pages!.each do |submissions|
-          collection << submissions
-        end
-      end
+      collection = api_client.course_submissions(course.canvas_course_id, DEFAULT_PARAMS).all_pages!
       sync_submissions(collection)
     when :groups
       collection = api_client.course_groups(course.canvas_course_id).all_pages!
       sync_groups(collection)
     when :group_categories
-      collection = api_client.list_group_categories('courses', course.canvas_course_id).all_pages!
+      collection = api_client.list_group_categories('courses', course.canvas_course_id, DEFAULT_PARAMS).all_pages!
       sync_group_categories(collection)
     when :group_memberships
       collection = []

data/lib/coalescing_panda/version.rb

@@ -1,3 +1,3 @@
 module CoalescingPanda
-  VERSION = '4.5.3'
+  VERSION = '4.5.4'
 end

data/spec/models/coalescing_panda/workers/course_miner_spec.rb

@@ -20,11 +20,9 @@ RSpec.describe CoalescingPanda::Workers::CourseMiner, :type => :model do
     {"assignment_group_id"=>1, "automatic_peer_reviews"=>false, "created_at"=>"2014-11-18T18:04:38Z", "description"=>"<p>What is your name?</p>", "due_at"=>nil, "grade_group_students_individually"=>false, "grading_standard_id"=>nil, "grading_type"=>"points", "group_category_id"=>1, "id"=>1, "lock_at"=>nil, "peer_reviews"=>false, "points_possible"=>100, "position"=>1, "post_to_sis"=>true, "unlock_at"=>nil, "updated_at"=>"2014-11-18T18:04:42Z", "course_id"=>1, "name"=>"Gimme your name", "submission_types"=>["online_text_entry"], "has_submitted_submissions"=>false, "muted"=>false, "html_url"=>"http://localhost:3000/courses/1/assignments/1", "needs_grading_count"=>0, "integration_id"=>nil, "integration_data"=>{}, "published"=>true, "unpublishable"=>true, "locked_for_user"=>false},
     {"assignment_group_id"=>1, "automatic_peer_reviews"=>false, "created_at"=>"2014-11-18T19:10:28Z", "description"=>"<p>What is your Favorite Color?</p>", "due_at"=>nil, "grade_group_students_individually"=>false, "grading_standard_id"=>nil, "grading_type"=>"points", "group_category_id"=>nil, "id"=>2, "lock_at"=>nil, "peer_reviews"=>false, "points_possible"=>100, "position"=>2, "post_to_sis"=>true, "unlock_at"=>nil, "updated_at"=>"2014-11-18T19:10:30Z", "course_id"=>1, "name"=>"Favorite Color", "submission_types"=>["online_text_entry"], "has_submitted_submissions"=>false, "muted"=>false, "html_url"=>"http://localhost:3000/courses/1/assignments/2", "needs_grading_count"=>0, "integration_id"=>nil, "integration_data"=>{}, "published"=>true, "unpublishable"=>true, "locked_for_user"=>false}
   ]}
-  let(:submissions_response1) {[
+  let(:submissions_response) {[
     {"assignment_id"=>1, "attempt"=>nil, "body"=>nil, "grade"=>"70", "grade_matches_current_submission"=>true, "graded_at"=>"2014-11-20T23:18:19Z", "grader_id"=>1, "id"=>3, "score"=>70, "submission_type"=>nil, "submitted_at"=>nil, "url"=>nil, "user_id"=>3, "workflow_state"=>"graded", "late"=>false, "preview_url"=>"http://localhost:3000/courses/1/assignments/1/submissions/3?preview=1"},
-    {"assignment_id"=>1, "attempt"=>nil, "body"=>nil, "grade"=>"100", "grade_matches_current_submission"=>true, "graded_at"=>"2014-11-20T23:18:14Z", "grader_id"=>1, "id"=>1, "score"=>100, "submission_type"=>nil, "submitted_at"=>nil, "url"=>nil, "user_id"=>2, "workflow_state"=>"graded", "late"=>false, "preview_url"=>"http://localhost:3000/courses/1/assignments/1/submissions/2?preview=1"}
-  ]}
-  let(:submissions_response2) {[
+    {"assignment_id"=>1, "attempt"=>nil, "body"=>nil, "grade"=>"100", "grade_matches_current_submission"=>true, "graded_at"=>"2014-11-20T23:18:14Z", "grader_id"=>1, "id"=>1, "score"=>100, "submission_type"=>nil, "submitted_at"=>nil, "url"=>nil, "user_id"=>2, "workflow_state"=>"graded", "late"=>false, "preview_url"=>"http://localhost:3000/courses/1/assignments/1/submissions/2?preview=1"},
     {"assignment_id"=>2, "attempt"=>nil, "body"=>nil, "grade"=>"90", "grade_matches_current_submission"=>true, "graded_at"=>"2014-11-20T23:18:21Z", "grader_id"=>1, "id"=>4, "score"=>90, "submission_type"=>nil, "submitted_at"=>nil, "url"=>nil, "user_id"=>3, "workflow_state"=>"graded", "late"=>false, "preview_url"=>"http://localhost:3000/courses/1/assignments/2/submissions/3?preview=1"},
     {"assignment_id"=>2, "attempt"=>nil, "body"=>nil, "grade"=>"80", "grade_matches_current_submission"=>true, "graded_at"=>"2014-11-20T23:18:17Z", "grader_id"=>1, "id"=>2, "score"=>80, "submission_type"=>nil, "submitted_at"=>nil, "url"=>nil, "user_id"=>2, "workflow_state"=>"graded", "late"=>false, "preview_url"=>"http://localhost:3000/courses/1/assignments/2/submissions/2?preview=1"}
   ]}
@@ -49,11 +47,10 @@ RSpec.describe CoalescingPanda::Workers::CourseMiner, :type => :model do
     Bearcat::Client.any_instance.stub(:course_enrollments) { double(Bearcat::ApiArray, :all_pages! => enrollments_response) }
     Bearcat::Client.any_instance.stub(:assignments) { double(Bearcat::ApiArray, :all_pages! => assignments_response) }
     Bearcat::Client.any_instance.stub(:get_course_submissions) { double(Bearcat::ApiArray, :all_pages! => {}) }
-    Bearcat::Client.any_instance.stub(:get_course_submissions).with("1", "1") { double(Bearcat::ApiArray, :all_pages! => submissions_response1) }
-    Bearcat::Client.any_instance.stub(:get_course_submissions).with("1", "2") { double(Bearcat::ApiArray, :all_pages! => submissions_response2) }
     Bearcat::Client.any_instance.stub(:course_groups) { double(Bearcat::ApiArray, :all_pages! => groups_response) }
     Bearcat::Client.any_instance.stub(:list_group_memberships) { double(Bearcat::ApiArray, :all_pages! => membership_response) }
-    Bearcat::Client.any_instance.stub(:list_assignment_groups) { double(Bearcat::ApiArray, :all_pages! => assignment_groups_response) }
+    Bearcat::Client.any_instance.stub(:course_submissions) { double(Bearcat::ApiArray, :all_pages! => submissions_response) }
+    Bearcat::Client.any_instance.stub(:list_assignment_groups) { double(Bearcat::ApiArray, :all_pages! => []) }
   end
 
   describe '#initialize' do
@@ -133,7 +130,6 @@ RSpec.describe CoalescingPanda::Workers::CourseMiner, :type => :model do
 
     it 'creates submissions' do
       CoalescingPanda::Submission.destroy_all
-      submissions_response = submissions_response1 + submissions_response2
       worker.sync_sections(sections_response)
       worker.sync_users(users_response)
       worker.sync_enrollments(enrollments_response)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coalescing_panda
 version: !ruby/object:Gem::Version
-  version: 4.5.3
+  version: 4.5.4
 platform: ruby
 authors:
 - Nathan Mills
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-22 00:00:00.000000000 Z
+date: 2018-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails