broken commit, WIP

api/institution/controllers.py

@@ -31,4 +31,5 @@ def post(self):
 
     def get(self):
         institutions = InstitutionModel.query.all()
+        print(institutions)
         return make_response(jsonify({'institutions': institutions}), 200)

api/institution/models.py

@@ -17,7 +17,7 @@ def __init__(self, user_id, name, location, description):
 
     def __repr__(self):
         return '<Institution %r>' % self.name
-    
+
     def save(self):
         db.session.add(self)
         db.session.commit()

api/user/controllers.py

@@ -7,9 +7,8 @@
     'username': fields.String(required=True, description='Username'),
     'password': fields.String(required=True, description='Password'),
     'first_name': fields.String(required=True, description='First Name'),
-    'last_name': fields.String(required=True, description='Last Name'),
-    'api_key': fields.String(description='API Key')
-})
+    'last_name': fields.String(required=True, description='Last Name')
+    })
 
 @g.api.route('/user')
 class User(Resource):
@@ -43,4 +42,5 @@ def post(self):
 
     def get(self):
         users = _user_model.query.all()
-        return make_response(jsonify({'users': users}), 200)\
+        return make_response(jsonify({'users': users}), 200)
+

api/user/models.py

@@ -12,13 +12,6 @@ class User(Base, UserMixin):
     last_name = db.Column(db.String(100))
     api_key = db.Column(db.String(64), unique=True, nullable=True)
 
-    def __init__(self,email,username,password,first_name,last_name):
-        self.email = email
-        self.username = username
-        self.password = password
-        self.first_name = first_name
-        self.last_name = last_name
-
     def __init__(self, email, username, password, first_name, last_name):
         self.email = email
         self.username = username

app/__init__.py

@@ -1,11 +1,13 @@
-# Baseline
-from app.config import Config
-from app.database import db
 # Flask
 from flask import Flask
 from flask import g
+# Flask Restx
+from flask_restx import Namespace
 from flask_restx import Api
 from flask_login import LoginManager
+# Baseline
+from app.config import Config
+from app.database import db
 
 def create_app():
     app = Flask(__name__)