Changeset 5127 for main/waeup.sirp/trunk/src/waeup

Timestamp:

5 Apr 2010, 13:44:44 (14 years ago)

Author:

uli

Message:

• Reorder statements in PIN generation to get better test-coverage.

• Add createBatch method for batch containers.

File:

• main/waeup.sirp/trunk/src/waeup/sirp/accesscodes/accesscodes.py (modified) (2 diffs)

main/waeup.sirp/trunk/src/waeup/sirp/accesscodes/accesscodes.py

@@ -95 +95 @@
             for x in range(10):
                 pin += str(random().randint(0, 9))
-            if '%s-%s-%s' % (self.prefix, self.num, pin) in self._acids:
-                # PIN already in use
-                continue
-            curr += 1
-            yield pin
+            if not '%s-%s-%s' % (self.prefix, self.num, pin) in self._acids:
+                curr += 1
+                yield pin
+            # PIN already in use
 
     def _getStoragePath(self):
@@ -207 +206 @@
         self._p_changed = True
 
+    def createBatch(self, creation_date, creator, batch_prefix, cost,
+                    entry_num):
+        """Create and add a batch.
+        """
+        batch_num = self.getNum(batch_prefix)
+        batch = AccessCodeBatch(creation_date, creator, batch_prefix,
+                                cost, entry_num, num=batch_num)
+        self.addBatch(batch)
+        return batch
+        
     def getNum(self, prefix):
         """Get next unused num for given prefix.