canvas_sync 0.24.0 → 0.26.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3391d91c2c45a7bbd04099137bfc94d896b703407c71b8b04c71b0e586bd4219
-  data.tar.gz: 581742ed82c4b5cdfcbd8d2c0c7ef2d97ab6c86833aebceeb4cd1bdab881aea1
+  metadata.gz: ce4d1927f18104be2a36720a8932671c3a0188a1e3a235f6929a23299a8d89c4
+  data.tar.gz: e8e7a15fde1156d9485026c3039e5bcbe2c4dec3c3491b61eb2f06cc1d0ea718
 SHA512:
-  metadata.gz: 8dd6fb7e8585626f31564edd76f67227e306bc4d29449f154c197d3ef289ca69d2c7371659b4a479854e9a57f0f9c3a61e68a275370a965da0f192bb97c747e8
-  data.tar.gz: a31a167d26a44df1837038db87d9584c5f7f0e2964f142c34f08efc353a2cb2f713cf8002df681d79237ece0540f97eb35d2ab9eef931033bc1e264d847c9e15
+  metadata.gz: 2b4b60b41f8b249baaef413d1f44ba17d124ba6cff5960bb0d8b7db43c28f7a5213a04b91f19650c31efb5889f1674ccb84937d33a21270f39a28cbfe0efcee1
+  data.tar.gz: 0a5932d0dcf129bedd5ebad761d2df9d77793ecb9ea3dcdc905b39a676f2e7da5f68e1c0bbd89b7e564ebabc92d5ee59d3722f2c73c8f7306479e3dfa5c65ee2

data/lib/canvas_sync/concerns/ability_helper.rb

@@ -73,8 +73,12 @@ module CanvasSync::Concerns
     end
 
     def canvas_super_user?
-      panda_pal_session.cache(:canvas_super_user?) do
-        panda_pal_session.canvas_site_admin? || (panda_pal_session.canvas_account_role_labels(:root) & ["AccountAdmin", "Account Admin"]).present?
+      canvas_account_admin?(:root)
+    end
+
+    def canvas_account_admin?(account = launch_account)
+      panda_pal_session.cache([:canvas_account_admin?, account]) do
+        panda_pal_session.canvas_site_admin? || (panda_pal_session.canvas_account_role_labels(account) & ["AccountAdmin", "Account Admin"]).present?
       end
     end
 

data/lib/canvas_sync/concerns/canvas_id_as_primary.rb

@@ -0,0 +1,11 @@
+module CanvasSync::Concerns
+  module CanvasIdAsPrimary
+    extend ActiveSupport::Concern
+
+    CanvasSync::Record.define_feature self, default: true
+
+    included do
+      self.primary_key = :canvas_id unless column_names.include?('id')
+    end
+  end
+end

data/lib/canvas_sync/concerns/user/through_pseudonyms.rb

@@ -0,0 +1,47 @@
+module CanvasSync::Concerns
+  module User
+    module ThroughPseudonyms
+      extend ActiveSupport::Concern
+      include CanvasSync::Record
+
+      CanvasSync::Record.define_feature self, default: true
+
+      class_methods do
+        def has_many_via_pseudonyms(rel_name, *args, using_sis_id: false, **kwargs)
+          kwargs[:class_name] ||= rel_name.to_s.classify
+          kwargs[:primary_key] ||= using_sis_id ? :sis_id : :canvas_id
+
+          # TODO Try and guess the foreign key?
+          # kwargs[:foreign_key] ||= using_sis_id ? :"#{rel_name}_sis_id" : :"#{rel_name}_pseudonym_canvas_id"
+
+          through_rel = using_sis_id ? :active_pseudonyms : :all_pseudonyms
+
+          pseudo_rel = :"_user_#{rel_name}_via_pseudonym"
+          Pseudonym.has_many(pseudo_rel, *args, **kwargs)
+
+          class_eval <<~RUBY
+            has_many(:#{rel_name}, through: :#{through_rel}, source: :#{pseudo_rel}, inverse_of: :student) do
+              def scope_for_create(...)
+                # @association.reflection.inverse_of
+                super.tap do |scope|
+                  user = @association.owner
+                  scope[:#{kwargs[:foreign_key]}] = user.load_pseudonym_for_relation!(any: #{!using_sis_id}).canvas_id
+                end
+              end
+            end
+          RUBY
+        end
+      end
+
+      def load_pseudonym_for_relation!(any: false)
+        return @pseudonym_for_relation if defined?(@pseudonym_for_relation)
+
+        @pseudonym_for_relation = self.active_pseudonyms[0] || Pseudonym.find_by(user: self)
+        raise ActiveRecord::RecordNotFound, "No Pseudonym for User #{self.canvas_id}" unless @pseudonym_for_relation.present?
+        raise ActiveRecord::RecordNotFound, "No Active Pseudonym for User #{self.canvas_id}" unless @pseudonym_for_relation.workflow_state != "deleted" || any
+
+        @pseudonym_for_relation
+      end
+    end
+  end
+end

data/lib/canvas_sync/concerns/user_via_pseudonym.rb

@@ -0,0 +1,141 @@
+module CanvasSync::Concerns
+  module UserViaPseudonym
+    extend ActiveSupport::Concern
+
+    module RelationHook
+      extend ActiveSupport::Concern
+
+      def where!(*args)
+        return super unless self.respond_to?(:users_via_pseudonym)
+
+        super.tap do |q|
+          args.select { |a| a.is_a?(Hash) }.each do |hash|
+            hash.each do |key, value|
+              next unless users_via_pseudonym.key?(key)
+              q.joins!(key).references!(Arel::Nodes::SqlLiteral.new(key.to_s))
+            end
+          end
+        end
+      end
+    end
+
+    ActiveRecord::Relation.include(RelationHook)
+
+    class RefreshUserCachesJob < CanvasSync::Job
+      def perform
+        ActiveRecord::Base.subclasses.each do |model|
+          next unless model.respond_to?(:update_cached_user_ids!)
+          model.update_cached_user_ids!
+        end
+      end
+    end
+
+    included do
+      class_hash :users_via_pseudonym
+    end
+
+    class_methods do
+      def class_hash(key)
+        class_eval <<~RUBY
+          def self.#{key}
+            @#{key} ||= superclass.try(:#{key})&.dup || {}
+          end
+        RUBY
+      end
+
+      def belongs_to_user(rel_name = :user, using_sis_id: false)
+        rel_name = rel_name.to_sym
+
+        pseudonym_rel_name = :"#{rel_name}_pseudonym"
+        if using_sis_id
+          belongs_to pseudonym_rel_name, -> { active }, primary_key: :sis_id, foreign_key: :"#{rel_name}_sis_id", class_name: "Pseudonym"
+        else
+          belongs_to pseudonym_rel_name, primary_key: :canvas_id, foreign_key: :"#{rel_name}_pseudonym_canvas_id", class_name: "Pseudonym"
+        end
+
+        config = users_via_pseudonym[rel_name] = {
+          user_relation: rel_name,
+          pseudonym_relation: pseudonym_rel_name,
+          by_sis_id: using_sis_id,
+        }
+
+        cache_column = :"#{rel_name}_cached_user_canvas_id"
+        if column_names.include?(cache_column.to_s)
+          belongs_to(rel_name, primary_key: :canvas_id, foreign_key: cache_column, class_name: "User")
+          config[:user_cache_column] = cache_column
+        else
+          has_one(rel_name, through: pseudonym_rel_name, source: :user)
+        end
+
+        class_eval <<~RUBY
+          def #{rel_name}=(user)
+            return if self.#{rel_name} == user
+            association(:#{pseudonym_rel_name}).writer(user&.load_pseudonym_for_relation!(any: #{!using_sis_id}))
+            association(:#{rel_name}).writer(user) if association(:#{rel_name}).class <= ActiveRecord::Associations::BelongsToAssociation
+          end
+
+          def #{pseudonym_rel_name}=(pseudonym)
+            return if self.#{pseudonym_rel_name} == pseudonym
+            association(:#{pseudonym_rel_name}).writer(pseudonym)
+            association(:#{rel_name}).writer(pseudonym&.user) if association(:#{rel_name}).class <= ActiveRecord::Associations::BelongsToAssociation
+          end
+        RUBY
+      end
+
+      def update_cached_user_ids!
+        cached_configs = users_via_pseudonym.values.select { |c| c[:user_cache_column].present? }
+        return if cached_configs.empty?
+
+        query = all
+
+        # Add JOINs
+        query = cached_configs.reduce(query) do |clause, config|
+          clause.joins(config[:pseudonym_relation]).references([ config[:pseudonym_relation], config[:user_relation] ].map { |x| Arel.sql(x.to_s) })
+        end
+
+        # Add OR clauses for filtering to only records with stale caches
+        query = cached_configs.reduce(query.where("1=0")) do |clause, config|
+          where_clause = query
+          if (updated_after = CanvasSync::JobBatches::Batch.current_context[:updated_after]).present?
+            where_clause = where_clause.where("#{config[:pseudonym_relation]}.updated_at >= ?", updated_after)
+          end
+          where_clause = where_clause.where("#{table_name}.#{config[:user_cache_column]} IS DISTINCT FROM #{config[:pseudonym_relation]}.canvas_user_id")
+          clause.or(where_clause)
+        end
+
+        query.in_batches do |batch|
+          batch = batch.to_a
+
+          cacheable_pseudonym_ids = cached_configs.map { |config| :"#{config[:pseudonym_relation]}_canvas_id" }.map { |col| batch.map(&col) }.flatten
+          user_id_map = Pseudonym.where(canvas_id: cacheable_pseudonym_ids).pluck(:canvas_id, :canvas_user_id).to_h
+
+          transaction do
+            where(primary_key => batch.map(&:id)).delete_all
+
+            cached_configs.each do |config|
+              batch.each do |record|
+                record[config[:user_cache_column]] = user_id_map[record[:"#{config[:pseudonym_relation]}_canvas_id"]]
+              end
+            end
+
+            import_results = import(
+              batch,
+              validate: false,
+              timestamps: false,
+              on_duplicate_key_ignore: true,
+            )
+
+            failures = import_results.failed_instances
+            if failures.present?
+              handle_duplicated_cache_failures(failures)
+            end
+          end
+        end
+      end
+
+      def handle_user_cache_refresh_failures(records)
+
+      end
+    end
+  end
+end

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

@@ -2,7 +2,7 @@
 
 class CreateAccounts < ActiveRecord::Migration[5.1]
   def change
-    create_table :accounts do |t|
+    create_table :accounts, id: false do |t|
       t.bigint :canvas_id, null: false
       t.string :sis_id
       t.bigint :canvas_parent_account_id

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

@@ -2,7 +2,7 @@
 
 class CreateAdmins < ActiveRecord::Migration[5.1]
   def change
-    create_table :admins do |t|
+    create_table :admins, id: false do |t|
       t.bigint :canvas_id, null: false
       t.string :role_name
       t.bigint :canvas_account_id

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

@@ -2,7 +2,7 @@
 
 class CreateAssignmentGroups < ActiveRecord::Migration[5.1]
   def change
-    create_table :assignment_groups do |t|
+    create_table :assignment_groups, id: false do |t|
       t.bigint :canvas_id, null: false
       t.bigint :canvas_course_id
       t.string :name

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

@@ -1,6 +1,6 @@
 class CreateAssignmentOverrides < ActiveRecord::Migration[5.1]
   def change
-    create_table :assignment_overrides do |t|
+    create_table :assignment_overrides, id: false do |t|
       t.bigint :canvas_id, null: false
       t.bigint :canvas_assignment_id
       t.bigint :canvas_group_id

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

@@ -2,7 +2,7 @@
 
 class CreateAssignments < ActiveRecord::Migration[5.1]
   def change
-    create_table :assignments do |t|
+    create_table :assignments, id: false do |t|
       t.bigint :canvas_id, null: false
       t.string :title
       t.text :description

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

@@ -2,7 +2,7 @@
 
 class CreateContentMigrations < ActiveRecord::Migration[5.1]
   def change
-    create_table :content_migrations do |t|
+    create_table :content_migrations, id: false do |t|
       t.bigint :canvas_id
       t.bigint :canvas_context_id
       t.string :canvas_context_type

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

@@ -2,7 +2,7 @@
 
 class CreateContextModuleItems < ActiveRecord::Migration[5.1]
   def change
-    create_table :context_module_items do |t|
+    create_table :context_module_items, id: false do |t|
       t.bigint :canvas_id
       t.bigint :canvas_context_module_id
       t.integer :position

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

@@ -2,7 +2,7 @@
 
 class CreateContextModules < ActiveRecord::Migration[5.1]
   def change
-    create_table :context_modules do |t|
+    create_table :context_modules, id: false do |t|
       t.bigint :canvas_id
       t.bigint :canvas_context_id
       t.string :canvas_context_type

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

@@ -2,7 +2,7 @@
 
 class CreateCourseNicknames < ActiveRecord::Migration[5.1]
   def change
-    create_table :course_nicknames do |t|
+    create_table :course_nicknames, id: false do |t|
       t.bigint :canvas_user_preference_value_id, null: true
       t.integer :canvas_user_id
       t.integer :canvas_course_id

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

@@ -2,7 +2,7 @@
 
 class CreateCourseProgresses < ActiveRecord::Migration[5.1]
   def change
-    create_table :course_progresses do |t|
+    create_table :course_progresses, id: false do |t|
       t.bigint :canvas_course_id, null: false
       t.bigint :canvas_user_id, null: false
       t.integer :requirement_count

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

@@ -2,7 +2,7 @@
 
 class CreateCourses < ActiveRecord::Migration[5.1]
   def change
-    create_table :courses do |t|
+    create_table :courses, id: false do |t|
       t.bigint :canvas_id, null: false
       t.string :sis_id
       t.string :course_code

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

@@ -2,7 +2,7 @@
 
 class CreateEnrollments < ActiveRecord::Migration[5.1]
   def change
-    create_table :enrollments do |t|
+    create_table :enrollments, id: false do |t|
       t.bigint :canvas_id, null: false
       t.bigint :canvas_course_id
       t.string :course_sis_id

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

@@ -2,7 +2,7 @@
 
 class CreateGradingPeriodGroups < ActiveRecord::Migration[5.1]
   def change
-    create_table :grading_period_groups do |t|
+    create_table :grading_period_groups, id: false do |t|
       t.bigint :canvas_id, null: false
       t.string :title
       t.boolean :weighted

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

@@ -2,7 +2,7 @@
 
 class CreateGradingPeriods < ActiveRecord::Migration[5.1]
   def change
-    create_table :grading_periods do |t|
+    create_table :grading_periods, id: false do |t|
       t.bigint :canvas_id, null: false
       t.string :title
       t.float :weight

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

@@ -2,7 +2,7 @@
 
 class CreateGroupMemberships < ActiveRecord::Migration[5.1]
   def change
-    create_table :group_memberships do |t|
+    create_table :group_memberships, id: false do |t|
       t.bigint :canvas_id, null: false
       t.bigint :canvas_user_id, null: false
       t.bigint :canvas_group_id, null: false

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

@@ -2,7 +2,7 @@
 
 class CreateGroups < ActiveRecord::Migration[5.1]
   def change
-    create_table :groups do |t|
+    create_table :groups, id: false do |t|
       t.bigint :canvas_id, null: false
       t.string :sis_id
       t.bigint :canvas_group_category_id

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

@@ -2,7 +2,7 @@
 
 class CreateLearningOutcomeResults < ActiveRecord::Migration[5.1]
   def change
-    create_table :learning_outcome_results do |t|
+    create_table :learning_outcome_results, id: false do |t|
       t.bigint :canvas_id, null: false
       t.bigint :canvas_context_id
       t.string :canvas_context_type

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

@@ -2,7 +2,7 @@
 
 class CreateLearningOutcomes < ActiveRecord::Migration[5.1]
   def change
-    create_table :learning_outcomes do |t|
+    create_table :learning_outcomes, id: false do |t|
       t.bigint :canvas_id, null: false
       t.integer :canvas_context_id
       t.string :canvas_context_type

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

@@ -2,7 +2,7 @@
 
 class CreatePseudonyms < ActiveRecord::Migration[5.1]
   def change
-    create_table :pseudonyms do |t|
+    create_table :pseudonyms, id: false do |t|
       t.bigint :canvas_id, null: false
       t.bigint :canvas_user_id
       t.string :sis_id

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

@@ -2,7 +2,7 @@
 
 class CreateRoles < ActiveRecord::Migration[5.1]
   def change
-    create_table :roles do |t|
+    create_table :roles, id: false do |t|
       t.bigint :canvas_id, null: false
       t.string :label
       t.string :base_role_type

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

@@ -2,7 +2,7 @@
 
 class CreateRubricAssessments < ActiveRecord::Migration[5.1]
   def change
-    create_table :rubric_assessments do |t|
+    create_table :rubric_assessments, id: false do |t|
       t.bigint :canvas_id
       t.bigint :canvas_user_id
       t.bigint :canvas_rubric_id

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

@@ -2,7 +2,7 @@
 
 class CreateRubricAssociations < ActiveRecord::Migration[5.1]
   def change
-    create_table :rubric_associations do |t|
+    create_table :rubric_associations, id: false do |t|
       t.bigint :canvas_id, null: false
       t.bigint :canvas_rubric_id
       t.bigint :canvas_association_id

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

@@ -2,7 +2,7 @@
 
 class CreateRubrics < ActiveRecord::Migration[5.1]
   def change
-    create_table :rubrics do |t|
+    create_table :rubrics, id: false do |t|
       t.bigint :canvas_id, null: false
       t.bigint :canvas_user_id
       t.bigint :canvas_rubric_id

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

@@ -2,7 +2,7 @@
 
 class CreateScores < ActiveRecord::Migration[5.1]
   def change
-    create_table :scores do |t|
+    create_table :scores, id: false do |t|
       t.bigint :canvas_id, null: false
       t.bigint :canvas_enrollment_id, null: false
       t.bigint :canvas_assignment_group_id

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

@@ -2,7 +2,7 @@
 
 class CreateSections < ActiveRecord::Migration[5.1]
   def change
-    create_table :sections do |t|
+    create_table :sections, id: false do |t|
       t.bigint :canvas_id, null: false
       t.string :sis_id
       t.bigint :canvas_course_id

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

@@ -2,7 +2,7 @@
 
 class CreateSubmissions < ActiveRecord::Migration[5.1]
   def change
-    create_table :submissions do |t|
+    create_table :submissions, id: false do |t|
       t.bigint :canvas_id, null: false
       t.bigint :canvas_course_id
       t.bigint :canvas_assignment_id

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

@@ -2,7 +2,7 @@
 
 class CreateTerms < ActiveRecord::Migration[5.1]
   def change
-    create_table :terms do |t|
+    create_table :terms, id: false do |t|
       t.integer :canvas_id, null: false
       t.string :name
       t.datetime :start_at

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

@@ -2,7 +2,7 @@
 
 class CreateUserObservers < ActiveRecord::Migration[5.1]
   def change
-    create_table :user_observers do |t|
+    create_table :user_observers, id: false do |t|
       t.bigint :observing_user_id
       t.bigint :observed_user_id
       t.string :workflow_state

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

@@ -2,7 +2,7 @@
 
 class CreateUsers < ActiveRecord::Migration[5.1]
   def change
-    create_table :users do |t|
+    create_table :users, id: false do |t|
       t.bigint :canvas_id, null: false
       t.string :email
       t.string :first_name

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

@@ -7,6 +7,7 @@ class CourseNickname < ApplicationRecord
   include CanvasSync::Concerns::ApiSyncable
 
   canvas_sync_features :defaults
+  self.primary_key = [:canvas_user_id, :canvas_course_id] unless column_names.include?("id")
 
   belongs_to :user, primary_key: :canvas_id, foreign_key: :canvas_user_id, optional: true
   belongs_to :course, primary_key: :canvas_id, foreign_key: :canvas_course_id, optional: true

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

@@ -6,6 +6,7 @@ class CourseProgress < ApplicationRecord
   include CanvasSync::Concerns::ApiSyncable
 
   canvas_sync_features :defaults
+  self.primary_key = [:canvas_user_id, :canvas_course_id] unless column_names.include?("id")
 
   belongs_to :user, primary_key: :canvas_id, foreign_key: :canvas_user_id, optional: true
   belongs_to :course, primary_key: :canvas_id, foreign_key: :canvas_course_id, optional: true

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

@@ -8,4 +8,6 @@ class Pseudonym < ApplicationRecord
 
   validates :canvas_id, uniqueness: true, presence: true
   belongs_to :user, primary_key: :canvas_id, foreign_key: :canvas_user_id
+
+  scope :active, -> { where(workflow_state: "active") }
 end

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

@@ -17,6 +17,8 @@ class User < ApplicationRecord
 
   validates :canvas_id, uniqueness: true, presence: true
   has_many :pseudonyms, primary_key: :canvas_id, foreign_key: :canvas_user_id
+  has_many :active_pseudonyms, ->() { active }, primary_key: :canvas_id, foreign_key: :canvas_user_id, class_name: "Pseudonym"
+  has_many :all_pseudonyms, primary_key: :canvas_id, foreign_key: :canvas_user_id, class_name: "Pseudonym"
   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/lib/canvas_sync/generators/templates/models/user_observer.rb

@@ -7,6 +7,8 @@ class UserObserver < ApplicationRecord
 
   canvas_sync_features :defaults
 
+  self.primary_key = [:observing_user_id, :observed_user_id] unless column_names.include?("id")
+
   validates :canvas_id, uniqueness: true, presence: true
 
   belongs_to :observing_user, primary_key: :canvas_id, foreign_key: :observing_user_id, class_name: 'User', optional: true

data/lib/canvas_sync/importers/bulk_importer.rb

@@ -150,7 +150,7 @@ module CanvasSync
           }
           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)
+            klass.where(klass.primary_key => result.ids).update_all(global_updates)
           end
         end
 

data/lib/canvas_sync/jobs/sync_admins_job.rb

@@ -12,10 +12,10 @@ module CanvasSync
           api_client.account_admins(acc.canvas_id).all_pages_each do |admin_params|
             admin_params[:account_id] = acc.canvas_id
             admin = update_or_create_model(Admin, admin_params)
-            updated_admin_ids.push(admin.id)
+            updated_admin_ids.push(admin.canvas_id)
           end
         end
-        Admin.where.not(id: updated_admin_ids).update_all(workflow_state: 'inactive')
+        Admin.where.not(canvas_id: updated_admin_ids).update_all(workflow_state: 'inactive')
       end
     end
   end

data/lib/canvas_sync/jobs/sync_roles_job.rb

@@ -14,10 +14,10 @@ module CanvasSync
           end
           api_client.list_roles(acc.canvas_id, api_params).all_pages_each do |role_params|
             role = update_or_create_model(Role, role_params)
-            updated_role_ids.push(role.id)
+            updated_role_ids.push(role.canvas_id)
           end
         end
-        Role.where.not(id: updated_role_ids).update_all(workflow_state: 'inactive')
+        Role.where.not(canvas_id: updated_role_ids).update_all(workflow_state: 'inactive')
       end
     end
   end

data/lib/canvas_sync/misc_helper.rb

@@ -34,7 +34,7 @@ module CanvasSync
         # TODO Support globalid
         model_class = load_constant(job[:model])
         find_by = job[:find_by]
-        target = find_by.is_a?(Hash) ? model_class.find_by(**find_by) : model_class.find_by(id: find_by)
+        target = find_by.is_a?(Hash) ? model_class.find_by(**find_by) : model_class.find_by(model_class.primary_key => find_by)
         target.send(job[:method], *job_args, **job_kwargs)
       elsif job[:class]
         target = load_constant(job[:class])

data/lib/canvas_sync/version.rb

@@ -1,3 +1,3 @@
 module CanvasSync
-  VERSION = "0.24.0".freeze
+  VERSION = "0.26.0.beta1".freeze
 end

data/lib/canvas_sync.rb

@@ -177,6 +177,8 @@ module CanvasSync
       term_scope = term_scope.to_s if term_scope
       options = options.deep_symbolize_keys!
 
+      given_models = models.dup
+
       model_job_map = {
         terms: CanvasSync::Jobs::SyncTermsJob,
         accounts: CanvasSync::Jobs::SyncAccountsJob,
@@ -255,6 +257,10 @@ module CanvasSync
       # Wrap it all up
       ###############################
 
+      if given_models.include?('pseudonyms')
+        root_chain << Concerns::UserViaPseudonym::RefreshUserCachesJob
+      end
+
       root_chain
     end