canvas_sync 0.18.0.beta1 → 0.18.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de4a872d4a40555407e9dd9e2ab4e10aabfe61a68e06be46caaface500d89358
-  data.tar.gz: a79a7d11bdf1565662aab1832cc9cd664cc7e41b52e8586c57f579ef0b2f9f6a
+  metadata.gz: e8e85a06016546795344ff896342c54b8c3ec40dbd0568473bd0e4dc899c17d3
+  data.tar.gz: d2b566f00eb432b73fb8f47d70d1a88233c461ada010c374f677fcb2cde1a0aa
 SHA512:
-  metadata.gz: 0b50db7fb0d71fc8e707793e4ba3275407e2a8e3e00d6991d5e233c1aeb479859e9d6a36206b77e7d52797f4dd422ae1ab0a4c8d249767d885587b2616368eba
-  data.tar.gz: 61bb66d592d83b9e263d443328a05d32a1bd17e551a87cbd59c68821820bf471c80fa708719edc35dbbbe6530fa0496d2e4c99ee70ddb7836195412b3e8687d2
+  metadata.gz: bd4fdb11e3a79d796d18b908e100130ffaf503d060e00a5a8fb0cd249c70c3cbb5caf4fbf734ebf77c732c9640c361af5577df9c41431a9dc3ab3f7689852243
+  data.tar.gz: 63e5afb3933e8659cb3e263f2ace1ee6cdd2f344da9e439c9b44ac3f32c45c92935ce4c6f12d3966c7a2547b09a8bad8481c1706ebb34df7e0414bbe56a33fe1

data/lib/canvas_sync/concerns/api_syncable.rb

@@ -155,6 +155,11 @@ module CanvasSync::Concerns
       end
 
       apply_block = options[:process_response]
+
+      if self.class.column_names.include?("canvas_synced_at")
+        self.canvas_synced_at = mapped_params[:canvas_synced_at] = DateTime.now
+      end
+
       if apply_block.present?
         case apply_block.arity
         when 1

data/lib/canvas_sync/concerns/auto_relations.rb

@@ -0,0 +1,11 @@
+module CanvasSync::Concerns
+  module AutoRelations
+    extend ActiveSupport::Concern
+
+    # CanvasSync::Record.define_feature self, default: true
+
+    included do
+
+    end
+  end
+end

data/lib/canvas_sync/importers/bulk_importer.rb

@@ -101,7 +101,19 @@ module CanvasSync
 
         options = { validate: false, on_duplicate_key_update: update_conditions }.merge(import_args)
         options.delete(:on_duplicate_key_update) if options.key?(:on_duplicate_key_ignore)
-        klass.import(columns, rows, options)
+
+        result = klass.import(columns, rows, options)
+
+        global_updates = {
+          canvas_synced_at: DateTime.now,
+          canvas_sync_batch_id: JobBatches::Batch.current_context[:sync_batch_id],
+        }
+        global_updates.slice!(*klass.column_names.map(&:to_sym))
+        if global_updates.present? && result.ids.present?
+          klass.where(id: result.ids).update_all(global_updates)
+        end
+
+        result
       end
 
       # This method generates SQL that looks like:
@@ -118,9 +130,13 @@ module CanvasSync
         columns_str = columns.map { |c| "#{klass.quoted_table_name}.#{c}" }.join(", ")
         excluded_str = columns.map { |c| "EXCLUDED.#{c}" }.join(", ")
         condition_sql = "(#{columns_str}) IS DISTINCT FROM (#{excluded_str})"
-        if klass.column_names.include?("updated_at") && report_start
+
+        if klass.column_names.include?("canvas_synced_at") && report_start
+          condition_sql += " AND #{klass.quoted_table_name}.canvas_synced_at < '#{report_start}'"
+        elsif klass.column_names.include?("updated_at") && report_start
           condition_sql += " AND #{klass.quoted_table_name}.updated_at < '#{report_start}'"
         end
+
         condition_sql
       end
 

data/lib/canvas_sync/record.rb

@@ -100,6 +100,10 @@ module CanvasSync
 
     included do
       define_model_callbacks :sync_import
+
+      if column_names.include?("canvas_sync_batch_id")
+        belongs_to :canvas_sync_batch, foreign_key: :canvas_sync_batch_id, class_name: "CanvasSync::SyncBatch", optional: true
+      end
     end
   end
 end

data/lib/canvas_sync/version.rb

@@ -1,3 +1,3 @@
 module CanvasSync
-  VERSION = "0.18.0.beta1".freeze
+  VERSION = "0.18.0.beta2".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: canvas_sync
 version: !ruby/object:Gem::Version
-  version: 0.18.0.beta1
+  version: 0.18.0.beta2
 platform: ruby
 authors:
 - Nate Collings
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-27 00:00:00.000000000 Z
+date: 2023-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -414,6 +414,7 @@ files:
 - lib/canvas_sync/concerns/ability_helper.rb
 - lib/canvas_sync/concerns/account/ancestry.rb
 - lib/canvas_sync/concerns/api_syncable.rb
+- lib/canvas_sync/concerns/auto_relations.rb
 - lib/canvas_sync/concerns/legacy_columns.rb
 - lib/canvas_sync/concerns/role/base.rb
 - lib/canvas_sync/concerns/sync_mapping.rb