Merge branch 'main' into feature/#33

Author: IkeSalmonson

.vscode/settings.json

@@ -9,5 +9,10 @@
     },
     "python-envs.defaultEnvManager": "ms-python.python:poetry",
     "python-envs.defaultPackageManager": "ms-python.python:poetry",
-    "python-envs.pythonProjects": []
+    "python-envs.pythonProjects": [],
+    "python.testing.pytestArgs": [
+      "tests"
+    ],
+    "python.testing.unittestEnabled": false,
+    "python.testing.pytestEnabled": true
 }

Makefile

@@ -1,3 +1,4 @@
+API_CONTAINER_NAME=pynews-server
 .PHONY: help build up down logs test lint format clean dev prod restart health
 
 # Colors for terminal output
@@ -73,3 +74,7 @@ shell: ## Entra no shell do container
 setup: install build up ## Setup completo do projeto
 	@echo "$(GREEN)Setup completo realizado!$(NC)"
 	@echo "$(GREEN)Acesse: http://localhost:8000/docs$(NC)"
+
+
+docker/test:
+	docker exec -e PYTHONPATH=/app $(API_CONTAINER_NAME) pytest -s --cov-report=term-missing --cov-report html --cov-report=xml --cov=app tests/

app/enums.py

@@ -0,0 +1,8 @@
+from enum import Enum
+
+
+class LibraryTagUpdatesEnum(str, Enum):
+    UPDATE = "updates"
+    BUG_FIX = "bug_fix"
+    NEW_FEATURE = "new_feature"
+    SECURITY_FIX = "security_fix"

app/main.py

@@ -2,9 +2,11 @@
 from contextlib import asynccontextmanager
 
 from fastapi import FastAPI
+from slowapi import _rate_limit_exceeded_handler
 
 from app.routers.router import setup_router as setup_router_v2
 from app.services.database.database import AsyncSessionLocal, init_db
+from app.services.limiter import limiter
 
 logger = logging.getLogger(__name__)
 
@@ -27,6 +29,9 @@ async def lifespan(app: FastAPI):
 )
 
 
+app.state.limiter = limiter
+app.add_exception_handler(429, _rate_limit_exceeded_handler)
+
 app.include_router(setup_router_v2(), prefix="/api")
 
 logger.info("PyNews Server Starter")

app/routers/authentication.py

@@ -10,10 +10,49 @@
 from app.services import auth
 from app.services.database.models import Community as DBCommunity
 from app.services.database.orm.community import get_community_by_username
+from app.services.limiter import limiter
 
 oauth2_scheme = OAuth2PasswordBearer(tokenUrl="/authentication/token")
 
 
+async def get_current_community(
+    request: Request,
+    token: Annotated[str, Depends(oauth2_scheme)],
+) -> DBCommunity:
+    credentials_exception = HTTPException(
+        status_code=status.HTTP_401_UNAUTHORIZED,
+        detail="Could not validate credentials",
+        headers={"WWW-Authenticate": "Bearer"},
+    )
+
+    try:
+        payload = jwt.decode(
+            token, auth.SECRET_KEY, algorithms=[auth.ALGORITHM]
+        )
+        username = payload.get("sub")
+        if username is None:
+            raise credentials_exception
+        token_data = TokenPayload(username=username)
+    except InvalidTokenError:
+        raise credentials_exception
+    session: AsyncSession = request.app.db_session_factory
+    community = await get_community_by_username(
+        session=session, username=token_data.username
+    )
+    if community is None:
+        raise credentials_exception
+
+    return community
+
+
+async def get_current_active_community(
+    current_user: Annotated[DBCommunity, Depends(get_current_community)],
+) -> DBCommunity:
+    # A função simplesmente retorna o usuário.
+    # Pode ser estendido futuramente para verificar um status "ativo".
+    return current_user
+
+
 def setup():
     router = APIRouter(prefix="/authentication", tags=["authentication"])
 
@@ -31,43 +70,6 @@ async def authenticate_community(
             return None
         return found_community
 
-    # Teste
-    async def get_current_community(
-        request: Request,
-        token: Annotated[str, Depends(oauth2_scheme)],
-    ) -> DBCommunity:
-        credentials_exception = HTTPException(
-            status_code=status.HTTP_401_UNAUTHORIZED,
-            detail="Could not validate credentials",
-            headers={"WWW-Authenticate": "Bearer"},
-        )
-
-        try:
-            payload = jwt.decode(
-                token, auth.SECRET_KEY, algorithms=[auth.ALGORITHM]
-            )
-            username = payload.get("sub")
-            if username is None:
-                raise credentials_exception
-            token_data = TokenPayload(username=username)
-        except InvalidTokenError:
-            raise credentials_exception
-        session: AsyncSession = request.app.db_session_factory
-        community = await get_community_by_username(
-            session=session, username=token_data.username
-        )
-        if community is None:
-            raise credentials_exception
-
-        return community
-
-    async def get_current_active_community(
-        current_user: Annotated[DBCommunity, Depends(get_current_community)],
-    ) -> DBCommunity:
-        # A função simplesmente retorna o usuário.
-        # Pode ser estendido futuramente para verificar um status "ativo".
-        return current_user
-
     # Teste
 
     @router.post("/create_commumity")
@@ -88,6 +90,7 @@ async def create_community(request: Request):
     # Teste
 
     @router.post("/token", response_model=Token)
+    @limiter.limit("60/minute")
     async def login_for_access_token(
         request: Request, form_data: OAuth2PasswordRequestForm = Depends()
     ):
@@ -109,7 +112,9 @@ async def login_for_access_token(
         }
 
     @router.get("/me", response_model=Community)
+    @limiter.limit("60/minute")
     async def read_community_me(
+        request: Request,
         current_community: Annotated[
             DBCommunity, Depends(get_current_active_community)
         ],

app/routers/libraries/routes.py

@@ -1,13 +1,20 @@
-from fastapi import APIRouter, HTTPException, Request, status
+from typing import Annotated, List
+
+from fastapi import APIRouter, Header, HTTPException, Request, status
 from pydantic import BaseModel
 
 from app.schemas import Library as LibrarySchema
+from app.schemas import LibraryNews
+from app.schemas import LibraryRequest as LibraryRequestSchema
 from app.schemas import Subscription as SubscriptionSchema
 from app.services.database.models import Library, Subscription
+from app.services.database.models.libraries_request import LibraryRequest
 from app.services.database.orm.library import (
+    get_libraries_by_language,
     get_library_ids_by_multiple_names,
     insert_library,
 )
+from app.services.database.orm.library_request import insert_library_request
 from app.services.database.orm.subscription import upsert_multiple_subscription
 
 
@@ -22,6 +29,41 @@ class SubscribeLibraryResponse(BaseModel):
 def setup():
     router = APIRouter(prefix="/libraries", tags=["libraries"])
 
+    @router.get(
+        "",
+        response_model=List[LibrarySchema],
+        status_code=status.HTTP_200_OK,
+        summary="Get libraries by language",
+        description="Get libraries by language",
+    )
+    async def get_by_language(request: Request, language: str):
+        try:
+            libraryList = await get_libraries_by_language(
+                language=language, session=request.app.db_session_factory
+            )
+            return [
+                LibrarySchema(
+                    library_name=libraryDb.library_name,
+                    news=[
+                        LibraryNews(
+                            tag=news["tag"], description=news["description"]
+                        )
+                        for news in libraryDb.news
+                    ],
+                    logo=libraryDb.logo,
+                    version=libraryDb.version,
+                    release_date=libraryDb.release_date,
+                    releases_doc_url=libraryDb.releases_doc_url,
+                    fixed_release_url=libraryDb.fixed_release_url,
+                    language=libraryDb.language,
+                )
+                for libraryDb in libraryList
+            ]
+        except HTTPException as e:
+            raise e
+        except Exception as e:
+            HTTPException(status_code=500, detail=f"Unexpected error: {e}")
+
     @router.post(
         "",
         response_model=LibraryResponse,
@@ -35,16 +77,22 @@ async def create_library(
     ):
         library = Library(
             library_name=body.library_name,
-            user_email="",  # TODO: Considerar obter o email do usuário autenticado
-            releases_url=body.releases_url.encoded_string(),
-            logo=body.logo.encoded_string(),
+            news=[news.model_dump() for news in body.news],
+            logo=body.logo,
+            version=body.version,
+            release_date=body.release_date,
+            releases_doc_url=body.releases_doc_url,
+            fixed_release_url=body.fixed_release_url,
+            language=body.language,
         )
         try:
             await insert_library(library, request.app.db_session_factory)
             return LibraryResponse()
+        except HTTPException as e:
+            raise e
         except Exception as e:
             raise HTTPException(
-                status_code=500, detail=f"Failed to create library: {e}"
+                status_code=500, detail=f"Unexpected error: {e}"
             )
 
     @router.post(
@@ -59,14 +107,22 @@ async def create_library(
     async def subscribe_libraries(
         request: Request,
         body: SubscriptionSchema,
+        user_email: Annotated[str, Header(alias="user-email")],
     ):
         try:
             library_ids = await get_library_ids_by_multiple_names(
                 body.libraries_list, request.app.db_session_factory
             )
 
+            if (library_ids is None) or (len(library_ids) == 0):
+                raise HTTPException(
+                    status_code=404, detail="Libraries not found"
+                )
+
             subscriptions = [
-                Subscription(email=body.email, tags=body.tags, library_id=id)
+                Subscription(
+                    user_email=user_email, tags=body.tags, library_id=id
+                )
                 for id in library_ids
             ]
 
@@ -75,9 +131,42 @@ async def subscribe_libraries(
             )
 
             return SubscribeLibraryResponse()
+        except HTTPException as e:
+            raise e
+        except Exception as e:
+            raise HTTPException(
+                status_code=500, detail=f"Unexpected error: {e}"
+            )
+
+    @router.post(
+        "/request",
+        response_model=LibraryResponse,
+        status_code=status.HTTP_200_OK,
+        summary="Request a library",
+        description="Request a library to follow",
+    )
+    async def request_library(
+        request: Request,
+        body: LibraryRequestSchema,
+        user_email: Annotated[str, Header(alias="user-email")],
+    ):
+        try:
+            library_request = LibraryRequest(
+                user_email=user_email,
+                library_name=body.library_name,
+                library_home_page=body.library_home_page,
+            )
+
+            await insert_library_request(
+                library_request, request.app.db_session_factory
+            )
+
+            return LibraryResponse()
+        except HTTPException as e:
+            raise e
         except Exception as e:
             raise HTTPException(
-                status_code=500, detail=f"Subscription failed: {e}"
+                status_code=500, detail=f"Unexpected error: {e}"
             )
 
     return router