canvas_sync 0.15.1 → 0.16.5

data/lib/canvas_sync/jobs/sync_simple_table_job.rb

@@ -9,15 +9,15 @@ module CanvasSync
       # @param options [Hash]
       def perform(job_chain, options)
         if options[:term_scope]
-          sub_reports = CanvasSync.fork(@job_log, job_chain, keys: [:canvas_term_id]) do |job_chain|
+          sub_reports = CanvasSync.fork(@job_log, job_chain, keys: [:canvas_term_id]) do |fork_template|
             Term.send(options[:term_scope]).find_each.map do |term|
+              fork = fork_template.duplicate
               # Deep copy the job_chain so each report gets the correct term id passed into
               # its options with no side effects
               term_id = get_term_id(term)
-              duped_job_chain = Marshal.load(Marshal.dump(job_chain))
-              duped_job_chain[:global_options][:canvas_term_id] = term_id
+              fork[:global_options][:canvas_term_id] = term_id
               {
-                job_chain: duped_job_chain,
+                job_chain: fork.serialize,
                 params: report_params(options, term_id),
                 options: options,
               }

data/lib/canvas_sync/misc_helper.rb

@@ -0,0 +1,15 @@
+require 'active_record'
+
+module CanvasSync
+  module MiscHelper
+    MigrationClass = Rails.version < '5.0' ? ActiveRecord::Migration : ActiveRecord::Migration[4.2]
+
+    def self.to_boolean(v)
+      if Rails.version < '5.0'
+        ActiveRecord::Type::Boolean.new.type_cast_from_user(v)
+      else
+        ActiveRecord::Type::Boolean.new.deserialize(v)
+      end
+    end
+  end
+end

data/lib/canvas_sync/processors/assignment_groups_processor.rb

@@ -8,15 +8,16 @@ module CanvasSync
     # @param options [Hash]
     class AssignmentGroupsProcessor < ReportProcessor
       def self.process(report_file_path, _options, report_id)
-        new(report_file_path)
+        new(report_file_path, _options)
       end
 
-      def initialize(report_file_path)
+      def initialize(report_file_path, options)
         CanvasSync::Importers::BulkImporter.import(
           report_file_path,
           mapping[:assignment_groups][:report_columns],
           AssignmentGroup,
           mapping[:assignment_groups][:conflict_target].to_sym,
+          import_args: options
         )
       end
     end

data/lib/canvas_sync/processors/assignments_processor.rb

@@ -8,15 +8,16 @@ module CanvasSync
     # @param options [Hash]
     class AssignmentsProcessor < ReportProcessor
       def self.process(report_file_path, _options, report_id)
-        new(report_file_path)
+        new(report_file_path, _options)
       end
 
-      def initialize(report_file_path)
+      def initialize(report_file_path, options)
         CanvasSync::Importers::BulkImporter.import(
           report_file_path,
           mapping[:assignments][:report_columns],
           Assignment,
           mapping[:assignments][:conflict_target].to_sym,
+          import_args: options
         )
       end
     end

data/lib/canvas_sync/processors/context_module_items_processor.rb

@@ -8,15 +8,16 @@ module CanvasSync
     # @param options [Hash]
     class ContextModuleItemsProcessor < ReportProcessor
       def self.process(report_file_path, _options, report_id)
-        new(report_file_path)
+        new(report_file_path, _options)
       end
 
-      def initialize(report_file_path)
+      def initialize(report_file_path, options)
         CanvasSync::Importers::BulkImporter.import(
           report_file_path,
           mapping[:context_module_items][:report_columns],
           ContextModuleItem,
           mapping[:context_module_items][:conflict_target].to_sym,
+          import_args: options
         )
       end
     end

data/lib/canvas_sync/processors/context_modules_processor.rb

@@ -8,15 +8,16 @@ module CanvasSync
     # @param options [Hash]
     class ContextModulesProcessor < ReportProcessor
       def self.process(report_file_path, _options, report_id)
-        new(report_file_path)
+        new(report_file_path, _options)
       end
 
-      def initialize(report_file_path)
+      def initialize(report_file_path, options)
         CanvasSync::Importers::BulkImporter.import(
           report_file_path,
           mapping[:context_modules][:report_columns],
           ContextModule,
           mapping[:context_modules][:conflict_target].to_sym,
+          import_args: options
         )
       end
     end

data/lib/canvas_sync/processors/model_mappings.yml

@@ -249,6 +249,9 @@ submissions:
     submission_date:
       database_column_name: submitted_at
       type: datetime
+    due_at:
+      database_column_name: due_at
+      type: datetime
     graded_date:
       database_column_name: graded_at
       type: datetime

data/lib/canvas_sync/processors/normal_processor.rb

@@ -18,7 +18,8 @@ module CanvasSync
           report_file_path,
           mapping[options[:mapping].to_sym][:report_columns],
           options[:klass].constantize,
-          conflict_target ? conflict_target.to_sym : conflict_target
+          conflict_target ? conflict_target.to_sym : conflict_target,
+          import_args: options
         )
       end
     end

data/lib/canvas_sync/processors/provisioning_report_processor.rb

@@ -21,7 +21,6 @@ module CanvasSync
 
       def initialize(report_file_path, options) # rubocop:disable Metrics/AbcSize
         @options = options
-
         if options[:models].length == 1
           run_import(options[:models][0], report_file_path)
         else
@@ -75,6 +74,7 @@ module CanvasSync
           mapping[:users][:report_columns],
           User,
           mapping[:users][:conflict_target].to_sym,
+          import_args: @options
         )
       end
 
@@ -84,6 +84,7 @@ module CanvasSync
           mapping[:pseudonyms][:report_columns],
           Pseudonym,
           mapping[:pseudonyms][:conflict_target].to_sym,
+          import_args: @options
         )
       end
 
@@ -92,7 +93,8 @@ module CanvasSync
           report_file_path,
           mapping[:accounts][:report_columns],
           Account,
-          mapping[:accounts][:conflict_target].to_sym
+          mapping[:accounts][:conflict_target].to_sym,
+          import_args: @options
         )
       end
 
@@ -102,6 +104,7 @@ module CanvasSync
           mapping[:courses][:report_columns],
           Course,
           mapping[:courses][:conflict_target].to_sym,
+          import_args: @options
         )
       end
 
@@ -111,6 +114,7 @@ module CanvasSync
           mapping[:enrollments][:report_columns],
           Enrollment,
           mapping[:enrollments][:conflict_target].to_sym,
+          import_args: @options
         )
       end
 
@@ -120,6 +124,7 @@ module CanvasSync
           mapping[:sections][:report_columns],
           Section,
           mapping[:sections][:conflict_target].to_sym,
+          import_args: @options
         )
       end
 
@@ -129,6 +134,7 @@ module CanvasSync
           mapping[:xlist][:report_columns],
           Section,
           mapping[:xlist][:conflict_target].to_sym,
+          import_args: @options
         )
       end
 
@@ -138,6 +144,7 @@ module CanvasSync
           mapping[:groups][:report_columns],
           Group,
           mapping[:groups][:conflict_target].to_sym,
+          import_args: @options
         )
       end
 
@@ -148,6 +155,7 @@ module CanvasSync
           mapping[:group_memberships][:report_columns],
           GroupMembership,
           mapping[:group_memberships][:conflict_target].to_sym,
+          import_args: @options
         )
       end
     end

data/lib/canvas_sync/processors/submissions_processor.rb

@@ -8,15 +8,16 @@ module CanvasSync
     # @param options [Hash]
     class SubmissionsProcessor < ReportProcessor
       def self.process(report_file_path, _options, report_id)
-        new(report_file_path)
+        new(report_file_path, _options)
       end
 
-      def initialize(report_file_path)
+      def initialize(report_file_path, options)
         CanvasSync::Importers::BulkImporter.import(
           report_file_path,
           mapping[:submissions][:report_columns],
           Submission,
           mapping[:submissions][:conflict_target].to_sym,
+          import_args: options
         )
       end
     end

data/lib/canvas_sync/version.rb

@@ -1,3 +1,3 @@
 module CanvasSync
-  VERSION = "0.15.1".freeze
+  VERSION = "0.16.5".freeze
 end

data/spec/canvas_sync/jobs/fork_gather_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 RSpec.describe CanvasSync::Jobs::ForkGather do
   describe '#perform' do
     let!(:job_log) { CanvasSync::JobLog.create!(job_id: 'BLAH', fork_count: 3) }
-    let(:job_chain) { {jobs: [], global_options: { fork_path: ['BLAH'] }} }
+    let(:job_chain) { {jobs: [], fork_state: { forking_path: ['BLAH'], pre_fork_globals: [{}] }} }
 
     it 'decrements fork_count' do
       CanvasSync::Jobs::ForkGather.perform_now(job_chain, {})
@@ -21,16 +21,16 @@ RSpec.describe CanvasSync::Jobs::ForkGather do
       CanvasSync::Jobs::ForkGather.perform_now(job_chain, {})
     end
 
-    it 'continues if no fork_path is specified' do
-      job_chain[:global_options].delete(:fork_path)
+    it 'continues if no forking_path is specified' do
+      job_chain[:fork_state].delete(:forking_path)
       expect(CanvasSync).to receive(:invoke_next)
       CanvasSync::Jobs::ForkGather.perform_now(job_chain, {})
     end
 
-    it 'pops the most-recent fork_path enrty' do
+    it 'pops the most-recent forking_path enrty' do
       job_log.update!(fork_count: 1)
       expect(CanvasSync).to receive(:invoke_next) do |*args|
-        expect(args[0][:global_options][:fork_path]).to eq []
+        expect(args[0][:fork_state][:forking_path]).to eq []
       end
       CanvasSync::Jobs::ForkGather.perform_now(job_chain, {})
     end
@@ -47,8 +47,8 @@ RSpec.describe CanvasSync::Jobs::ForkGather do
           { job: 'CanvasSync::Jobs::ForkGather' },
           { job: 'CanvasSync::Jobs::ReportChecker' },
         ],
-        global_options: {
-          fork_path: ['BLAH'],
+        fork_state: {
+          forking_path: ['BLAH'],
         }
       }
     }
@@ -65,8 +65,8 @@ RSpec.describe CanvasSync::Jobs::ForkGather do
       expect(CanvasSync::Jobs::ForkGather.handle_branch_error(error, job_chain: job_chain)).to be nil
     end
 
-    it 'does nothing if no fork_path is present' do
-      job_chain[:global_options][:fork_path] = []
+    it 'does nothing if no forking_path is present' do
+      job_chain[:fork_state][:forking_path] = []
       expect(CanvasSync::Jobs::ForkGather.handle_branch_error(error, job_chain: job_chain)).to be nil
     end
   end

data/spec/canvas_sync/jobs/sync_provisioning_report_job_spec.rb

@@ -16,7 +16,7 @@ RSpec.describe CanvasSync::Jobs::SyncProvisioningReportJob do
 
         expect(CanvasSync::Jobs::ReportStarter).to receive(:perform_later)
           .with(
-            expected_job_chain,
+            hash_including(expected_job_chain),
             'proservices_provisioning_csv',
             {
               parameters: {
@@ -36,7 +36,7 @@ RSpec.describe CanvasSync::Jobs::SyncProvisioningReportJob do
 
         expect(CanvasSync::Jobs::ReportStarter).to receive(:perform_later)
           .with(
-            expected_job_chain_2,
+            hash_including(expected_job_chain_2),
             'proservices_provisioning_csv',
             {
               parameters: {

data/spec/canvas_sync/jobs/sync_simple_table_job_spec.rb

@@ -15,7 +15,7 @@ RSpec.describe CanvasSync::Jobs::SyncSimpleTableJob do
 
         expect(CanvasSync::Jobs::ReportStarter).to receive(:perform_later)
           .with(
-            expected_job_chain,
+            hash_including(expected_job_chain),
             'proservices_provisioning_csv',
             {
               "parameters[include_deleted]" => true,

data/spec/dummy/app/models/account.rb

@@ -20,6 +20,9 @@ class Account < ApplicationRecord
                           primary_key: :canvas_id, foreign_key: :canvas_parent_account_id
   has_many :groups, primary_key: :canvas_id, foreign_key: :canvas_account_id
 
+  scope :active, -> { where.not(workflow_state: 'deleted') }
+  # scope :should_canvas_sync, -> { active } # Optional - uses .active if not given
+
   api_syncable({
     name: :name,
     workflow_state: :workflow_state,

data/spec/dummy/app/models/pseudonym.rb

@@ -0,0 +1,14 @@
+# #
+# AUTO GENERATED MODEL
+# This model was auto generated by the CanvasSync Gem.
+# You can customize it as needed, but make sure you test
+# any changes you make to the auto generated methods.
+#
+
+
+class Pseudonym < ApplicationRecord
+  include CanvasSync::Record
+
+  validates :canvas_id, uniqueness: true, presence: true
+  belongs_to :user, primary_key: :canvas_id, foreign_key: :canvas_user_id
+end

data/spec/dummy/app/models/submission.rb

@@ -20,6 +20,7 @@ class Submission < ApplicationRecord
     canvas_user_id: :user_id,
     submitted_at: :submitted_at,
     graded_at: :graded_at,
+    cached_due_date: :due_at,
     score: :score,
     excused: :excused,
     workflow_state: :workflow_state,

data/spec/dummy/app/models/user.rb

@@ -11,6 +11,7 @@ class User < ApplicationRecord
   include CanvasSync::Concerns::ApiSyncable
 
   validates :canvas_id, uniqueness: true, presence: true
+  has_many :pseudonyms, primary_key: :canvas_id, foreign_key: :canvas_user_id
   has_many :enrollments, primary_key: :canvas_id, foreign_key: :canvas_user_id
   has_many :admins, primary_key: :canvas_id, foreign_key: :canvas_user_id
   has_many :admin_roles, through: :admins, source: :role

data/spec/dummy/db/migrate/20190702203627_create_submissions.rb

@@ -14,6 +14,7 @@ class CreateSubmissions < ActiveRecord::Migration[5.1]
       t.bigint :canvas_assignment_id
       t.bigint :canvas_user_id
       t.datetime :submitted_at
+      t.datetime :due_at
       t.datetime :graded_at
       t.float :score
       t.float :points_possible

data/spec/dummy/db/migrate/20201016181346_create_pseudonyms.rb

@@ -0,0 +1,24 @@
+# #
+# AUTO GENERATED MIGRATION
+# This migration was auto generated by the CanvasSync Gem.
+# You can add new columns to this table, but removing or
+# re-naming ones created here may break Canvas Syncing.
+#
+
+
+class CreatePseudonyms < ActiveRecord::Migration[5.1]
+  def change
+    create_table :pseudonyms do |t|
+      t.bigint :canvas_id, null: false
+      t.bigint :canvas_user_id
+      t.string :sis_id
+      t.string :unique_id
+      t.string :workflow_state
+
+      t.timestamps
+    end
+
+    add_index :pseudonyms, :canvas_id, unique: true
+    add_index :pseudonyms, :canvas_user_id
+  end
+end

data/spec/dummy/db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2020_04_16_214248) do
+ActiveRecord::Schema.define(version: 2020_10_16_181346) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -83,7 +83,7 @@ ActiveRecord::Schema.define(version: 2020_04_16_214248) do
     t.index ["canvas_id"], name: "index_assignments_on_canvas_id", unique: true
   end
 
-  create_table "canvas_sync_job_logs", force: :cascade do |t|
+  create_table "canvas_sync_job_logs", id: :serial, force: :cascade do |t|
     t.datetime "started_at"
     t.datetime "completed_at"
     t.string "exception"
@@ -92,8 +92,8 @@ ActiveRecord::Schema.define(version: 2020_04_16_214248) do
     t.string "status"
     t.text "metadata"
     t.text "job_arguments"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.string "job_id"
     t.integer "fork_count"
     t.index ["job_id"], name: "index_canvas_sync_job_logs_on_job_id"
@@ -191,6 +191,18 @@ ActiveRecord::Schema.define(version: 2020_04_16_214248) do
     t.index ["canvas_id"], name: "index_groups_on_canvas_id", unique: true
   end
 
+  create_table "pseudonyms", force: :cascade do |t|
+    t.bigint "canvas_id", null: false
+    t.bigint "canvas_user_id"
+    t.string "sis_id"
+    t.string "unique_id"
+    t.string "workflow_state"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["canvas_id"], name: "index_pseudonyms_on_canvas_id", unique: true
+    t.index ["canvas_user_id"], name: "index_pseudonyms_on_canvas_user_id"
+  end
+
   create_table "roles", force: :cascade do |t|
     t.integer "canvas_id", null: false
     t.string "label"
@@ -225,6 +237,7 @@ ActiveRecord::Schema.define(version: 2020_04_16_214248) do
     t.bigint "canvas_assignment_id"
     t.bigint "canvas_user_id"
     t.datetime "submitted_at"
+    t.datetime "due_at"
     t.datetime "graded_at"
     t.float "score"
     t.float "points_possible"