When ordering expenditures and transfers, by default order by the time

[bluechips.git] / bluechips / model / __init__.py

diff --git a/bluechips/model/__init__.py b/bluechips/model/__init__.py
index e251d5099db3bcde35868462202ffc34fcac7096..4b016eab8223392a79cc32f5a02f669bec2c9b07 100644 (file)
--- a/bluechips/model/__init__.py
+++ b/bluechips/model/__init__.py
@@ -2,10 +2,16 @@
 import sqlalchemy as sa
 from sqlalchemy import orm
 
+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
 
-import datetime
+from datetime import datetime
 
 def init_model(engine):
     """Call me before using any of the tables or classes in the model"""
@@ -28,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,
@@ -41,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,
@@ -50,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,
@@ -59,61 +65,41 @@ 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)
                      )
 
-### ORM Classes ###
-
-class User(object):
-    def __repr__(self):
-        return '<User: %s>' % (self.username)
-
-class Expenditure(object):
-    def __repr__(self):
-        return '<Expenditure: spender: %s spent: %s>' % (self.spender,
-                                                         self.amount)
-
-class Split(object):
-    def __repr__(self):
-        return '<Split: expense: %s user: %s share: %s>' % (self.expenditure,
-                                                            self.user,
-                                                            self.share)
-
-class Subitem(object):
-    def __repr__(self):
-        return '<Subitem: expense: %s user: %s cost: %s>' % (self.expense,
-                                                             self.user,
-                                                             self.amount)
-
-class Transfer(object):
-    def __repr__(self):
-        return '<Transfer: from %s to %s for %s>' % (self.debtor,
-                                                     self.creditor,
-                                                     self.amount)
-
 ### DB/Class Mapping ###
 
-orm.mapper(User, users)
+orm.mapper(User, users,
+           properties={
+        'expenditures': orm.relation(Expenditure,
+                                     backref='spender')
+})
 
-orm.mapper(Expenditure, expenditures, properties={
-        'spender': orm.relation(User, backref='expenditures')
+orm.mapper(Expenditure, expenditures,
+           order_by=[expenditures.c.date.desc(), expenditures.c.entered_time.desc()],
+           properties={
+        '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)
 })
 
-orm.mapper(Transfer, transfers, properties={
+orm.mapper(Transfer, transfers,
+           order_by=[transfers.c.date.desc(), transfers.c.entered_time.desc()],
+           properties={
         'debtor': orm.relation(User,
                                primaryjoin=(transfers.c.debtor_id==\
                                                 users.c.id)),