Changeset 9137 for main/waeup.kofa/trunk/src

Timestamp:

31 Aug 2012, 20:19:08 (12 years ago)

Author:

Henrik Bettermann

Message:

Return error code after transfer.

Add history message.

Location:

main/waeup.kofa/trunk/src/waeup/kofa/students

Files:

• student.py (modified) (4 diffs)
• tests/test_student.py (modified) (3 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/students/student.py

@@ -28 +28 @@
 from zope.interface import implementedBy
 from zope.securitypolicy.interfaces import IPrincipalRoleManager
+from zope.schema.interfaces import ConstraintNotSatisfied
 
 from waeup.kofa.image import KofaImageFile
@@ -149 +150 @@
         """
         studycourse = createObject(u'waeup.StudentStudyCourse')
-        studycourse.certificate = certificate
-        studycourse.entry_mode = 'transfer'
-        studycourse.current_session = current_session
-        studycourse.current_level = current_level
-        studycourse.current_verdict = current_verdict
-        studycourse.previous_verdict = previous_verdict
+        try:
+            studycourse.certificate = certificate
+            studycourse.entry_mode = 'transfer'
+            studycourse.current_session = current_session
+            studycourse.current_level = current_level
+            studycourse.current_verdict = current_verdict
+            studycourse.previous_verdict = previous_verdict
+        except ConstraintNotSatisfied:
+            return -1
         old = self['studycourse']
         studycourse.entry_session = old.entry_session
@@ -160 +164 @@
         if 'studycourse_1' in self.keys():
             if 'studycourse_2' in self.keys():
-                return False
+                return -2
             self['studycourse_2'] = old
         else:
@@ -169 +173 @@
             '%s - transferred from %s to %s' % (
             self.student_id, old.certificate.code, studycourse.certificate.code))
-        return True
+        history = IObjectHistory(self)
+        history.addMessage('Transferred from %s to %s' % (
+            old.certificate.code, studycourse.certificate.code))
+        return
 
 

main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_student.py

@@ -267 +267 @@
         self.assertRaises(
             RequiredMissing, self.student.transfer, self.certificate2)
-        success = self.student.transfer(self.certificate2,
-            current_session=2013)
+        error = self.student.transfer(self.certificate2, current_session=1000)
+        self.assertTrue(error == -1)
+        error = self.student.transfer(self.certificate2, current_session=2013)
+        self.assertTrue(error == None)
         self.assertEqual(self.student['studycourse_1'].certificate.code, 'CERT1')
         self.assertEqual(self.student['studycourse'].certificate.code, 'CERT2')
@@ -281 +283 @@
         self.assertTrue('system - K1000000 - transferred from CERT1 to CERT2'
             in logcontent)
+        messages = ' '.join(self.student.history.messages)
+        self.assertMatches(
+            '...<YYYY-MM-DD hh:mm:ss> UTC - '
+            'Transferred from CERT1 to CERT2 by system', messages)
 
         # The students_catalog has been updated.
@@ -297 +303 @@
 
         # Students can be transferred (only) two times.
-        success = self.student.transfer(self.certificate,
+        error = self.student.transfer(self.certificate,
             current_session=2013)
-        self.assertTrue(success)
-        success = self.student.transfer(self.certificate2,
+        self.assertTrue(error == None)
+        error = self.student.transfer(self.certificate2,
             current_session=2013)
-        self.assertFalse(success)
+        self.assertTrue(error == -2)
         self.assertEqual([i for i in self.student.keys()],
             [u'accommodation', u'payments', u'studycourse',