user create and get api created

Author: ajaysharmadeveloper

BaseApp/UserApp/models.py

@@ -1,14 +1,22 @@
-from sqlalchemy import Boolean, Column, Integer, String, DateTime
-import datetime
+from sqlalchemy import Boolean, Column, Integer, String
 from BaseApp.database import Base
 
 
+# Create database models
+
 class User(Base):
     __tablename__ = "users"
     id = Column(Integer, primary_key=True)
-    fullname = Column(String)
-    created_date = Column(DateTime, default=datetime.datetime.utcnow)
-    username = Column(String, unique=True)
-    hashed_password = Column(String)
-    is_active = Column(Boolean, default=True)
-    is_delete = Column(Boolean, default=False)
+    first_name = Column(String(50), nullable=True)
+    last_name = Column(String(50), nullable=True)
+    username = Column(String(100), unique=True, nullable=False)
+    email = Column(String(100), unique=True, nullable=False)
+    password = Column(String(200), nullable=False)
+    is_active = Column(Boolean, default=True, nullable=False)
+    is_verify = Column(Boolean, default=True, nullable=False)
+    is_delete = Column(Boolean, default=False, nullable=False)
+    created_on = Column(String(100), nullable=True)
+    updated_on = Column(String(100), nullable=True)
+
+    def __repr__(self):
+        return 'User : %r' % self.username

BaseApp/UserApp/router.py

@@ -1,9 +1,31 @@
 from fastapi import Depends, APIRouter, HTTPException, status
-from BaseApp.UserApp import schemas
+from sqlalchemy.orm import Session
+from BaseApp.dependencies import get_db
+from BaseApp.UserApp.schemas import UserCreateSchema
+from BaseApp.UserApp.models import User
+import datetime
 
 api = APIRouter()
 
 
-@api.get("/index")
-def index():
-    return {"key": "value"}
+@api.get("/users")
+def users(db: Session = Depends(get_db)):
+    data = db.query(User).all()
+    return data
+
+
+@api.post("/create-user")
+def registerUser(userData: UserCreateSchema, db: Session = Depends(get_db)):
+    dateTime = str(datetime.datetime.timestamp(datetime.datetime.now()))
+    userObj = User(
+        first_name=userData.first_name,
+        last_name=userData.last_name,
+        username=userData.username,
+        email=userData.email,
+        password=userData.password,
+        created_on=dateTime,
+        updated_on=dateTime
+    )
+    db.add(userObj)
+    db.commit()
+    return {"status": "User created"}

BaseApp/UserApp/schemas.py

@@ -1,13 +1,11 @@
 from pydantic import BaseModel
-from typing import Optional
-import datetime
-from fastapi import Body
 
 
-class User(BaseModel):
+class UserCreateSchema(BaseModel):
+    first_name: str
+    last_name: str
     username: str
+    email: str
+    password: str
 
 
-class UserCreate(User):
-    password: str
-    email: str

BaseApp/dependencies.py

@@ -0,0 +1,10 @@
+from BaseApp.database import SessionLocal
+
+
+# Dependency
+def get_db():
+    db = SessionLocal()
+    try:
+        yield db
+    finally:
+        db.close()

db-migration/versions/12db141fd663_user_model_updated_all.py

@@ -0,0 +1,66 @@
+"""user model updated all
+
+Revision ID: 12db141fd663
+Revises: e97c745d015f
+Create Date: 2021-06-10 16:09:54.818509
+
+"""
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision = '12db141fd663'
+down_revision = 'e97c745d015f'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('users', sa.Column('first_name', sa.String(length=50), nullable=True))
+    op.add_column('users', sa.Column('last_name', sa.String(length=50), nullable=True))
+    op.add_column('users', sa.Column('email', sa.String(length=100), nullable=False))
+    op.add_column('users', sa.Column('password', sa.String(length=200), nullable=False))
+    op.add_column('users', sa.Column('is_verify', sa.Boolean(), nullable=False))
+    op.add_column('users', sa.Column('created_on', sa.String(length=100), nullable=True))
+    op.add_column('users', sa.Column('updated_on', sa.String(length=100), nullable=True))
+    op.alter_column('users', 'username',
+               existing_type=sa.VARCHAR(),
+               nullable=False)
+    op.alter_column('users', 'is_active',
+               existing_type=sa.BOOLEAN(),
+               nullable=False)
+    op.alter_column('users', 'is_delete',
+               existing_type=sa.BOOLEAN(),
+               nullable=False)
+    op.create_unique_constraint(None, 'users', ['email'])
+    op.drop_column('users', 'hashed_password')
+    op.drop_column('users', 'fullname')
+    op.drop_column('users', 'created_date')
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('users', sa.Column('created_date', postgresql.TIMESTAMP(), autoincrement=False, nullable=True))
+    op.add_column('users', sa.Column('fullname', sa.VARCHAR(), autoincrement=False, nullable=True))
+    op.add_column('users', sa.Column('hashed_password', sa.VARCHAR(), autoincrement=False, nullable=True))
+    op.drop_constraint(None, 'users', type_='unique')
+    op.alter_column('users', 'is_delete',
+               existing_type=sa.BOOLEAN(),
+               nullable=True)
+    op.alter_column('users', 'is_active',
+               existing_type=sa.BOOLEAN(),
+               nullable=True)
+    op.alter_column('users', 'username',
+               existing_type=sa.VARCHAR(),
+               nullable=True)
+    op.drop_column('users', 'updated_on')
+    op.drop_column('users', 'created_on')
+    op.drop_column('users', 'is_verify')
+    op.drop_column('users', 'password')
+    op.drop_column('users', 'email')
+    op.drop_column('users', 'last_name')
+    op.drop_column('users', 'first_name')
+    # ### end Alembic commands ###