Changeset 8321

Timestamp:

2 May 2012, 06:24:42 (13 years ago)

Author:

Henrik Bettermann

Message:

We have to store the cost in AccessCode? not only in AccessCodeBatches?. We need this for access code slips in students.

Location:

main/waeup.kofa/trunk/src/waeup/kofa/accesscodes

Files:

• accesscode.py (modified) (8 diffs)
• browser.txt (modified) (1 diff)
• interfaces.py (modified) (1 diff)
• tests/sample_import.csv (modified) (1 diff)
• tests/test_accesscode.py (modified) (4 diffs)
• tests/test_catalog.py (modified) (1 diff)

main/waeup.kofa/trunk/src/waeup/kofa/accesscodes/accesscode.py

@@ -85 +85 @@
         self.random_num = random_num
         self.owner = None
+        self.cost = None
         IWorkflowInfo(self).fireTransition('init')
 
@@ -119 +120 @@
         return self.batch.num
 
-    @property
-    def cost(self):
-        """A float representing the price or ``None``. A read-only attribute.
-        """
-        if self.batch is None:
-            return None
-        return self.batch.cost
+    #@property
+    #def cost(self):
+    #    """A float representing the price or ``None``. A read-only attribute.
+    #    """
+    #    if self.batch is None:
+    #        return None
+    #    return self.batch.cost
 
     @property
@@ -167 +168 @@
         """
         for num, pin in enumerate(self.getNewRandomNum(num=self.entry_num)):
-            self.addAccessCode(num, pin)
+            self.addAccessCode(num, pin, self.cost)
         return
 
@@ -200 +201 @@
         return self[ac_id]
 
-    def addAccessCode(self, num, pin, owner=None):
+    def addAccessCode(self, num, pin, cost=0.0, owner=None):
         """Add an access-code.
         """
@@ -206 +207 @@
         if owner:
             ac.owner = owner
+        ac.cost = cost
         ac.__parent__ = self
         self[ac.representation] = ac
@@ -255 +257 @@
             )
         writer = csv.writer(open(csv_path, 'w'), quoting=csv.QUOTE_ALL)
-        writer.writerow(['prefix', 'serial', 'ac', 'state', 'history'])
+        writer.writerow(['prefix', 'serial', 'ac', 'state', 'history', 'cost'])
         writer.writerow([self.prefix, '%0.2f' % self.cost, str(self.num),
                          str(self.entry_num)])
@@ -264 +266 @@
             writer.writerow([
                     self.prefix, value.batch_serial, value.representation,
-                    value.state, value.history
+                    value.state, value.history, value.cost
                     ])
         return os.path.basename(csv_path)
@@ -363 +365 @@
             pin = row['ac']
             serial = int(row['serial'])
+            try:
+                cost = float(row['cost'])
+            except ValueError:
+                cost = 0.0
             rand_num = pin.rsplit('-', 1)[-1]
-            batch.addAccessCode(serial, rand_num)
+            batch.addAccessCode(serial, rand_num, cost)
             num_entries += 1
         batch.entry_num = num_entries
-
         batch.createCSVLogFile()
         return

main/waeup.kofa/trunk/src/waeup/kofa/accesscodes/browser.txt

@@ -438 +438 @@
     ...                             sorted(os.listdir(ac_storage))[-2])
     >>> print open(archive_file, 'rb').read()
-    "prefix","serial","ac","state","history"
+    "prefix","serial","ac","state","history","cost"
     "BLA","19.12","1","3"
-    "BLA","0","BLA-1-<10-DIGITS>","initialized","..."
-    "BLA","1","BLA-1-<10-DIGITS>","initialized","..."
-    "BLA","2","BLA-1-<10-DIGITS>","initialized","..."
+    "BLA","0","BLA-1-<10-DIGITS>","initialized","...","19.12"
+    "BLA","1","BLA-1-<10-DIGITS>","initialized","...","19.12"
+    "BLA","2","BLA-1-<10-DIGITS>","initialized","...","19.12"
 
 Clean up:

main/waeup.kofa/trunk/src/waeup/kofa/accesscodes/interfaces.py

@@ -40 +40 @@
     cost = schema.Float(
         title = _(u'Cost of access code'),
-        default = 0.0, min = 0.0,
         )
     state = schema.TextLine(

main/waeup.kofa/trunk/src/waeup/kofa/accesscodes/tests/sample_import.csv

@@ -1 @@
-"prefix","serial","ac","state","history"
-"FOO","9.99","1","0"
-"FOO","0","FOO-1-11111111","used","2011-06-01 12:12:14 - AC initialized by system||2011-06-01 12:14:14 - comment with ""quotes"" by system"
-"FOO","1","FOO-1-22222222","initialized","2011-05-30 21:10:12 - AC initialized by system"
-"FOO","2","FOO-1-33333333","disabled","2012-05-30 21:12:10 - AC initialized by system||2012-05-30 23:10:10 - AC disabled by system"
+"prefix","serial","ac","state","history","cost"
+"FOO","9.99","1","0",""
+"FOO","0","FOO-1-11111111","used","2011-06-01 12:12:14 - AC initialized by system||2011-06-01 12:14:14 - comment with ""quotes"" by system","1000.0"
+"FOO","1","FOO-1-22222222","initialized","2011-05-30 21:10:12 - AC initialized by system",""
+"FOO","2","FOO-1-33333333","disabled","2012-05-30 21:12:10 - AC initialized by system||2012-05-30 23:10:10 - AC disabled by system",""

main/waeup.kofa/trunk/src/waeup/kofa/accesscodes/tests/test_accesscode.py

@@ -238 +238 @@
 
     def test_cost(self):
-        # We get the cost set in batch
+        # The cost of an access code will be stored by handle_batch_added
+        # right after the batch has been added to the ZODB. Thus after
+        # creation of the batch, cost is still 0.0
         cost = self.ac1.cost
-        assert cost == 6.6
+        assert cost == 0.0
 
 class AccessCodeBatchTests(FunctionalTestCase):
@@ -264 +266 @@
 
         self.ac1 = AccessCode(0, '11111111')
+        self.ac1.cost = 2345.0
         self.ac2 = AccessCode(1, '22222222')
         self.ac3 = AccessCode(2, '33333333')
@@ -298 +301 @@
         result_path = os.path.join(batch._getStoragePath(), basename)
         expected = '''
-"prefix","serial","ac","state","history"
+"prefix","serial","ac","state","history","cost"
 "FOO","9.99","1","0"
-"FOO","0","FOO-1-11111111","used","<YYYY-MM-DD hh:mm:ss> UTC - ..."
-"FOO","1","FOO-1-22222222","initialized","<YYYY-MM-DD hh:mm:ss> UTC - ..."
-"FOO","2","FOO-1-33333333","disabled","<YYYY-MM-DD hh:mm:ss> UTC - ..."
+"FOO","0","FOO-1-11111111","used","<YYYY-MM-DD hh:mm:ss> UTC - ...","2345.0"
+"FOO","1","FOO-1-22222222","initialized","<YYYY-MM-DD hh:mm:ss> UTC - ...",""
+"FOO","2","FOO-1-33333333","disabled","<YYYY-MM-DD hh:mm:ss> UTC - ...",""
 '''[1:]
         contents = open(result_path, 'rb').read()
@@ -366 +369 @@
             keys,
             [u'FOO-1-11111111', u'FOO-1-22222222', u'FOO-1-33333333'])
+        # Also cost has been stored correctly
+        self.assertEqual(batch['FOO-1-11111111'].cost,1000.0)
 
     def test_getAccessCode(self):

main/waeup.kofa/trunk/src/waeup/kofa/accesscodes/tests/test_catalog.py

@@ -60 +60 @@
         self.ac2 = batch.getAccessCode('APP-1-22222222')
         self.ac3 = batch.getAccessCode('APP-1-33333333')
-
-
         return