canvas_sync 0.17.23.beta7 → 0.17.26.beta1

data/lib/canvas_sync/version.rb

@@ -1,3 +1,3 @@
 module CanvasSync
-  VERSION = "0.17.23.beta7".freeze
+  VERSION = "0.17.26.beta1".freeze
 end

data/lib/canvas_sync.rb

@@ -80,6 +80,7 @@ module CanvasSync
   ].freeze
 
   JobBatches::ChainBuilder.register_chain_job(CanvasSync::Jobs::SyncTermsJob, :sub_jobs)
+  JobBatches::ChainBuilder.register_chain_job(CanvasSync::Jobs::TermBatchesJob, :sub_jobs)
   JobBatches::ChainBuilder.register_chain_job(CanvasSync::Jobs::BeginSyncChainJob, 0)
 
   class << self
@@ -130,12 +131,8 @@ module CanvasSync
       models,
       term_scope: nil,
       term_scoped_models: DEFAULT_TERM_SCOPE_MODELS,
-      legacy_support: false,
-      account_id: nil,
-      updated_after: nil,
-      full_sync_every: nil,
-      batch_genre: nil,
-      options: {}
+      options: {},
+      **kwargs
     ) # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Metrics/LineLength
       return unless models.present?
       models.map! &:to_s
@@ -155,7 +152,7 @@ module CanvasSync
         context_module_items: CanvasSync::Jobs::SyncContextModuleItemsJob,
       }.with_indifferent_access
 
-      root_chain = JobBatches::ChainBuilder.new(CanvasSync::Jobs::BeginSyncChainJob)
+      root_chain = base_canvas_sync_chain(**kwargs, globals: options[:global] || kwargs[:globals])
       concurrent_root_chain = JobBatches::ChainBuilder.new(JobBatches::ConcurrentBatchJob)
       root_chain << concurrent_root_chain
       current_chain = concurrent_root_chain
@@ -211,6 +208,20 @@ module CanvasSync
       # Wrap it all up
       ###############################
 
+      root_chain
+    end
+
+    def base_canvas_sync_chain(
+      legacy_support: false, # Import records 1 by 1 instead of with bulk upserts
+      account_id: nil, # legacy/non PandaPal apps
+      updated_after: nil,
+      full_sync_every: nil,
+      batch_genre: nil,
+      globals: {},
+      &blk
+    )
+      root_chain = JobBatches::ChainBuilder.new(CanvasSync::Jobs::BeginSyncChainJob)
+
       global_options = {
         legacy_support: legacy_support,
         updated_after: updated_after,
@@ -218,10 +229,12 @@ module CanvasSync
         batch_genre: batch_genre,
       }
       global_options[:account_id] = account_id if account_id.present?
-      global_options.merge!(options[:global]) if options[:global].present?
+      global_options.merge!(globals) if globals
 
       root_chain.params[1] = global_options
 
+      root_chain.apply_block(&blk)
+
       root_chain
     end
 

data/spec/canvas_sync/processors/provisioning_report_processor_spec.rb

@@ -35,11 +35,18 @@ RSpec.describe CanvasSync::Processors::ProvisioningReportProcessor do
     end
 
     it 'processes xlist' do
+      subject.process('spec/support/fixtures/reports/sections.csv', { models: ['sections'] }, 1)
+      expect(Section.find_by(canvas_id: 2).name).to eq "Lame Section"
+
       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_id).to eq 2
-      expect(cross_listed_section.canvas_nonxlist_course_id).to eq 2
+      expect(cross_listed_section.canvas_nonxlist_course_id).to eq 3
+
+      expect(cross_listed_section.canvas_course_id).to eq 2
+      expect(cross_listed_section.name).to eq "Lame Section"
     end
 
     it 'processes groups' do