Changeset 12315 for main/waeup.ikoba/trunk

Timestamp:

24 Dec 2014, 16:00:58 (10 years ago)

Author:

Henrik Bettermann

Message:

Test and fix export of ProductOptionEntry? lists.

Location:

main/waeup.ikoba/trunk/src/waeup/ikoba/products

Files:

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

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

@@ -48 +48 @@
             for local_role, user_name, setting in role_map.getPrincipalsAndRoles():
                 value.append({'user_name':user_name,'local_role':local_role})
+        if name == 'options' and value is not None:
+            value = [eval(entry.to_string()) for entry in value]
         return super(ProductExporter, self).mangle_value(
             value, name, context)

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

@@ -25 +25 @@
 import datetime
 import grok
+from decimal import Decimal
 from time import time
 from zope.event import notify
@@ -37 +38 @@
 from waeup.ikoba.products.batching import ProductProcessor
 from waeup.ikoba.products.product import Product
+from waeup.ikoba.products.productoptions import ProductOptionEntry
 from waeup.ikoba.testing import FunctionalLayer, FunctionalTestCase
 
@@ -81 +83 @@
         product = Product()
         product.product_id = u'LIC'
+        options = ProductOptionEntry()
+        options.title = u'Base Fee'
+        options.fee = Decimal('800.6')
+        options.currency = 'usd'
+        product.options = [options,]
         self.app['products'][product.product_id] = self.product = product
         self.outfile = os.path.join(self.workdir, 'myoutput.csv')

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

@@ -62 +62 @@
         result = open(self.outfile, 'rb').read()
         self.assertTrue(
-            'contract_category,product_id,title,users_with_local_roles\r\n'
-            'license,LIC,Unnamed,"[{\'user_name\': u\'john\', \'local_role\': '
+            'contract_category,options,product_id,title,users_with_local_roles\r\n'
+            'license,"[(u\'Base Fee\', u\'800.6\', u\'usd\')]",LIC,Unnamed,'
+            '"[{\'user_name\': u\'john\', \'local_role\': '
             'u\'johnsrole\'}]"\r\n'
             in result
@@ -75 +76 @@
         result = open(self.outfile, 'rb').read()
         self.assertTrue(
-            'contract_category,product_id,title,users_with_local_roles\r\n'
-            'license,LIC,Unnamed,"[{\'user_name\': u\'john\', \'local_role\': '
+            'contract_category,options,product_id,title,users_with_local_roles\r\n'
+            'license,"[(u\'Base Fee\', u\'800.6\', u\'usd\')]",LIC,Unnamed,'
+            '"[{\'user_name\': u\'john\', \'local_role\': '
             'u\'johnsrole\'}]"\r\n'
             in result