canvas_sync 0.1.5 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fbbd1539f4a800bb595198f919653e5b73454b7b
-  data.tar.gz: 75508d1a64e10df9cd21b413ccfda805be8abdbd
+  metadata.gz: 68b09dd9ca869bb37f08c0691ce54f1efa4abb7e
+  data.tar.gz: 6615009014df4ddcd3b20e602549658fd659e0f9
 SHA512:
-  metadata.gz: 0b346284748712d882fba0f6ce149d8750967c832b58bf3c9446b51e6f0b02ab2d3346d54d9e3c0fc653785517faa93d35a5123146797c35d6db0242a8db4d6a
-  data.tar.gz: fa0fe09275931b1af5f08940515300543fcbbdf7557f0c650f294efc5512ff503f5f7da6eba1bb23a4e28853b69df651b50fb2d5ced403b837e15481a825a49c
+  metadata.gz: c7526df95cf7d7cd2a86d48c95ca57b4da54d9a6e94095318b0eefc5ec08dc37112072e0be0246b655715b21a0c593a0d49fbfc6cf44a6b5ad647ee6aa57188d
+  data.tar.gz: 92b7dd1398562e07cacb45a5b5c54aac29ee4e366b090dbc5fec31e44690d4a211872c6dfe3d0b93c5aa71de5bff3f39da8f82d933f26484516a1fe875c17fd1

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

@@ -9,6 +9,7 @@ class CreateUsers < ActiveRecord::Migration[5.1]
       t.string :first_name
       t.string :last_name
       t.string :status
+      t.string :login_id
 
       t.timestamps
     end

data/lib/canvas_sync/importers/bulk_importer.rb

@@ -36,15 +36,32 @@ module CanvasSync
 
       private
 
-      def self.perform_import(klass, database_column_names, rows, conflict_target)
+      def self.perform_import(klass, columns, rows, conflict_target)
         return if rows.length == 0
-        database_column_names = database_column_names.dup
-        klass.import(database_column_names, rows, validate: false, on_duplicate_key_update: {
+        columns = columns.dup
+        klass.import(columns, rows, validate: false, on_duplicate_key_update: {
           conflict_target: conflict_target,
-          columns: database_column_names
+          condition: condition_sql(klass, columns),
+          columns: columns
         })
       end
 
+      # This method generates SQL that looks like:
+      # (users.sis_id, users.email) IS DISTINCT FROM (EXCLUDED.sis_id, EXCLUDED.email)
+      #
+      # This prevents activerecord-import from setting the `updated_at` column for
+      # rows that haven't actually changed. This allows you to query for rows that have changed
+      # by doing something like:
+      #
+      # started_at = Time.now
+      # run_the_users_sync!
+      # changed = User.where("updated_at >= ?", started_at)
+      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(", ")
+        "(#{columns_str}) IS DISTINCT FROM (#{excluded_str})"
+      end
+
       def self.batch_size
         batch_size = ENV['BULK_IMPORTER_BATCH_SIZE'].to_i
         batch_size > 0 ? batch_size : DEFAULT_BATCH_SIZE

data/lib/canvas_sync/processors/provisioning_report_processor.rb

@@ -13,7 +13,8 @@ module CanvasSync
         email: :email,
         first_name: :first_name,
         last_name: :last_name,
-        status: :status
+        status: :status,
+        login_id: :login_id
       }
 
       COURSES_CSV_MAPPING = {

data/lib/canvas_sync/version.rb

@@ -1,3 +1,3 @@
 module CanvasSync
-  VERSION = "0.1.5"
+  VERSION = "0.1.7"
 end

data/spec/dummy/db/migrate/{20170831221129_create_users.rb → 20170918221413_create_users.rb}

@@ -15,6 +15,7 @@ class CreateUsers < ActiveRecord::Migration[5.1]
       t.string :first_name
       t.string :last_name
       t.string :status
+      t.string :login_id
 
       t.timestamps
     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: 20170915210836) do
+ActiveRecord::Schema.define(version: 20170918221413) do
 
   create_table "canvas_sync_job_logs", force: :cascade do |t|
     t.datetime "started_at"
@@ -18,6 +18,7 @@ ActiveRecord::Schema.define(version: 20170915210836) do
     t.string "exception"
     t.text "backtrace"
     t.string "job_class"
+    t.string "status"
     t.text "metadata"
     t.text "job_arguments"
     t.datetime "created_at", null: false
@@ -93,6 +94,7 @@ ActiveRecord::Schema.define(version: 20170915210836) do
     t.string "first_name"
     t.string "last_name"
     t.string "status"
+    t.string "login_id"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.index ["canvas_user_id"], name: "index_users_on_canvas_user_id", unique: true

data/spec/dummy/log/development.log

@@ -4239,4 +4239,153 @@ Migrating to CreateCanvasSyncJobLog (20170915210836)
             SELECT sql
             FROM sqlite_temp_master
             WHERE name='index_users_on_canvas_user_id' AND type='index'
+
+   (0.2ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC
+   (0.1ms)  SELECT "ar_internal_metadata"."value" FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = ?  [["key", "environment"]]
+   (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC
+   (0.1ms)  SELECT "ar_internal_metadata"."value" FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = ?  [["key", "environment"]]
+   (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC
+   (0.1ms)  SELECT "ar_internal_metadata"."value" FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = ?  [["key", "environment"]]
+   (0.1ms)  SELECT sqlite_version(*)
+   (7.2ms)  CREATE TABLE "schema_migrations" ("version" varchar NOT NULL PRIMARY KEY)
+   (1.1ms)  CREATE TABLE "ar_internal_metadata" ("key" varchar NOT NULL PRIMARY KEY, "value" varchar, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL)
+   (0.2ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC
+Migrating to CreateEnrollments (20170905192509)
+   (0.1ms)  begin transaction
+   (0.4ms)  CREATE TABLE "enrollments" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "canvas_enrollment_id" bigint NOT NULL, "canvas_course_id" bigint, "course_sis_id" varchar, "canvas_user_id" bigint, "user_sis_id" varchar, "role" varchar, "role_id" integer, "canvas_section_id" bigint, "section_sis_id" varchar, "status" varchar, "base_role_type" varchar, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL)
+   (0.1ms)  CREATE UNIQUE INDEX "index_enrollments_on_canvas_enrollment_id" ON "enrollments" ("canvas_enrollment_id")
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_enrollments_on_canvas_enrollment_id' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_enrollments_on_canvas_enrollment_id' AND type='index'
+
+   (0.1ms)  CREATE  INDEX "index_enrollments_on_canvas_course_id" ON "enrollments" ("canvas_course_id")
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_enrollments_on_canvas_course_id' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_enrollments_on_canvas_course_id' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_enrollments_on_canvas_enrollment_id' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_enrollments_on_canvas_enrollment_id' AND type='index'
+
+   (0.1ms)  CREATE  INDEX "index_enrollments_on_canvas_user_id" ON "enrollments" ("canvas_user_id")
+  SQL (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20170905192509"]]
+   (1.3ms)  commit transaction
+Migrating to CreateTerms (20170906193506)
+   (0.1ms)  begin transaction
+   (0.4ms)  CREATE TABLE "terms" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "canvas_term_id" integer NOT NULL, "name" varchar, "start_at" datetime, "end_at" datetime, "workflow_state" varchar, "grading_period_group_id" integer, "sis_id" varchar, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL)
+   (0.1ms)  CREATE UNIQUE INDEX "index_terms_on_canvas_term_id" ON "terms" ("canvas_term_id")
+  SQL (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20170906193506"]]
+   (1.4ms)  commit transaction
+Migrating to CreateSections (20170906203438)
+   (0.1ms)  begin transaction
+   (0.4ms)  CREATE TABLE "sections" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "canvas_section_id" bigint NOT NULL, "sis_id" varchar, "canvas_course_id" bigint, "name" varchar, "status" varchar, "start_date" datetime, "end_date" datetime, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL)
+   (0.1ms)  CREATE UNIQUE INDEX "index_sections_on_canvas_section_id" ON "sections" ("canvas_section_id")
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_sections_on_canvas_section_id' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_sections_on_canvas_section_id' AND type='index'
+
+   (0.1ms)  CREATE  INDEX "index_sections_on_canvas_course_id" ON "sections" ("canvas_course_id")
+  SQL (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20170906203438"]]
+   (0.8ms)  commit transaction
+Migrating to CreateCourses (20170914181345)
+   (0.0ms)  begin transaction
+   (0.3ms)  CREATE TABLE "courses" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "canvas_course_id" bigint NOT NULL, "sis_id" varchar, "short_name" varchar, "long_name" varchar, "status" varchar, "canvas_account_id" integer, "canvas_term_id" integer, "term_sis_id" integer, "start_date" datetime, "end_date" datetime, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL)
+   (0.1ms)  CREATE UNIQUE INDEX "index_courses_on_canvas_course_id" ON "courses" ("canvas_course_id")
+  SQL (0.2ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20170914181345"]]
+   (1.0ms)  commit transaction
+Migrating to CreateCanvasSyncJobLog (20170915210836)
+   (0.1ms)  begin transaction
+   (0.3ms)  CREATE TABLE "canvas_sync_job_logs" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "started_at" datetime, "completed_at" datetime, "exception" varchar, "backtrace" text, "job_class" varchar, "status" varchar, "metadata" text, "job_arguments" text, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL)
+  SQL (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20170915210836"]]
+   (0.8ms)  commit transaction
+Migrating to CreateUsers (20170918221413)
+   (0.0ms)  begin transaction
+   (0.3ms)  CREATE TABLE "users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "canvas_user_id" bigint NOT NULL, "sis_id" varchar, "email" varchar, "first_name" varchar, "last_name" varchar, "status" varchar, "login_id" varchar, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL)
+   (0.1ms)  CREATE UNIQUE INDEX "index_users_on_canvas_user_id" ON "users" ("canvas_user_id")
+  SQL (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20170918221413"]]
+   (1.0ms)  commit transaction
+  ActiveRecord::InternalMetadata Load (0.1ms)  SELECT  "ar_internal_metadata".* FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = ? LIMIT ?  [["key", "environment"], ["LIMIT", 1]]
+   (0.0ms)  begin transaction
+  SQL (0.3ms)  INSERT INTO "ar_internal_metadata" ("key", "value", "created_at", "updated_at") VALUES (?, ?, ?, ?)  [["key", "environment"], ["value", "development"], ["created_at", "2017-09-18 22:14:19.660824"], ["updated_at", "2017-09-18 22:14:19.660824"]]
+   (1.0ms)  commit transaction
+   (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_courses_on_canvas_course_id' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_courses_on_canvas_course_id' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_enrollments_on_canvas_user_id' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_enrollments_on_canvas_user_id' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_enrollments_on_canvas_course_id' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_enrollments_on_canvas_course_id' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_enrollments_on_canvas_enrollment_id' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_enrollments_on_canvas_enrollment_id' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_sections_on_canvas_course_id' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_sections_on_canvas_course_id' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_sections_on_canvas_section_id' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_sections_on_canvas_section_id' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_terms_on_canvas_term_id' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_terms_on_canvas_term_id' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_users_on_canvas_user_id' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_users_on_canvas_user_id' AND type='index'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: canvas_sync
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.7
 platform: ruby
 authors:
 - Nate Collings
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-15 00:00:00.000000000 Z
+date: 2017-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -346,13 +346,12 @@ files:
 - spec/dummy/config/routes.rb
 - spec/dummy/config/secrets.yml
 - spec/dummy/db/development.sqlite3
-- spec/dummy/db/migrate/20170831221129_create_users.rb
 - spec/dummy/db/migrate/20170905192509_create_enrollments.rb
 - spec/dummy/db/migrate/20170906193506_create_terms.rb
 - spec/dummy/db/migrate/20170906203438_create_sections.rb
 - spec/dummy/db/migrate/20170914181345_create_courses.rb
+- spec/dummy/db/migrate/20170918221413_create_users.rb
 - spec/dummy/db/schema.rb
-- spec/dummy/db/test.sqlite3
 - spec/dummy/log/development.log
 - spec/dummy/log/test.log
 - spec/factories/course_factory.rb
@@ -430,13 +429,12 @@ test_files:
 - spec/dummy/config/routes.rb
 - spec/dummy/config/secrets.yml
 - spec/dummy/db/development.sqlite3
-- spec/dummy/db/migrate/20170831221129_create_users.rb
 - spec/dummy/db/migrate/20170905192509_create_enrollments.rb
 - spec/dummy/db/migrate/20170906193506_create_terms.rb
 - spec/dummy/db/migrate/20170906203438_create_sections.rb
 - spec/dummy/db/migrate/20170914181345_create_courses.rb
+- spec/dummy/db/migrate/20170918221413_create_users.rb
 - spec/dummy/db/schema.rb
-- spec/dummy/db/test.sqlite3
 - spec/dummy/log/development.log
 - spec/dummy/log/test.log
 - spec/factories/course_factory.rb