update response model

Author: ajaysharmadeveloper

BaseApp/UserApp/query.py

@@ -0,0 +1,22 @@
+from BaseApp.UserApp.models import User
+import datetime
+
+
+def getUser(db):
+    return db.query(User).all()
+
+
+def createUser(data, db):
+    dateTime = str(datetime.datetime.timestamp(datetime.datetime.now()))
+    userObj = User(
+        first_name=data.first_name,
+        last_name=data.last_name,
+        username=data.username,
+        email=data.email,
+        password=data.password,
+        created_on=dateTime,
+        updated_on=dateTime
+    )
+    db.add(userObj)
+    db.commit()
+    return userObj

BaseApp/UserApp/router.py

@@ -1,31 +1,32 @@
 from fastapi import Depends, APIRouter, HTTPException, status
 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
+from BaseApp.UserApp.schemas import UserCreateSchema, UserResponse, UserList
+from BaseApp.UserApp.query import getUser, createUser
+from typing import List
+# from BaseApp.database import database
 
 api = APIRouter()
 
 
-@api.get("/users")
-def users(db: Session = Depends(get_db)):
-    data = db.query(User).all()
+# @api.on_event("startup")
+# async def startup():
+#     await database.connect()
+#
+#
+# @api.on_event("shutdown")
+# async def shutdown():
+#     await database.disconnect()
+
+
+@api.get("/users", response_model=List[UserResponse], status_code=200)
+async def users(db: Session = Depends(get_db)):
+    data = getUser(db)
+    print(data)
     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"}
+@api.post("/create-user", status_code=201)
+async def registerUser(userData: UserCreateSchema, db: Session = Depends(get_db)):
+    data = createUser(userData, db)
+    return data

BaseApp/UserApp/schemas.py

@@ -1,3 +1,4 @@
+from typing import List
 from pydantic import BaseModel
 
 
@@ -9,3 +10,19 @@ class UserCreateSchema(BaseModel):
     password: str
 
 
+class UserResponse(BaseModel):
+    id: int
+    first_name: str
+    last_name: str
+    username: str
+    email: str
+    password: str
+    is_active: bool
+    is_verify: bool
+    is_delete: bool
+    created_on: str
+    updated_on: str
+
+
+class UserList(BaseModel):
+    data: List = UserResponse

BaseApp/database.py

@@ -2,6 +2,7 @@
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.orm import sessionmaker
 import os
+# import databases
 from dotenv import load_dotenv
 
 load_dotenv()
@@ -13,4 +14,6 @@
 )
 SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine)
 
+# database = databases.Database(SQLALCHEMY_DATABASE_URL)
+
 Base = declarative_base()

requirements.txt

@@ -16,3 +16,4 @@ SQLAlchemy==1.4.17
 starlette==0.14.2
 typing-extensions==3.10.0.0
 uvicorn==0.14.0
+databases~=0.4.3