Changeset 12035 for main/waeup.ikoba/trunk/src/waeup/ikoba/customers/customer.py

Timestamp:

22 Nov 2014, 10:14:38 (10 years ago)

Author:

Henrik Bettermann

Message:

Add document file viewlets. Tests will follow.

File:

• main/waeup.ikoba/trunk/src/waeup/ikoba/customers/customer.py (modified) (5 diffs)

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

@@ -20 +20 @@
 """
 import os
-import re
 import shutil
 import grok
@@ -42 +41 @@
     ICustomer, ICustomerNavigation, ICSVCustomerExporter,
     ICustomersUtils)
-from waeup.ikoba.customers.utils import generate_customer_id
+from waeup.ikoba.customers.utils import generate_customer_id, path_from_custid
 from waeup.ikoba.customers.documents import CustomerDocumentsContainer
 from waeup.ikoba.utils.helpers import attrs_to_fields, now, copy_filesystem_tree
-
-RE_CUSTID_NON_NUM = re.compile('[^\d]+')
-
 
 class Customer(grok.Container):
@@ -188 +184 @@
     return
 
-
-def path_from_custid(customer_id):
-    """Convert a customer_id into a predictable relative folder path.
-
-    Used for storing files.
-
-    Returns the name of folder in which files for a particular customer
-    should be stored. This is a relative path, relative to any general
-    customers folder with 5 zero-padded digits (except when customer_id
-    is overlong).
-
-    We normally map 1,000 different customer ids into one single
-    path. For instance ``K1000000`` will give ``01000/K1000000``,
-    ``K1234567`` will give ``0123/K1234567`` and ``K12345678`` will
-    result in ``1234/K12345678``.
-
-    For lower numbers < 10**6 we return the same path for up to 10,000
-    customer_ids. So for instance ``KM123456`` will result in
-    ``00120/KM123456`` (there will be no path starting with
-    ``00123``).
-
-    Works also with overlong number: here the leading zeros will be
-    missing but ``K123456789`` will give reliably
-    ``12345/K123456789`` as expected.
-    """
-    # remove all non numeric characters and turn this into an int.
-    num = int(RE_CUSTID_NON_NUM.sub('', customer_id))
-    if num < 10**6:
-        # store max. of 10000 custs per folder and correct num for 5 digits
-        num = num / 10000 * 10
-    else:
-        # store max. of 1000 custs per folder
-        num = num / 1000
-    # format folder name to have 5 zero-padded digits
-    folder_name = u'%05d' % num
-    folder_name = os.path.join(folder_name, customer_id)
-    return folder_name
-
-
 def move_customer_files(customer, del_dir):
     """Move files belonging to `customer` to `del_dir`.
@@ -340 +297 @@
     `context` is an :class:`Customer` instance.
 
-    The :class:`CustomerImageNameChooser` can build/check file ids for
+    The :class:`CustomerFileNameChooser` can build/check file ids for
     :class:`Customer` objects suitable for use with
     :class:`ExtFileStore` instances. The delivered file_id contains
@@ -380 +337 @@
           ``'__file-customer__customers/A/A123456/nice_image_A123456.jpeg'``
 
-        meaning that the nice image of this applicant would be
+        meaning that the nice image of this customer would be
         stored in the site-wide file storage in path: