Changeset 12297

Timestamp:

22 Dec 2014, 16:42:50 (10 years ago)

Author:

Henrik Bettermann

Message:

Make EXPORTER_NAMES tuples customizable. We have many new subobject classes in custom packages.

Location:

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

Files:

• customers/customer.py (modified) (2 diffs)
• customers/export.py (modified) (1 diff)
• customers/tests/test_customer.py (modified) (2 diffs)
• customers/utils.py (modified) (1 diff)
• utils/utils.py (modified) (2 diffs)

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

@@ -37 +37 @@
     IIkobaUtils, IExtFileStore,
     CREATED, REQUESTED, APPROVED)
-from waeup.ikoba.customers.export import EXPORTER_NAMES
 from waeup.ikoba.customers.interfaces import (
     ICustomer, ICustomerNavigation, ICSVCustomerExporter,
@@ -233 +232 @@
     (column `del_date`) as a UTC timestamp.
     """
-    for name in EXPORTER_NAMES:
+    for name in getUtility(ICustomersUtils).EXPORTER_NAMES:
         exporter = getUtility(ICSVCustomerExporter, name=name)
         csv_data = exporter.export_customer(customer)

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

@@ -32 +32 @@
 from waeup.ikoba.utils.helpers import iface_names, to_timezone
 
-#: A tuple containing all exporter names referring to customers or
-#: subobjects thereof.
-EXPORTER_NAMES = ('customers', 'customersampledocuments', 'samplecontracts')
-
-
 def get_customers(site, cust_filter=CustomersQuery()):
     """Get all customers registered in catalog in `site`.

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

@@ -31 +31 @@
 from zope.schema.interfaces import RequiredMissing
 from waeup.ikoba.interfaces import IExtFileStore, IFileStoreNameChooser
-from waeup.ikoba.customers.export import EXPORTER_NAMES
 from waeup.ikoba.customers.customer import (
     Customer, CustomerFactory, handle_customer_removed, path_from_custid)
 from waeup.ikoba.customers.interfaces import (
-    ICustomer, ICustomerNavigation)
+    ICustomer, ICustomerNavigation, ICustomersUtils)
 from waeup.ikoba.customers.tests.test_batching import CustomerImportExportSetup
 from waeup.ikoba.testing import FunctionalLayer, FunctionalTestCase
@@ -136 +135 @@
 
         # The customer data were put into CSV files
-        for name in EXPORTER_NAMES:
+        for name in getUtility(ICustomersUtils).EXPORTER_NAMES:
             csv_path = os.path.join(del_dir, '%s.csv' % name)
             self.assertTrue(os.path.isfile(csv_path))

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

@@ -333 +333 @@
     SELECTABLE_CONTYPES_DICT = CONTYPES_DICT
 
+    EXPORTER_NAMES = ('customers', 'customersampledocuments', 'samplecontracts')
+
     def getPDFCreator(self, context=None):
         """Get a pdf creator suitable for `context`.

main/waeup.ikoba/trunk/src/waeup/ikoba/utils/utils.py

@@ -29 +29 @@
 from waeup.ikoba.smtp import send_mail as send_mail_internally
 from waeup.ikoba.utils.helpers import get_sorted_preferred
-from waeup.ikoba.customers.export import EXPORTER_NAMES as CUSTOMER_EXPORTER_NAMES
 
 
@@ -139 +138 @@
         }
 
-    EXPORTER_NAMES = CUSTOMER_EXPORTER_NAMES + (
+    EXPORTER_NAMES = (
         'pdfdocuments',
         'htmldocuments',
         'users',
-        'products')
+        'products',
+        'customers',
+        'customersampledocuments',
+        'samplecontracts')
 
     BATCH_PROCESSOR_NAMES = (