Reconfigure some models for convenience

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

diff --git a/bluechips/model/__init__.py b/bluechips/model/__init__.py
index cf9b5fa28c51ed816d710934d401b0c36cddb1df..8601d321e219b05b2988c5031c0ba18f30bf4454 100644 (file)
--- a/bluechips/model/__init__.py
+++ b/bluechips/model/__init__.py
@@ -5,6 +5,8 @@ from sqlalchemy import orm
 from bluechips.model import meta
 from bluechips.model import types
 
+from datetime import datetime
+
 def init_model(engine):
     """Call me before using any of the tables or classes in the model"""
 
@@ -28,9 +30,9 @@ expenditures = sa.Table('expenditures', meta.metadata,
                                   sa.ForeignKey('users.id'), nullable=False),
                         sa.Column('amount', types.Currency, nullable=False),
                         sa.Column('description', sa.types.Text),
-                        sa.Column('date', sa.types.Date, default=sa.func.now),
+                        sa.Column('date', sa.types.Date, default=datetime.now),
                         sa.Column('entered_time', sa.types.DateTime, 
-                                  default=sa.func.now)
+                                  default=datetime.now)
                         )
 
 splits = sa.Table('splits', meta.metadata,
@@ -59,9 +61,9 @@ transfers = sa.Table('transfers', meta.metadata,
                                sa.ForeignKey('users.id'), nullable=False),
                      sa.Column('amount', types.Currency, nullable=False),
                      sa.Column('description', sa.Text, default=None),
-                     sa.Column('date', sa.types.Date, default=sa.func.now),
+                     sa.Column('date', sa.types.Date, default=datetime.now),
                      sa.Column('entered_time', sa.types.DateTime,
-                               default=sa.func.now)
+                               default=datetime.now)
                      )
 
 ### ORM Classes ###
@@ -73,7 +75,7 @@ class User(object):
 class Expenditure(object):
     def __repr__(self):
         return '<Expenditure: spender: %s spent: %s>' % (self.spender,
-                                               self.amount)
+                                                         self.amount)
 
 class Split(object):
     def __repr__(self):
@@ -97,8 +99,11 @@ class Transfer(object):
 
 orm.mapper(User, users)
 
-orm.mapper(Expenditure, expenditures, properties={
-        'spender': orm.relation(User, backref='expenditures')
+orm.mapper(Expenditure, expenditures, order_by=expenditures.c.date.desc(),
+           properties={
+        'spender': orm.relation(User,
+                                backref='expenditures',
+                                lazy=False)
 })
 
 orm.mapper(Split, splits, properties={
@@ -111,15 +116,18 @@ orm.mapper(Subitem, subitems, properties={
         'user': orm.relation(User)
 })
 
-orm.mapper(Transfer, transfers, properties={
+orm.mapper(Transfer, transfers, order_by=transfers.c.date.desc(),
+           properties={
         'debtor': orm.relation(User,
                                primaryjoin=(transfers.c.debtor_id==\
-                                                users.c.id)),
+                                                users.c.id),
+                               lazy=False),
         'creditor': orm.relation(User,
                                  primaryjoin=(transfers.c.creditor_id==\
-                                                  users.c.id))
+                                                  users.c.id),
+                                 lazy=False)
 })
 
-__all__ = [users, expenditures, splits, subitems, transfers,
-           User, Expenditure, Split, Subitem, Transfer,
-           meta]
+__all__ = ['users', 'expenditures', 'splits', 'subitems', 'transfers',
+           'User', 'Expenditure', 'Split', 'Subitem', 'Transfer',
+           'meta']