Skip to content

Commit

Permalink
🎁 Show guests to an event
Browse files Browse the repository at this point in the history
- Refactor event serializer to show guests to event
- Regenerate migrations (single file)
- Fixes #5
  • Loading branch information
collinmutembei committed Mar 5, 2017
1 parent 6b61a2d commit a4d36cb
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 132 deletions.
4 changes: 3 additions & 1 deletion api/events/resources.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,14 @@

from api.app import db
from api.events.models import Event
from api.users.resources import user_fields

event_fields = {
"id": fields.Integer,
"name": fields.String,
"venue": fields.String,
"created_by": fields.String
"created_by": fields.String,
"guest": fields.List(fields.Nested(user_fields)),
}


Expand Down
28 changes: 0 additions & 28 deletions migrations/versions/1f5ff7ecbecf_.py

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,39 +1,39 @@
"""empty message
Revision ID: 12b81447deac
Revision ID: 2906ed7b5de2
Revises:
Create Date: 2017-03-04 16:19:54.114332
Create Date: 2017-03-05 17:28:03.395998
"""
from alembic import op
import sqlalchemy as sa


# revision identifiers, used by Alembic.
revision = '12b81447deac'
revision = '2906ed7b5de2'
down_revision = None
branch_labels = None
depends_on = None


def upgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.create_table('event',
sa.Column('id', sa.Integer(), nullable=False),
sa.Column('name', sa.String(length=80), nullable=True),
sa.Column('venue', sa.String(length=80), nullable=True),
sa.Column('max_guests', sa.String(length=80), nullable=True),
sa.PrimaryKeyConstraint('id'),
sa.UniqueConstraint('name')
)
op.create_table('user',
sa.Column('id', sa.Integer(), nullable=False),
sa.Column('username', sa.String(length=80), nullable=True),
sa.Column('_password', sa.String(length=128), nullable=True),
sa.Column('authenticated', sa.Boolean(), nullable=True),
sa.PrimaryKeyConstraint('id'),
sa.UniqueConstraint('username')
)
op.create_table('event',
sa.Column('id', sa.Integer(), nullable=False),
sa.Column('created_by', sa.Integer(), nullable=False),
sa.Column('name', sa.String(length=80), nullable=True),
sa.Column('venue', sa.String(length=80), nullable=True),
sa.ForeignKeyConstraint(['created_by'], ['user.id'], ),
sa.PrimaryKeyConstraint('id'),
sa.UniqueConstraint('name')
)
op.create_table('guests',
sa.Column('user_id', sa.Integer(), nullable=True),
sa.Column('event_id', sa.Integer(), nullable=True),
Expand All @@ -46,6 +46,6 @@ def upgrade():
def downgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.drop_table('guests')
op.drop_table('user')
op.drop_table('event')
op.drop_table('user')
# ### end Alembic commands ###
32 changes: 0 additions & 32 deletions migrations/versions/4dc8e3d77152_.py

This file was deleted.

30 changes: 0 additions & 30 deletions migrations/versions/c9839c0f0b1a_.py

This file was deleted.

28 changes: 0 additions & 28 deletions migrations/versions/db399910d932_.py

This file was deleted.

0 comments on commit a4d36cb

Please sign in to comment.