canvas_sync 0.17.36 → 0.17.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2bcfff804b06ecd1812adc2b4cc52ac50f925329cdfe196b1e734a7ab6f308f8
-  data.tar.gz: c553b8bdab0ba265e6d81f254c7d7022392a90a01af1bd998a81bdb36948d2b7
+  metadata.gz: b77546f58b3db164d3121fecdfb6de07d708e46a7673d7abeee45682d5390b45
+  data.tar.gz: c4ca76da8b99d56c2a1d9db6f9ef9be793ee0f74ca3ef4f59ad494f67f8a596c
 SHA512:
-  metadata.gz: 4e2ac201fb1645f14cc82f3e8dda29640c7b82cbf9ff35b07d82ad898c926d2436694d4eb48fed3f7f528df4a33529e59304978f229e72ce9d469cc0d794b674
-  data.tar.gz: d6345cf78fe6f606d98d8aadfc0ab9e7ae9f7cfb4b3655fa274e7d74381b2ffb32295896569e13d79357a58254f365b1453cdeab98d543f855709b0072289da7
+  metadata.gz: e1e655a7e5a202dd13a80f650538c6576c2998a15e35334fda932cf4b49485ad0cf5be2de2e79458f71e317cd21380375876c5cc5b3d7c5858e6071468b4421f
+  data.tar.gz: c1f5c91a3f01429fc0f588240f83003e78a46d8de29ce64020b7c36d2c7d582cd4b6f66743ab4f6c2c0be443ae9f32650e48d35a36434a1bb85d2636d371b84c

data/lib/canvas_sync/engine.rb

@@ -5,6 +5,12 @@ module CanvasSync
   class Engine < ::Rails::Engine
     isolate_namespace CanvasSync
 
+    initializer "canvas_sync.serialze_symbols" do |app|
+      app.config.active_record.yaml_column_permitted_classes ||= []
+      app.config.active_record.yaml_column_permitted_classes |= [Symbol]
+    rescue
+    end
+
     initializer :append_migrations do |app|
       config.paths["db/migrate"].expanded.each do |expanded_path|
         app.config.paths["db/migrate"] << expanded_path

data/lib/canvas_sync/generators/templates/migrations/create_users.rb

@@ -4,7 +4,6 @@ class CreateUsers < ActiveRecord::Migration[5.1]
   def change
     create_table :users do |t|
       t.bigint :canvas_id, null: false
-      t.string :sis_id
       t.string :email
       t.string :first_name
       t.string :last_name

data/lib/canvas_sync/importers/bulk_importer.rb

@@ -23,7 +23,14 @@ module CanvasSync
         end
       end
 
-      def self.perform_in_batches(report_file_path, mapping, klass, conflict_target, import_args: {})
+      def self.perform_in_batches(report_file_path, raw_mapping, klass, conflict_target, import_args: {})
+        mapping = {}.with_indifferent_access
+        raw_mapping.each do |db_col, opts|
+          next if opts[:deprecated] && !klass.column_names.include?(db_col.to_s)
+
+          mapping[db_col] = opts
+        end
+
         csv_column_names = mapping.values.map { |value| value[:report_column].to_s }
         database_column_names = mapping.keys
 

data/lib/canvas_sync/job_batches/jobs/base_job.rb

@@ -1,6 +1,6 @@
 module CanvasSync
   module JobBatches
-    class BaseJob < ActiveJob::Base
+    class BaseJob < ::ActiveJob::Base
 
     end
   end

data/lib/canvas_sync/job_batches/jobs/managed_batch_job.rb

@@ -26,7 +26,7 @@ module CanvasSync
 
               mapped_sub_jobs = sub_jobs.each_with_index.map do |j, i|
                 j['_mngbid_index_'] = i # This allows duplicate jobs when a Redis Set is used
-                j = ActiveJob::Arguments.serialize([j])
+                j = ::ActiveJob::Arguments.serialize([j])
                 JSON.unparse(j)
               end
               if ordered
@@ -104,7 +104,7 @@ module CanvasSync
         return unless next_job_json.present?
 
         next_job = JSON.parse(next_job_json)
-        next_job = ActiveJob::Arguments.deserialize(next_job)[0]
+        next_job = ::ActiveJob::Arguments.deserialize(next_job)[0]
 
         Batch.new(root_bid).jobs do
           Batch.new.tap do |batch|

data/lib/canvas_sync/job_batches/pool.rb

@@ -171,7 +171,7 @@ module CanvasSync
         jobs_key = "#{redis_key}-jobs"
         # This allows duplicate jobs when a Redis Set is used
         job_desc[:_pool_random_key_] = SecureRandom.urlsafe_base64(10)
-        job_json = JSON.unparse(ActiveJob::Arguments.serialize([job_desc]))
+        job_json = JSON.unparse(::ActiveJob::Arguments.serialize([job_desc]))
         order = self.order
 
         redis.multi do |r|
@@ -204,7 +204,7 @@ module CanvasSync
 
         return nil unless job_json.present?
 
-        ActiveJob::Arguments.deserialize(JSON.parse(job_json))[0]&.symbolize_keys
+        ::ActiveJob::Arguments.deserialize(JSON.parse(job_json))[0]&.symbolize_keys
       end
 
       def self.redis(&blk)

data/lib/canvas_sync/job_batches/sidekiq.rb

@@ -76,11 +76,21 @@ module CanvasSync
       end
 
       def self.is_activejob_job?(msg)
-        return false unless defined?(ActiveJob)
+        return false unless defined?(::ActiveJob)
 
         msg['class'] == 'ActiveJob::QueueAdapters::SidekiqAdapter::JobWrapper' && (msg['wrapped'].to_s).constantize < JobBatches::ActiveJob::BatchAwareJob
       end
 
+      def self.switch_tenant(job)
+        if defined?(::Apartment)
+          ::Apartment::Tenant.switch(job['apartment'] || 'public') do
+            yield
+          end
+        else
+          yield
+        end
+      end
+
       def self.configure
         if defined?(::Sidekiq::Batch) && ::Sidekiq::Batch != JobBatches::Batch
           print "WARNING: Detected Sidekiq Pro or sidekiq-batch. CanvasSync JobBatches may not be fully compatible!"
@@ -104,19 +114,12 @@ module CanvasSync
           end
 
           config.death_handlers << ->(job, ex) do
-            if is_activejob_job?(job)
-              JobBatches::ActiveJob.handle_job_death(job["args"][0], ex)
-              return
-            end
-
-            return unless job['bid'].present?
-
-            if defined?(::Apartment)
-              ::Apartment::Tenant.switch(job['apartment'] || 'public') do
+            switch_tenant(job) do
+              if is_activejob_job?(job)
+                JobBatches::ActiveJob.handle_job_death(job["args"][0], ex)
+              elsif job['bid'].present?
                 ::Sidekiq::Batch.process_dead_job(job['bid'], job['jid'])
               end
-            else
-              ::Sidekiq::Batch.process_dead_job(job['bid'], job['jid'])
             end
           end
         end

data/lib/canvas_sync/processors/model_mappings.yml

@@ -7,6 +7,7 @@ users:
     user_id:
       database_column_name: sis_id
       type: string
+      deprecated: true
     email:
       database_column_name: email
       type: string

data/lib/canvas_sync/version.rb

@@ -1,3 +1,3 @@
 module CanvasSync
-  VERSION = "0.17.36".freeze
+  VERSION = "0.17.38".freeze
 end