canvas_sync 0.16.4 → 0.21.0

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: 2020_04_16_214248) do
+ActiveRecord::Schema.define(version: 2024_05_23_101010) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -83,7 +83,7 @@ ActiveRecord::Schema.define(version: 2020_04_16_214248) do
     t.index ["canvas_id"], name: "index_assignments_on_canvas_id", unique: true
   end
 
-  create_table "canvas_sync_job_logs", force: :cascade do |t|
+  create_table "canvas_sync_job_logs", id: :serial, force: :cascade do |t|
     t.datetime "started_at"
     t.datetime "completed_at"
     t.string "exception"
@@ -92,13 +92,42 @@ ActiveRecord::Schema.define(version: 2020_04_16_214248) do
     t.string "status"
     t.text "metadata"
     t.text "job_arguments"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.string "job_id"
     t.integer "fork_count"
     t.index ["job_id"], name: "index_canvas_sync_job_logs_on_job_id"
   end
 
+  create_table "canvas_sync_sync_batches", id: :serial, force: :cascade do |t|
+    t.datetime "started_at"
+    t.datetime "completed_at"
+    t.string "status"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.boolean "full_sync", default: false
+    t.string "batch_genre"
+    t.string "batch_bid"
+  end
+
+  create_table "content_migrations", force: :cascade do |t|
+    t.bigint "canvas_id"
+    t.bigint "canvas_context_id"
+    t.string "canvas_context_type"
+    t.string "workflow_state"
+    t.text "migration_settings"
+    t.datetime "started_at"
+    t.datetime "finished_at"
+    t.float "progress"
+    t.bigint "canvas_source_course_id"
+    t.string "migration_type"
+    t.bigint "canvas_child_subscription_id"
+    t.bigint "canvas_root_account_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["canvas_id"], name: "index_content_migrations_on_canvas_id", unique: true
+  end
+
   create_table "context_module_items", force: :cascade do |t|
     t.bigint "canvas_id"
     t.bigint "canvas_context_module_id"
@@ -128,6 +157,17 @@ ActiveRecord::Schema.define(version: 2020_04_16_214248) do
     t.index ["canvas_id"], name: "index_context_modules_on_canvas_id", unique: true
   end
 
+  create_table "course_nicknames", force: :cascade do |t|
+    t.bigint "canvas_user_preference_value_id", null: false
+    t.integer "canvas_user_id"
+    t.integer "canvas_course_id"
+    t.string "nickname"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["canvas_course_id", "canvas_user_id"], name: "index_course_nicknames_on_canvas_course_id_and_canvas_user_id", unique: true
+    t.index ["canvas_user_preference_value_id"], name: "index_course_nicknames_on_canvas_user_preference_value_id", unique: true
+  end
+
   create_table "courses", force: :cascade do |t|
     t.bigint "canvas_id", null: false
     t.string "sis_id"
@@ -162,6 +202,32 @@ ActiveRecord::Schema.define(version: 2020_04_16_214248) do
     t.index ["canvas_user_id"], name: "index_enrollments_on_canvas_user_id"
   end
 
+  create_table "grading_period_groups", force: :cascade do |t|
+    t.bigint "canvas_id", null: false
+    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_id"], name: "index_grading_period_groups_on_canvas_id", unique: true
+  end
+
+  create_table "grading_periods", force: :cascade do |t|
+    t.bigint "canvas_id", null: false
+    t.string "title"
+    t.float "weight"
+    t.datetime "start_date"
+    t.datetime "end_date"
+    t.datetime "close_date"
+    t.bigint "canvas_grading_period_group_id"
+    t.string "workflow_state"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["canvas_grading_period_group_id"], name: "index_grading_periods_on_canvas_grading_period_group_id"
+    t.index ["canvas_id"], name: "index_grading_periods_on_canvas_id", unique: true
+  end
+
   create_table "group_memberships", force: :cascade do |t|
     t.bigint "canvas_id", null: false
     t.bigint "canvas_user_id", null: false
@@ -191,6 +257,82 @@ ActiveRecord::Schema.define(version: 2020_04_16_214248) do
     t.index ["canvas_id"], name: "index_groups_on_canvas_id", unique: true
   end
 
+  create_table "learning_outcomes", force: :cascade do |t|
+    t.bigint "canvas_id", null: false
+    t.integer "canvas_context_id"
+    t.string "canvas_context_type"
+    t.string "name"
+    t.string "friendly_name"
+    t.string "workflow_state"
+    t.datetime "canvas_created_at"
+    t.datetime "canvas_updated_at"
+    t.string "migration_id"
+    t.string "vendor_guid"
+    t.string "low_grade"
+    t.string "high_grade"
+    t.string "calculation_method"
+    t.string "calculation_int"
+    t.integer "outcome_import_id"
+    t.integer "root_account_ids", default: [], array: true
+    t.text "description"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["canvas_context_id", "canvas_context_type"], name: "index_learning_outcomes_on_context"
+    t.index ["canvas_id"], name: "index_learning_outcomes_on_canvas_id", unique: true
+  end
+
+  create_table "learning_outcome_results", force: :cascade do |t|
+    t.bigint "canvas_id",  null: false
+    t.bigint "canvas_context_id"
+    t.string "canvas_context_type"
+    t.bigint "canvas_association_id"
+    t.string "canvas_association_type"
+    t.bigint "canvas_content_tag_id"
+    t.bigint "canvas_learning_outcome_id"
+    t.bigint "canvas_user_id"
+    t.boolean "mastery"
+    t.boolean "original_mastery"
+    t.bigint "canvas_artifact_id"
+    t.string "canvas_artifact_type"
+    t.datetime "assessed_at"
+    t.string "title"
+    t.float "percent"
+    t.bigint "canvas_associated_asset_id"
+    t.string "canvas_associated_asset_type"
+    t.integer "attempt"
+    t.float "score"
+    t.float "possible"
+    t.float "original_score"
+    t.float "original_possible"
+    t.string "workflow_state"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index "canvas_id", unique: true
+    t.index [
+      "canvas_user_id",
+      "canvas_content_tag_id",
+      "canvas_association_id",
+      "canvas_association_type",
+      "canvas_associated_asset_id",
+      "canvas_associated_asset_type"
+    ], unique: true, name: 'index_learning_outcome_results_association'
+    t.index "canvas_content_tag_id"
+    t.index "canvas_learning_outcome_id"
+    t.index ["canvas_artifact_id", "canvas_artifact_type"], name: "index_learning_outcome_results_on_canvas_arid_and_artype"
+  end
+
+  create_table "pseudonyms", force: :cascade do |t|
+    t.bigint "canvas_id", null: false
+    t.bigint "canvas_user_id"
+    t.string "sis_id"
+    t.string "unique_id"
+    t.string "workflow_state"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["canvas_id"], name: "index_pseudonyms_on_canvas_id", unique: true
+    t.index ["canvas_user_id"], name: "index_pseudonyms_on_canvas_user_id"
+  end
+
   create_table "roles", force: :cascade do |t|
     t.integer "canvas_id", null: false
     t.string "label"
@@ -204,6 +346,93 @@ ActiveRecord::Schema.define(version: 2020_04_16_214248) do
     t.index ["canvas_id"], name: "index_roles_on_canvas_id", unique: true
   end
 
+  create_table "rubrics", force: :cascade do |t|
+    t.bigint "canvas_id", null: false
+    t.bigint "canvas_user_id"
+    t.bigint "canvas_rubric_id"
+    t.bigint "canvas_context_id"
+    t.string "canvas_context_type"
+    t.text "data"
+    t.float "points_possible"
+    t.string "title"
+    t.text "description"
+    t.boolean "reusable"
+    t.boolean "public"
+    t.boolean "read_only"
+    t.integer "association_count"
+    t.boolean "free_form_criterion_comments"
+    t.string "context_code"
+    t.string "migration_id"
+    t.boolean "hide_score_total"
+    t.string "workflow_state"
+    t.bigint "canvas_root_account_id"
+    t.boolean "hide_points"
+    t.string "rating_order"
+    t.string "button_display"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index "canvas_id", name: "index_rubrics_on_canvas_id", unique: true
+    t.index ["canvas_context_id", "canvas_context_type"], name: "index_rubrics_on_canvas_context_id_and_canvas_context_type"
+    t.index "canvas_rubric_id", name: "index_rubrics_on_canvas_rubric_id"
+    t.index "canvas_user_id", name: "index_rubrics_on_canvas_user_id"
+    t.index "canvas_root_account_id", name: "index_rubrics_on_canvas_root_account_id"
+  end
+
+  create_table "rubric_associations", force: :cascade do |t|
+    t.integer "canvas_id", null: false
+    t.integer "canvas_rubric_id"
+    t.integer "canvas_association_id"
+    t.string "canvas_association_type"
+    t.boolean "use_for_grading"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.string "title"
+    t.text "description"
+    t.text "summary_data"
+    t.string "purpose"
+    t.string "url"
+    t.integer "canvas_context_id"
+    t.string "canvas_context_type"
+    t.boolean "hide_score_total"
+    t.string "context_code"
+    t.boolean "bookmarked"
+    t.boolean "hide_points"
+    t.boolean "hide_outcome_results"
+    t.bigint "canvas_root_account_id"
+    t.string "workflow_state"
+    t.index ["canvas_id"], name: "index_rubric_associations_on_canvas_id", unique: true
+    t.index ["canvas_association_id", "canvas_association_type"], name: "index_rubric_associations_on_canvas_aid_and_canvas_atype"
+    t.index ["context_code"], name: "index_rubric_associations_on_context_code"
+    t.index ["canvas_context_id", "canvas_context_type"], name: "index_rubric_associations_on_canvas_cid_and_canvas_ctype"
+    t.index ["canvas_rubric_id"], name: "index_rubric_associations_on_canvas_rubric_id"
+    t.index ["canvas_root_account_id"], name: "index_rubric_associations_on_canvas_root_account_id"
+  end
+
+  create_table "rubric_assessments", force: :cascade do |t|
+    t.bigint "canvas_id"
+    t.bigint "canvas_user_id"
+    t.bigint "canvas_rubric_id"
+    t.bigint "canvas_rubric_association_id"
+    t.float "score"
+    t.text "data"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.bigint "canvas_artifact_id"
+    t.string "canvas_artifact_type"
+    t.string "assessment_type"
+    t.bigint "canvas_assessor_id"
+    t.integer "artifact_attempt"
+    t.boolean "hide_points"
+    t.bigint "canvas_root_account_id"
+    t.index ["canvas_id"], name: "index_rubric_assessments_on_canvas_id", unique: true
+    t.index ["canvas_artifact_id", "canvas_artifact_type"], name: "index_rubric_assessments_on_canvas_aid_and_canvas_atype"
+    t.index ["canvas_assessor_id"], name: "index_rubric_assessments_on_canvas_assessor_id"
+    t.index ["canvas_rubric_association_id"], name: "index_rubric_assessments_on_canvas_rubric_association_id"
+    t.index ["canvas_rubric_id"], name: "index_rubric_assessments_on_canvas_rubric_id"
+    t.index ["canvas_user_id"], name: "index_rubric_assessments_on_canvas_user_id"
+    t.index ["canvas_root_account_id"], name: "index_rubric_assessments_on_canvas_root_account_id"
+  end
+
   create_table "sections", force: :cascade do |t|
     t.bigint "canvas_id", null: false
     t.string "sis_id"
@@ -252,9 +481,19 @@ ActiveRecord::Schema.define(version: 2020_04_16_214248) do
     t.index ["canvas_id"], name: "index_terms_on_canvas_id", unique: true
   end
 
+  create_table "user_observers", force: :cascade do |t|
+    t.bigint "observing_user_id"
+    t.bigint "observed_user_id"
+    t.string "workflow_state"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["observed_user_id", "observing_user_id"], name: "index_user_observers_on_observed_user_id_and_observing_user_id", unique: true
+    t.index ["observed_user_id"], name: "index_user_observers_on_observed_user_id"
+    t.index ["observing_user_id"], name: "index_user_observers_on_observing_user_id"
+  end
+
   create_table "users", force: :cascade do |t|
     t.bigint "canvas_id", null: false
-    t.string "sis_id"
     t.string "email"
     t.string "first_name"
     t.string "last_name"

data/spec/factories/user_factory.rb

@@ -1,7 +1,6 @@
 FactoryGirl.define do
   factory :user do
     canvas_id { SecureRandom.random_number(100_000_000) }
-    sis_id { SecureRandom.hex }
     email "cooldude@coolsite.com"
     first_name "Cool"
     last_name "Dude"

data/spec/job_batching/active_job_spec.rb

@@ -0,0 +1,107 @@
+require 'spec_helper'
+
+RSpec.describe CanvasSync::JobBatches::ActiveJob do
+  describe CanvasSync::JobBatches::ActiveJob::BatchAwareJob do
+    include ActiveJob::TestHelper
+
+    after do
+      clear_enqueued_jobs
+      clear_performed_jobs
+    end
+
+    context "When Performing" do
+      context 'when without batch' do
+        it 'just yields' do
+          expect(CanvasSync::JobBatches::Batch).not_to receive(:process_successful_job)
+          expect(CanvasSync::JobBatches::Batch).not_to receive(:process_failed_job)
+          expect_any_instance_of(BatchTestJobBase).to receive(:perform)
+
+          BatchTestJobBase.perform_now
+        end
+      end
+
+      context 'when in batch' do
+        let(:bid) { 'SAMPLEBID' }
+
+        context 'when successful' do
+          it 'yields' do
+            expect_any_instance_of(BatchTestJobBase).to receive(:perform)
+            BatchTestJobBase.perform_now
+          end
+
+          it 'calls process_successful_job' do
+            job = BatchTestJobBase.new
+            job.instance_variable_set(:@bid, bid)
+            expect(CanvasSync::JobBatches::Batch).to receive(:process_successful_job).with(bid, job.job_id)
+            job.perform_now
+          end
+        end
+
+        context 'when failed' do
+          it 'calls process_failed_job and reraises exception' do
+            reraised = false
+            job = FailingBatchTestJobBase.new
+            job.instance_variable_set(:@bid, bid)
+            expect(CanvasSync::JobBatches::Batch).to receive(:process_failed_job)
+            begin
+              job.perform_now
+            rescue
+              reraised = true
+            end
+            expect(reraised).to be_truthy
+          end
+        end
+      end
+    end
+
+    context "When Enqueueing" do
+      context 'when without batch' do
+        it 'just yields' do
+          expect(CanvasSync::JobBatches::Batch).not_to receive(:increment_job_queue)
+          BatchTestJobBase.perform_later
+          expect(BatchTestJobBase).to have_been_enqueued
+        end
+      end
+
+      context 'when in batch' do
+        let(:bid) { 'SAMPLEBID' }
+
+        before do
+          Thread.current[CanvasSync::JobBatches::CURRENT_BATCH_THREAD_KEY] = CanvasSync::JobBatches::Batch.new(bid)
+          Thread.current[CanvasSync::JobBatches::CURRENT_BATCH_THREAD_KEY].instance_variable_set(:@open, true)
+        end
+        after { Thread.current[CanvasSync::JobBatches::CURRENT_BATCH_THREAD_KEY] = nil }
+
+        it 'yields' do
+          expect {
+            BatchTestJobBase.perform_later
+          }.to enqueue_job(BatchTestJobBase)
+        end
+
+        it 'assigns bid to job metadata' do
+          job = BatchTestJobBase.perform_later
+          expect(job.bid).to eq bid
+          expect(job.serialize['batch_id']).to eq bid
+        end
+      end
+    end
+
+    context 'worker' do
+      it 'defines method bid' do
+        expect(ActiveJob::Base.instance_methods).to include(:bid)
+      end
+
+      it 'defines method batch' do
+        expect(ActiveJob::Base.instance_methods).to include(:batch)
+      end
+
+      it 'defines method valid_within_batch?' do
+        expect(ActiveJob::Base.instance_methods).to include(:valid_within_batch?)
+      end
+    end
+  end
+
+  describe ".handle_job_death" do
+
+  end
+end