X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=bluechips%2Fmodel%2F__init__.py;h=3c71c6ed15d54a75ae4056a1c81a8c101be98826;hb=74d234f880ee6b3c510227ea94459b81a79755db;hp=0b6485c1c2d6ab192c4407704a599334576641e2;hpb=b61fda425d4498482f172afbfab0fed9ebf3f3c8;p=bluechips.git

diff --git a/bluechips/model/__init__.py b/bluechips/model/__init__.py
index 0b6485c..3c71c6e 100644
--- a/bluechips/model/__init__.py
+++ b/bluechips/model/__init__.py
@@ -2,9 +2,17 @@
 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
 
+from datetime import datetime
+
 def init_model(engine):
     """Call me before using any of the tables or classes in the model"""
 
@@ -26,10 +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('date', sa.types.Date, default=sa.func.now),
+                        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=sa.func.now)
+                                  default=datetime.utcnow)
                         )
 
 splits = sa.Table('splits', meta.metadata,
@@ -38,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', sa.types.Integer, nullable=False)
+                  sa.Column('share', types.DBCurrency, nullable=False)
                   )
 
 subitems = sa.Table('subitems', meta.metadata,
@@ -47,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,
@@ -56,69 +65,50 @@ 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('date', sa.types.Date, default=sa.func.now),
+                     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=sa.func.now),
-                     sa.Column('desc', sa.Text, default=None)
+                               default=datetime.utcnow)
                      )
 
-### ORM Classes ###
-
-class User(object):
-    def __repr__(self):
-        return '<User: %w>' % (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',
+                                     lazy=False)
+})
 
-orm.mapper(Expenditure, expenditures, properties={
-        'spender': orm.relation(User, backref='expenditures')
+orm.mapper(Expenditure, expenditures, order_by=expenditures.c.date.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(),
+           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']