canvas_sync 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61fa3f2a6f2ac74170f0eec3866bec23c662fbcce8a83e8a60ada2602818d693
-  data.tar.gz: 1a29823275161bf0a6d4c0e100702d75126395a56e20b5b4fe355baeb8c08696
+  metadata.gz: 07facec35d45ba07ac771963dea85bca3dbe9c920101808305d5bc9440ae158e
+  data.tar.gz: 919af58a0762425c6c128460a57bfc562d89ee9fe07cec7d7bb2f5983ad9211f
 SHA512:
-  metadata.gz: 4a555023f1f12e4b30717e790b9b1405e4e536d8061e068ba129f4a68dea45c612729561c961cb1fdcf2467366c6ca65700ea441bf138f9b7e92d61b3cc02d07
-  data.tar.gz: 431d583c39bdd9d5d04de46a02f1c2a65ad177b2767168d6e8ac1bb577584c0a5ca45ef5ba53ecd505b0f0accea28d437ae6c29dcb2f1f4b640a692e5200d944
+  metadata.gz: c88b2b03e0f74fa473d69c4665012e6f11755d2434ce47b81c443ca527ea11384f9573519931c3f5f1e197231bb2a6468c067745105e25c885d5cd89372a4f47
+  data.tar.gz: 6fa4ad837efdf6647f76f7451f749e4368f82fcb42661e9f834bb2b968ab5e0fdb4c19bfcdd484046ef23bfcbb03e399f8483e95124f9d72a8fe32dc5de332ec

data/lib/canvas_sync.rb

@@ -155,69 +155,66 @@ module CanvasSync
     # @param account_id [Integer, nil] This optional parameter can be used if your Term creation and
     #   canvas_sync_client methods require an account ID.
     # @return [Hash]
-    def default_provisioning_report_chain(models, term_scope=nil, legacy_support=false, account_id=nil) # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Metrics/LineLength
+    def default_provisioning_report_chain(models, term_scope=nil, legacy_support=false, account_id=nil, options: {}) # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Metrics/LineLength
+      return unless models.present?
+      models.map! &:to_s
       term_scope = term_scope.to_s if term_scope
+      options = options.with_indifferent_access
+
+      model_job_map = {
+        terms: CanvasSync::Jobs::SyncTermsJob,
+        users: CanvasSync::Jobs::SyncUsersJob,
+        roles: CanvasSync::Jobs::SyncRolesJob,
+        admins: CanvasSync::Jobs::SyncAdminsJob,
+
+        assignments: CanvasSync::Jobs::SyncAssignmentsJob,
+        submissions: CanvasSync::Jobs::SyncSubmissionsJob,
+        assignment_groups: CanvasSync::Jobs::SyncAssignmentGroupsJob,
+        context_modules: CanvasSync::Jobs::SyncContextModulesJob,
+        context_module_items: CanvasSync::Jobs::SyncContextModuleItemsJob,
+      }.with_indifferent_access
+
+      jobs = []
+      try_add_model_job = ->(model) {
+        return unless models.include?(model)
+        jobs.push(job: model_job_map[model].to_s, options: options[model] || {})
+        models -= [model]
+      }
 
       ##############################
       # Pre provisioning report jobs
       ##############################
 
       # Always sync Terms first
-      pre_provisioning_jobs = [{ job: CanvasSync::Jobs::SyncTermsJob.to_s, options: {} }]
+      models.unshift('terms') unless models.include?('terms')
+      try_add_model_job.call('terms')
 
       # Users, roles, and admins are synced before provisioning because they cannot be scoped to term
-      if models.include?("users") && term_scope.present?
-        pre_provisioning_jobs.push(job: CanvasSync::Jobs::SyncUsersJob.to_s, options: {})
-        models -= ["users"]
-      end
-
-      if models.include?("roles")
-        pre_provisioning_jobs.push(job: CanvasSync::Jobs::SyncRolesJob.to_s, options: {})
-        models -= ["roles"]
-      end
+      try_add_model_job.call('users') if term_scope.present?
+      try_add_model_job.call('roles')
+      try_add_model_job.call('admins')
 
-      if models.include?("admins")
-        pre_provisioning_jobs.push(job: CanvasSync::Jobs::SyncAdminsJob.to_s, options: {})
-        models -= ["admins"]
-      end
+      pre_provisioning_jobs = jobs
+      jobs = []
 
       ###############################
       # Post provisioning report jobs
       ###############################
 
-      post_provisioning_jobs = []
-
-      if models.include?("assignments")
-        post_provisioning_jobs.push(job: CanvasSync::Jobs::SyncAssignmentsJob.to_s, options: {})
-        models -= ["assignments"]
-      end
-
-      if models.include?("submissions")
-        post_provisioning_jobs.push(job: CanvasSync::Jobs::SyncSubmissionsJob.to_s, options: {})
-        models -= ["submissions"]
-      end
-
-      if models.include?("assignment_groups")
-        post_provisioning_jobs.push(job: CanvasSync::Jobs::SyncAssignmentGroupsJob.to_s, options: {})
-        models -= ["assignment_groups"]
-      end
-
-      if models.include?("context_modules")
-        post_provisioning_jobs.push(job: CanvasSync::Jobs::SyncContextModulesJob.to_s, options: {})
-        models -= ["context_modules"]
-      end
+      try_add_model_job.call('assignments')
+      try_add_model_job.call('submissions')
+      try_add_model_job.call('assignment_groups')
+      try_add_model_job.call('context_modules')
+      try_add_model_job.call('context_module_items')
 
-      if models.include?("context_module_items")
-        post_provisioning_jobs.push(job: CanvasSync::Jobs::SyncContextModuleItemsJob.to_s, options: {})
-        models -= ["context_module_items"]
-      end
+      post_provisioning_jobs = jobs
 
-      provisioning_job = {
+      jobs = pre_provisioning_jobs
+      jobs += Array.wrap({
         job: CanvasSync::Jobs::SyncProvisioningReportJob.to_s,
         options: { term_scope: term_scope, models: models },
-      }
-
-      jobs = pre_provisioning_jobs + Array.wrap(provisioning_job) + post_provisioning_jobs
+      }) if models.present?
+      jobs += post_provisioning_jobs
 
       global_options = { legacy_support: legacy_support }
       global_options[:account_id] = account_id if account_id.present?

data/lib/canvas_sync/jobs/sync_submissions_job.rb

@@ -8,12 +8,10 @@ module CanvasSync
       #
       # @param job_chain [Hash]
       # @param options [Hash]
-      def perform(job_chain, _options)
-        report_params = if job_chain[:global_options][:canvas_term_id].present?
-                          { "parameters[enrollment_term_id]" => job_chain[:global_options][:canvas_term_id] }
-                        else
-                          {}
-                        end
+      def perform(job_chain, options)
+        report_params = {}
+        report_params["parameters[enrollment_term_id]"] = job_chain[:global_options][:canvas_term_id] if job_chain[:global_options][:canvas_term_id].present?
+        report_params["parameters[include_all]"] = true if options[:include_all]
 
         super(
           job_chain,

data/lib/canvas_sync/version.rb

@@ -1,3 +1,3 @@
 module CanvasSync
-  VERSION = "0.9.0".freeze
+  VERSION = "0.9.1".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: canvas_sync
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Nate Collings