Merge pull request #10 from Cinnamoon-dev/feat/view-fk-id

feat: joins adicionados para não mostrar as chaves estrangeiras

Author: Cinnamoon-dev

src/controllers/authController.py

@@ -1,5 +1,5 @@
 from datetime import timedelta
-from fastapi import APIRouter, HTTPException, Header
+from fastapi import APIRouter, HTTPException, Header, Request
 
 from src.infra.database.database import PgDatabase
 from src.services.userService import UserService
@@ -81,5 +81,8 @@ def refresh(refresh_token: str = Header(..., alias="X-Refresh-Token")):
 
 
 @router.get("/me")
-def me(user: user_dependency):
+def me(request: Request, user: user_dependency, show_fk_id: int | None = 1):
+    if show_fk_id == 0:
+        return UserService(PgDatabase()).view_controller(user["id"], request.query_params)
+
     return user

src/controllers/userController.py

@@ -23,8 +23,13 @@ def user_all(
 
 
 @router.get("/{user_id:int}")
-def user_view(user_id: int, perms=Depends(PermissionChecker("usuario-view"))):
-    user = UserService(PgDatabase()).view(user_id)
+def user_view(
+    request: Request,
+    user_id: int,
+    show_fk_id: int | None = 1,
+    perms=Depends(PermissionChecker("usuario-view"))
+):
+    user = UserService(PgDatabase()).view_controller(user_id, request.query_params)
 
     if user is None:
         return JSONResponse(

src/services/userService.py

@@ -87,6 +87,44 @@ def view(self, user_id: int) -> dict[str, Any] | None:
 
         return user
 
+    def view_controller(self, user_id: int, query_params: QueryParams) -> dict[str, Any] | None:
+        show_fk_id = bool(int(query_params.get("show_fk_id", 1)))
+        user = None
+
+        if show_fk_id:
+            query = f"SELECT {self.all_columns} FROM {self.table} WHERE id = %s"
+        else:
+            query = f"""
+                SELECT u.id, u.email, u.senha, tu.nome as tipo_usuario
+                FROM {self.table} AS u
+                INNER JOIN tipo_usuario AS tu
+                ON u.tipo_usuario_id = tu.id
+                WHERE u.id = %s
+                LIMIT 1
+            """
+
+        try:
+            with self.database as db:
+                db.cursor.execute(
+                    query,
+                    (user_id,),
+                )
+                row = db.cursor.fetchone()
+        except Exception:
+            raise HTTPException(
+                status_code=500, detail={"error": True, "message": "Database error"}
+            )
+
+        if row is None:
+            return user
+
+        if show_fk_id:
+            user = line_to_dict(row, self.columns)
+        else:
+            user = line_to_dict(row, ["id", "email", "senha", "tipo_usuario"])
+
+        return user
+
     def view_by_email(self, email: str) -> dict[str, Any] | None:
         user = None