Changeset 12333 for main/waeup.ikoba/trunk/src/waeup

Timestamp:

29 Dec 2014, 06:10:50 (10 years ago)

Author:

Henrik Bettermann

Message:

Add interface for contract batch processor.

Location:

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

Files:

• batching.py (modified) (2 diffs)
• browser.py (modified) (2 diffs)
• contracts.py (modified) (3 diffs)
• interfaces.py (modified) (3 diffs)
• tests/sample_contract_data.csv (modified) (1 diff)
• tests/test_batching.py (modified) (2 diffs)

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

@@ -43 +43 @@
 from waeup.ikoba.customers.interfaces import (
     ICustomer, ICustomerUpdateByRegNo,
-    ICustomerSampleDocument, ISampleContract)
+    ICustomerSampleDocument, ISampleContractProcess)
 from waeup.ikoba.customers.workflow import  (
     IMPORTABLE_REGISTRATION_STATES, IMPORTABLE_REGISTRATION_TRANSITIONS)
@@ -561 +561 @@
 
     name = _('Customer Sample Contract Processor')
-    iface = ISampleContract
+    iface = ISampleContractProcess
     factory_name = 'waeup.SampleContract'

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

@@ -1166 +1166 @@
 
     form_fields = grok.AutoFields(IContract).omit(
-        'product_object', 'contract_id')
+        'product_object', 'contract_id', 'product_options')
 
     @property
@@ -1218 +1218 @@
 
 class ContractManageFormPage(IkobaEditFormPage):
-    """ Page to edit a contract
+    """ Page to manage a contract
     """
     grok.context(IContract)

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

@@ -31 +31 @@
 from waeup.ikoba.customers.interfaces import (
     IContractsContainer, ICustomerNavigation,
-    IContract, IContractEdit, ICustomersUtils,
-    ISampleContract, ISampleContractEdit)
+    IContract, IContractProcess, IContractEdit, ICustomersUtils,
+    ISampleContract, ISampleContractProcess, ISampleContractEdit)
 from waeup.ikoba.customers.utils import generate_contract_id
 from waeup.ikoba.utils.helpers import attrs_to_fields
@@ -61 +61 @@
     """This is a customer contract baseclass.
     """
-    grok.implements(IContract, IContractEdit, ICustomerNavigation)
-    grok.provides(IContract)
+
     grok.baseclass()
 
@@ -164 +163 @@
     """
 
-    grok.implements(ISampleContract, ISampleContractEdit, ICustomerNavigation)
+    grok.implements(
+        ISampleContractProcess, # must come before ISampleContract
+        ISampleContract,
+        ISampleContractEdit,
+        ICustomerNavigation)
 
     contract_category = 'sample'

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

@@ -27 +27 @@
 from waeup.ikoba.browser.interfaces import ICustomerNavigationBase
 from waeup.ikoba.documents.interfaces import IDocumentsContainer, IDocument
+from waeup.ikoba.products.productoptions import ProductOptionField
 
 from waeup.ikoba.customers.vocabularies import (
@@ -323 +324 @@
 
 
+class IContractProcess(IContract):
+    """Interface for processing contract data.
+    """
+
+    product_options = schema.List(
+        title = _(u'Options/Fees'),
+        value_type = ProductOptionField(),
+        required = False,
+        readonly = False,
+        default = [],
+        )
+
+
 class IContractEdit(IContract):
     """Interface for editing contract data by customers.
@@ -347 +361 @@
 
 
+class ISampleContractProcess(ISampleContract):
+    """Interface for processing contract data.
+    """
+
+    product_options = schema.List(
+        title = _(u'Options/Fees'),
+        value_type = ProductOptionField(),
+        required = False,
+        readonly = False,
+        default = [],
+        )
+
+
 class ISampleContractEdit(ISampleContract):
     """Interface for editing sample contract data by customers.

main/waeup.ikoba/trunk/src/waeup/ikoba/customers/tests/sample_contract_data.csv

@@ -1 @@
-class_name,contract_id,reg_number,title,product_object,document_object
-SampleContract,c3,1,My first contract,SAM,DOC1
-SampleContract,c4,2,My second contract,SAM,DOC1
-SampleContract,c5,3,My third contract,SAM,DOC1
-SampleContract,,1,My 4th contract,SAM,DOC1
-SampleContract,c5,2,My stolen contract,SAM,DOC1
-SampleContract,c6,3,My 5th contract,SAM,NONEXISTENT
-SampleContract,c7,3,My sixt contract,NONEXISTENT,DOC1
+class_name,contract_id,reg_number,title,product_object,document_object,product_options
+SampleContract,c3,1,My first contract,SAM,DOC1,"[('Base Fee', '800.6', 'usd')]"
+SampleContract,c4,2,My second contract,SAM,DOC1,[]
+SampleContract,c5,3,My third contract,SAM,DOC1,[]
+SampleContract,,1,My 4th contract,SAM,DOC1,[]
+SampleContract,c5,2,My stolen contract,SAM,DOC1,[]
+SampleContract,c6,3,My 5th contract,SAM,NONEXISTENT,[]
+SampleContract,c7,3,My sixt contract,NONEXISTENT,DOC1,[]

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

@@ -490 +490 @@
         fail_file = open(fail_file).read()
         self.assertEqual(fail_file,
-            'reg_number,contract_id,title,class_name,product_object,document_object,--ERRORS--\r\n'
-            '2,c5,My stolen contract,SampleContract,SAM,DOC1,This object already exists. Skipping.\r\n'
-            '3,c6,My 5th contract,SampleContract,SAM,NONEXISTENT,document_object: Invalid value\r\n'
-            '3,c7,My sixt contract,SampleContract,NONEXISTENT,DOC1,product_object: Invalid value\r\n'
+            'reg_number,contract_id,title,class_name,product_object,document_object,product_options,--ERRORS--\r\n'
+            '2,c5,My stolen contract,SampleContract,SAM,DOC1,[],This object already exists. Skipping.\r\n'
+            '3,c6,My 5th contract,SampleContract,SAM,NONEXISTENT,[],document_object: Invalid value\r\n'
+            '3,c7,My sixt contract,SampleContract,NONEXISTENT,DOC1,[],product_object: Invalid value\r\n'
             )
         contract = self.processor.getEntry(dict(reg_number='1',
@@ -500 +500 @@
             self.app['customers']['X666666']['contracts']['c3'],
             contract)
+        self.assertEqual(contract.product_options[0].title, 'Base Fee')
+        self.assertEqual(contract.product_options[0].fee, Decimal('800.6') )
+        self.assertEqual(contract.product_options[0].currency, 'usd')
         self.assertEqual(contract.contract_id, 'c3')
         contract = self.processor.getEntry(dict(reg_number='3',