Changeset 7497 for main

Timestamp:

21 Jan 2012, 11:55:44 (13 years ago)

Author:

Henrik Bettermann

Message:

Import student password as well. This is crucial for upcoming portal migration.

Location:

main/waeup.sirp/trunk/src/waeup/sirp/students

Files:

• batching.py (modified) (3 diffs)
• tests/sample_student_data_migration.csv (modified) (1 diff)
• tests/test_browser.py (modified) (2 diffs)

main/waeup.sirp/trunk/src/waeup/sirp/students/batching.py

@@ -32 +32 @@
 from zope.catalog.interfaces import ICatalog
 from waeup.sirp.interfaces import (
-    IBatchProcessor, FatalCSVError, IObjectConverter)
+    IBatchProcessor, FatalCSVError, IObjectConverter, IUserAccount)
 from waeup.sirp.students.interfaces import (
     IStudent, IStudentStudyCourseImport,
@@ -58 +58 @@
     def available_fields(self):
         return sorted(list(set(
-            ['student_id','reg_number','matric_number'] + getFields(
+            ['student_id','reg_number','matric_number','password'] + getFields(
                 self.iface).keys())))
 
@@ -137 +137 @@
         pass
 
+    def updateEntry(self, obj, row, site):
+        """Update obj to the values given in row.
+        """
+        for key, value in row.items():
+            # Set student password and all fields declared in interface.
+            if key == 'password':
+                IUserAccount(obj).setPassword(value)
+            elif hasattr(obj, key):
+                setattr(obj, key, value)
+        return
+
     def getMapping(self, path, headerfields, mode):
         """Get a mapping from CSV file headerfields to actually used fieldnames.

main/waeup.sirp/trunk/src/waeup/sirp/students/tests/sample_student_data_migration.csv

@@ -1 @@
-student_id,firstname,lastname,reg_number,date_of_birth,matric_number,email,phone
-A123456,Aaren,Pieri,1,1990-01-02,100000,aa@aa.ng,1234
-B123456,Aaren,Finau,2,1990-01-03,100001,aa@aa.ng,1234
-C123456,Aaren,Berson,3,1990-01-04,100002,aa@aa.ng,1234
+student_id,firstname,lastname,reg_number,date_of_birth,matric_number,email,phone,password
+A123456,Aaren,Pieri,1,1990-01-02,100000,aa@aa.ng,1234,mypw1
+B123456,Aaren,Finau,2,1990-01-03,100001,aa@aa.ng,1234,mypw1
+C123456,Aaren,Berson,3,1990-01-04,100002,aa@aa.ng,1234,mypw1

main/waeup.sirp/trunk/src/waeup/sirp/students/tests/test_browser.py

@@ -682 +682 @@
         # Prepare a csv file for students
         open('students.csv', 'wb').write(
-"""firstname,lastname,reg_number,date_of_birth,matric_number,email,phone
-Aaren,Pieri,1,1990-01-02,100000,aa@aa.ng,1234
-Claus,Finau,2,1990-01-03,100001,aa@aa.ng,1234
-Brit,Berson,3,1990-01-04,100001,aa@aa.ng,1234
+"""firstname,lastname,reg_number,date_of_birth,matric_number,email,phone,password
+Aaren,Pieri,1,1990-01-02,100000,aa@aa.ng,1234,mypwd1
+Claus,Finau,2,1990-01-03,100001,aa@aa.ng,1234,mypwd1
+Brit,Berson,3,1990-01-04,100001,aa@aa.ng,1234,mypwd1
 """)
         self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
@@ -739 +739 @@
         # The students are properly indexed and we can
         # thus find a student in  the department
-        self.browser.open(self.container_path)
+        self.browser.open(self.manage_container_path)
         self.browser.getControl(name="searchtype").value = ['depcode']
         self.browser.getControl(name="searchterm").value = 'dep1'
         self.browser.getControl("Search").click()
         self.assertTrue('Aaren Pieri' in self.browser.contents)
+        # We can search for a new student by name ...
+        self.browser.getControl(name="searchtype").value = ['fullname']
+        self.browser.getControl(name="searchterm").value = 'Claus'
+        self.browser.getControl("Search").click()
+        self.assertTrue('Claus Finau' in self.browser.contents)
+        # ... and check if the imported password has been properly set
+        ctrl = self.browser.getControl(name='entries')
+        value = ctrl.options[0]
+        claus = self.app['students'][value]
+        self.assertTrue(IUserAccount(claus).checkPassword('mypwd1'))
         return