Improvement/1028

app/common/http_response/base.py

@@ -1,6 +1,6 @@
 from datetime import datetime
 
-from pydantic import BaseModel
+from pydantic import BaseModel, Field
 
 
 class BaseResponse(BaseModel):
@@ -16,5 +16,5 @@ class BaseResponse(BaseModel):
 
     status: int
     message: str
-    timestamp: datetime
-    path: str
+    timestamp: datetime = Field(default_factory=lambda: datetime.now(datetime.UTC))
+    path: str = Field(default="/")

app/common/http_response/success_result.py

@@ -41,12 +41,3 @@ def to_json_response(self, request: Request) -> JSONResponse:
             status_code=self.status_code,
             content=model.model_dump(mode="json"),
         )
-
-
-#! TODO: Remove this function and use the to_json_response method instead
-def success_response_builder(result: SuccessResult[T], request: Request) -> JSONResponse:
-    model = result.to_response_model(path=request.url.path)
-    return JSONResponse(
-        status_code=result.status_code,
-        content=model.model_dump(mode="json"),
-    )

app/common/schemas/pagination.py

@@ -0,0 +1,15 @@
+from pydantic import BaseModel, Field
+
+
+class PaginationInfo(BaseModel):
+    """
+    Standard pagination information for list responses.
+    Reusable across all modules (products, users, categories, orders, etc.).
+    """
+
+    page: int = Field(..., ge=1, description="Current page number", example=1)
+    limit: int = Field(..., ge=1, le=100, description="Items per page", example=10)
+    total_items: int = Field(..., ge=0, description="Total number of items", example=21)
+    total_pages: int = Field(..., ge=0, description="Total number of pages", example=3)
+    has_next: bool = Field(default=False, description="Whether there is a next page", example=True)
+    has_prev: bool = Field(default=False, description="Whether there is a previous page", example=False)

app/core/logger/get_logger.py

@@ -9,7 +9,7 @@ class ServiceName(StrEnum):
     AUTH_SERVICE = "auth_service"
     API_ROUTERS = "api_routers"
     REDIS_SERVICE = "redis_service"
-    TEST_SERVICE = "test_service"
+    E2E_TEST_SERVICE = "e2e_test_service"
     # Add more services as needed
 
 

app/modules/auth/routers.py

@@ -4,9 +4,9 @@
 from fastapi.params import Depends
 from fastapi.security import OAuth2PasswordRequestForm
 
-from app.common.http_response.doc_reponses import ResponseErrorDoc, ResponseSuccessDoc
+from app.common.http_response.doc_responses import ResponseErrorDoc, ResponseSuccessDoc
 from app.common.http_response.success_response import SuccessCodes, SuccessResponse
-from app.common.http_response.success_result import SuccessResult, success_response_builder
+from app.common.http_response.success_result import SuccessResult
 from app.modules.user.depends import get_user_repository
 from app.modules.user.models import UserRole
 from app.modules.user.repository_interface import UserRepositoryInterface
@@ -72,7 +72,7 @@ async def auth_get_token(
         data=tokens,
     )
 
-    return success_response_builder(result, request)
+    return result.to_json_response(request)
 
 
 @router.post(
@@ -143,7 +143,7 @@ async def auth_get_me(
         status_code=status.HTTP_200_OK,
         data=user,
     )
-    return success_response_builder(result, request)
+    return result.to_json_response(request)
 
 
 @router.post(
@@ -187,7 +187,7 @@ async def auth_refresh_tokens(
         data=tokens,
     )
 
-    return success_response_builder(result, request)
+    return result.to_json_response(request)
 
 
 @router.get(
@@ -228,4 +228,4 @@ async def auth_verify_refresh_token(
         data=user_read,
     )
 
-    return success_response_builder(result, request)
+    return result.to_json_response(request)

app/modules/cart/routers.py

@@ -2,7 +2,7 @@
 
 from fastapi import APIRouter, Depends, Request, status
 
-from app.common.http_response.doc_reponses import ResponseErrorDoc, ResponseSuccessDoc
+from app.common.http_response.doc_responses import ResponseErrorDoc, ResponseSuccessDoc
 from app.common.http_response.success_response import SuccessResponse
 from app.common.http_response.success_result import SuccessCodes, SuccessResult
 from app.modules.product.depends import get_product_repository

app/modules/category/routers.py

@@ -3,7 +3,7 @@
 from fastapi import APIRouter, Depends, Request, status
 from fastapi.responses import JSONResponse
 
-from app.common.http_response.doc_reponses import ResponseErrorDoc, ResponseSuccessDoc
+from app.common.http_response.doc_responses import ResponseErrorDoc, ResponseSuccessDoc
 from app.common.http_response.success_response import SuccessCodes, SuccessResponse
 from app.common.http_response.success_result import SuccessResult
 from app.modules.category.depends import get_category_repository

app/modules/category/routers/category_create.py

@@ -3,7 +3,7 @@
 from fastapi import Depends, Request, status
 from fastapi.responses import JSONResponse
 
-from app.common.http_response.doc_reponses import ResponseErrorDoc, ResponseSuccessDoc
+from app.common.http_response.doc_responses import ResponseErrorDoc, ResponseSuccessDoc
 from app.common.http_response.success_response import SuccessCodes, SuccessResponse
 from app.common.http_response.success_result import SuccessResult
 from app.modules.category.depends import get_category_repository

app/modules/category/routers/category_list.py

@@ -4,7 +4,7 @@
 from fastapi.params import Query
 from fastapi.responses import JSONResponse
 
-from app.common.http_response.doc_reponses import ResponseErrorDoc, ResponseSuccessDoc
+from app.common.http_response.doc_responses import ResponseErrorDoc, ResponseSuccessDoc
 from app.common.http_response.success_response import SuccessCodes, SuccessResponse
 from app.common.http_response.success_result import SuccessResult
 from app.modules.category.depends import get_category_repository

app/modules/category/routers/category_retrieve.py

@@ -2,8 +2,10 @@
 
 from fastapi import Depends, status
 from fastapi.requests import Request
+from fastapi.responses import JSONResponse
 
-from app.common.http_response.doc_reponses import ResponseErrorDoc, ResponseSuccessDoc
+from app.common.http_response.doc_responses import ResponseErrorDoc, ResponseSuccessDoc
+from app.common.http_response.success_response import SuccessCodes, SuccessResponse
 from app.common.http_response.success_result import SuccessResult
 from app.modules.category.depends import get_category_repository
 from app.modules.category.repository_interface import CategoryRepositoryInterface
@@ -14,24 +16,25 @@
 
 @router.get(
     "/{category_id}",
-    response_model=CategoryRead,
+    response_model=SuccessResponse[CategoryRead],
     responses={
-        **ResponseSuccessDoc.HTTP_200_OK("Category retrieved successfully", CategoryRead),
+        **ResponseSuccessDoc.HTTP_200_OK("Category fetched successfully", CategoryRead),
         **ResponseErrorDoc.HTTP_404_NOT_FOUND("Category not found"),
+        **ResponseErrorDoc.HTTP_500_INTERNAL_SERVER_ERROR("Internal server error"),
     },
 )
 async def category_get_by_id(
     request: Request,
     category_id: int,
     category_repository: Annotated[CategoryRepositoryInterface, Depends(get_category_repository)],
-) -> CategoryRead:
+) -> JSONResponse:
     category_by_id_usecase = CategoryGetById(category_repository)
 
     category_read = await category_by_id_usecase.execute(category_id)
 
     return SuccessResult[CategoryRead](
-        code=status.HTTP_200_OK,
-        message="Category retrieved successfully",
+        code=SuccessCodes.SUCCESS,
+        message="Category fetched successfully",
         status_code=status.HTTP_200_OK,
         data=category_read,
     ).to_json_response(request)

app/modules/product/repository.py

@@ -1,6 +1,6 @@
 from typing import Any
 
-from sqlalchemy import select
+from sqlalchemy import func, select
 from sqlalchemy.ext.asyncio import AsyncSession
 
 from .models import Product
@@ -17,7 +17,7 @@ async def create(self, product: Product) -> Product:
 
         return product
 
-    async def update(self, product_id: int, updated_product: Product) -> Product | None:
+    async def update_by_id(self, product_id: int, updated_product: Product) -> Product | None:
         product = await self.session.get(Product, product_id)
         if not product:
             return None
@@ -30,7 +30,7 @@ async def update(self, product_id: int, updated_product: Product) -> Product | N
         await self.session.refresh(product)
         return product
 
-    async def delete(self, product_id: int) -> Product | None:
+    async def delete_by_id(self, product_id: int) -> Product | None:
         product = await self.session.get(Product, product_id)
 
         if not product:
@@ -41,10 +41,7 @@ async def delete(self, product_id: int) -> Product | None:
         return product
 
     async def get_by_id(self, product_id: int) -> Product | None:
-        # More explicit query with all columns
-        stmt = select(Product).where(Product.id == product_id)
-        result = await self.session.execute(stmt)
-        return result.scalar_one_or_none()
+        return await self.session.get(Product, product_id)
 
     async def list_all(self, category_id: int | None = None, skip: int = 0, limit: int = 10) -> list[Product]:
         query = select(Product)
@@ -61,3 +58,13 @@ async def exists_by_field(self, field: str, value: Any) -> bool:
         stmt = select(Product).where(getattr(Product, field) == value)
         result = await self.session.execute(stmt)
         return result.scalar_one_or_none() is not None
+
+    async def count_all(self, category_id: int | None = None) -> int:
+        """Count total products with optional category filter."""
+        query = select(func.count(Product.id))
+
+        if category_id is not None:
+            query = query.where(Product.category_id == category_id)
+
+        result = await self.session.execute(query)
+        return result.scalar() or 0

app/modules/product/repository_interface.py

@@ -10,11 +10,11 @@ async def create(self, product: Product) -> Product:
         pass
 
     @abstractmethod
-    async def update(self, product_id: int, updated_product: Product) -> Product:
+    async def update_by_id(self, product_id: int, updated_product: Product) -> Product:
         pass
 
     @abstractmethod
-    async def delete(self, product_id: int) -> Product | None:
+    async def delete_by_id(self, product_id: int) -> Product | None:
         pass
 
     @abstractmethod
@@ -28,3 +28,7 @@ async def list_all(self, category_id: int | None = None, skip: int = 0, limit: i
     @abstractmethod
     async def exists_by_field(self, field: str, value: Any) -> bool:
         pass
+
+    @abstractmethod
+    async def count_all(self, category_id: int | None = None) -> int:
+        pass