canvas_sync 0.17.0.beta10 → 0.17.0.beta11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e44255a358ea745c6d434b9977d97c37c7dd649ae3fdc9679b7e37546a4e014
-  data.tar.gz: cab18a5115b02798a7f25fcd062db9a6c6ef8f5394c018fb332be766444ca460
+  metadata.gz: a6d329899fbeae89b111e225d044250383eb6f4a0547c0883e0ff555a331f5f3
+  data.tar.gz: ab87348b3d757fbb6acacdf7b7118f7a8da4f290643b34cc7bf0dcdc01f9d109
 SHA512:
-  metadata.gz: 5b06550842f727c1615e7b84daa7f7f66c05ff2a440f4e319f3ac7bf435e9d89da826d805eedfa5fbe5b7c8f16a9aefa276db182139ceffa6a8f70faca1a7156
-  data.tar.gz: 4b53ae2ef1df19049f981d0e585e800d5291dd203acafda0d9d5ed3015341ce0af35e9e41c437271eec29efb9fc059ae53db2e1f8a176c13382b70eeea663deb
+  metadata.gz: 9090f7b6058736f5b012d1c1bda245a100a9fbe3eb89eb27f27ba29fefcb3f4d36e464315186acf13dbc298b17d6b3d634e7a2ba5fedd086c31fefa94ef70224
+  data.tar.gz: ac4f18e914e1310cc74d209620b97af398c86e22f6c48220e1d3ae15dbb4ab483480ae4ee9e34ad8eb964cdd2bdfb1355dc2cdd142eef59e3d5297f34bae78f8

data/lib/canvas_sync/job_batches/batch.rb

@@ -126,8 +126,6 @@ module CanvasSync
 
         job_queue = @ready_to_queue = []
 
-        puts "Beginning Batch #{bid}"
-
         begin
           parent = Thread.current[:batch]
           Thread.current[:batch] = self
@@ -373,19 +371,19 @@ module CanvasSync
 
         def cleanup_redis(bid)
           logger.debug {"Cleaning redis of batch #{bid}"}
-          # redis do |r|
-          #   r.del(
-          #     "BID-#{bid}",
-          #     "BID-#{bid}-callbacks-complete",
-          #     "BID-#{bid}-callbacks-success",
-          #     "BID-#{bid}-failed",
-
-          #     "BID-#{bid}-batches-success",
-          #     "BID-#{bid}-batches-complete",
-          #     "BID-#{bid}-batches-failed",
-          #     "BID-#{bid}-jids",
-          #   )
-          # end
+          redis do |r|
+            r.del(
+              "BID-#{bid}",
+              "BID-#{bid}-callbacks-complete",
+              "BID-#{bid}-callbacks-success",
+              "BID-#{bid}-failed",
+
+              "BID-#{bid}-batches-success",
+              "BID-#{bid}-batches-complete",
+              "BID-#{bid}-batches-failed",
+              "BID-#{bid}-jids",
+            )
+          end
         end
 
         def redis(*args, &blk)

data/lib/canvas_sync/jobs/report_starter.rb

@@ -35,7 +35,7 @@ module CanvasSync
       protected
 
       def merge_report_params(options={}, params={}, term_scope: true)
-        term_scope = batch_context[:canvas_term_id] if term_scope == true
+        term_scope = options[:canvas_term_id] || batch_context[:canvas_term_id] if term_scope == true
         if term_scope.present?
           params[:enrollment_term_id] = term_scope
         end
@@ -43,6 +43,7 @@ module CanvasSync
           params[:updated_after] = updated_after
         end
         params.merge!(options[:report_params]) if options[:report_params].present?
+        params.merge!(options[:report_parameters]) if options[:report_parameters].present?
         { parameters: params }
       end
 

data/lib/canvas_sync/jobs/sync_provisioning_report_job.rb

@@ -1,23 +1,8 @@
 module CanvasSync
   module Jobs
     # ActiveJob class that starts a Canvas provisioning report
-    class SyncProvisioningReportJob < CanvasSync::Job
+    class SyncProvisioningReportJob < ReportStarter
       def perform(options)
-        start_report(report_params(options), options)
-      end
-
-      protected
-
-      def start_report(report_params, options)
-        CanvasSync::Jobs::ReportStarter.perform_later(
-          "proservices_provisioning_csv",
-          report_params,
-          CanvasSync::Processors::ProvisioningReportProcessor.to_s,
-          options,
-        )
-      end
-
-      def report_params(options, canvas_term_id = options[:canvas_term_id] || batch_context[:canvas_term_id])
         params = {
           include_deleted: true,
         }
@@ -28,11 +13,12 @@ module CanvasSync
           params[model] = true
         end
 
-        params[:enrollment_term_id] = canvas_term_id if canvas_term_id
-
-        params.merge!(options[:report_parameters]) if options[:report_parameters].present?
-
-        { parameters: params }
+        super(
+          "proservices_provisioning_csv",
+          merge_report_params(options, params, {}),
+          CanvasSync::Processors::ProvisioningReportProcessor.to_s,
+          options,
+        )
       end
     end
   end

data/lib/canvas_sync/version.rb

@@ -1,3 +1,3 @@
 module CanvasSync
-  VERSION = "0.17.0.beta10".freeze
+  VERSION = "0.17.0.beta11".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: canvas_sync
 version: !ruby/object:Gem::Version
-  version: 0.17.0.beta10
+  version: 0.17.0.beta11
 platform: ruby
 authors:
 - Nate Collings