Changeset 12258 for main/waeup.ikoba/trunk/src/waeup/ikoba/customers/batching.py

Timestamp:

18 Dec 2014, 14:44:30 (10 years ago)

Author:

Henrik Bettermann

Message:

Change contract_id generation algorithm. Use Universally Unique IDentifiers instead of consecutive numbers.

File:

• main/waeup.ikoba/trunk/src/waeup/ikoba/customers/batching.py (modified) (3 diffs)

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

@@ -406 +406 @@
         return None
 
-        #documents = self.getParent(row, site)
-        #if documents is None:
-        #    return None
-        #document_id = row.get('document_id', None)
-        #if document_id is None:
-        #    return None
-        #entry = documents.get(document_id)
-        #return entry
-
     def updateEntry(self, obj, row, site, filename):
         """Update obj to the values given in row.
@@ -496 +487 @@
         if contract_id is None:
             return None
-        entry = contracts.get(contract_id)
-        return entry
+        cat = queryUtility(ICatalog, name='contracts_catalog')
+        results = list(cat.searchResults(contract_id=(contract_id, contract_id)))
+        if results:
+            return results[0]
+        return None
 
     def updateEntry(self, obj, row, site, filename):
         """Update obj to the values given in row.
         """
+        # Remove contract_id from row if empty
+        if 'contract_id' in row and row['contract_id'] in (None, IGNORE_MARKER):
+            row.pop('contract_id')
         items_changed = super(ContractProcessor, self).updateEntry(
             obj, row, site, filename)
         customer = self.getParent(row, site).__parent__
         customer.__parent__.logger.info(
-            '%s - %s - %s - updated: %s'
-            % (self.name, filename, customer.customer_id, items_changed))
+            '%s - %s - %s - %s - updated: %s'
+            % (self.name, filename, customer.customer_id, obj.contract_id,
+               items_changed))
         return
 
     def addEntry(self, obj, row, site):
         parent = self.getParent(row, site)
-        contract_id = row['contract_id'].strip('#')
-        parent[contract_id] = obj
-        # Reset _curr_con_id if contract_id has been imported
-        site = grok.getSite()
-        if row.get('contract_id', None) not in (None, IGNORE_MARKER):
-            site._curr_con_id -= 1
+        parent.addContract(obj)
         return
 
@@ -541 +534 @@
             if class_name != self.factory_name.strip('waeup.'):
                 errs.append(('class_name','wrong processor'))
-        try:
-            # Correct con_id counter. As the IConverter for contracts
-            # creates contract objects that are not used afterwards, we
-            # have to fix the site-wide con_id counter.
-            site = grok.getSite()
-            site._curr_con_id -= 1
-        except (KeyError, TypeError, AttributeError):
-                pass
-        # We have to check contract_id.
-        contract_id = row.get('contract_id', None)
-        if mode == 'create':
-            if not contract_id:
-                contract_id = generate_contract_id()
-                conv_dict['contract_id'] = contract_id
-                return errs, inv_errs, conv_dict
-            cat = queryUtility(ICatalog, name='contracts_catalog')
-            results = list(
-                cat.searchResults(contract_id=(contract_id, contract_id)))
-            if results:
-                # contract_id must not exist.
-                errs.append(('contract_id','id exists'))
-        else:
-            if not contract_id.startswith('c'):
-                errs.append(('contract_id','invalid format'))
         return errs, inv_errs, conv_dict