X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=bluechips%2Fmodel%2F__init__.py;h=49d6046f56a3d3b26359112c073ca0bcf18d8364;hb=8bfdfc2600a85b1b8935f434bce64dc3c5cbfc06;hp=9261b971a794847ac18566a24715d550bb18d396;hpb=d743a3b7011fdb293efbc0b002623d1079faeb35;p=bluechips.git

diff --git a/bluechips/model/__init__.py b/bluechips/model/__init__.py
index 9261b97..49d6046 100644
--- a/bluechips/model/__init__.py
+++ b/bluechips/model/__init__.py
@@ -2,11 +2,11 @@
 import sqlalchemy as sa
 from sqlalchemy import orm
 
-from user import *
-from expenditure import *
-from split import *
-from subitem import *
-from transfer import *
+from bluechips.model.user import User
+from bluechips.model.expenditure import Expenditure
+from bluechips.model.split import Split
+from bluechips.model.subitem import Subitem
+from bluechips.model.transfer import Transfer
 
 from bluechips.model import meta
 from bluechips.model import types
@@ -34,11 +34,11 @@ expenditures = sa.Table('expenditures', meta.metadata,
                         sa.Column('id', sa.types.Integer, primary_key=True),
                         sa.Column('spender_id', sa.types.Integer,
                                   sa.ForeignKey('users.id'), nullable=False),
-                        sa.Column('amount', types.Currency, nullable=False),
+                        sa.Column('amount', types.DBCurrency, nullable=False),
                         sa.Column('description', sa.types.Text),
                         sa.Column('date', sa.types.Date, default=datetime.now),
                         sa.Column('entered_time', sa.types.DateTime, 
-                                  default=datetime.now)
+                                  default=datetime.utcnow)
                         )
 
 splits = sa.Table('splits', meta.metadata,
@@ -47,7 +47,7 @@ splits = sa.Table('splits', meta.metadata,
                             sa.ForeignKey('expenditures.id'), nullable=False),
                   sa.Column('user_id', sa.types.Integer,
                             sa.ForeignKey('users.id'), nullable=False),
-                  sa.Column('share', types.Currency, nullable=False)
+                  sa.Column('share', types.DBCurrency, nullable=False)
                   )
 
 subitems = sa.Table('subitems', meta.metadata,
@@ -56,7 +56,7 @@ subitems = sa.Table('subitems', meta.metadata,
                               sa.ForeignKey('expenditures.id'), nullable=False),
                     sa.Column('user_id', sa.types.Integer,
                               sa.ForeignKey('users.id'), nullable=False),
-                    sa.Column('amount', types.Currency, nullable=False)
+                    sa.Column('amount', types.DBCurrency, nullable=False)
                     )
 
 transfers = sa.Table('transfers', meta.metadata,
@@ -65,31 +65,34 @@ transfers = sa.Table('transfers', meta.metadata,
                                sa.ForeignKey('users.id'), nullable=False),
                      sa.Column('creditor_id', sa.types.Integer,
                                sa.ForeignKey('users.id'), nullable=False),
-                     sa.Column('amount', types.Currency, nullable=False),
+                     sa.Column('amount', types.DBCurrency, nullable=False),
                      sa.Column('description', sa.Text, default=None),
                      sa.Column('date', sa.types.Date, default=datetime.now),
                      sa.Column('entered_time', sa.types.DateTime,
-                               default=datetime.now)
+                               default=datetime.utcnow)
                      )
 
 ### DB/Class Mapping ###
 
-orm.mapper(User, users)
+orm.mapper(User, users,
+           properties={
+        'expenditures': orm.relation(Expenditure,
+                                     backref='spender')
+})
 
 orm.mapper(Expenditure, expenditures, order_by=expenditures.c.date.desc(),
            properties={
-        'spender': orm.relation(User,
-                                backref='expenditures',
-                                lazy=False)
+        'splits': orm.relation(Split, backref='expenditure',
+                               cascade='all, delete'),
+        'subitems': orm.relation(Subitem, backref='expenditure',
+                                 cascade='all, delete')
 })
 
 orm.mapper(Split, splits, properties={
-        'expenditure': orm.relation(Expenditure, backref='splits'),
         'user': orm.relation(User)
 })
 
 orm.mapper(Subitem, subitems, properties={
-        'expenditure': orm.relation(Expenditure, backref='subitems'),
         'user': orm.relation(User)
 })
 
@@ -97,12 +100,10 @@ orm.mapper(Transfer, transfers, order_by=transfers.c.date.desc(),
            properties={
         'debtor': orm.relation(User,
                                primaryjoin=(transfers.c.debtor_id==\
-                                                users.c.id),
-                               lazy=False),
+                                                users.c.id)),
         'creditor': orm.relation(User,
                                  primaryjoin=(transfers.c.creditor_id==\
-                                                  users.c.id),
-                                 lazy=False)
+                                                  users.c.id))
 })
 
 __all__ = ['users', 'expenditures', 'splits', 'subitems', 'transfers',