Merge pull request #8 from brionmario/feature/applications

 fix(models): fix data type issues in models 🐛

Author: brionmario

app/models/application.py

@@ -13,6 +13,7 @@ class Application(db.Model):
     developer = db.Column(db.String(100), nullable=False)
     type_id = db.Column(db.Integer, db.ForeignKey('application_type.id', use_alter=True, name='fk_type_id'), nullable=False)
     description = db.Column(db.String(250), nullable=False)
+    public_sharing = db.Column(db.Boolean, nullable=False, default=False)
     creation_date = db.Column(db.TIMESTAMP, server_default=db.func.current_timestamp(), nullable=False)
     genre_id = db.Column(db.Integer, db.ForeignKey('genre.id', use_alter=True, name='fk_genre_id'), nullable=False)
     sessions = db.relationship('Session', backref='app', lazy='dynamic')
@@ -38,3 +39,4 @@ class ApplicationSchema(ma.Schema):
     description = fields.String(required=True, validate=validate.Length(1, 250))
     creation_date = fields.DateTime()
     genre = fields.Nested(GenreSchema, dump_only=True)
+    public_sharing = fields.Boolean(required=True)

app/models/application_type.py

@@ -50,7 +50,7 @@ def __repr__(self):
 
 
 class ApplicationTypeSchema(ma.Schema):
-    id = fields.Integer()
+    id = fields.Integer(dump_only=True)
     name = fields.String(required=True)
     display_name = fields.String(required=True)
     display_name_full = fields.String(required=True)

app/models/genre.py

@@ -48,6 +48,6 @@ def __repr__(self):
 
 
 class GenreSchema(ma.Schema):
-    id = fields.Integer()
+    id = fields.Integer(dump_only=True)
     name = fields.String(required=True)
     display_name = fields.String(required=True)

app/models/questionnaire.py

@@ -1,4 +1,4 @@
-from marshmallow import fields, validate
+from marshmallow import fields
 from .. import db, ma
 
 
@@ -19,14 +19,8 @@ def __repr__(self):
         return '<Questionnaire %r>' % self.id
 
 
-class SymptomSchema(ma.Schema):
-    name = fields.String(required=False)
-    display_name = fields.String(required=False)
-    score = fields.String(required=False)
-
-
 class QuestionnaireSchema(ma.Schema):
     id = fields.Integer(dump_only=True)
-    pre = fields.List(fields.Nested(SymptomSchema), dump_only=True)
-    post = fields.List(fields.Nested(SymptomSchema), dump_only=True)
+    pre = fields.Dict(required=True)
+    post = fields.Dict(required=False)
     creation_date = fields.DateTime()

app/models/session.py

@@ -10,7 +10,7 @@ class Session(db.Model):
     id = db.Column(db.Integer, primary_key=True)
     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)
+    expected_emotions = db.Column(db.PickleType, nullable=False)
     questionnaire_id = db.Column(db.Integer, db.ForeignKey('questionnaire.id', use_alter=True, name='fk_questionnaire_id'), nullable=False)
     cssi_score = db.Column(db.Float, nullable=False, default=0)
     latency_scores = db.Column(db.JSON, nullable=False, default={})

app/routes/v1/questionnaire.py

@@ -17,7 +17,7 @@
 
 from flask import Blueprint, jsonify, request
 from flask_cors import cross_origin
-from app.models import Questionnaire, ApplicationType, QuestionnaireSchema, Genre
+from app.models import Questionnaire, QuestionnaireSchema
 from app import db
 
 questionnaire = Blueprint('questionnaire', __name__)

migrations/versions/89ee48680e79_.py

@@ -1,16 +1,16 @@
 """empty message
 
-Revision ID: cb018c771a53
+Revision ID: d874df9a1f85
 Revises: 
-Create Date: 2019-04-16 01:05:44.197617
+Create Date: 2019-04-19 01:39:08.576426
 
 """
 from alembic import op
 import sqlalchemy as sa
 
 
 # revision identifiers, used by Alembic.
-revision = 'cb018c771a53'
+revision = 'd874df9a1f85'
 down_revision = None
 branch_labels = None
 depends_on = None
@@ -25,6 +25,7 @@ def upgrade():
     sa.Column('developer', sa.String(length=100), nullable=False),
     sa.Column('type_id', sa.Integer(), nullable=False),
     sa.Column('description', sa.String(length=250), nullable=False),
+    sa.Column('public_sharing', sa.Boolean(), nullable=False),
     sa.Column('creation_date', sa.TIMESTAMP(), server_default=sa.text('CURRENT_TIMESTAMP'), nullable=False),
     sa.Column('genre_id', sa.Integer(), nullable=False),
     sa.ForeignKeyConstraint(['genre_id'], ['genre.id'], name='fk_genre_id', use_alter=True),
@@ -46,25 +47,23 @@ def upgrade():
     )
     op.create_table('questionnaire',
     sa.Column('id', sa.Integer(), nullable=False),
-    sa.Column('pre', sa.TEXT(), nullable=False),
-    sa.Column('post', sa.TEXT(), nullable=False),
+    sa.Column('pre', sa.JSON(), nullable=False),
+    sa.Column('post', sa.JSON(), nullable=False),
     sa.Column('creation_date', sa.TIMESTAMP(), server_default=sa.text('CURRENT_TIMESTAMP'), nullable=False),
-    sa.Column('session_id', sa.Integer(), nullable=False),
-    sa.ForeignKeyConstraint(['session_id'], ['session.id'], name='fk_session_id', use_alter=True),
     sa.PrimaryKeyConstraint('id')
     )
     op.create_table('session',
     sa.Column('id', sa.Integer(), nullable=False),
     sa.Column('app_id', sa.Integer(), nullable=False),
     sa.Column('creation_date', sa.TIMESTAMP(), server_default=sa.text('CURRENT_TIMESTAMP'), nullable=False),
-    sa.Column('expected_emotions', sa.TEXT(), nullable=False),
+    sa.Column('expected_emotions', sa.PickleType(), nullable=False),
+    sa.Column('questionnaire_id', sa.Integer(), nullable=False),
     sa.Column('cssi_score', sa.Float(), nullable=False),
-    sa.Column('latency_scores', sa.TEXT(), nullable=False),
+    sa.Column('latency_scores', sa.JSON(), nullable=False),
     sa.Column('total_latency_score', sa.Float(), nullable=False),
-    sa.Column('sentiment_scores', sa.TEXT(), nullable=False),
+    sa.Column('sentiment_scores', sa.JSON(), nullable=False),
     sa.Column('total_sentiment_score', sa.Float(), nullable=False),
-    sa.Column('questionnaire_id', sa.Integer(), nullable=False),
-    sa.Column('questionnaire_scores', sa.TEXT(), nullable=True),
+    sa.Column('questionnaire_scores', sa.JSON(), nullable=True),
     sa.Column('total_questionnaire_score', sa.Float(), nullable=False),
     sa.ForeignKeyConstraint(['app_id'], ['application.id'], name='fk_app_id', use_alter=True),
     sa.ForeignKeyConstraint(['questionnaire_id'], ['questionnaire.id'], name='fk_questionnaire_id', use_alter=True),