Jwt and Alembic added

Author: Jrhero14

.idea/vcs.xml

@@ -1,27 +1,37 @@
-from fastapi import HTTPException
 from starlette import status
+from starlette.responses import JSONResponse
 
-from app.DTO import CreateUserDto
+from app.dto import CreateUserDto
+from app.dto.LoginUserDto import LoginUserDto
 from app.services import UserService
-from app.utilities import formating
 
 
-async def registerUser(user: CreateUserDto):
-    email = formating.format_string(user.email)
-
-    if not email:
-        raise HTTPException(
-            detail="Email can not be empty",
-            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY
-        )
-
-    if not user.password:
-        raise HTTPException(
-            detail="Password can not be empty",
-            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY
-        )
+async def registerUser(user: CreateUserDto) -> JSONResponse:
 
     # Process Register in UserService
     user = UserService.register(user)
 
-    return user
+    return JSONResponse(
+        status_code=status.HTTP_201_CREATED,
+        content={
+            "status": "success",
+            "message": "User created successfully",
+            "data": user.toJson()
+        },
+        headers={"Content-Type": "application/json"}
+    )
+
+async def login(body: LoginUserDto):
+
+    token = UserService.login(body=body)
+
+    return JSONResponse(
+        status_code=status.HTTP_201_CREATED,
+        content={
+            "status": "success",
+            "message": "Login successfully",
+            "token": token,
+            "type": "bearer"
+        },
+        headers={"Content-Type": "application/json"}
+    )

app/DTO/CreateUserDto.py

@@ -0,0 +1,10 @@
+import re
+
+from pydantic import BaseModel, Field, EmailStr
+
+password_regex = r"^(?=.*\d)(?=.*[a-zA-Z]).{8,}$"
+
+class CreateUserDto(BaseModel):
+    name: str
+    email: EmailStr
+    password: str = Field(default="password", pattern=re.compile(password_regex))

app/controllers/authController.py

@@ -0,0 +1,6 @@
+from pydantic import BaseModel, EmailStr
+
+class LoginUserDto(BaseModel):
+    email: EmailStr
+    password: str
+

app/dto/CreateUserDto.py

@@ -1,6 +1,5 @@
-from sqlalchemy import Integer, String, Column, DateTime, ForeignKey
+from sqlalchemy import Integer, String, Column, DateTime
 from sqlalchemy.sql.functions import current_timestamp
-from sqlalchemy.orm import relationship
 
 from app.models import Base
 
@@ -12,4 +11,13 @@ class User(Base):
     name = Column("name", String(100))
     password = Column("hashed_password", String(255))
     updated_at = Column("updated_at", DateTime(), default=current_timestamp())
-    created_at = Column("created_at", DateTime(), default=current_timestamp())
+    created_at = Column("created_at", DateTime(), default=current_timestamp())
+
+    def toJson(self):
+        return {
+            "id": self.id,
+            "name": self.name,
+            "email": self.email,
+            "updated_at": str(self.updated_at),
+            "created_at": str(self.created_at)
+        }

app/DTO/GetUserDto.py renamed to app/dto/GetUserDto.py

@@ -1,7 +1,7 @@
 from fastapi import HTTPException
 
 from app.models.User import User
-from app.database.Config import SessionLocal
+from database.config import SessionLocal
 
 
 def store(name: str, email: str, password: str)-> User:
@@ -30,8 +30,8 @@ def store(name: str, email: str, password: str)-> User:
             detail=str(e))
 
 def getbyid(id: int) -> User:
-    user = SessionLocal.query(User).filter(User.id == id).first()
-    return user
+    with SessionLocal() as session:
+        return session.query(User).filter(User.id == id).first()
 
 def getByEmail(email: str):
     with SessionLocal() as session: