From d23ff411cd1aec18bade6609cc8b3304813caa69 Mon Sep 17 00:00:00 2001 From: Brion Mario Date: Fri, 19 Apr 2019 04:12:51 +0530 Subject: [PATCH 1/2] feat(sessions): add session status recording ability :sparkles: --- app/models/session.py | 2 ++ app/routes/v1/session.py | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/session.py b/app/models/session.py index 810f670..f195c5c 100644 --- a/app/models/session.py +++ b/app/models/session.py @@ -8,6 +8,7 @@ class Session(db.Model): __tablename__ = 'session' id = db.Column(db.Integer, primary_key=True) + status = db.Column(db.String(25), nullable=False, default='initialised') app_id = db.Column(db.Integer, db.ForeignKey('application.id', use_alter=True, name='fk_app_id'), nullable=False) creation_date = db.Column(db.TIMESTAMP, server_default=db.func.current_timestamp(), nullable=False) expected_emotions = db.Column(db.JSON, nullable=False) @@ -31,6 +32,7 @@ def __repr__(self): class SessionSchema(ma.Schema): id = fields.Integer(dump_only=True) + status = fields.String() creation_date = fields.DateTime(dump_only=True) expected_emotions = fields.List(fields.String(), required=True) app = fields.Nested(ApplicationSchema, dump_only=True) diff --git a/app/routes/v1/session.py b/app/routes/v1/session.py index 00fca15..69b3735 100644 --- a/app/routes/v1/session.py +++ b/app/routes/v1/session.py @@ -52,8 +52,6 @@ def create_session(): questionnaire = Questionnaire.query.filter_by(id=request.json['questionnaire']).first() expected_emotions = request.json['expected_emotions'] - print(questionnaire) - # validate application type if not app: return {'status': 'error', 'message': 'Invalid application.'}, 400 From ea83425513201c508309887b3db20eac068c5758 Mon Sep 17 00:00:00 2001 From: Brion Mario Date: Fri, 19 Apr 2019 04:13:11 +0530 Subject: [PATCH 2/2] chore(migrations): update migrations :alembic: --- migrations/versions/64702ea1834d_.py | 36 ++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 migrations/versions/64702ea1834d_.py diff --git a/migrations/versions/64702ea1834d_.py b/migrations/versions/64702ea1834d_.py new file mode 100644 index 0000000..e823621 --- /dev/null +++ b/migrations/versions/64702ea1834d_.py @@ -0,0 +1,36 @@ +"""empty message + +Revision ID: 64702ea1834d +Revises: 06614ec763fe +Create Date: 2019-04-19 03:56:38.990243 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '64702ea1834d' +down_revision = '06614ec763fe' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.create_foreign_key('fk_genre_id', 'application', 'genre', ['genre_id'], ['id'], use_alter=True) + op.create_foreign_key('fk_type_id', 'application', 'application_type', ['type_id'], ['id'], use_alter=True) + op.add_column('session', sa.Column('status', sa.String(length=25), nullable=False)) + op.create_foreign_key('fk_app_id', 'session', 'application', ['app_id'], ['id'], use_alter=True) + op.create_foreign_key('fk_questionnaire_id', 'session', 'questionnaire', ['questionnaire_id'], ['id'], use_alter=True) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_constraint('fk_questionnaire_id', 'session', type_='foreignkey') + op.drop_constraint('fk_app_id', 'session', type_='foreignkey') + op.drop_column('session', 'status') + op.drop_constraint('fk_type_id', 'application', type_='foreignkey') + op.drop_constraint('fk_genre_id', 'application', type_='foreignkey') + # ### end Alembic commands ###