X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=bluechips%2Fmodel%2F__init__.py;h=ee991b75abbc127abf67ed194f24ff89a301f1a8;hb=fed6d11d2cbd6d617d18bc01a78196865da4155b;hp=0b6485c1c2d6ab192c4407704a599334576641e2;hpb=b61fda425d4498482f172afbfab0fed9ebf3f3c8;p=bluechips.git diff --git a/bluechips/model/__init__.py b/bluechips/model/__init__.py index 0b6485c..ee991b7 100644 --- a/bluechips/model/__init__.py +++ b/bluechips/model/__init__.py @@ -2,13 +2,22 @@ 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.tag import Tag + 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""" - 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) @@ -19,17 +28,20 @@ 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, 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,16 +50,29 @@ 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_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, 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,61 +81,46 @@ 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 '' % (self.username) - -class Expenditure(object): - def __repr__(self): - return '' % (self.spender, - self.amount) - -class Split(object): - def __repr__(self): - return '' % (self.expenditure, - self.user, - self.share) - -class Subitem(object): - def __repr__(self): - return '' % (self.expense, - self.user, - self.amount) - -class Transfer(object): - def __repr__(self): - return '' % (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'), + '_tags': orm.relation(Tag, secondary=tag_to_expense_map, + collection_class=set, 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(Tag, tags, properties={ + 'expenditures': orm.relation(Expenditure, secondary=tag_to_expense_map)}) + 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)), @@ -119,6 +129,6 @@ orm.mapper(Transfer, transfers, properties={ users.c.id)) }) -__all__ = [users, expenditures, splits, subitems, transfers, - User, Expenditure, Split, Subitem, Transfer, - meta] +__all__ = ['users', 'expenditures', 'splits', 'tags', 'subitems', 'transfers', + 'User', 'Expenditure', 'Split', 'Tag', 'Subitem', 'Transfer', + 'meta']