Add and use an __init__ method for Expenditure objects

diff --git a/bluechips/model/expenditure.py b/bluechips/model/expenditure.py
index 59968f3e879742d09b65a1c02fb7942a81bdf635..009ba3a561a0024df244137c829d15c58fd20f11 100644 (file)
--- a/bluechips/model/expenditure.py
+++ b/bluechips/model/expenditure.py
@@ -3,9 +3,18 @@ from bluechips.model.split import Split
 from bluechips.model import meta
 from bluechips.model.types import Currency
 from decimal import Decimal
 from bluechips.model import meta
 from bluechips.model.types import Currency
 from decimal import Decimal

+from datetime import datetime

 import random
 
 class Expenditure(object):
 import random
 
 class Expenditure(object):

+    def __init__(self, spender=None, amount=Currency(0), description=u"",
+                 date=None):
+        self.spender = spender
+        self.amount = amount
+        self.description = description
+        if self.date == None:
+            self.date = datetime.now()
+    

     def __repr__(self):
         return '<Expenditure: spender: %s spent: %s>' % (self.spender,
                                                          self.amount)
     def __repr__(self):
         return '<Expenditure: spender: %s spent: %s>' % (self.spender,
                                                          self.amount)

diff --git a/bluechips/tests/__init__.py b/bluechips/tests/__init__.py
index 514b1a3c9fcef4dbee2b64c4642edac3ec93fed8..cbc0ad459d5eade3873955a405ece11245b539e2 100644 (file)
--- a/bluechips/tests/__init__.py
+++ b/bluechips/tests/__init__.py
@@ -58,9 +58,8 @@ def createExpenditures(n=None):
         n = random.randint(5, 20)
     users = meta.Session.query(bluechips.model.User).all()
     for i in xrange(n):
         n = random.randint(5, 20)
     users = meta.Session.query(bluechips.model.User).all()
     for i in xrange(n):

-        e = bluechips.model.Expenditure()
-        e.spender = random.choice(users)
-        e.amount = Currency(random.randint(1000, 100000))
+        e = bluechips.model.Expenditure(random.choice(users),
+                                        Currency(random.randint(1000, 100000)))

         meta.Session.save(e)
         e.even_split()
     meta.Session.commit()
         meta.Session.save(e)
         e.even_split()
     meta.Session.commit()

diff --git a/bluechips/tests/splits/test_fixed.py b/bluechips/tests/splits/test_fixed.py
index 2916eb763822da305d14d8e0982a5f53d38a2a3a..c338cbd1785fbb7a1c91267a3202517856e06cf4 100644 (file)
--- a/bluechips/tests/splits/test_fixed.py
+++ b/bluechips/tests/splits/test_fixed.py
@@ -12,9 +12,8 @@ class TestSplitFixed(TestCase):
         """
         createUsers(4)
         
         """
         createUsers(4)
         

-        e = model.Expenditure()
-        e.spender = meta.Session.query(model.User).first()
-        e.amount = Currency("100.00")
+        e = model.Expenditure(meta.Session.query(model.User).first(),
+                              Currency("100"))

         meta.Session.save(e)
         e.even_split()
         meta.Session.commit()
         meta.Session.save(e)
         e.even_split()
         meta.Session.commit()


@@ -34,9 +33,7 @@ class TestSplitFixed(TestCase):
         
         users = meta.Session.query(model.User).all()
         
         
         users = meta.Session.query(model.User).all()
         

-        e = model.Expenditure()
-        e.spender = users[0]
-        e.amount = Currency("100.00")
+        e = model.Expenditure(users[0], Currency("100"))

         meta.Session.save(e)
         
         split_dict = {users[0]: Decimal("20"),
         meta.Session.save(e)
         
         split_dict = {users[0]: Decimal("20"),


@@ -63,9 +60,7 @@ class TestSplitFixed(TestCase):
         
         users = meta.Session.query(model.User).all()
         
         
         users = meta.Session.query(model.User).all()
         

-        e = model.Expenditure()
-        e.spender = users[0]
-        e.amount = Currency("100.00")
+        e = model.Expenditure(users[0], Currency("100.00"))

         meta.Session.save(e)
         
         split_dict = {users[0]: Decimal(10),
         meta.Session.save(e)
         
         split_dict = {users[0]: Decimal(10),