canvas_sync 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 430c8ec60a8869bd4c7ed65b24057496793115af
-  data.tar.gz: cde2e6c7f4016df8b4d2c225e35469e750f3f4d3
+  metadata.gz: 23899e5c41cb63d0267eb031be38b7810e84f58e
+  data.tar.gz: 7e6c5093980d7e07d271a85a330c2fcae8d52b54
 SHA512:
-  metadata.gz: '08ca7f817cbcf1ce58cf0c0c8fee4fe4afe9c1f09fbc2b89859f4fdc0332f9430d02c8ee800caf30caecd06a4a8e8a42db31bdf0d6016c7ece0cad344da0287c'
-  data.tar.gz: 3c7528cad8053d81c6e95f6e8126d872e1334cb8793521cf1b9027a5eadc16962504a4db78d1470a780ce752e683165b2d136e252c6b85ea9c9a878e4470b900
+  metadata.gz: 32803f19bc38b505ab67abcdbcc55b3b283a00b79541942fea14142306ce6e569ba1746efc2d6a1d55c6eccd2b6cf7046a4f1f200e9cda9a4cd01f749f22b839
+  data.tar.gz: 83b5c340093e644dc26faf58ae297f937f207b0457c32b0991fad1c2194c773e49f0dff929aa0d9f4f39f6f2eafd028e1f6afc039bd240648e7b478ff03e141e

data/lib/canvas_sync/importers/bulk_importer.rb

@@ -19,7 +19,7 @@ module CanvasSync
       #   This can be used if you need to filter or massage the data in any way.
       def self.import(report_file_path, mapping, klass, conflict_target, exclude_duplicates=false)
         csv_column_names = mapping.keys
-        database_column_names = mapping.values
+        database_column_names = mapping.values.map{ |value| value[:database_column_name] }
         rows = []
         row_ids = {}
 
@@ -32,7 +32,13 @@ module CanvasSync
             row_ids[row[conflict_target]] = true
           end
 
-          rows << csv_column_names.map { |column| row[column] }
+          rows << csv_column_names.map do |column|
+            if mapping[column][:type] == :datetime
+              DateTime.parse(row[column]).utc if row[column].present?
+            else
+              row[column]
+            end
+          end
 
           if rows.length >= batch_size
             perform_import(klass, database_column_names, rows, conflict_target)

data/lib/canvas_sync/processors/provisioning_report_processor.rb

@@ -8,55 +8,166 @@ module CanvasSync
       # Used by the {CanvasSync::Importers::BulkImporter bulk importer}. The keys are
       # CSV columns and the values are the database columns.
       USERS_CSV_MAPPING = {
-        canvas_user_id: :canvas_user_id,
-        user_id: :sis_id,
-        email: :email,
-        first_name: :first_name,
-        last_name: :last_name,
-        status: :status,
-        login_id: :login_id
+        canvas_user_id: {
+          database_column_name: :canvas_user_id,
+          type: :integer
+        },
+        user_id: {
+          database_column_name: :sis_id,
+          type: :string
+        },
+        email: {
+          database_column_name: :email,
+          type: :string
+        },
+        first_name: {
+          database_column_name: :first_name,
+          type: :string
+        },
+        last_name: {
+          database_column_name: :last_name,
+          type: :string
+        },
+        status: {
+          database_column_name: :status,
+          type: :string
+        },
+        login_id: {
+          database_column_name: :login_id,
+          type: :string
+        }
       }
 
       COURSES_CSV_MAPPING = {
-        canvas_course_id: :canvas_course_id,
-        course_id: :sis_id,
-        short_name: :short_name,
-        long_name: :long_name,
-        canvas_account_id: :canvas_account_id,
-        canvas_term_id: :canvas_term_id,
-        term_id: :term_sis_id,
-        start_date: :start_date,
-        end_date: :end_date,
-        status: :status
+        canvas_course_id: {
+          database_column_name: :canvas_course_id,
+          type: :integer
+        },
+        course_id: {
+          database_column_name: :sis_id,
+          type: :string
+        },
+        short_name: {
+          database_column_name: :short_name,
+          type: :string
+        },
+        long_name: {
+          database_column_name: :long_name,
+          type: :string
+        },
+        canvas_account_id: {
+          database_column_name: :canvas_account_id,
+          type: :integer
+        },
+        canvas_term_id: {
+          database_column_name: :canvas_term_id,
+          type: :integer
+        },
+        term_id: {
+          database_column_name: :term_sis_id,
+          type: :string
+        },
+        start_date: {
+          database_column_name: :start_date,
+          type: :datetime
+        },
+        end_date: {
+          database_column_name: :end_date,
+          type: :datetime
+        },
+        status: {
+          database_column_name: :status,
+          type: :integer
+        }
       }
 
       ENROLLMENTS_CSV_MAPPING = {
-        canvas_enrollment_id: :canvas_enrollment_id,
-        canvas_course_id: :canvas_course_id,
-        course_id: :course_sis_id,
-        canvas_user_id: :canvas_user_id,
-        user_id: :user_sis_id,
-        role: :role,
-        role_id: :role_id,
-        canvas_section_id: :canvas_section_id,
-        section_id: :section_sis_id,
-        status: :status,
-        base_role_type: :base_role_type
+        canvas_enrollment_id: {
+          database_column_name: :canvas_enrollment_id,
+          type: :integer
+        },
+        canvas_course_id: {
+          database_column_name: :canvas_course_id,
+          type: :integer
+        },
+        course_id: {
+          database_column_name: :course_sis_id,
+          type: :string
+        },
+        canvas_user_id: {
+          database_column_name: :canvas_user_id,
+          type: :integer
+        },
+        user_id: {
+          database_column_name: :user_sis_id,
+          type: :string
+        },
+        role: {
+          database_column_name: :role,
+          type: :string
+        },
+        role_id: {
+          database_column_name: :role_id,
+          type: :integer
+        },
+        canvas_section_id: {
+          database_column_name: :canvas_section_id,
+          type: :integer
+        },
+        section_id: {
+          database_column_name: :section_sis_id,
+          type: :string
+        },
+        status: {
+          database_column_name: :status,
+          type: :string
+        },
+        base_role_type: {
+          database_column_name: :base_role_type,
+          type: :string
+        }
       }
 
       SECTIONS_CSV_MAPPING = {
-        canvas_section_id: :canvas_section_id,
-        section_id: :sis_id,
-        canvas_course_id: :canvas_course_id,
-        name: :name,
-        status: :status,
-        start_date: :start_date,
-        end_date: :end_date
+        canvas_section_id: {
+          database_column_name: :canvas_section_id,
+          type: :integer
+        },
+        section_id: {
+          database_column_name: :sis_id,
+          type: :string
+        },
+        canvas_course_id: {
+          database_column_name: :canvas_course_id,
+          type: :integer
+        },
+        name: {
+          database_column_name: :name,
+          type: :string
+        },
+        status: {
+          database_column_name: :status,
+          type: :string
+        },
+        start_date: {
+          database_column_name: :start_date,
+          type: :datetime
+        },
+        end_date: {
+          database_column_name: :end_date,
+          type: :datetime
+        }
       }
 
       XLIST_CSV_MAPPING = {
-        canvas_section_id: :canvas_section_id,
-        canvas_nonxlist_course_id: :canvas_nonxlist_course_id
+        canvas_section_id: {
+          database_column_name: :canvas_section_id,
+          type: :integer
+        },
+        canvas_nonxlist_course_id: {
+          database_column_name: :canvas_nonxlist_course_id,
+          type: :integer
+        }
       }
 
       # Processes a provisioning report using the bulk importer.

data/lib/canvas_sync/version.rb

@@ -1,3 +1,3 @@
 module CanvasSync
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

data/spec/canvas_sync/processors/provisioning_report_processor_spec.rb

@@ -14,6 +14,9 @@ RSpec.describe CanvasSync::Processors::ProvisioningReportProcessor do
       expect {
         subject.process('spec/support/fixtures/reports/courses.csv', { models: ['courses'] })
       }.to change { Course.count }.by(2)
+      course = Course.first
+      expect(course.start_date).to eq DateTime.parse("2017-03-27 21:53:18")
+      expect(course.end_date).to eq DateTime.parse("2017-04-27 12:21:18")
     end
 
     it 'processes enrollments' do
@@ -26,6 +29,9 @@ RSpec.describe CanvasSync::Processors::ProvisioningReportProcessor do
       expect {
         subject.process('spec/support/fixtures/reports/sections.csv', { models: ['sections'] })
       }.to change { Section.count }.by(2)
+      section = Section.first
+      expect(section.start_date).to eq DateTime.parse("2017-03-27 21:53:18")
+      expect(section.end_date).to eq DateTime.parse("2017-03-27 21:53:18")
     end
 
     it 'processes xlist' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: canvas_sync
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Nate Collings
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-07 00:00:00.000000000 Z
+date: 2017-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler