add start_date/end_date to enrollment sis imports closes #5408

Change-Id: Ic300cd25ea87210e0cb61d11a433a89bd56dcb3d
Reviewed-on: https://gerrit.instructure.com/5325
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>

Author: ccutrer

lib/sis/enrollment_importer.rb

@@ -167,6 +167,14 @@ def process(csv)
                     enrollment.workflow_state = 'inactive'
                   end
 
+                  begin
+                    enrollment.start_at = row['start_date'].blank? ? nil : DateTime.parse(row['start_date'])
+                    enrollment.end_at = row['end_date'].blank? ? nil : DateTime.parse(row['end_date'])
+                  rescue
+                    add_warning(csv, "Bad date format for user #{row['user_id']} in #{row['course_id'].blank? ? 'section' : 'course'} #{row['course_id'].blank? ? row['section_id'] : row['course_id']}")
+                  end
+
+
                   courses_to_touch_ids.add(enrollment.course)
                   if enrollment.should_update_user_account_association?
                     if enrollment.new_record? && !update_account_association_user_ids.include?(user.id)

spec/lib/sis_csv_importer_spec.rb

@@ -877,20 +877,22 @@ def gen_ssha_password(password)
         "user_2,user2,User,Dos,user2@example.com,active",
         "user_3,user4,User,Tres,user3@example.com,active",
         "user_5,user5,User,Quatro,user5@example.com,active",
-        "user_6,user6,User,Cinco,user6@example.com,active"
+        "user_6,user6,User,Cinco,user6@example.com,active",
+        "user_7,user7,User,Siete,user7@example.com,active"
       )
       process_csv_data(
         "section_id,course_id,name,status,start_date,end_date",
         "S001,test_1,Sec1,active,,"
       )
       # the enrollments
       process_csv_data(
-        "course_id,user_id,role,section_id,status,associated_user_id",
-        "test_1,user_1,teacher,,active,",
-        ",user_2,student,S001,active,",
-        "test_1,user_3,ta,S001,active,",
-        "test_1,user_5,observer,S001,active,user_2",
-        "test_1,user_6,designer,S001,active,"
+        "course_id,user_id,role,section_id,status,associated_user_id,start_date,end_date",
+        "test_1,user_1,teacher,,active,,,",
+        ",user_2,student,S001,active,,,",
+        "test_1,user_3,ta,S001,active,,,",
+        "test_1,user_5,observer,S001,active,user_2,,",
+        "test_1,user_6,designer,S001,active,,,",
+        "test_1,user_7,teacher,S001,active,,1985-08-24,2011-08-29"
       )
       course = @account.courses.find_by_sis_source_id("test_1")
       course.teachers.first.name.should == "User Uno"
@@ -899,6 +901,9 @@ def gen_ssha_password(password)
       course.observers.first.name.should == "User Quatro"
       course.observer_enrollments.first.associated_user_id.should == course.students.first.id
       course.designers.first.name.should == "User Cinco"
+      course.teacher_enrollments.last.user.name.should == "User Siete"
+      course.teacher_enrollments.last.start_at.should == DateTime.new(1985, 8, 24)
+      course.teacher_enrollments.last.end_at.should == DateTime.new(2011, 8, 29)
     end
 
     it "should not try looking up a section to enroll into if the section name is empty" do