Changeset 10937 for main/waeup.aaue/trunk/src

Timestamp:

16 Jan 2014, 15:46:17 (11 years ago)

Author:

Henrik Bettermann

Message:

Implement validation of PAYMENT_TYPE parameter.

Location:

main/waeup.aaue/trunk/src/waeup/aaue/etranzact

Files:

• browser.py (modified) (5 diffs)
• tests.py (modified) (2 diffs)

main/waeup.aaue/trunk/src/waeup/aaue/etranzact/browser.py

@@ -53 +53 @@
     ACCEPTED_IP = None
 
-    def update(self, PAYEE_ID=None):
+    def update(self, PAYEE_ID=None, PAYMENT_TYPE=None):
         if PAYEE_ID == None:
             self.output = '-1'
@@ -64 +64 @@
         if real_ip  and self.ACCEPTED_IP:
             if real_ip not in  self.ACCEPTED_IP:
-                self.output = '-4'
+                self.output = '-2'
                 return
+        if PAYMENT_TYPE not in ('SCHOOL-FEE', 'ACCEPTANCE-FEE', 'APPLICATION-FEE'):
+            self.output = '-3'
+            return
 
         # It seems eTranzact sends a POST request with an empty body but the URL
@@ -76 +79 @@
         #        PAYEE_ID = self.request['QUERY_STRING'].split('=')[1]
         #    except:
-        #        self.output = '-2'
+        #        self.output = '-4'
         #        return
 
@@ -83 +86 @@
         if len(results) != 1:
             self.output = '-1'
+            return
+        if PAYMENT_TYPE == 'SCHOOL-FEE' \
+            and not results[0].p_category.startswith('schoolfee'):
+            self.output = '-5'
+            return
+        if PAYMENT_TYPE == 'ACCEPTANCE-FEE' \
+            and not results[0].p_category == 'clearance':
+            self.output = '-6'
+            return
+        if PAYMENT_TYPE == 'APPLICATION-FEE' \
+            and not results[0].p_category == 'application':
+            self.output = '-7'
             return
         try:
@@ -95 +110 @@
             level = owner.current_level
         except (TypeError, AttributeError):
-            self.output = '-3'
+            self.output = '-8'
             return
         amount = results[0].amount_auth

main/waeup.aaue/trunk/src/waeup/aaue/etranzact/tests.py

@@ -74 +74 @@
 
     def test_webservice(self):
-        self.browser.open('http://localhost/app/feerequest?PAYEE_ID=%s' % self.p_id)
+        self.browser.open(
+            'http://localhost/app/feerequest?PAYEE_ID=%s&PAYMENT_TYPE=SCHOOL-FEE'
+            % self.p_id)
         self.assertEqual(self.browser.contents,
             # Version 1
@@ -105 +107 @@
             'PhoneNumber=1234' % self.p_id)
 
+        self.browser.open('http://localhost/app/feerequest')
+        self.assertEqual(self.browser.contents, '-1')
         self.browser.open('http://localhost/app/feerequest?NONSENSE=nonsense')
         self.assertEqual(self.browser.contents, '-1')
+        self.browser.open(
+            'http://localhost/app/feerequest?PAYEE_ID=%s&PAYMENT_TYPE=NONSENSE'
+            % self.p_id)
+        self.assertEqual(self.browser.contents, '-3')
+        self.browser.open(
+            'http://localhost/app/feerequest?PAYEE_ID=%s'
+            % self.p_id)
+        self.assertEqual(self.browser.contents, '-3')
+        self.browser.open(
+            'http://localhost/app/feerequest?PAYEE_ID=%s&PAYMENT_TYPE=ACCEPTANCE-FEE'
+            % self.p_id)
+        self.assertEqual(self.browser.contents, '-6')
+        self.browser.open(
+            'http://localhost/app/feerequest?PAYEE_ID=%s&PAYMENT_TYPE=APPLICATION-FEE'
+            % self.p_id)
+        self.assertEqual(self.browser.contents, '-7')
+
 
     @external_test