Changeset 12330 for main/waeup.ikoba/trunk

Timestamp:

27 Dec 2014, 10:05:03 (10 years ago)

Author:

Henrik Bettermann

Message:

Adjust contract exporter and extend exporter tests.

Location:

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

Files:

• export.py (modified) (1 diff)
• tests/test_batching.py (modified) (4 diffs)
• tests/test_export.py (modified) (4 diffs)

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

@@ -231 +231 @@
             if mangled_value:
                 return mangled_value
+        if name == 'product_options' and value is not None:
+            value = [eval(entry.to_string()) for entry in value]
         return super(
             ContractExporterBase, self).mangle_value(

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

@@ -25 +25 @@
 import datetime
 import grok
+from decimal import Decimal
 from time import time
 from zope.event import notify
@@ -40 +41 @@
 from waeup.ikoba.customers.customer import Customer
 from waeup.ikoba.customers.documents import CustomerSampleDocument
+from waeup.ikoba.products.productoptions import ProductOption
 from waeup.ikoba.testing import FunctionalLayer, FunctionalTestCase
 
@@ -99 +101 @@
         self.product.title = u'Our Samle Product'
         self.product.contract_category = u'sample'
+        option = ProductOption()
+        option.title = u'Base Fee'
+        option.fee = Decimal('800.6')
+        option.currency = 'usd'
+        self.product.options = [option,]
         self.app['products'].addProduct(self.product)
         return
@@ -142 +149 @@
         contract.product_object = self.product
         contract.document_object = self.document
+        contract.product_options = self.product.options
         customer['contracts'].addContract(contract)
         self.contract = contract

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

@@ -257 +257 @@
             'class_name,contract_category,contract_id,document_object,'
             'history,last_product_id,'
-            'product_object,state,title,user_id\r\n'
-
-            'SampleContract,sample,CON1,,[],,,,,\r\n'
+            'product_object,product_options,state,title,user_id\r\n'
+
+            'SampleContract,sample,CON1,,[],,,[],,,\r\n'
             )
         return
@@ -273 +273 @@
             'class_name,contract_category,contract_id,document_object,'
             'history,last_product_id,'
-            'product_object,state,title,user_id\r\n'
+            'product_object,product_options,state,title,user_id\r\n'
 
             'SampleContract,sample,CON1,DOC1,[u\'2014-12-04 12:10:46 UTC - '
             'Contract created by system\'],,'
-            'SAM,created,My Contract,A111111\r\n',
+            'SAM,"[(u\'Base Fee\', u\'800.6\', u\'usd\')]",'
+            'created,My Contract,A111111\r\n',
             result
             )
@@ -292 +293 @@
             'class_name,contract_category,contract_id,document_object,'
             'history,last_product_id,'
-            'product_object,state,title,user_id\r\n'
+            'product_object,product_options,state,title,user_id\r\n'
 
             'SampleContract,sample,CON1,DOC1,[u\'2014-12-04 12:10:46 UTC - '
             'Contract created by system\'],,'
-            'SAM,created,My Contract,A111111\r\n',
+            'SAM,"[(u\'Base Fee\', u\'800.6\', u\'usd\')]",'
+            'created,My Contract,A111111\r\n',
             result
             )
@@ -311 +313 @@
             'class_name,contract_category,contract_id,document_object,'
             'history,last_product_id,'
-            'product_object,state,title,user_id\r\n'
+            'product_object,product_options,state,title,user_id\r\n'
 
             'SampleContract,sample,CON1,DOC1,[u\'2014-12-04 12:10:46 UTC - '
             'Contract created by system\'],,'
-            'SAM,created,My Contract,A111111\r\n',
-            result
-            )
-        return
-
+            'SAM,"[(u\'Base Fee\', u\'800.6\', u\'usd\')]",'
+            'created,My Contract,A111111\r\n',
+            result
+            )
+        return
+