Changeset 12260 for main/waeup.ikoba/trunk/src/waeup/ikoba/customers

Timestamp:

19 Dec 2014, 08:11:12 (10 years ago)

Author:

Henrik Bettermann

Message:

Validate document and contract ids properly.

Location:

main/waeup.ikoba/trunk/src/waeup/ikoba/customers

Files:

• interfaces.py (modified) (4 diffs)
• tests/test_batching.py (modified) (2 diffs)

main/waeup.ikoba/trunk/src/waeup/ikoba/customers/interfaces.py

@@ -23 +23 @@
 from waeup.ikoba.interfaces import MessageFactory as _
 from waeup.ikoba.interfaces import (
-    IIkobaObject, validate_email, ICSVExporter)
+    IIkobaObject, validate_email, ICSVExporter, validate_uuid)
 from waeup.ikoba.schema import TextLineChoice, FormattedDate, PhoneNumber
 from waeup.ikoba.browser.interfaces import ICustomerNavigationBase
@@ -128 +128 @@
         constraint=validate_email,
         )
+
     phone = PhoneNumber(
         title = _(u'Phone'),
@@ -243 +244 @@
     is_editable_by_manager = Attribute('Document editable by manager')
 
-
-class ICustomerPDFDocument(IDocument):
+    document_id = schema.TextLine(
+        title = _(u'Document Id'),
+        required = False,
+        constraint=validate_uuid,
+        )
+
+
+class ICustomerPDFDocument(ICustomerDocument):
     """A customer document.
 
@@ -282 +289 @@
         title = _(u'Contract Id'),
         required = False,
+        constraint=validate_uuid,
         )
 

main/waeup.ikoba/trunk/src/waeup/ikoba/customers/tests/test_batching.py

@@ -337 +337 @@
             dict(document_id='DOC', class_name='CustomerSampleDocument'))
         self.assertEqual(len(errs),0)
-        #errs, inv_errs, conv_dict = self.processor.checkConversion(
-        #    dict(document_id='id with spaces', class_name='CustomerSampleDocument'))
-        #self.assertEqual(len(errs),1)
+        errs, inv_errs, conv_dict = self.processor.checkConversion(
+            dict(document_id='id with spaces', class_name='CustomerSampleDocument'))
+        self.assertEqual(len(errs),1)
         errs, inv_errs, conv_dict = self.processor.checkConversion(
             dict(document_id='DOC', class_name='WrongDocument'))
@@ -468 +468 @@
                  document_object='DOC1', product_object='SAM'))
         self.assertEqual(len(errs),0)
-        #errs, inv_errs, conv_dict = self.processor.checkConversion(
-        #    dict(contract_id='id with spaces', class_name='SampleContract'))
-        #self.assertEqual(len(errs),1)
+        errs, inv_errs, conv_dict = self.processor.checkConversion(
+            dict(contract_id='id with spaces', class_name='SampleContract'))
+        self.assertEqual(len(errs),1)
         errs, inv_errs, conv_dict = self.processor.checkConversion(
             dict(contract_id='CON3', class_name='WrongContract'))