X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=bluechips%2Fmodel%2F__init__.py;h=12e28d81a99d1fe023d361bb92b711f64bb69eb3;hb=30f5cb7f4149310ce5666bb3e49a7a723677c45e;hp=26686ff18362edc80ed1cd878774f506f297ebfd;hpb=a5039375dfdaa2c1dd5bf753ac5511b615f99515;p=bluechips.git

diff --git a/bluechips/model/__init__.py b/bluechips/model/__init__.py
index 26686ff..12e28d8 100644
--- a/bluechips/model/__init__.py
+++ b/bluechips/model/__init__.py
@@ -5,13 +5,10 @@ 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"""
-    ## Reflected tables must be defined and mapped here
-    #global reflected_table
-    #reflected_table = sa.Table("Reflected", meta.metadata, autoload=True,
-    #                           autoload_with=engine)
-    #orm.mapper(Reflected, reflected_table)
 
     sm = orm.sessionmaker(autoflush=True, transactional=True, bind=engine)
 
@@ -32,9 +29,10 @@ expenditures = sa.Table('expenditures', meta.metadata,
                         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('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.now)
                         )
 
 splits = sa.Table('splits', meta.metadata,
@@ -43,7 +41,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.Currency, nullable=False)
                   )
 
 subitems = sa.Table('subitems', meta.metadata,
@@ -62,28 +60,28 @@ transfers = sa.Table('transfers', meta.metadata,
                      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('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.now)
                      )
 
 ### ORM Classes ###
 
 class User(object):
     def __repr__(self):
-        return '<User: %w>' % (self.username)
+        return '<User: %s>' % (self.username)
 
 class Expenditure(object):
     def __repr__(self):
         return '<Expenditure: spender: %s spent: %s>' % (self.spender,
-                                               self.amount)
+                                                         self.amount)
 
 class Split(object):
     def __repr__(self):
-        return '<Split: expense: %s user: %s share: %s%%>' % (self.expenditure,
-                                                              self.user,
-                                                              self.share)
+        return '<Split: expense: %s user: %s share: %s>' % (self.expenditure,
+                                                            self.user,
+                                                            self.share)
 
 class Subitem(object):
     def __repr__(self):
@@ -116,10 +114,14 @@ orm.mapper(Subitem, subitems, properties={
 })
 
 orm.mapper(Transfer, transfers, properties={
-        'debtor': orm.relation(User),
-        'creditor': orm.relation(User)
+        'debtor': orm.relation(User,
+                               primaryjoin=(transfers.c.debtor_id==\
+                                                users.c.id)),
+        'creditor': orm.relation(User,
+                                 primaryjoin=(transfers.c.creditor_id==\
+                                                  users.c.id))
 })
 
-__all__ = [users, expenditures, splits, subitems, transfers,
-           User, Expenditure, Split, Subitem, Transfer,
-           meta]
+__all__ = ['users', 'expenditures', 'splits', 'subitems', 'transfers',
+           'User', 'Expenditure', 'Split', 'Subitem', 'Transfer',
+           'meta']