Changeset 8700

Timestamp:

12 Jun 2012, 21:01:17 (12 years ago)

Author:

Henrik Bettermann

Message:

Catalogue all kinds of payments not only student payments.

Location:

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

Files:

• applicants/tests/test_catalog.py (modified) (2 diffs)
• payments/catalog.py (added)
• students/catalog.py (modified) (2 diffs)

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

@@ -21 +21 @@
 import shutil
 import tempfile
+import grok
+from zope.component import getUtility, createObject
 from hurry.query import Eq
 from hurry.query.interfaces import IQuery
@@ -86 +88 @@
         self.assertTrue(isinstance(result_applicant, Applicant))
         self.assertEqual(result_applicant.applicant_id, self.applicant.applicant_id)
+
+    def test_get_payment(self):
+        self.create_applicant()
+        q = getUtility(IQuery)
+        subquery = Eq(('applicants_catalog', 'applicant_id'),
+            self.applicant.applicant_id)
+        results = list(q.searchResults(subquery))
+        self.assertEqual(len(results), 1)
+        result_applicant = results[0]
+        payment = createObject('waeup.ApplicantOnlinePayment')
+        payment.p_id = 'p1234567890'
+        payment.p_item = u'Payment Item'
+        payment.p_session = 2011
+        payment.p_category = 'application'
+        result_applicant[payment.p_id] = payment
+        # We can find a payment ticket by the payment session ...
+        cat = getUtility(ICatalog, name='payments_catalog')
+        results = cat.searchResults(p_session=(2011, 2011))
+        results = [x for x in results] # Turn results generator into list
+        assert len(results) == 1
+        assert results[0] is result_applicant['p1234567890']
+        # ... and by the payment id
+        results = cat.searchResults(p_id=('p1234567890', 'p1234567890'))
+        assert len(results) == 1
+        # If we remove the applicant also the payment disappears
+        del self.app['applicants']['mystuff'][result_applicant.application_number]
+        results = cat.searchResults(p_id=('p1234567890', 'p1234567890'))
+        assert len(results) == 0

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

@@ -26 +26 @@
 from waeup.kofa.interfaces import (
     IUniversity, IQueryResultItem, academic_sessions_vocab)
-from waeup.kofa.students.interfaces import (IStudent, ICourseTicket,
-    IStudentOnlinePayment)
+from waeup.kofa.students.interfaces import IStudent, ICourseTicket
 from waeup.kofa.university.vocabularies import course_levels
 
@@ -129 +128 @@
     session = index.Field(attribute='getLevelSession')
     code = index.Field(attribute='code')
-
-class StudentPaymentIndexes(grok.Indexes):
-    """A catalog for payments.
-    """
-    grok.site(IUniversity)
-    grok.name('payments_catalog')
-    grok.context(IStudentOnlinePayment)
-
-    p_session = index.Field(attribute='p_session')
-    p_category = index.Field(attribute='p_category')
-    p_item = index.Field(attribute='p_item')
-    p_state = index.Field(attribute='p_state')