X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=bluechips%2Fmodel%2F__init__.py;h=ee991b75abbc127abf67ed194f24ff89a301f1a8;hb=fed6d11d2cbd6d617d18bc01a78196865da4155b;hp=a25f1d12df768e845a426a76321c4671d4e4734a;hpb=e6327295659555afc592537194c38812ab107f26;p=bluechips.git

diff --git a/bluechips/model/__init__.py b/bluechips/model/__init__.py
index a25f1d1..ee991b7 100644
--- a/bluechips/model/__init__.py
+++ b/bluechips/model/__init__.py
@@ -2,11 +2,12 @@
 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.tag import Tag
 
 from bluechips.model import meta
 from bluechips.model import types
@@ -16,7 +17,7 @@ from datetime import datetime
 def init_model(engine):
     """Call me before using any of the tables or classes in the model"""
 
-    sm = orm.sessionmaker(autoflush=True, transactional=True, bind=engine)
+    sm = orm.sessionmaker(autoflush=True, bind=engine)
 
     meta.engine = engine
     meta.Session = orm.scoped_session(sm)
@@ -27,7 +28,9 @@ users = sa.Table('users', meta.metadata,
                  sa.Column('id', sa.types.Integer, primary_key=True),
                  sa.Column('username', sa.types.Unicode(32), nullable=False),
                  sa.Column('name', sa.types.Unicode(64)),
-                 sa.Column('resident', sa.types.Boolean, default=True)
+                 sa.Column('resident', sa.types.Boolean, default=True),
+                 sa.Column('email', sa.types.Unicode(64)),
+                 sa.Column('password', sa.types.Unicode(64)),
                  )
 
 expenditures = sa.Table('expenditures', meta.metadata,
@@ -47,9 +50,22 @@ 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_text', sa.Text, nullable=False),
                   sa.Column('share', types.DBCurrency, nullable=False)
                   )
 
+tags = sa.Table('tags', meta.metadata,
+                sa.Column('id', sa.types.Integer, primary_key=True),
+                sa.Column('name', sa.Text))
+
+tag_to_expense_map = sa.Table('tag_to_expense_map', meta.metadata,
+                              sa.Column('tag_id', sa.types.Integer,
+                                        sa.ForeignKey('tags.id'),
+                                        primary_key=True),
+                              sa.Column('expenditure_id', sa.types.Integer,
+                                        sa.ForeignKey('expenditures.id'),
+                                        primary_key=True))
+
 subitems = sa.Table('subitems', meta.metadata,
                     sa.Column('id', sa.types.Integer, primary_key=True),
                     sa.Column('expenditure_id', sa.types.Integer,
@@ -77,14 +93,16 @@ transfers = sa.Table('transfers', meta.metadata,
 orm.mapper(User, users,
            properties={
         'expenditures': orm.relation(Expenditure,
-                                     backref='spender',
-                                     lazy=False)
+                                     backref='spender')
 })
 
-orm.mapper(Expenditure, expenditures, order_by=expenditures.c.date.desc(),
+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'),
+        '_tags': orm.relation(Tag, secondary=tag_to_expense_map,
+                             collection_class=set, cascade='all, delete'),
         'subitems': orm.relation(Subitem, backref='expenditure',
                                  cascade='all, delete')
 })
@@ -93,22 +111,24 @@ orm.mapper(Split, splits, properties={
         'user': orm.relation(User)
 })
 
+orm.mapper(Tag, tags, properties={
+        'expenditures': orm.relation(Expenditure, secondary=tag_to_expense_map)})
+
 orm.mapper(Subitem, subitems, properties={
         'user': orm.relation(User)
 })
 
-orm.mapper(Transfer, transfers, order_by=transfers.c.date.desc(),
+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),
-                               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',
-           'User', 'Expenditure', 'Split', 'Subitem', 'Transfer',
+__all__ = ['users', 'expenditures', 'splits', 'tags', 'subitems', 'transfers',
+           'User', 'Expenditure', 'Split', 'Tag', 'Subitem', 'Transfer',
            'meta']