Merge pull request #142 from grillazz/refactor

Refactor

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.12.2-slim-bookworm AS base
+FROM python:3.12-slim-bookworm AS base
 RUN apt-get update \
     && apt-get upgrade -y \
     && apt-get install -y --no-install-recommends curl git build-essential \

Makefile

@@ -39,7 +39,7 @@ py-upgrade:	## Upgrade project py files with pyupgrade library for python versio
 
 .PHONY: lint
 lint:  ## Lint project code.
-	poetry run ruff --fix .
+	poetry run ruff check --fix .
 
 .PHONY: slim-build
 slim-build: ## with power of docker-slim build smaller and safer images

app/api/user.py

@@ -5,12 +5,16 @@
 from app.models.user import User
 from app.schemas.user import UserSchema, UserResponse, UserLogin, TokenResponse
 from app.services.auth import create_access_token
+from app.utils.logging import AppLogger
+
+logger = AppLogger().get_logger()
 
 router = APIRouter(prefix="/v1/user")
 
 
 @router.post("/", status_code=status.HTTP_201_CREATED, response_model=UserResponse)
 async def create_user(payload: UserSchema, request: Request, db_session: AsyncSession = Depends(get_db)):
+    logger.info(f"Creating user: {payload}")
     _user: User = User(**payload.model_dump())
     await _user.save(db_session)
 

app/models/user.py

@@ -3,6 +3,7 @@
 
 import bcrypt
 from passlib.context import CryptContext
+from pydantic import SecretStr
 from sqlalchemy import String, LargeBinary, select
 from sqlalchemy.dialects.postgresql import UUID
 from sqlalchemy.ext.asyncio import AsyncSession
@@ -25,11 +26,12 @@ def password(self):
         return self._password.decode("utf-8")
 
     @password.setter
-    def password(self, password: str):
-        self._password = bcrypt.hashpw(password.encode("utf-8"), bcrypt.gensalt())
+    def password(self, password: SecretStr):
+        _password_string = password.get_secret_value()
+        self._password = bcrypt.hashpw(_password_string.encode("utf-8"), bcrypt.gensalt())
 
-    def check_password(self, password: str):
-        return pwd_context.verify(password, self.password)
+    def check_password(self, password: SecretStr):
+        return pwd_context.verify(password.get_secret_value(), self.password)
 
     @classmethod
     async def find(cls, database_session: AsyncSession, where_conditions: list[Any]):

app/schemas/user.py

@@ -1,17 +1,17 @@
 from uuid import UUID
 
-from pydantic import BaseModel, Field, EmailStr, ConfigDict
+from pydantic import BaseModel, Field, EmailStr, ConfigDict, SecretStr
 
 config = ConfigDict(from_attributes=True)
 
 
 # TODO: add pydantic field validator for strong password
 class UserSchema(BaseModel):
     model_config = config
-    email: EmailStr = Field(title="User’s email", description="User’s email")
-    first_name: str = Field(title="User’s first name", description="User’s first name")
-    last_name: str = Field(title="User’s last name", description="User’s last name")
-    password: str = Field(title="User’s password", description="User’s password")
+    email: EmailStr = Field(title="User’s email", description="User’s email", examples=["[email protected]"])
+    first_name: str = Field(title="User’s first name", description="User’s first name", examples=["John"])
+    last_name: str = Field(title="User’s last name", description="User’s last name", examples=["Doe"])
+    password: SecretStr = Field(title="User’s password", description="User’s password", examples=["@SuperSecret123"])
 
 
 class UserResponse(BaseModel):
@@ -29,5 +29,5 @@ class TokenResponse(BaseModel):
 
 class UserLogin(BaseModel):
     model_config = config
-    email: EmailStr = Field(title="User’s email", description="User’s email")
-    password: str = Field(title="User’s password", description="User’s password")
+    email: EmailStr = Field(title="User’s email", description="User’s email", examples=["[email protected]"])
+    password: SecretStr = Field(title="User’s password", description="User’s password", examples=["@SuperSecret123"])