✨ Update all for Postgres and new techniques

Author: tiangolo

{{cookiecutter.project_slug}}/README.md

@@ -181,6 +181,8 @@ Make sure you create a "revision" of your models and that you "upgrade" your dat
 docker-compose exec backend bash
 ```
 
+* If you created a new model in `./backend/app/app/db_models/`, make sure to import it in `./backend/app/app/db/base.py`, that Python module (`base.py`) that imports all the models will be used by Alembic.
+
 * After changing a model (for example, adding a column), inside the container, create a revision, e.g.:
 
 ```bash

{{cookiecutter.project_slug}}/backend/app/Pipfile

@@ -11,6 +11,7 @@ isort = "*"
 autoflake = "*"
 flake8 = "*"
 pytest = "*"
+vulture = "*"
 
 [packages]
 fastapi = "*"
@@ -25,6 +26,11 @@ tenacity = "*"
 pydantic = "*"
 emails = "*"
 raven = "*"
+gunicorn = "*"
+jinja2 = "*"
+psycopg2-binary = "*"
+alembic = "*"
+sqlalchemy = "*"
 
 [requires]
 python_version = "3.6"

{{cookiecutter.project_slug}}/backend/app/Pipfile.lock

@@ -0,0 +1,74 @@
+# A generic, single database configuration.
+
+[alembic]
+# path to migration scripts
+script_location = alembic
+
+# template used to generate migration files
+# file_template = %%(rev)s_%%(slug)s
+
+# timezone to use when rendering the date
+# within the migration file as well as the filename.
+# string value is passed to dateutil.tz.gettz()
+# leave blank for localtime
+# timezone =
+
+# max length of characters to apply to the
+# "slug" field
+#truncate_slug_length = 40
+
+# set to 'true' to run the environment during
+# the 'revision' command, regardless of autogenerate
+# revision_environment = false
+
+# set to 'true' to allow .pyc and .pyo files without
+# a source .py file to be detected as revisions in the
+# versions/ directory
+# sourceless = false
+
+# version location specification; this defaults
+# to alembic/versions.  When using multiple version
+# directories, initial revisions must be specified with --version-path
+# version_locations = %(here)s/bar %(here)s/bat alembic/versions
+
+# the output encoding used when revision files
+# are written from script.py.mako
+# output_encoding = utf-8
+
+sqlalchemy.url = postgresql://postgres:changethis@db/app
+
+
+# Logging configuration
+[loggers]
+keys = root,sqlalchemy,alembic
+
+[handlers]
+keys = console
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = WARN
+handlers = console
+qualname =
+
+[logger_sqlalchemy]
+level = WARN
+handlers =
+qualname = sqlalchemy.engine
+
+[logger_alembic]
+level = INFO
+handlers =
+qualname = alembic
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+formatter = generic
+
+[formatter_generic]
+format = %(levelname)-5.5s [%(name)s] %(message)s
+datefmt = %H:%M:%S

{{cookiecutter.project_slug}}/backend/app/alembic.ini

@@ -0,0 +1,42 @@
+"""First revision
+
+Revision ID: e6ae69e9dcb9
+Revises: 
+Create Date: 2019-02-13 14:27:57.038583
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'e6ae69e9dcb9'
+down_revision = None
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table('user',
+    sa.Column('id', sa.Integer(), nullable=False),
+    sa.Column('full_name', sa.String(), nullable=True),
+    sa.Column('email', sa.String(), nullable=True),
+    sa.Column('hashed_password', sa.String(), nullable=True),
+    sa.Column('is_active', sa.Boolean(), nullable=True),
+    sa.Column('is_superuser', sa.Boolean(), nullable=True),
+    sa.PrimaryKeyConstraint('id')
+    )
+    op.create_index(op.f('ix_user_email'), 'user', ['email'], unique=True)
+    op.create_index(op.f('ix_user_full_name'), 'user', ['full_name'], unique=False)
+    op.create_index(op.f('ix_user_id'), 'user', ['id'], unique=False)
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_index(op.f('ix_user_id'), table_name='user')
+    op.drop_index(op.f('ix_user_full_name'), table_name='user')
+    op.drop_index(op.f('ix_user_email'), table_name='user')
+    op.drop_table('user')
+    # ### end Alembic commands ###

{{cookiecutter.project_slug}}/backend/app/alembic/versions/e6ae69e9dcb9_first_revision.py

@@ -1,12 +1,10 @@
 from fastapi import APIRouter
 
-from app.api.api_v1.endpoints.role import router as roles_router
 from app.api.api_v1.endpoints.token import router as token_router
 from app.api.api_v1.endpoints.user import router as user_router
 from app.api.api_v1.endpoints.utils import router as utils_router
 
 api_router = APIRouter()
-api_router.include_router(roles_router)
 api_router.include_router(token_router)
 api_router.include_router(user_router)
 api_router.include_router(utils_router)

{{cookiecutter.project_slug}}/backend/app/app/api/api_v1/api.py

@@ -1,22 +1,19 @@
 from datetime import timedelta
 
-from fastapi import APIRouter, Depends
+from fastapi import APIRouter, Depends, HTTPException
 from fastapi.security import OAuth2PasswordRequestForm
-from starlette.exceptions import HTTPException
+from sqlalchemy.orm import Session
 
+from app.api.utils.db import get_db
+from app.api.utils.security import get_current_user
 from app.core import config
-from app.core.jwt import create_access_token, get_current_user
-from app.crud.user import (
-    authenticate_user,
-    check_if_user_is_active,
-    check_if_user_is_superuser,
-    get_user,
-    update_user,
-)
-from app.db.database import get_default_bucket
+from app.core.jwt import create_access_token
+from app.core.security import get_password_hash
+from app.crud import user as crud_user
+from app.db_models.user import User as DBUser
 from app.models.msg import Msg
 from app.models.token import Token
-from app.models.user import User, UserInDB, UserInUpdate
+from app.models.user import User
 from app.utils import (
     generate_password_reset_token,
     send_reset_password_email,
@@ -27,70 +24,73 @@
 
 
 @router.post("/login/access-token", response_model=Token, tags=["login"])
-def route_login_access_token(form_data: OAuth2PasswordRequestForm = Depends()):
+def login_access_token(
+    db: Session = Depends(get_db), form_data: OAuth2PasswordRequestForm = Depends()
+):
     """
     OAuth2 compatible token login, get an access token for future requests
     """
-    bucket = get_default_bucket()
-    user = authenticate_user(bucket, form_data.username, form_data.password)
+    user = crud_user.authenticate(
+        db, email=form_data.username, password=form_data.password
+    )
     if not user:
         raise HTTPException(status_code=400, detail="Incorrect email or password")
-    elif not check_if_user_is_active(user):
+    elif not crud_user.is_active(user):
         raise HTTPException(status_code=400, detail="Inactive user")
     access_token_expires = timedelta(minutes=config.ACCESS_TOKEN_EXPIRE_MINUTES)
     return {
         "access_token": create_access_token(
-            data={"username": form_data.username}, expires_delta=access_token_expires
+            data={"user_id": user.id}, expires_delta=access_token_expires
         ),
         "token_type": "bearer",
     }
 
 
 @router.post("/login/test-token", tags=["login"], response_model=User)
-def route_test_token(current_user: UserInDB = Depends(get_current_user)):
+def test_token(current_user: DBUser = Depends(get_current_user)):
     """
     Test access token
     """
     return current_user
 
 
-@router.post("/password-recovery/{username}", tags=["login"], response_model=Msg)
-def route_recover_password(username: str):
+@router.post("/password-recovery/{email}", tags=["login"], response_model=Msg)
+def recover_password(email: str, db: Session = Depends(get_db)):
     """
     Password Recovery
     """
-    bucket = get_default_bucket()
-    user = get_user(bucket, username)
+    user = crud_user.get_by_email(db, email=email)
 
     if not user:
         raise HTTPException(
             status_code=404,
             detail="The user with this username does not exist in the system.",
         )
-    password_reset_token = generate_password_reset_token(username)
+    password_reset_token = generate_password_reset_token(email=email)
     send_reset_password_email(
-        email_to=user.email, username=username, token=password_reset_token
+        email_to=user.email, email=email, token=password_reset_token
     )
     return {"msg": "Password recovery email sent"}
 
 
 @router.post("/reset-password/", tags=["login"], response_model=Msg)
-def route_reset_password(token: str, new_password: str):
+def reset_password(token: str, new_password: str, db: Session = Depends(get_db)):
     """
     Reset password
     """
-    username = verify_password_reset_token(token)
-    if not username:
+    email = verify_password_reset_token(token)
+    if not email:
         raise HTTPException(status_code=400, detail="Invalid token")
-    bucket = get_default_bucket()
-    user = get_user(bucket, username)
+    user = crud_user.get_by_email(db, email=email)
     if not user:
         raise HTTPException(
             status_code=404,
             detail="The user with this username does not exist in the system.",
         )
-    elif not check_if_user_is_active(user):
+    elif not crud_user.is_active(user):
         raise HTTPException(status_code=400, detail="Inactive user")
-    user_in = UserInUpdate(name=username, password=new_password)
-    user = update_user(bucket, user_in)
+    hashed_password = get_password_hash(new_password)
+    user.hashed_password = hashed_password
+    db.add(user)
+    db.commit()
     return {"msg": "Password updated successfully"}