canvas_sync 0.9.4 → 0.10.0

data/lib/canvas_sync/version.rb

@@ -1,3 +1,3 @@
 module CanvasSync
-  VERSION = "0.9.4".freeze
+  VERSION = "0.10.0".freeze
 end

data/spec/canvas_sync/jobs/sync_provisioning_report_job_spec.rb

@@ -11,7 +11,7 @@ RSpec.describe CanvasSync::Jobs::SyncProvisioningReportJob do
 
       it 'enqueues a ReportStarter for a provisioning report for the specified models for each term' do
         expected_job_chain = Marshal.load(Marshal.dump(job_chain))
-        expected_job_chain[:global_options][:canvas_term_id] = active_term_1.canvas_term_id
+        expected_job_chain[:global_options][:canvas_term_id] = active_term_1.canvas_id
 
         expect(CanvasSync::Jobs::ReportStarter).to receive(:perform_later)
           .with(
@@ -21,14 +21,14 @@ RSpec.describe CanvasSync::Jobs::SyncProvisioningReportJob do
               "parameters[include_deleted]" => true,
               "parameters[users]" => true,
               "parameters[courses]" => true,
-              "parameters[enrollment_term_id]" => active_term_1.canvas_term_id
+              "parameters[enrollment_term_id]" => active_term_1.canvas_id
             },
             CanvasSync::Processors::ProvisioningReportProcessor.to_s,
             { models: ['users', 'courses'], term_scope: 'active' }
           )
 
         expected_job_chain_2 = Marshal.load(Marshal.dump(job_chain))
-        expected_job_chain_2[:global_options][:canvas_term_id] = active_term_2.canvas_term_id
+        expected_job_chain_2[:global_options][:canvas_term_id] = active_term_2.canvas_id
 
         expect(CanvasSync::Jobs::ReportStarter).to receive(:perform_later)
           .with(
@@ -38,7 +38,7 @@ RSpec.describe CanvasSync::Jobs::SyncProvisioningReportJob do
               "parameters[include_deleted]" => true,
               "parameters[users]" => true,
               "parameters[courses]" => true,
-              "parameters[enrollment_term_id]" => active_term_2.canvas_term_id
+              "parameters[enrollment_term_id]" => active_term_2.canvas_id
             },
             CanvasSync::Processors::ProvisioningReportProcessor.to_s,
             { models: ['users', 'courses'], term_scope: 'active' }

data/spec/canvas_sync/jobs/sync_simple_table_job_spec.rb

@@ -10,7 +10,7 @@ RSpec.describe CanvasSync::Jobs::SyncSimpleTableJob do
 
       it 'enqueues a ReportStarter for a provisioning report for the specified model for a term' do
         expected_job_chain = Marshal.load(Marshal.dump(job_chain))
-        expected_job_chain[:global_options][:canvas_term_id] = active_term_1.canvas_term_id
+        expected_job_chain[:global_options][:canvas_term_id] = active_term_1.canvas_id
 
         expect(CanvasSync::Jobs::ReportStarter).to receive(:perform_later)
           .with(
@@ -19,7 +19,7 @@ RSpec.describe CanvasSync::Jobs::SyncSimpleTableJob do
             {
               "parameters[include_deleted]" => true,
               "parameters[courses]" => true,
-              "parameters[enrollment_term_id]" => active_term_1.canvas_term_id
+              "parameters[enrollment_term_id]" => active_term_1.canvas_id
             },
             CanvasSync::Processors::NormalProcessor.to_s,
             {
@@ -31,7 +31,7 @@ RSpec.describe CanvasSync::Jobs::SyncSimpleTableJob do
               params: {
                 "parameters[include_deleted]" => true,
                 "parameters[courses]" => true,
-                "parameters[enrollment_term_id]" => active_term_1.canvas_term_id
+                "parameters[enrollment_term_id]" => active_term_1.canvas_id
               }
             }
           )

data/spec/canvas_sync/models/accounts_spec.rb

@@ -4,8 +4,8 @@ RSpec.describe Account, type: :model do
   let(:subject) { FactoryGirl.create(:account) }
 
   describe 'validations' do
-    it { should validate_presence_of(:canvas_account_id) }
-    it { should validate_uniqueness_of(:canvas_account_id) }
+    it { should validate_presence_of(:canvas_id) }
+    it { should validate_uniqueness_of(:canvas_id) }
   end
 
 end

data/spec/canvas_sync/models/admins_spec.rb

@@ -4,8 +4,8 @@ RSpec.describe Admin, type: :model do
   let(:subject) { FactoryGirl.create(:admin) }
 
   describe 'validations' do
-    it { should validate_presence_of(:canvas_admin_id) }
-    it { should validate_uniqueness_of(:canvas_admin_id) }
+    it { should validate_presence_of(:canvas_id) }
+    it { should validate_uniqueness_of(:canvas_id) }
   end
 
   describe '.create_or_update' do
@@ -27,7 +27,7 @@ RSpec.describe Admin, type: :model do
     end
 
     context 'the admin already exists' do
-      let!(:existing_admin) { FactoryGirl.create(:admin, canvas_admin_id: admin_params['id']) }
+      let!(:existing_admin) { FactoryGirl.create(:admin, canvas_id: admin_params['id']) }
 
       it 'updates it' do
         expect {

data/spec/canvas_sync/models/assignment_group_spec.rb

@@ -4,20 +4,20 @@ RSpec.describe AssignmentGroup, type: :model do
   let(:subject) { FactoryGirl.create(:assignment_group) }
 
   describe 'validations' do
-    it { should validate_presence_of(:canvas_assignment_group_id) }
-    it { should validate_uniqueness_of(:canvas_assignment_group_id) }
+    it { should validate_presence_of(:canvas_id) }
+    it { should validate_uniqueness_of(:canvas_id) }
   end
 
   describe 'associations' do
     it do
       should belong_to(:course)
-        .with_primary_key(:canvas_course_id)
+        .with_primary_key(:canvas_id)
         .with_foreign_key(:canvas_course_id)
     end
 
     it do
       should have_many(:assignments)
-        .with_primary_key(:canvas_assignment_group_id)
+        .with_primary_key(:canvas_id)
         .with_foreign_key(:canvas_assignment_group_id)
     end
   end

data/spec/canvas_sync/models/assignment_spec.rb

@@ -4,27 +4,27 @@ RSpec.describe Assignment, type: :model do
   let(:subject) { FactoryGirl.create(:assignment) }
 
   describe "validations" do
-    it { should validate_presence_of(:canvas_assignment_id) }
-    it { should validate_uniqueness_of(:canvas_assignment_id) }
+    it { should validate_presence_of(:canvas_id) }
+    it { should validate_uniqueness_of(:canvas_id) }
   end
 
   describe "associations" do
     it do
       should have_many(:submissions)
-        .with_primary_key(:canvas_assignment_id)
+        .with_primary_key(:canvas_id)
         .with_foreign_key(:canvas_assignment_id)
     end
 
     it do
       should belong_to(:assignment_group)
-        .with_primary_key(:canvas_assignment_group_id)
+        .with_primary_key(:canvas_id)
         .with_foreign_key(:canvas_assignment_group_id)
     end
 
     it do
       should have_many(:context_module_items)
-        .with_primary_key(:canvas_assignment_id)
-        .with_foreign_key(:content_id)
+        .with_primary_key(:canvas_id)
+        .with_foreign_key(:canvas_content_id)
         .dependent(:destroy)
     end
 
@@ -35,10 +35,10 @@ RSpec.describe Assignment, type: :model do
       let!(:matching_course) { FactoryGirl.create(:course) }
 
       before do
-        subject.update_attributes(context_type: "Course", context_id: matching_course.canvas_course_id)
+        subject.update_attributes(canvas_context_type: "Course", canvas_context_id: matching_course.canvas_id)
       end
 
-      it "should belong to courses where the context_type is Course and context_id is the canvas_course_id" do
+      it "should belong to courses where the canvas_context_type is Course and canvas_context_id is the canvas_course_id" do
         expect(subject.context).to eq(matching_course)
       end
     end

data/spec/canvas_sync/models/context_module_spec.rb

@@ -5,12 +5,12 @@ RSpec.describe ContextModule, type: :model do
 
   describe "associations" do
     it do
-      should belong_to(:canvas_context)
+      should belong_to(:context)
     end
 
     it do
       should have_many(:context_module_items)
-        .with_primary_key(:canvas_context_module_id)
+        .with_primary_key(:canvas_id)
         .with_foreign_key(:canvas_context_module_id)
     end
 

data/spec/canvas_sync/models/course_spec.rb

@@ -4,43 +4,42 @@ RSpec.describe Course, type: :model do
   let(:subject) { FactoryGirl.create(:course) }
 
   describe 'validations' do
-    it { should validate_presence_of(:canvas_course_id) }
-    it { should validate_uniqueness_of(:canvas_course_id) }
+    it { should validate_presence_of(:canvas_id) }
+    it { should validate_uniqueness_of(:canvas_id) }
   end
 
   describe 'associations' do
     it do
       should belong_to(:term)
-        .with_primary_key(:canvas_term_id)
+        .with_primary_key(:canvas_id)
         .with_foreign_key(:canvas_term_id)
     end
 
     it do
       should have_many(:enrollments)
-        .with_primary_key(:canvas_course_id)
+        .with_primary_key(:canvas_id)
         .with_foreign_key(:canvas_course_id)
     end
 
     it do
       should have_many(:sections)
-        .with_primary_key(:canvas_course_id)
+        .with_primary_key(:canvas_id)
         .with_foreign_key(:canvas_course_id)
     end
 
     it do
       should have_many(:assignment_groups)
-        .with_primary_key(:canvas_course_id)
+        .with_primary_key(:canvas_id)
         .with_foreign_key(:canvas_course_id)
     end
 
     it do
       should have_many(:assignments)
-        .with_primary_key(:canvas_course_id)
+        .with_primary_key(:canvas_id)
     end
 
     it do
       should have_many(:submissions)
-        .with_primary_key(:canvas_course_id)
     end
   end
 end

data/spec/canvas_sync/models/enrollment_spec.rb

@@ -4,26 +4,26 @@ RSpec.describe Enrollment, type: :model do
   let(:subject) { FactoryGirl.create(:enrollment) }
 
   describe 'validations' do
-    it { should validate_presence_of(:canvas_enrollment_id) }
-    it { should validate_uniqueness_of(:canvas_enrollment_id) }
+    it { should validate_presence_of(:canvas_id) }
+    it { should validate_uniqueness_of(:canvas_id) }
   end
 
   describe 'associations' do
     it do
       should belong_to(:user)
-        .with_primary_key(:canvas_user_id)
+        .with_primary_key(:canvas_id)
         .with_foreign_key(:canvas_user_id)
     end
 
     it do
       should belong_to(:course)
-        .with_primary_key(:canvas_course_id)
+        .with_primary_key(:canvas_id)
         .with_foreign_key(:canvas_course_id)
     end
 
     it do
       should belong_to(:section)
-        .with_primary_key(:canvas_section_id)
+        .with_primary_key(:canvas_id)
         .with_foreign_key(:canvas_section_id)
     end
   end

data/spec/canvas_sync/models/roles_spec.rb

@@ -4,8 +4,8 @@ RSpec.describe Role, type: :model do
   let(:subject) { FactoryGirl.create(:role) }
 
   describe 'validations' do
-    it { should validate_presence_of(:canvas_role_id) }
-    it { should validate_uniqueness_of(:canvas_role_id) }
+    it { should validate_presence_of(:canvas_id) }
+    it { should validate_uniqueness_of(:canvas_id) }
   end
 
   describe '.create_or_update' do
@@ -27,7 +27,7 @@ RSpec.describe Role, type: :model do
     end
 
     context 'the role already exists' do
-      let!(:existing_role) { FactoryGirl.create(:role, canvas_role_id: role_params['id']) }
+      let!(:existing_role) { FactoryGirl.create(:role, canvas_id: role_params['id']) }
 
       it 'updates it' do
         expect {

data/spec/canvas_sync/models/section_spec.rb

@@ -4,20 +4,20 @@ RSpec.describe Section, type: :model do
   let(:subject) { FactoryGirl.create(:section) }
 
   describe 'validations' do
-    it { should validate_presence_of(:canvas_section_id) }
-    it { should validate_uniqueness_of(:canvas_section_id) }
+    it { should validate_presence_of(:canvas_id) }
+    it { should validate_uniqueness_of(:canvas_id) }
   end
 
   describe 'associations' do
     it do
       should belong_to(:course)
-        .with_primary_key(:canvas_course_id)
+        .with_primary_key(:canvas_id)
         .with_foreign_key(:canvas_course_id)
     end
 
     it do
       should have_many(:enrollments)
-        .with_primary_key(:canvas_section_id)
+        .with_primary_key(:canvas_id)
         .with_foreign_key(:canvas_section_id)
     end
   end

data/spec/canvas_sync/models/submission_spec.rb

@@ -4,26 +4,26 @@ RSpec.describe Submission, type: :model do
   let(:subject) { FactoryGirl.create(:submission) }
 
   describe "validations" do
-    it { should validate_presence_of(:canvas_submission_id) }
-    it { should validate_uniqueness_of(:canvas_submission_id) }
+    it { should validate_presence_of(:canvas_id) }
+    it { should validate_uniqueness_of(:canvas_id) }
   end
 
   describe 'associations' do
     it do
       should belong_to(:user)
-        .with_primary_key(:canvas_user_id)
+        .with_primary_key(:canvas_id)
         .with_foreign_key(:canvas_user_id)
     end
 
     it do
       should belong_to(:assignment)
-        .with_primary_key(:canvas_assignment_id)
+        .with_primary_key(:canvas_id)
         .with_foreign_key(:canvas_assignment_id)
     end
 
     it do
       should belong_to(:course)
-        .with_primary_key(:canvas_course_id)
+        .with_primary_key(:canvas_id)
         .with_foreign_key(:canvas_course_id)
     end
   end

data/spec/canvas_sync/models/term_spec.rb

@@ -4,14 +4,14 @@ RSpec.describe Term, type: :model do
   let(:subject) { FactoryGirl.create(:term) }
 
   describe 'validations' do
-    it { should validate_presence_of(:canvas_term_id) }
-    it { should validate_uniqueness_of(:canvas_term_id) }
+    it { should validate_presence_of(:canvas_id) }
+    it { should validate_uniqueness_of(:canvas_id) }
   end
 
   describe 'associations' do
     it do
       should have_many(:courses)
-        .with_primary_key(:canvas_term_id)
+        .with_primary_key(:canvas_id)
         .with_foreign_key(:canvas_term_id)
     end
   end
@@ -23,7 +23,7 @@ RSpec.describe Term, type: :model do
       let!(:completed_term) { FactoryGirl.create(:term, start_at: 2.months.ago, end_at: 1.month.ago) }
       let!(:unstarted_term) { FactoryGirl.create(:term, start_at: 6.months.from_now, end_at: 1.year.from_now) }
 
-      it 'returns terms with an active workflow_state that have a start_date 15 days in the future or earlier and an end_date 15 days in the past or later' do
+      it 'returns terms with an active workflow_state that have a start_at 15 days in the future or earlier and an end_at 15 days in the past or later' do
         expect(Term.active).to match_array([active_term])
       end
     end
@@ -42,7 +42,7 @@ RSpec.describe Term, type: :model do
         expect(term.name).to eq(term_params['name'])
         expect(term.start_at).to eq(term_params['start_at'])
         expect(term.end_at).to eq(term_params['end_at'])
-        expect(term.canvas_term_id).to eq(term_params['id'])
+        expect(term.canvas_id).to eq(term_params['id'])
         expect(term.grading_period_group_id).to eq(term_params['grading_period_group_id'])
         expect(term.sis_id).to eq(term_params['sis_term_id'])
         expect(term.workflow_state).to eq(term_params['workflow_state'])
@@ -50,7 +50,7 @@ RSpec.describe Term, type: :model do
     end
 
     context 'the term already exists' do
-      let!(:existing_term) { FactoryGirl.create(:term, canvas_term_id: term_params['id']) }
+      let!(:existing_term) { FactoryGirl.create(:term, canvas_id: term_params['id']) }
 
       it 'updates it' do
         expect {
@@ -61,7 +61,7 @@ RSpec.describe Term, type: :model do
         expect(existing_term.name).to eq(term_params['name'])
         expect(existing_term.start_at).to eq(term_params['start_at'])
         expect(existing_term.end_at).to eq(term_params['end_at'])
-        expect(existing_term.canvas_term_id).to eq(term_params['id'])
+        expect(existing_term.canvas_id).to eq(term_params['id'])
         expect(existing_term.grading_period_group_id).to eq(term_params['grading_period_group_id'])
         expect(existing_term.sis_id).to eq(term_params['sis_term_id'])
         expect(existing_term.workflow_state).to eq(term_params['workflow_state'])

data/spec/canvas_sync/models/user_spec.rb

@@ -4,20 +4,20 @@ RSpec.describe User, type: :model do
   let(:subject) { FactoryGirl.create(:user) }
 
   describe 'validations' do
-    it { should validate_presence_of(:canvas_user_id) }
-    it { should validate_uniqueness_of(:canvas_user_id) }
+    it { should validate_presence_of(:canvas_id) }
+    it { should validate_uniqueness_of(:canvas_id) }
   end
 
   describe 'associations' do
     it do
       should have_many(:enrollments)
-        .with_primary_key(:canvas_user_id)
+        .with_primary_key(:canvas_id)
         .with_foreign_key(:canvas_user_id)
     end
 
     it do
       should have_many(:submissions)
-        .with_primary_key(:canvas_user_id)
+        .with_primary_key(:canvas_id)
         .with_foreign_key(:canvas_user_id)
     end
   end

data/spec/canvas_sync/processors/provisioning_report_processor_spec.rb

@@ -15,8 +15,8 @@ RSpec.describe CanvasSync::Processors::ProvisioningReportProcessor do
         subject.process('spec/support/fixtures/reports/courses.csv', { models: ['courses'] }, 1)
       }.to change { Course.count }.by(2)
       course = Course.first
-      expect(course.start_date).to eq DateTime.parse("2017-03-27 21:53:18")
-      expect(course.end_date).to eq DateTime.parse("2017-04-27 12:21:18")
+      expect(course.start_at).to eq DateTime.parse("2017-03-27 21:53:18")
+      expect(course.end_at).to eq DateTime.parse("2017-04-27 12:21:18")
     end
 
     it 'processes enrollments' do
@@ -30,15 +30,15 @@ RSpec.describe CanvasSync::Processors::ProvisioningReportProcessor do
         subject.process('spec/support/fixtures/reports/sections.csv', { models: ['sections'] }, 1)
       }.to change { Section.count }.by(2)
       section = Section.first
-      expect(section.start_date).to eq DateTime.parse("2017-03-27 21:53:18")
-      expect(section.end_date).to eq DateTime.parse("2017-03-27 21:53:18")
+      expect(section.start_at).to eq DateTime.parse("2017-03-27 21:53:18")
+      expect(section.end_at).to eq DateTime.parse("2017-03-27 21:53:18")
     end
 
     it 'processes xlist' do
       subject.process('spec/support/fixtures/reports/xlist.csv', { models: ['xlist'] }, 1)
       expect(Section.where.not(canvas_nonxlist_course_id: nil).count).to eq 1
       cross_listed_section = Section.where.not(canvas_nonxlist_course_id: nil).first
-      expect(cross_listed_section.canvas_section_id).to eq 2
+      expect(cross_listed_section.canvas_id).to eq 2
       expect(cross_listed_section.canvas_nonxlist_course_id).to eq 2
     end