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

Timestamp:

4 Apr 2013, 10:38:36 (12 years ago)

Author:

Henrik Bettermann

Message:

Add method to revert a previously made transfer.

Location:

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

Files:

• student.py (modified) (1 diff)
• tests/test_student.py (modified) (1 diff)

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

@@ -257 +257 @@
         return
 
+    def revert_transfer(self):
+        """ Revert previous transfer.
+
+        """
+        if not self.has_key('studycourse_1'):
+            return -1
+        del self['studycourse']
+        if 'studycourse_2' in self.keys():
+            studycourse = self['studycourse_2']
+            self['studycourse'] = studycourse
+            del self['studycourse_2']
+        else:
+            studycourse = self['studycourse_1']
+            self['studycourse'] = studycourse
+            del self['studycourse_1']
+        self.__parent__.logger.info(
+            '%s - transfer reverted' % self.student_id)
+        history = IObjectHistory(self)
+        history.addMessage('Transfer reverted')
+        return
 
 # Set all attributes of Student required in IStudent as field

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

@@ -319 +319 @@
         self.assertEqual(len(results), 1)
         assert results[0] is self.app['students'][self.student.student_id]
+
+        # Previous transfer can be successively reverted.
+        self.assertEqual(self.student['studycourse_2'].certificate.code, 'CERT2')
+        self.assertEqual(self.student['studycourse_1'].certificate.code, 'CERT1')
+        self.assertEqual(self.student['studycourse'].certificate.code, 'CERT1')
+        error = self.student.revert_transfer()
+        self.assertTrue(error == None)
+        self.assertEqual([i for i in self.student.keys()],
+            [u'accommodation', u'payments', u'studycourse',
+             u'studycourse_1'])
+        self.assertEqual(self.student['studycourse_1'].certificate.code, 'CERT1')
+        self.assertEqual(self.student['studycourse'].certificate.code, 'CERT2')
+        # The students_catalog has been updated again.
+        cat = queryUtility(ICatalog, name='students_catalog')
+        results = cat.searchResults(certcode=('CERT2', 'CERT2'))
+        results = [x for x in results]
+        self.assertEqual(len(results), 1)
+        assert results[0] is self.app['students'][self.student.student_id]
+        error = self.student.revert_transfer()
+        self.assertTrue(error == None)
+        self.assertEqual([i for i in self.student.keys()],
+            [u'accommodation', u'payments', u'studycourse'])
+        self.assertEqual(self.student['studycourse'].certificate.code, 'CERT1')
+        error = self.student.revert_transfer()
+        self.assertTrue(error == -1)
+        # The students_catalog has been updated again.
+        cat = queryUtility(ICatalog, name='students_catalog')
+        results = cat.searchResults(certcode=('CERT1', 'CERT1'))
+        results = [x for x in results]
+        self.assertEqual(len(results), 1)
+        assert results[0] is self.app['students'][self.student.student_id]
+        results = cat.searchResults(certcode=('CERT2', 'CERT2'))
+        results = [x for x in results]
+        self.assertEqual(len(results), 0)
+        logcontent = open(logfile).read()
+        self.assertTrue('system - K1000000 - transfer reverted'
+            in logcontent)
+        messages = ' '.join(self.student.history.messages)
+        self.assertTrue('Transfer reverted by system' in messages)
         return