canvas_sync 0.17.23.beta1 → 0.17.23.beta6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6fe925c97d18da5736681b55e51a1702d727ef2900097c9058de6f247748af9f
-  data.tar.gz: 27c0bd4eb8d57efc705cbe3affdfa6ce4af9580b1b2374e11a8e7e84ddf2b8bd
+  metadata.gz: 298b05c56dda9ca6d603c1242c25fce864b4d69d096f2559a22267546f2183cb
+  data.tar.gz: d130e60ee19646e3d6cb817d63875bfdbd9358772c1dca25e49286c18cd0ca0d
 SHA512:
-  metadata.gz: 82f682b5e2b713ba2adc45483f215c1de8103dc16bdd3872a1656649527053a8819de35b50d1f4bc8e9961bedbc647fd7a03dbebbe4f2ad0fb3235d6754788be
-  data.tar.gz: 674159253800095ba66e15d9d14f58fd41d46f7fa70a33a8303160488544d721f7e8c83700c8a5e4978436e01d34e070b7bc22ff7433219e68fe00d4620dc38f
+  metadata.gz: d1b091aa6718f213dffc0a80985db5d736dcc4269365a8c7cdba713fc17ed256314b66183d050b952284374fc10f18b31018fcfee6fdb4fa9d185824fec73033
+  data.tar.gz: b822704460aef2ea10664ff02de96de7f9baa240e3c1fbd19092a86160cad364ec8f42305882502b3aede3ad4972bd3f168716cba1c65bdd6e3b46014776f7ff

data/config/initializers/apartment.rb

@@ -5,6 +5,15 @@
 #   * https://github.com/influitive/apartment/issues/508
 
 Rails.application.config.after_initialize do
+  next unless defined?(Apartment)
+
+  # Newer versions of Apartment already solves this issue (and in a better way)
+  begin
+    require('apartment/version')
+    next if Gem::Version.new(Apartment::VERSION) >= Gem::Version.new('2.8.1')
+  rescue LoadError
+  end
+
   begin
     Rails.application.eager_load!
     ActiveRecord::Base.descendants.each do |model|

data/lib/canvas_sync/concerns/sync_mapping.rb

@@ -24,9 +24,11 @@ module CanvasSync::Concerns
     class Mapping
       attr_reader :map_def
 
-      def initialize(map_def = {}, model: nil)
-        @map_def = map_def
+      def initialize(map_def, model: nil)
         @model = model
+        @map_def = map_def
+        @map_def[:conflict_target] ||= []
+        @map_def[:report_columns] ||= {}
       end
 
       def self.normalize_model_name(model)
@@ -82,7 +84,7 @@ module CanvasSync::Concerns
       end
 
       def reset_links
-        @map_def = {}
+        @map_def[:report_columns] = {}.with_indifferent_access
       end
 
       def unlink_column(key)

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

@@ -4,8 +4,6 @@ class CreateGradingPeriodGroups < ActiveRecord::Migration[5.1]
   def change
     create_table :grading_period_groups do |t|
       t.bigint :canvas_id, null: false
-      t.bigint :canvas_course_id
-      t.bigint :canvas_account_id
       t.string :title
       t.boolean :weighted
       t.boolean :display_totals_for_all_grading_periods
@@ -16,7 +14,5 @@ class CreateGradingPeriodGroups < ActiveRecord::Migration[5.1]
     end
 
     add_index :grading_period_groups, :canvas_id, unique: true
-    add_index :grading_period_groups, :canvas_course_id
-    add_index :grading_period_groups, :canvas_account_id
   end
 end

data/lib/canvas_sync/generators/templates/models/grading_period_group.rb

@@ -4,6 +4,4 @@ class GradingPeriodGroup < ApplicationRecord
   include CanvasSync::Record
 
   validates :canvas_id, uniqueness: true, presence: true
-  belongs_to :course, primary_key: :canvas_id, foreign_key: :canvas_course_id, optional: true
-  belongs_to :account, primary_key: :canvas_id, foreign_key: :canvas_account_id, optional: true
 end

data/lib/canvas_sync/generators/templates/models/term.rb

@@ -6,6 +6,7 @@ class Term < ApplicationRecord
 
   validates :canvas_id, uniqueness: true, presence: true
   has_many :courses, foreign_key: :canvas_term_id, primary_key: :canvas_id
+  belongs_to :grading_period_group, primary_key: :canvas_id, foreign_key: :grading_period_group_id, optional: true
 
   api_syncable({
     canvas_id: :id,

data/lib/canvas_sync/processors/model_mappings.yml

@@ -457,12 +457,6 @@ grading_period_groups:
     grading_period_group_id:
       database_column_name: canvas_id
       type: integer
-    canvas_course_id:
-      database_column_name: canvas_course_id
-      type: integer
-    canvas_account_id:
-      database_column_name: canvas_account_id
-      type: integer
     title:
       database_column_name: title
       type: string

data/lib/canvas_sync/processors/report_processor.rb

@@ -5,11 +5,11 @@ module CanvasSync
     # Base report processing class
     class ReportProcessor
       def mapping
-        SyncMapping::Mapping.default_mappings
+        CanvasSync::Concerns::SyncMapping::Mapping.default_mappings
       end
 
       def mapping_for(model, key = nil)
-        model.try(:get_sync_mapping, key) || mapping[key || SyncMapping::Mapping.normalize_model_name(model)]
+        model.try(:get_sync_mapping, key) || mapping[key || CanvasSync::Concerns::SyncMapping::Mapping.normalize_model_name(model)]
       end
 
       def do_bulk_import(report_file_path, model, options: {}, mapping_key: nil)

data/lib/canvas_sync/record.rb

@@ -4,7 +4,7 @@ require_relative 'concerns/sync_mapping'
 module CanvasSync
   module Record
     extend ActiveSupport::Concern
-    include SyncMapping
+    include CanvasSync::Concerns::SyncMapping
 
     included do
       define_model_callbacks :sync_import

data/lib/canvas_sync/version.rb

@@ -1,3 +1,3 @@
 module CanvasSync
-  VERSION = "0.17.23.beta1".freeze
+  VERSION = "0.17.23.beta6".freeze
 end

data/lib/canvas_sync.rb

@@ -179,7 +179,7 @@ module CanvasSync
       # These Models use the provisioning report, but are not term-scoped,
       # so we sync them outside of the term scoping to ensure work is not duplicated
       if term_scope.present?
-        models -= (first_provisioning_models = models & ['users', 'pseudonyms', 'user_observers'])
+        models -= (first_provisioning_models = models & ['users', 'pseudonyms', 'user_observers', 'grading_periods', 'grading_period_groups'])
         current_chain.insert(generate_provisioning_jobs(first_provisioning_models, options))
       end
 

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

@@ -10,6 +10,4 @@ class GradingPeriodGroup < ApplicationRecord
   include CanvasSync::Record
 
   validates :canvas_id, uniqueness: true, presence: true
-  belongs_to :course, primary_key: :canvas_id, foreign_key: :canvas_course_id, optional: true
-  belongs_to :account, primary_key: :canvas_id, foreign_key: :canvas_account_id, optional: true
 end

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

@@ -12,6 +12,7 @@ class Term < ApplicationRecord
 
   validates :canvas_id, uniqueness: true, presence: true
   has_many :courses, foreign_key: :canvas_term_id, primary_key: :canvas_id
+  belongs_to :grading_period_group, primary_key: :canvas_id, foreign_key: :grading_period_group_id, optional: true
 
   api_syncable({
     canvas_id: :id,

data/spec/dummy/db/migrate/{20210907233331_create_grading_period_groups.rb → 20211001184920_create_grading_period_groups.rb}

@@ -10,8 +10,6 @@ class CreateGradingPeriodGroups < ActiveRecord::Migration[5.1]
   def change
     create_table :grading_period_groups do |t|
       t.bigint :canvas_id, null: false
-      t.bigint :canvas_course_id
-      t.bigint :canvas_account_id
       t.string :title
       t.boolean :weighted
       t.boolean :display_totals_for_all_grading_periods
@@ -22,7 +20,5 @@ class CreateGradingPeriodGroups < ActiveRecord::Migration[5.1]
     end
 
     add_index :grading_period_groups, :canvas_id, unique: true
-    add_index :grading_period_groups, :canvas_course_id
-    add_index :grading_period_groups, :canvas_account_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: 2021_09_07_233331) do
+ActiveRecord::Schema.define(version: 2021_10_01_184920) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -175,16 +175,12 @@ ActiveRecord::Schema.define(version: 2021_09_07_233331) do
 
   create_table "grading_period_groups", force: :cascade do |t|
     t.bigint "canvas_id", null: false
-    t.bigint "canvas_course_id"
-    t.bigint "canvas_account_id"
     t.string "title"
     t.boolean "weighted"
     t.boolean "display_totals_for_all_grading_periods"
     t.string "workflow_state"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
-    t.index ["canvas_account_id"], name: "index_grading_period_groups_on_canvas_account_id"
-    t.index ["canvas_course_id"], name: "index_grading_period_groups_on_canvas_course_id"
     t.index ["canvas_id"], name: "index_grading_period_groups_on_canvas_id", unique: true
   end