Changeset 15932 for main

Timestamp:

16 Jan 2020, 11:04:43 (5 years ago)

Author:

Henrik Bettermann

Message:

Reset _curr_stud_id if student could not be created.

Location:

main/waeup.kofa/trunk

Files:

• CHANGES.txt (modified) (1 diff)
• src/waeup/kofa/applicants/applicant.py (modified) (5 diffs)
• src/waeup/kofa/applicants/browser.py (modified) (1 diff)
• src/waeup/kofa/applicants/tests/test_applicantcopier.py (modified) (5 diffs)

main/waeup.kofa/trunk/CHANGES.txt

@@ -4 +4 @@
 1.6.1.dev0 (unreleased)
 =======================
+
+* Reset _curr_stud_id if student could not be created.
 
 * Add `TranscriptDataExporter` and reorganize exporter names.

main/waeup.kofa/trunk/src/waeup/kofa/applicants/applicant.py

@@ -156 +156 @@
         and copy applicant data.
         """
+        site = grok.getSite()
         # Is applicant in the correct state?
         if self.state != 'admitted':
@@ -164 +165 @@
             student.reg_number = self.reg_number
         except RegNumNotInSource:
+            # Reset _curr_stud_id 
+            site['students']._curr_stud_id -= 1
             return False, _('Registration Number exists.')
         # Has the course_admitted field been properly filled?
         if self.course_admitted is None:
+            # Reset _curr_stud_id
+            site['students']._curr_stud_id -= 1
             return False, _('No course admitted provided.')
         # Set student attributes
@@ -173 +178 @@
                 setattr(student, item[1], getattr(self, item[0], None))
         except RequiredMissing, err:
+            site['students']._curr_stud_id -= 1
             return False, 'RequiredMissing: %s' % err
         except:
+            site['students']._curr_stud_id -= 1
             return False, 'Unknown Error'
         # Prove if the certificate still exists
@@ -180 +187 @@
             StudentStudyCourse().certificate = self.course_admitted
         except ConstraintNotSatisfied, err:
+            # Reset _curr_stud_id
+            site['students']._curr_stud_id -= 1
             return False, 'ConstraintNotSatisfied: %s' % self.course_admitted.code
         # Finally prove if an application slip can be created
@@ -186 +195 @@
                 view=view)
         except IOError:
+            site['students']._curr_stud_id -= 1
             return False, _('IOError: Application Slip could not be created.')
         except LayoutError, err:
+            site['students']._curr_stud_id -= 1
             return False, _('Reportlab LayoutError: %s' % err)
         except AttributeError, err:
+            site['students']._curr_stud_id -= 1
             return False, _('Reportlab AttributeError: ${a}', mapping = {'a':err})
         except:
+            site['students']._curr_stud_id -= 1
             return False, _('Unknown Reportlab error')
         # Add student
-        site = grok.getSite()
         site['students'].addStudent(student)
         # Save student_id

main/waeup.kofa/trunk/src/waeup/kofa/applicants/browser.py

@@ -700 +700 @@
     """Create all student objects from applicant data
     in the root container or in a specific applicants container only.
-    Only PortalManagers can do this.
+    Only PortalManagers or StudentCreators can do this.
     """
     #grok.context(IApplicantsContainer)

main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_applicantcopier.py

@@ -63 +63 @@
         fd = storage.getFile(file_id)
         file_len_orig = len(fd.read())
+        self.assertEqual(self.app['students']._curr_stud_id, 1000000)
         # Let's try to create the student
         (success, msg) = self.applicant.createStudent()
@@ -68 +69 @@
         IWorkflowState(self.applicant).setState('admitted')
         (success, msg) = self.applicant.createStudent()
+        # Current student_id has not changed.
+        self.assertEqual(self.app['students']._curr_stud_id, 1000000)
         self.assertTrue(msg == 'No course admitted provided.')
         self.browser.open(self.manage_path)
@@ -77 +80 @@
         self.assertFalse(success)
         self.assertTrue('ConstraintNotSatisfied: CERT1' in msg)
+        # Current student_id has not changed.
+        self.assertEqual(self.app['students']._curr_stud_id, 1000000)
         # Ok, lets add the certificate and try again
         self.app['faculties']['fac1']['dep1'].certificates.addCertificate(
@@ -85 +90 @@
         (success, msg) = self.applicant.createStudent()
         self.assertTrue('created' in msg)
+        # Current student_id has not changed.
+        self.assertEqual(self.app['students']._curr_stud_id, 1000001)
         # The applicant is locked
         self.assertTrue(self.applicant.locked)
@@ -116 +123 @@
         self.assertTrue(len(pdf) > 0)
         self.assertEqual(pdf[:8], '%PDF-1.4')
-        # Copy te file to samples_dir
         path = os.path.join(samples_dir(), 'application_slip.pdf')
         open(path, 'wb').write(pdf)