Changeset 10030 for main/waeup.kofa/trunk/src/waeup/kofa/applicants

Timestamp:

17 Mar 2013, 08:40:59 (12 years ago)

Author:

Henrik Bettermann

Message:

Use better class names. The PaymentWebservice? adapter is not a webservice. KofaPaymentRequest? is not a request but a view for a simple web service.

We do not publish the data of the payee but of the payer.

Location:

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

Files:

• payment.py (modified) (2 diffs)
• tests/test_browser.py (modified) (2 diffs)
• tests/test_payment.py (modified) (2 diffs)

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

@@ -27 +27 @@
 from waeup.kofa.interfaces import MessageFactory as _
 from waeup.kofa.payments import OnlinePayment
-from waeup.kofa.payments.interfaces import IPaymentWebservice
+from waeup.kofa.payments.interfaces import IPayer
 from waeup.kofa.applicants.interfaces import IApplicantOnlinePayment
 from waeup.kofa.utils.helpers import attrs_to_fields
@@ -78 +78 @@
     ApplicantOnlinePayment, omit=['display_item'])
 
-class PaymentWebservice(grok.Adapter):
-    """An adapter to publish applicant data through a webservice.
+class Payer(grok.Adapter):
+    """An adapter to publish applicant data through a simple webservice.
     """
     grok.context(IApplicantOnlinePayment)
-    grok.implements(IPaymentWebservice)
+    grok.implements(IPayer)
 
     @property
     def display_fullname(self):
-        "Name of  payee"
+        "Name of  payer"
         return self.context.__parent__.display_fullname
 
     @property
     def id(self):
-        "Id of payee"
+        "Id of payer"
         return self.context.__parent__.applicant_id
 
     @property
     def reg_number(self):
-        "Reg number of payee"
+        "Reg number of payer"
         return self.context.__parent__.reg_number
 

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

@@ -37 +37 @@
 from waeup.kofa.testing import FunctionalLayer, FunctionalTestCase
 from waeup.kofa.app import University
-from waeup.kofa.payments.interfaces import IPaymentWebservice
+from waeup.kofa.payments.interfaces import IPayer
 from waeup.kofa.configuration import SessionConfiguration
 from waeup.kofa.applicants.container import ApplicantsContainer
@@ -758 +758 @@
         self.assertEqual(payment.p_category,'application')
         self.assertEqual(payment.amount_auth,200.0)
-        # Applicant is payee of the payment ticket.
+        # Applicant is payer of the payment ticket.
         self.assertEqual(
-            IPaymentWebservice(payment).display_fullname, 'John Anthony Tester')
+            IPayer(payment).display_fullname, 'John Anthony Tester')
         self.assertEqual(
-            IPaymentWebservice(payment).id, self.applicant.applicant_id)
-        self.assertEqual(IPaymentWebservice(payment).faculty, '')
-        self.assertEqual(IPaymentWebservice(payment).department, '')
+            IPayer(payment).id, self.applicant.applicant_id)
+        self.assertEqual(IPayer(payment).faculty, '')
+        self.assertEqual(IPayer(payment).department, '')
         # The pdf payment slip can't yet be opened
         #self.browser.open(payment_url + '/payment_receipt.pdf')

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

@@ -22 +22 @@
 from zope.interface import verify
 from waeup.kofa.applicants.payment import (
-    ApplicantOnlinePayment, ApplicantOnlinePaymentFactory, PaymentWebservice)
-from waeup.kofa.payments.interfaces import IOnlinePayment, IPaymentWebservice
+    ApplicantOnlinePayment, ApplicantOnlinePaymentFactory, Payer)
+from waeup.kofa.payments.interfaces import IOnlinePayment, IPayer
 
 class ApplicantOnlinePaymentFactoryTest(unittest.TestCase):
@@ -39 +39 @@
         assert implemented_by.isOrExtends(IOnlinePayment)
 
-    def test_webservice_interface(self):
-        verify.verifyClass(IPaymentWebservice, PaymentWebservice)
+    def test_payer_interface(self):
+        verify.verifyClass(IPayer, Payer)