Merge branch 'feature/#41' into feature/#32

Author: Gildofj

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/routers/authentication.py

@@ -14,6 +14,44 @@
 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 +69,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")

app/routers/libraries/routes.py

@@ -1,10 +1,14 @@
+from typing import List
+
 from fastapi import APIRouter, HTTPException, Request, status
 from pydantic import BaseModel
 
 from app.schemas import Library as LibrarySchema
+from app.schemas import LibraryNews
 from app.schemas import Subscription as SubscriptionSchema
 from app.services.database.models import Library, Subscription
 from app.services.database.orm.library import (
+    get_libraries_by_language,
     get_library_ids_by_multiple_names,
     insert_library,
 )
@@ -22,6 +26,36 @@ 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):
+        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
+        ]
+
     @router.post(
         "",
         response_model=LibraryResponse,
@@ -35,12 +69,13 @@ async def create_library(
     ):
         library = Library(
             library_name=body.library_name,
-            user_email="",  # TODO: Considerar obter o email do usuário autenticado
-            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.encoded_string(),
-            fixed_release_url=body.fixed_release_url.encoded_string(),
+            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)

app/routers/news/routes.py

@@ -1,6 +1,13 @@
-from fastapi import APIRouter, Request, status
+from typing import Annotated
+
+from fastapi import APIRouter, Depends, Request, status
+from fastapi.params import Header
 from pydantic import BaseModel
-from services.database.orm.news import get_news_by_query_params
+
+from app.routers.authentication import get_current_active_community
+from app.schemas import News
+from app.services.database.models import Community as DBCommunity
+from app.services.database.orm.news import create_news, get_news_by_query_params
 
 
 class NewsPostResponse(BaseModel):
@@ -22,10 +29,22 @@ def setup():
         summary="News endpoint",
         description="Creates news and returns a confirmation message",
     )
-    async def post_news():
+    async def post_news(
+        request: Request,
+        current_community: Annotated[
+            DBCommunity, Depends(get_current_active_community)
+        ],
+        news: News,
+        user_email: str = Header(..., alias="user-email"),
+    ):
         """
         News endpoint that creates news and returns a confirmation message.
         """
+        news_dict = news.__dict__
+        news_dict["user_email"] = user_email
+        await create_news(
+            session=request.app.db_session_factory, news=news_dict
+        )
         return NewsPostResponse()
 
     @router.get(
@@ -35,16 +54,25 @@ async def post_news():
         summary="Get News",
         description="Retrieves news filtered by user and query params",
     )
-    async def get_news(request: Request):
+    async def get_news(
+        request: Request,
+        current_community: Annotated[
+            DBCommunity, Depends(get_current_active_community)
+        ],
+        id: str | None = None,
+        user_email: str = Header(..., alias="user-email"),
+        category: str | None = None,
+        tags: str | None = None,
+    ):
         """
         Get News endpoint that retrieves news filtered by user and query params.
         """
         news_list = await get_news_by_query_params(
             session=request.app.db_session_factory,
-            id=request.query_params.get("id"),
-            user_email=request.headers.get("user-email"),
-            category=request.query_params.get("category"),
-            tags=request.query_params.get("tags"),
+            id=id,
+            email=user_email,
+            category=category,
+            tags=tags,
         )
         return NewsGetResponse(news_list=news_list)
 

app/schemas.py

@@ -1,31 +1,26 @@
 from datetime import date
-from enum import Enum
 from typing import List
 
-from pydantic import BaseModel, HttpUrl
+from pydantic import BaseModel
 
-
-class LibraryTagEnum(str, Enum):
-    UPDATES = "updates"
-    BUG_FIX = "bug_fix"
-    NEW_FEATURE = "new_feature"
-    SECURITY_FIX = "security_fix"
-    DEPRECATION = "deprecation"
+from app.enums import LibraryTagUpdatesEnum
 
 
 class LibraryNews(BaseModel):
-    tag: LibraryTagEnum
+    tag: LibraryTagUpdatesEnum
     description: str
 
 
 class Library(BaseModel):
+    id: int | None = None
     library_name: str
     news: List[LibraryNews]
-    logo: HttpUrl
+    logo: str
     version: str
     release_date: date
-    releases_doc_url: HttpUrl
-    fixed_release_url: HttpUrl
+    releases_doc_url: str
+    fixed_release_url: str
+    language: str
 
 
 # Community / User Class
@@ -39,6 +34,16 @@ class CommunityInDB(Community):
     password: str
 
 
+class News(BaseModel):
+    title: str
+    content: str
+    category: str
+    tags: str | None = None
+    source_url: str
+    social_media_url: str | None = None
+    likes: int = 0
+
+
 class Token(BaseModel):
     access_token: str
     token_type: str
@@ -51,5 +56,5 @@ class TokenPayload(BaseModel):
 
 class Subscription(BaseModel):
     email: str
-    tags: List[LibraryTagEnum]
+    tags: List[LibraryTagUpdatesEnum]
     libraries_list: List[str]

app/services/database/models/libraries.py

@@ -1,6 +1,7 @@
 from datetime import date
-from typing import Optional
+from typing import List, Optional
 
+from sqlalchemy import JSON, Column
 from sqlmodel import Field, SQLModel
 
 
@@ -9,12 +10,13 @@ class Library(SQLModel, table=True):
 
     id: Optional[int] = Field(default=None, primary_key=True)
     library_name: str
-    user_email: str
+    news: List[dict] = Field(sa_column=Column(JSON))
     logo: str
     version: str
     release_date: date
     releases_doc_url: str
     fixed_release_url: str
+    language: str
     community_id: Optional[int] = Field(
         default=None, foreign_key="communities.id"
     )

app/services/database/models/subscriptions.py

@@ -1,16 +1,17 @@
 from typing import List, Optional
 
-from schemas import LibraryTagEnum
 from sqlalchemy import JSON, Column
 from sqlmodel import Field, SQLModel
 
+from app.enums import LibraryTagUpdatesEnum
+
 
 class Subscription(SQLModel, table=True):
     __tablename__ = "subscriptions"  # type: ignore
 
     id: Optional[int] = Field(default=None, primary_key=True)
     email: str
-    tags: List[LibraryTagEnum] = Field(sa_column=Column(JSON))
+    tags: List[LibraryTagUpdatesEnum] = Field(sa_column=Column(JSON))
     community_id: Optional[int] = Field(
         default=None, foreign_key="communities.id"
     )

app/services/database/orm/library.py

@@ -26,3 +26,14 @@ async def get_library_ids_by_multiple_names(
     )
     result = await session.exec(statement)
     return [id for id in result.all() if id is not None]
+
+
+async def get_libraries_by_language(
+    language: str,
+    session: AsyncSession,
+) -> List[Library]:
+    statement = select(Library).where(
+        func.lower(Library.language) == language.lower()
+    )
+    result = await session.exec(statement)
+    return [library for library in result.all()]