canvas_sync 0.22.6 → 0.22.9

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

@@ -144,10 +144,6 @@ module CanvasSync::JobBatches
             if next_job[:chain_link].present?
               # Annotate Batch with chain-step info
               batch.context["csb:chain_link"] = next_job[:chain_link]
-              # TODO Add Fiber Batch to chain-link
-              # With the exception of the top of the Chain, all nested ManagedBatch Roots should be within a Fiber,
-              #   so we shouldn't really need to make the Root checkin with the chain
-              #   ...except to cleanup the chain
               batch.on(:complete, "#{ChainBuilder.to_s}.chain_step_complete", chain_link: next_job[:chain_link])
             end
 

data/lib/canvas_sync/job_batches/status.rb

@@ -49,7 +49,6 @@ module CanvasSync::JobBatches
       end
 
       def success?
-        # TODO (Race Condition) This might not be valid if checked from a :complete callback
         'true' == Batch.redis { |r| r.hget("BID-#{bid}", 'success') }
       end
 

data/lib/canvas_sync/job_uniqueness/lock_context.rb

@@ -6,6 +6,8 @@ module CanvasSync::JobUniqueness
       context_class.new(data, **kwargs)
     end
 
+    attr_reader :lock_id
+
     # { job_clazz, jid, queue, args?, kwargs?, base_key? }
     def initialize(data, job_instance: nil, config: nil)
       @base_key = data[:base_key]
@@ -14,9 +16,7 @@ module CanvasSync::JobUniqueness
       @config = config || @context_data[:config]
 
       # TODO Consider (somewhere) updating the lock_id to the BID of the wrapping Batch (when applicable)
-      @lock_id ||= data[:lid] || Thread.current[:unique_jobs_previous_context]&.lock_id
-      @lock_id_locked = @lock_id.present?
-      @lock_id ||= job_id
+      @lock_id ||= data[:lid] || Thread.current[:unique_jobs_previous_context]&.lock_id || job_id
     end
 
     # This is primarily for rehydrating in a Batch Callback, so it is unlikely that args and kwargs are needed.
@@ -84,18 +84,6 @@ module CanvasSync::JobUniqueness
       end
     end
 
-    def lock_id
-      @lock_id_locked = true
-      @lock_id
-    end
-
-    def lock_id=(new_id)
-      raise "Lock ID already set" if @lock_id_locked
-      return unless new_id.present?
-      @lock_id = new_id
-      @lock_id_locked = true
-    end
-
     def job_id
       @context_data[:jid]
     end

data/lib/canvas_sync/jobs/sync_assignment_overrides_job.rb

@@ -0,0 +1,20 @@
+module CanvasSync
+  module Jobs
+    class SyncAssignmentOverridesJob < ReportStarter
+      # Syncs SyncAssignmentOverrides
+      #
+      # Starts a report processor for the assignment overrides report
+      # (the proserv_assignment_overrides_csv report must be enabled)
+      #
+      # @param options [Hash]
+      def perform(options)
+        super(
+          "proserv_assignment_overrides_csv",
+          merge_report_params(options),
+          CanvasSync::Processors::AssignmentOverridesProcessor.to_s,
+          {},
+        )
+      end
+    end
+  end
+end

data/lib/canvas_sync/jobs/term_batches_job.rb

@@ -12,17 +12,14 @@ module CanvasSync
               # Override the delta-syncing date if:
               # 1. the Term hasn't been synced before or
               # 2. the Term underwent a period of not syncing
+              term_last_sync = CanvasSync.redis.get(self.class.last_sync_key(term_id))
               if batch_context[:updated_after]
-                term_last_sync = CanvasSync.redis.get(self.class.last_sync_key(term_id))
                 if !term_last_sync.present? || batch_context[:updated_after] > term_last_sync
                   local_context[:updated_after] = term_last_sync.presence
                 end
               end
 
               JobBatches::ManagedBatchJob.make_batch(jobs, ordered: false, concurrency: true) do |b|
-                # TODO If we do a Chain UI, this will need to checkin somehow to indicate that the chain forked
-                #   Or chain steps just show a summary - eg "Started", "X Jobs Running", "Done" or "X Jobs Running, Y Jobs Done" - and not individual forks
-                #   For a step to be considered done, all previous sibling-level steps must be done and no batches pending
                 b.description = "TermBatchJob(#{term_id}) Root"
                 b.context = local_context
                 b.on(:success, "#{self.class.to_s}.batch_finished") unless options[:mark_synced] == false

data/lib/canvas_sync/processors/assignment_overrides_processor.rb

@@ -0,0 +1,41 @@
+require_relative "./report_processor"
+
+module CanvasSync
+  module Processors
+    # Processes a assignment overrides report using the bulk importer.
+    #
+    # @param report_file_path [String]
+    # @param options [Hash]
+    class AssignmentOverridesProcessor < ReportProcessor
+      # Class method that starts processing (for consistent interface with other processors).
+      def self.process(report_file_path, options, report_id)
+        new(report_file_path, options)
+      end
+
+      def initialize(report_file_path, options)
+        do_bulk_import(report_file_path, AssignmentOverride, options: options) do |row|
+          # Handle transforms here instead of in mappings
+          row[:student_ids]       = parse_student_ids(row[:student_ids])
+
+          # Convert empty/null/'0' values to nil
+          # For Ruby 2.7
+          row[:group_id]          = parse_nil_value(row[:group_id])
+          row[:course_section_id] = parse_nil_value(row[:course_section_id])
+          row
+        end
+      end
+
+      private
+
+      def parse_student_ids(value)
+        value.present? ? JSON.parse(value) : nil
+      end
+
+      def parse_nil_value(value)
+        # Convert "0", "null", or empty string to nil
+        return nil if %w[0 null].include?(value) || value == ''
+        value
+      end
+    end
+  end
+end

data/lib/canvas_sync/processors/model_mappings.yml

@@ -159,6 +159,9 @@ enrollments:
     base_role_type:
       database_column_name: base_role_type
       type: string
+    completed_at:
+      database_column_name: completed_at
+      type: datetime
 
 sections:
   conflict_target: canvas_section_id
@@ -290,6 +293,49 @@ submissions:
       database_column_name: workflow_state
       type: string
 
+assignment_overrides:
+  conflict_target: id
+  report_columns:
+    id:
+      database_column_name: canvas_id
+      type: integer
+    assignment_id:
+      database_column_name: canvas_assignment_id
+      type: integer
+    student_ids:
+      database_column_name: student_ids
+      type: array
+    group_id:
+      database_column_name: canvas_group_id
+      type: integer
+    course_section_id:
+      database_column_name: canvas_section_id
+      type: integer
+    course_id:
+      database_column_name: canvas_course_id
+      type: integer
+    title:
+      database_column_name: title
+      type: string
+    due_at:
+      database_column_name: due_at
+      type: datetime
+    unlock_at:
+      database_column_name: unlock_at
+      type: datetime
+    lock_at:
+      database_column_name: lock_at
+      type: datetime
+    all_day:
+      database_column_name: all_day
+      type: boolean
+    all_day_date:
+      database_column_name: all_day_date
+      type: datetime
+    workflow_state:
+      database_column_name: workflow_state
+      type: string
+
 assignment_groups:
   conflict_target: id
   report_columns:

data/lib/canvas_sync/version.rb

@@ -1,3 +1,3 @@
 module CanvasSync
-  VERSION = "0.22.6".freeze
+  VERSION = "0.22.9".freeze
 end

data/lib/canvas_sync.rb

@@ -54,6 +54,7 @@ module CanvasSync
     rubric_associations
     rubric_assessments
     course_progresses
+    assignment_overrides
   ].freeze
 
   SUPPORTED_TERM_SCOPE_MODELS = %w[
@@ -66,6 +67,7 @@ module CanvasSync
     rubric_associations
     rubric_assessments
     course_progresses
+    assignment_overrides
   ].freeze
 
   DEFAULT_TERM_SCOPE_MODELS = %w[
@@ -78,6 +80,7 @@ module CanvasSync
     rubric_associations
     rubric_assessments
     course_progresses
+    assignment_overrides
   ].freeze
 
   SUPPORTED_LIVE_EVENTS = %w[
@@ -166,6 +169,7 @@ module CanvasSync
         assignments: CanvasSync::Jobs::SyncAssignmentsJob,
         submissions: CanvasSync::Jobs::SyncSubmissionsJob,
         assignment_groups: CanvasSync::Jobs::SyncAssignmentGroupsJob,
+        assignment_overrides: CanvasSync::Jobs::SyncAssignmentOverridesJob,
         context_modules: CanvasSync::Jobs::SyncContextModulesJob,
         context_module_items: CanvasSync::Jobs::SyncContextModuleItemsJob,
         content_migrations: CanvasSync::Jobs::SyncContentMigrationsJob,