Merge pull request #1 from sungho-cho/schema

Data Schema Tasks 1 & 2
This commit is contained in:
Muhammad Yusuf 2019-12-06 15:59:44 -05:00 committed by GitHub
commit 65cdfe5155
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 51 additions and 0 deletions

View file

@ -0,0 +1,22 @@
"""add project.default_currency field
Revision ID: 5cdb4f2e52c9
Revises: e782dd493cdc
Create Date: 2019-12-06 15:46:03.416256
"""
# revision identifiers, used by Alembic.
revision = '5cdb4f2e52c9'
down_revision = 'e782dd493cdc'
from alembic import op
import sqlalchemy as sa
def upgrade():
op.add_column("project", sa.Column("default_currency", sa.String(length=3), nullable=True))
def downgrade():
op.drop_column("project", "default_currency")

View file

@ -0,0 +1,24 @@
"""add bill.original_currency and bill.original_amount fields
Revision ID: e782dd493cdc
Revises: 6c6fb2b7f229
Create Date: 2019-12-06 15:12:46.116711
"""
# revision identifiers, used by Alembic.
revision = 'e782dd493cdc'
down_revision = '6c6fb2b7f229'
from alembic import op
import sqlalchemy as sa
def upgrade():
op.add_column("bill", sa.Column("original_currency", sa.String(length=3), nullable=True))
op.add_column("bill", sa.Column("original_amount", sa.Float(), nullable=True))
def downgrade():
op.drop_column("bill", "original_currency")
op.drop_column("bill", "original_amount")

View file

@ -25,6 +25,8 @@ class Project(db.Model):
contact_email = db.Column(db.String(128)) contact_email = db.Column(db.String(128))
members = db.relationship("Person", backref="project") members = db.relationship("Person", backref="project")
default_currency = db.Column(db.String(3))
@property @property
def _to_serialize(self): def _to_serialize(self):
obj = { obj = {
@ -358,6 +360,9 @@ class Bill(db.Model):
what = db.Column(db.UnicodeText) what = db.Column(db.UnicodeText)
external_link = db.Column(db.UnicodeText) external_link = db.Column(db.UnicodeText)
original_currency = db.Column(db.String(3))
original_amount = db.Column(db.Float)
archive = db.Column(db.Integer, db.ForeignKey("archive.id")) archive = db.Column(db.Integer, db.ForeignKey("archive.id"))
@property @property