Normalized the implementation of tags

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

diff --git a/bluechips/model/__init__.py b/bluechips/model/__init__.py
index 8efaec6ae9abcdcfaeea8cfcab585797c0cfbaac..fa8d7a88239b5b94e5fa202461847a7a29b2c440 100644 (file)
--- a/bluechips/model/__init__.py
+++ b/bluechips/model/__init__.py
@@ -7,6 +7,7 @@ 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
@@ -28,7 +29,8 @@ users = sa.Table('users', meta.metadata,
                  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('email', sa.types.Unicode(64))
+                 sa.Column('email', sa.types.Unicode(64)),
+                 sa.Column('password', sa.types.Unicode(64)),
                  )
 
 expenditures = sa.Table('expenditures', meta.metadata,
@@ -48,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,
@@ -86,6 +101,8 @@ orm.mapper(Expenditure, expenditures,
            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')
 })
@@ -94,6 +111,8 @@ orm.mapper(Split, splits, properties={
         'user': orm.relation(User)
 })
 
+orm.mapper(Tag, tags)
+
 orm.mapper(Subitem, subitems, properties={
         'user': orm.relation(User)
 })
@@ -109,6 +128,6 @@ orm.mapper(Transfer, transfers,
                                                   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']