Fixes #832 : Adds JSON-API standards

backend/blueprint/api/controllers/fileUploader.py

@@ -4,13 +4,13 @@
 from api.helpers.uploads import saveToImage, saveToCSV, saveAsCSV
 from api.models.file import File
 from api.models.user import User
+from api.schemas.file import FileSchema
 
 
 router = Blueprint('fileUploader', __name__)
 
 
 @router.route('/image', methods=['POST'])
-@loginRequired
 def uploadImage():
     try:
         image = request.json['data']
@@ -108,3 +108,10 @@ def upload_manual_data():
         Response(200).generateMessage({
             'message': 'Manual Data uploaded successfully',
             'unique_id': csvName}))
+
+
+@router.route('/get_file', methods=['GET'])
+def get_file():
+    input_data = request.args
+    file = File().query.filter_by(filename=input_data.get('filename')).first()
+    return jsonify(FileSchema().dump(file).data)

backend/blueprint/api/controllers/loginUser.py

@@ -6,6 +6,7 @@
 from api.utils.response import Response
 from api.helpers.verifyPassword import verifyPassword
 from api.models.user import User
+from api.schemas.user import UserSchema
 
 
 router = Blueprint('loginUser', __name__)
@@ -45,3 +46,11 @@ def login():
     return jsonify(
         Response(403).generateMessage(
             'No name key received'))
+
+
+@router.route('/get_user', methods=['GET'])
+def index():
+    data = request.args
+    user = User.getUser(username=data.get('username'))
+    schema = UserSchema()
+    return jsonify(schema.dump(user).data)

backend/blueprint/api/controllers/registerUser.py

@@ -1,21 +1,19 @@
 from flask import Blueprint, jsonify, request
 from firebase_admin import auth
-from api.utils.response import Response
 from api.models.user import User
+from api.schemas.user import UserSchema
+
 
 router = Blueprint('registerUser', __name__)
 
 
 @router.route('/register', methods=['POST'])
-def registerUser():
-    try:
-        data = request.get_json()
-    except Exception as e:
-        return jsonify(
-            Response(500).exceptWithMessage(
-                str(e),
-                'Unable to get json'))
-
+def register_user():
+    schema = UserSchema()
+    input_data = request.get_json()
+    data, err = schema.load(input_data)
+    if err:
+        return err
     user = auth.create_user(
         email=data['email'],
         email_verified=False,
@@ -29,14 +27,6 @@ def registerUser():
         email=user.email,
         password=data['password'])
 
-    try:
-        newUser.save_to_db()
-    except Exception as e:
-        return jsonify(
-            Response(401).exceptWithMessage(
-                str(e),
-                'User already exists with the same Username'))
+    newUser.save_to_db()
 
-    return jsonify(
-        Response(200).generateMessage(
-            'User created successfully'))
+    return jsonify(schema.dump(newUser))

backend/blueprint/api/models/file.py

@@ -1,21 +1,21 @@
 from api.db import db
+import uuid
 
 
 class File(db.Model):
     __tablename__ = 'File'
 
+    id = db.Column(db.String(100))
     filename = db.Column(db.String(100), nullable=False, primary_key=True)
     filetype = db.Column(db.String(100), nullable=False)
     user_id = db.Column(db.String(100), db.ForeignKey('User.id', ondelete='CASCADE'))
 
     def save_to_db(self):
+        self.id = str(uuid.uuid4())
         db.session.add(self)
         try:
             db.session.commit()
         except Exception as e:
             db.session.rollback()
             db.session.flush()
             print(e)
-
-    def __repr__(self):
-        return '<File: {}>'.format(self.name)

backend/blueprint/api/models/user.py

@@ -6,8 +6,8 @@
 class User(db.Model):
     __tablename__ = 'User'
 
-    id = db.Column(db.String(100), primary_key=True)
-    username = db.Column(db.String(80))
+    id = db.Column(db.String(100))
+    username = db.Column(db.String(80), primary_key=True)
     password = db.Column(db.String(100))
     email = db.Column(db.String(100))
     files = db.relationship('File', backref='uploader')

backend/blueprint/api/run.py

@@ -13,8 +13,10 @@
     oauthToken
 )
 
+
 app = create_app()
 
+
 db.init_app(app)
 migrate = Migrate(app, db)
 

backend/blueprint/api/schemas/file.py

@@ -0,0 +1,21 @@
+from marshmallow_jsonapi.flask import Schema
+from marshmallow_jsonapi import fields
+
+
+class FileSchema(Schema):
+    class Meta:
+        type_ = 'File'
+        self_view = 'fileUploader.get_file'
+        kwargs = {'id': '<id>'}
+
+    id = fields.Str(required=True, dump_only=True)
+    filename = fields.Str(required=True)
+    filetype = fields.Str(required=True)
+    user_id = fields.Relationship(
+        self_url='/api/upload/get_file',
+        self_url_kwargs={'file_id': '<id>'},
+        related_url='/user/register',
+        related_url_kwargs={'id': '<id>'},
+        include_resource_linkage=True,
+        type_='User'
+    )

backend/blueprint/api/schemas/user.py

@@ -0,0 +1,15 @@
+from marshmallow_jsonapi.flask import Schema
+from marshmallow_jsonapi import fields
+
+
+class UserSchema(Schema):
+    class Meta:
+        type_ = 'Users'
+        self_view = 'loginUser.login'
+        kwargs = {'id': '<id>'}
+
+    id = fields.Str(required=True, dump_only=True)
+    username = fields.Str(required=True)
+    email = fields.Str(required=True)
+    password = fields.Str(required=True, load_only=True)
+    name = fields.Str(required=True)

backend/blueprint/api/utils/response.py

@@ -22,12 +22,12 @@ def generateURL(self, url, message):
 
     def sanitizeURL(self):
         self.URL = self.URL.replace('backend/app/', urlConfig.BASE_URL)
-        return self.serialize()
+        return {'data': self.serialize()}
 
     def generateResetURL(self, token):
         self.token = token
         self.URL = urlConfig.BASE_FRONTEND_URL + "reset/password/" + self.token
-        return self.serialize()
+        return {'data': self.serialize()}
 
     def generateToken(self, token):
         self.token = token
@@ -36,7 +36,7 @@ def generateToken(self, token):
     def exceptWithMessage(self, exception, message):
         self.message = message
         self.exception = exception
-        return self.serialize()
+        return {'data': self.serialize()}
 
     def serialize(self):
         return self.__dict__