Changeset 7534

Timestamp:

29 Jan 2012, 08:29:43 (13 years ago)

Author:

Henrik Bettermann

Message:

Fix logic. entryExists must return True or False, nothing else.

Location:

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

Files:

• batching.py (modified) (2 diffs)
• tests/test_batching.py (modified) (2 diffs)

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

@@ -268 +268 @@
         return self.getParent(row, site) is not None
 
+
     def entryExists(self, row, site):
+        return self.getEntry(row, site) is not None
+
+    def getEntry(self, row, site):
         student = self.getParent(row, site)
-        if not student:
-            return None
-        if 'studycourse' in student:
-            return student
-        return None
-
-    def getEntry(self, row, site):
-        student = self.entryExists(row, site)
         if not student:
             return None
@@ -301 +297 @@
         # We have to check if current_level is in range of certificate.
         # This is not done by the converter.
-        certificate = conv_dict['certificate']
-        start_level = certificate.start_level
-        end_level = certificate.end_level
-        if conv_dict['current_level'] < start_level or \
-            conv_dict['current_level'] > end_level:
-            errs.append(('current_level','not in range'))
+        if conv_dict.has_key('certificate'):
+          certificate = conv_dict['certificate']
+          start_level = certificate.start_level
+          end_level = certificate.end_level
+          if conv_dict['current_level'] < start_level or \
+              conv_dict['current_level'] > end_level:
+              errs.append(('current_level','not in range'))
         return errs, inv_errs, conv_dict
 

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

@@ -132 +132 @@
 
     def test_entryExists(self):
-        self.assertFalse(self.importer.entryExists(
-            dict(student_id='ID_NONE'), self.app))
-        student = self.importer.getEntry(
-            dict(student_id=self.student.student_id), self.app)
-        self.assertEqual(student.reg_number, u'123')
+        assert self.importer.entryExists(
+            dict(student_id='ID_NONE'), self.app) is False
+        assert self.importer.entryExists(
+            dict(reg_number='123'), self.app) is True
 
     def test_getParent(self):
@@ -267 +266 @@
     def test_entryExists(self):
         assert self.importer.entryExists(
-            dict(reg_number='REG_NONE'), self.app) is None
-        student = self.importer.entryExists(dict(reg_number='1'), self.app)
-        self.assertEqual(student.reg_number, u'1')
+            dict(reg_number='REG_NONE'), self.app) is False
+        assert self.importer.entryExists(
+            dict(reg_number='1'), self.app) is True
 
     def test_getEntry(self):
-        studycourse = self.importer.getEntry(dict(reg_number='1'), self.app)
-        student = studycourse.__parent__
-        s_id = student.student_id
-        assert studycourse is self.app['students'][s_id]['studycourse']
+        student = self.importer.getEntry(
+            dict(reg_number='1'), self.app).__parent__
+        self.assertEqual(student.reg_number,'1')
 
     def test_import(self):