canvas_sync 0.11.1 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bff01b4de68a53faba86076d5390dd4c95d1feec6be899cc28a21ccf2c80a918
-  data.tar.gz: c676786d55e600ed58167c00290cd29e119b62b1bf7974c7ff4df46697759223
+  metadata.gz: 7795e4388557d88e9134d2c5ae6dee8770ba282f1dd72a10686aaa7974741c92
+  data.tar.gz: db4251351aabda748429adb17bdcb3c3dbc383d0dc2a7a112c324d0e8e273067
 SHA512:
-  metadata.gz: c7340c9158ecc077e4f2246c24c6b4a608229cc2568a74b25b2afe8d7bebfd42e79deb23b49d22a7d7842e9a7923caaa1a43843fc68fa04497901477d480e9a2
-  data.tar.gz: a4f9ca68735ccc0ceb42cc9f8b486dd18b02e508b7ece0242b1a56c49c33db7e426126f0cb3d7a5bd5ba1057ee69082fe66ecfad252cab0fcb5d16c9c3fc12f4
+  metadata.gz: 3babc49ea2a583a81560aed52f08dcf7c4a706b74123fb1128b04f77030c575c3764feda1f5aab33c0e009b5c7d959cd2ebd7cdd79f566d9fdbad1f7a57d204d
+  data.tar.gz: '0048f0ebb889753af134a28a592a7b1ebee8f6b5c4d67c9ed816271fc4a14356a62ff8643b9bdfaf9a3e04046a95035768248790d56366b0db6f6a58701c2d4f'

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

@@ -12,6 +12,7 @@ class CreateCourses < ActiveRecord::Migration[5.1]
       t.integer :canvas_term_id
       t.datetime :start_at
       t.datetime :end_at
+      t.bigint :grading_standard_id
 
       t.timestamps
     end

data/lib/canvas_sync/importers/bulk_importer.rb

@@ -58,12 +58,13 @@ module CanvasSync
         columns = columns.dup
 
         update_conditions = {
-          condition: condition_sql(klass, columns, import_args[:sync_start_time]),
+          condition: condition_sql(klass, columns),
           columns: columns
         }
         update_conditions[:conflict_target] = conflict_target if conflict_target
 
         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)
       end
@@ -78,14 +79,10 @@ module CanvasSync
       # started_at = Time.now
       # run_the_users_sync!
       # changed = User.where("updated_at >= ?", started_at)
-      def self.condition_sql(klass, columns, report_start)
+      def self.condition_sql(klass, columns)
         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
-          condition_sql += " AND #{klass.quoted_table_name}.updated_at < '#{report_start}'"
-        end
-        condition_sql
+        "(#{columns_str}) IS DISTINCT FROM (#{excluded_str})"
       end
 
       def self.batch_size

data/lib/canvas_sync/jobs/report_starter.rb

@@ -12,7 +12,7 @@ module CanvasSync
       # @return [nil]
       def perform(job_chain, report_name, report_params, processor, options, allow_redownloads: false)
         account_id = options[:account_id] || job_chain[:global_options][:account_id] || "self"
-	options[:sync_start_time] = DateTime.now.utc.iso8601
+
         report_id = if allow_redownloads
                       get_cached_report(job_chain, account_id, report_name, report_params)
                     else

data/lib/canvas_sync/processors/assignment_groups_processor.rb

@@ -8,16 +8,15 @@ module CanvasSync
     # @param options [Hash]
     class AssignmentGroupsProcessor < ReportProcessor
       def self.process(report_file_path, _options, report_id)
-        new(report_file_path, _options)
+        new(report_file_path)
       end
 
-      def initialize(report_file_path, options)
+      def initialize(report_file_path)
         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,16 +8,15 @@ module CanvasSync
     # @param options [Hash]
     class AssignmentsProcessor < ReportProcessor
       def self.process(report_file_path, _options, report_id)
-        new(report_file_path, _options)
+        new(report_file_path)
       end
 
-      def initialize(report_file_path, options)
+      def initialize(report_file_path)
         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,16 +8,15 @@ module CanvasSync
     # @param options [Hash]
     class ContextModuleItemsProcessor < ReportProcessor
       def self.process(report_file_path, _options, report_id)
-        new(report_file_path, _options)
+        new(report_file_path)
       end
 
-      def initialize(report_file_path, options)
+      def initialize(report_file_path)
         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,16 +8,15 @@ module CanvasSync
     # @param options [Hash]
     class ContextModulesProcessor < ReportProcessor
       def self.process(report_file_path, _options, report_id)
-        new(report_file_path, _options)
+        new(report_file_path)
       end
 
-      def initialize(report_file_path, options)
+      def initialize(report_file_path)
         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

@@ -81,6 +81,9 @@ courses:
     status:
       database_column_name: workflow_state
       type: integer
+    grading_standard_id:
+      database_column_name: grading_standard_id
+      type: integer
 
 enrollments:
   conflict_target: canvas_enrollment_id

data/lib/canvas_sync/processors/normal_processor.rb

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

data/lib/canvas_sync/processors/provisioning_report_processor.rb

@@ -21,6 +21,7 @@ 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
@@ -74,7 +75,6 @@ module CanvasSync
           mapping[:users][:report_columns],
           User,
           mapping[:users][:conflict_target].to_sym,
-          import_args: @options
         )
       end
 
@@ -83,8 +83,7 @@ module CanvasSync
           report_file_path,
           mapping[:accounts][:report_columns],
           Account,
-          mapping[:accounts][:conflict_target].to_sym,
-          import_args: @options
+          mapping[:accounts][:conflict_target].to_sym
         )
       end
 
@@ -94,7 +93,6 @@ module CanvasSync
           mapping[:courses][:report_columns],
           Course,
           mapping[:courses][:conflict_target].to_sym,
-          import_args: @options
         )
       end
 
@@ -104,7 +102,6 @@ module CanvasSync
           mapping[:enrollments][:report_columns],
           Enrollment,
           mapping[:enrollments][:conflict_target].to_sym,
-          import_args: @options
         )
       end
 
@@ -114,7 +111,6 @@ module CanvasSync
           mapping[:sections][:report_columns],
           Section,
           mapping[:sections][:conflict_target].to_sym,
-          import_args: @options
         )
       end
 
@@ -124,7 +120,6 @@ module CanvasSync
           mapping[:xlist][:report_columns],
           Section,
           mapping[:xlist][:conflict_target].to_sym,
-          import_args: @options
         )
       end
     end

data/lib/canvas_sync/processors/submissions_processor.rb

@@ -8,16 +8,15 @@ module CanvasSync
     # @param options [Hash]
     class SubmissionsProcessor < ReportProcessor
       def self.process(report_file_path, _options, report_id)
-        new(report_file_path, _options)
+        new(report_file_path)
       end
 
-      def initialize(report_file_path, options)
+      def initialize(report_file_path)
         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.11.1".freeze
+  VERSION = "0.12.0".freeze
 end

data/spec/dummy/db/migrate/20190702203621_create_courses.rb

@@ -18,6 +18,7 @@ class CreateCourses < ActiveRecord::Migration[5.1]
       t.integer :canvas_term_id
       t.datetime :start_at
       t.datetime :end_at
+      t.bigint :grading_standard_id
 
       t.timestamps
     end

data/spec/dummy/db/schema.rb

@@ -138,6 +138,7 @@ ActiveRecord::Schema.define(version: 20190927204546) do
     t.integer "canvas_term_id"
     t.datetime "start_at"
     t.datetime "end_at"
+    t.bigint "grading_standard_id"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.index ["canvas_id"], name: "index_courses_on_canvas_id", unique: true

data/spec/support/fixtures/reports/courses.csv

@@ -1,3 +1,3 @@
 canvas_course_id,course_id,integration_id,short_name,long_name,canvas_account_id,account_id,canvas_term_id,term_id,status,start_date,end_date,course_format,created_by_sis
 1,course_sis_id_1,,C1,Course #1,1,,1,term_sis_id_1,active,2017-03-27T15:53:18-06:00,2017-04-27T06:21:18-06:00,,FALSE
-2,course_sis_id_2,,C2,Course #2,1,,1,term_sis_id_2,unpublished,2017-03-27T15:53:18-06:00,2017-04-27T06:21:18-06:00,,FALSE
+2,course_sis_id_2,,C2,Course #2,1,,1,term_sis_id_2,unpublished,2017-03-27T15:53:18-06:00,2017-04-27T06:21:18-06:00,,FALSE,5

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: canvas_sync
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.12.0
 platform: ruby
 authors:
 - Nate Collings
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-27 00:00:00.000000000 Z
+date: 2020-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -268,14 +268,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.22
+        version: 1.3.49
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.22
+        version: 1.3.49
 - !ruby/object:Gem::Dependency
   name: activerecord-import
   requirement: !ruby/object:Gem::Requirement
@@ -304,7 +304,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description:
+description: 
 email:
 - ncollings@instructure.com
 executables: []
@@ -543,7 +543,7 @@ files:
 homepage: https://instructure.com
 licenses: []
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -558,8 +558,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key:
+rubygems_version: 3.0.3
+signing_key: 
 specification_version: 4
 summary: Gem for generating Canvas models and migrations and syncing data from Canvas
 test_files: