Resolve User data model.

Author: toddbirchard

Makefile

@@ -38,7 +38,6 @@ run: env
 install: env
 	$(LOCAL_PYTHON) -m pip install --upgrade pip setuptools wheel && \
 	$(LOCAL_PYTHON) -m pip install -r requirements.txt && \
-	npm i -g less && \
 	echo Installed dependencies in \`${VIRTUAL_ENV}\`;
 
 .PHONY: deploy

config.py

@@ -1,5 +1,10 @@
 """Flask configuration variables."""
-from os import environ
+from os import environ, path
+
+from dotenv import load_dotenv
+
+BASE_DIR = path.abspath(path.dirname(__file__))
+load_dotenv(path.join(BASE_DIR, ".env"))
 
 
 class Config:
@@ -11,7 +16,6 @@ class Config:
     # Flask Config
     FLASK_APP = "main.py"
     FLASK_DEBUG = environ.get("FLASK_DEBUG")
-    FLASK_ENV = environ.get("FLASK_ENV")
 
     # Database
     SQLALCHEMY_DATABASE_URI = environ.get("SQLALCHEMY_DATABASE_URI")

flask_sqlalchemy_tutorial/__init__.py

@@ -9,7 +9,9 @@ def create_app():
     """Construct the core application."""
     app = Flask(__name__, instance_relative_config=False)
     app.config.from_object("config.Config")
+    print(app.config)
 
+    # Initialize Database Plugin
     db.init_app(app)
 
     with app.app_context():

flask_sqlalchemy_tutorial/models.py

@@ -5,14 +5,15 @@
 class User(db.Model):
     """User account data model."""
 
-    __tablename__ = "user"
+    __tablename__ = "flasksqlalchemy-tutorial-users"
 
     id = db.Column(db.Integer, primary_key=True)
     username = db.Column(db.String(64), index=True, unique=True, nullable=False)
     email = db.Column(db.String(80), index=True, unique=True, nullable=False)
-    created = db.Column(db.DateTime, nullable=False)
     bio = db.Column(db.Text, nullable=True)
     admin = db.Column(db.Boolean, nullable=False)
+    created_at = db.Column(db.DateTime, server_default=db.func.now())
+    updated_at = db.Column(db.DateTime, server_default=db.func.now(), server_onupdate=db.func.now())
 
     def __repr__(self):
         return f"<User id={self.id}, username={self.username}, email={self.email}>"

flask_sqlalchemy_tutorial/routes.py

@@ -13,9 +13,7 @@ def user_records():
     username = request.args.get("user")
     email = request.args.get("email")
     if username and email:
-        existing_user = User.query.filter(
-            User.username == username or User.email == email
-        ).first()
+        existing_user = User.query.filter(User.username == username or User.email == email).first()
         if existing_user:
             return make_response(f"{username} ({email}) already created!")
         new_user = User(

main.py

@@ -4,4 +4,4 @@
 app = create_app()
 
 if __name__ == "__main__":
-    app.run(host="0.0.0.0", port=8089, debug=True, load_dotenv=True)
+    app.run(host="0.0.0.0", port=8089, debug=False, load_dotenv=True)

pyproject.toml

@@ -20,7 +20,7 @@ python-dotenv = "*"
 pytest = "*"
 black = "*"
 isort = "*"
-mypy = "^1.5.1"
+mypy = "*"
 
 [tool.poetry.scripts]
 run = "main:app"