Merge pull request #4 from brionmario/develop

Implement Application and Sessions routes

Author: brionmario

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+  "python.pythonPath": "venv/bin/python3.7"
+}

CONTRIBUTING.md

@@ -23,9 +23,14 @@ The scope should be the name of the npm package affected (as perceived by the pe
 
 The following is the list of supported scopes:
 
-  - **config**
+  - **core**
   - **common**
+  - **app**
+  - **tests**
+  - **models**
+  - **views**
+  - **manager**
   - **vcs**
-  - **core**
-  - **routes**
+  - **deps**
   - **migrations**
+  - **config**

app/__init__.py

@@ -17,16 +17,26 @@ def create_app(config_name):
     app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False  # disabling sqlalchemy event system
 
     CONFIG[config_name].init_app(app)
+
     root = CONFIG[config_name].APPLICATION_ROOT
 
+    # flask migrate doesn't recognize the tables without this import
+    from app.models import Application, Genre, ApplicationType, Session, Questionnaire
+
     # Set up extensions
     db.init_app(app)
 
     # Create app blueprints
-    from .main import main as main_blueprint
+    from app.routes.v1 import main as main_blueprint
     app.register_blueprint(main_blueprint, url_prefix=root + '/')
 
-    from .applications import applications as applications_blueprint
-    app.register_blueprint(applications_blueprint, url_prefix=root + '/applications')
+    from app.routes.v1 import application as application_blueprint
+    app.register_blueprint(application_blueprint, url_prefix=root + '/application')
+
+    from app.routes.v1 import session as session_blueprint
+    app.register_blueprint(session_blueprint, url_prefix=root + '/session')
+
+    from app.routes.v1 import questionnaire as questionnaire_blueprint
+    app.register_blueprint(questionnaire_blueprint, url_prefix=root + '/questionnaire')
 
     return app

app/applications/__init__.py

@@ -4,3 +4,7 @@
 """
 
 from .application import *  # noqa
+from .application_type import *  # noqa
+from .genre import *  # noqa
+from .session import *  # noqa
+from .questionnaire import *  # noqa

app/applications/views.py

@@ -1,18 +1,40 @@
+from marshmallow import fields, validate
+from .application_type import ApplicationTypeSchema
+from .genre import GenreSchema
 from .. import db, ma
 
 
 class Application(db.Model):
-    __tablename__ = 'applications'
+    __tablename__ = 'application'
+
     id = db.Column(db.Integer, primary_key=True)
-    name = db.Column(db.String(250), nullable=False)
+    name = db.Column(db.String(100), nullable=False)
+    identifier = db.Column(db.String(100), nullable=False)
+    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)
     creation_date = db.Column(db.TIMESTAMP, server_default=db.func.current_timestamp(), nullable=False)
-    genre = db.Column(db.String(250), 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')
 
-    def __init__(self, name, genre):
+    def __init__(self, name, identifier, developer, type, description, genre):
         self.name = name
+        self.identifier = identifier
+        self.developer = developer
+        self.type = type
+        self.description = description
         self.genre = genre
 
+    def __repr__(self):
+        return '<Application %r>' % self.id
+
 
 class ApplicationSchema(ma.Schema):
-    class Meta:
-        fields = ('id', 'name', 'creation_date', 'genre')
+    id = fields.Integer(dump_only=True)
+    name = fields.String(required=True, validate=validate.Length(1, 100))
+    identifier = fields.String()
+    developer = fields.String(required=True, validate=validate.Length(1, 100))
+    type = fields.Nested(ApplicationTypeSchema, dump_only=True)
+    description = fields.String(required=True, validate=validate.Length(1, 250))
+    creation_date = fields.DateTime()
+    genre = fields.Nested(GenreSchema, dump_only=True)

app/main/__init__.py

@@ -0,0 +1,56 @@
+import os
+import json
+from marshmallow import fields, validate
+from .. import db, ma
+
+APPLICATION_TYPE_META_FILE_PATH = 'meta/application_type.meta.json'
+
+
+class ApplicationType(db.Model):
+    __tablename__ = 'application_type'
+
+    id = db.Column(db.Integer, primary_key=True)
+    name = db.Column(db.String(50), nullable=False)
+    display_name = db.Column(db.String(100), nullable=False)
+    display_name_full = db.Column(db.String(250), nullable=False)
+    applications = db.relationship('Application', backref='type', lazy='dynamic')
+
+    def __init__(self, name, display_name, display_name_full):
+        self.name = name
+        self.display_name = display_name
+        self.display_name_full = display_name_full
+
+    @classmethod
+    def seed(cls):
+        if cls.is_table_empty(cls):
+            if os.path.exists(APPLICATION_TYPE_META_FILE_PATH):
+                with open(APPLICATION_TYPE_META_FILE_PATH) as app_type_meta_json:
+                    data = json.load(app_type_meta_json)
+                    for item in data['types']:
+                        app_type = ApplicationType(name=item['name'], display_name=item['display_name'], display_name_full=item['display_name_full'])
+                        app_type.save()
+                        print("Adding application type metadata: {}".format(app_type))
+            else:
+                # TODO: Add exception
+                print("Couldn't locate meta file")
+        else:
+            print('Table is already filled')
+
+    def save(self):
+        db.session.add(self)
+        db.session.commit()
+
+    def is_table_empty(self):
+        if not self.query.all():
+            return True
+        return False
+
+    def __repr__(self):
+        return '<ApplicationType %r>' % self.id
+
+
+class ApplicationTypeSchema(ma.Schema):
+    id = fields.Integer()
+    name = fields.String(required=True)
+    display_name = fields.String(required=True)
+    display_name_full = fields.String(required=True)

app/models/__init__.py

@@ -0,0 +1,53 @@
+import os
+import json
+from marshmallow import fields
+from .. import db, ma
+
+GENRE_META_FILE_PATH = 'meta/genre.meta.json'
+
+
+class Genre(db.Model):
+    __tablename__ = 'genre'
+
+    id = db.Column(db.Integer, primary_key=True)
+    name = db.Column(db.String(100), nullable=False)
+    display_name = db.Column(db.String(250), nullable=False)
+    applications = db.relationship('Application', backref='genre', lazy='dynamic')
+
+    def __init__(self, name, display_name):
+        self.name = name
+        self.display_name = display_name
+
+    @classmethod
+    def seed(cls):
+        if cls.is_table_empty(cls):
+            if os.path.exists(GENRE_META_FILE_PATH):
+                with open(GENRE_META_FILE_PATH) as genre_meta_json:
+                    data = json.load(genre_meta_json)
+                    for item in data['genre']:
+                        genre = Genre(name=item['name'], display_name=item['display_name'])
+                        genre.save()
+                        print("Adding genre metadata: {}".format(genre))
+            else:
+                # TODO: Add exception
+                print("Couldn't locate meta file")
+        else:
+            print('Table is already filled')
+
+    def save(self):
+        db.session.add(self)
+        db.session.commit()
+
+    def is_table_empty(self):
+        if not self.query.all():
+            return True
+        return False
+
+    def __repr__(self):
+        return '<Genre %r>' % self.id
+
+
+class GenreSchema(ma.Schema):
+    id = fields.Integer()
+    name = fields.String(required=True)
+    display_name = fields.String(required=True)