Changeset 11595 for main

Timestamp:

23 Apr 2014, 08:26:03 (11 years ago)

Author:

Henrik Bettermann

Message:

constructMatricNumber must not be private. We will be calling it in custom packages.

Location:

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

Files:

• tests/test_utils.py (modified) (2 diffs)
• utils.py (modified) (4 diffs)

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

@@ -43 +43 @@
         site = grok.getSite()
         utils = getUtility(IStudentsUtils)
-        msg, mnumber = utils.setMatricNumber(self.student)
-        self.assertEqual(msg, 'Matriculation number cannot be set.')
-        self.assertEqual(mnumber, None)
-        site['configuration'].next_matric_integer = 1
+        # Matric number can't be set twice.
         msg, mnumber = utils.setMatricNumber(self.student)
         self.assertEqual(msg, 'Matriculation number already set.')
@@ -52 +49 @@
         self.assertEqual(self.student.matric_number, '234')
         self.student.matric_number = None
+        # Matric number can't be set if next_matric_integer is 0.
+        msg, mnumber = utils.setMatricNumber(self.student)
+        self.assertEqual(msg, 'Matriculation number cannot be set.')
+        self.assertEqual(mnumber, None)
+        site['configuration'].next_matric_integer = 1
+        # Now all requirements are met and matric number can be set.
         msg, mnumber = utils.setMatricNumber(self.student)
         self.assertEqual(msg, None)
-        self.assertEqual(mnumber, 1)
+        self.assertEqual(mnumber, '1')
         self.assertEqual(self.student.matric_number, '1')
         self.assertEqual(site['configuration'].next_matric_integer, 2)
-        # Student can be found in catalog.
+        # Student can be found in catalog with new matric number.
         cat = queryUtility(ICatalog, name='students_catalog')
         results = list(cat.searchResults(matric_number=('1', '1')))

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

@@ -516 +516 @@
         return None, payment
 
-    def _constructMatricNumber(self, student, next_integer):
+    def constructMatricNumber(self, student):
+        next_integer = grok.getSite()['configuration'].next_matric_integer
+        if next_integer == 0:
+            return None
         return unicode(next_integer)
 
@@ -526 +529 @@
         the site configuration container and according to the
         matriculation number construction rules defined in the
-        _constructMatricNumber method. The new matric number is set,
+        constructMatricNumber method. The new matric number is set,
         the students catalog updated and next_matric_integer
         increased by one.
@@ -537 +540 @@
         The method can be disabled by setting next_matric_integer to zero.
         """
-        next_integer = grok.getSite()['configuration'].next_matric_integer
-        if next_integer == 0:
-            return _('Matriculation number cannot be set.'), None
         if student.matric_number is not None:
             return _('Matriculation number already set.'), None
         if student.certcode is None:
             return _('No certificate assigned.'), None
-        matric_number = self._constructMatricNumber(student, next_integer)
+        matric_number = self.constructMatricNumber(student)
         if not matric_number:
             return _('Matriculation number cannot be set.'), None
@@ -553 +553 @@
         notify(grok.ObjectModifiedEvent(student))
         grok.getSite()['configuration'].next_matric_integer += 1
-        return None, next_integer
+        return None, matric_number
 
     def getAccommodationDetails(self, student):