Merge pull request #53 from PythonFloripa/feature/#44

Feature#44

Author: dan5e3s6ares

app/routers/healthcheck/routes.py

@@ -1,6 +1,8 @@
-from fastapi import APIRouter, status
+from fastapi import APIRouter, Request, status
 from pydantic import BaseModel
 
+from app.services.limiter import limiter
+
 
 class HealthCheckResponse(BaseModel):
     status: str = "healthy"
@@ -17,7 +19,8 @@ def setup():
         summary="Health check endpoint",
         description="Returns the health status of the API",
     )
-    async def healthcheck():
+    @limiter.limit("60/minute")
+    async def healthcheck(request: Request):
         """
         Health check endpoint that returns the current status of the API.
         """

app/routers/libraries/routes.py

@@ -1,13 +1,16 @@
 from typing import Annotated, List
 
 from fastapi import APIRouter, Header, HTTPException, Request, status
+from fastapi.params import Depends
 from pydantic import BaseModel
 
+from app.routers.authentication import get_current_active_community
 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.communities import Community as DBCommunity
 from app.services.database.models.libraries_request import LibraryRequest
 from app.services.database.orm.library import (
     get_libraries_by_language,
@@ -16,6 +19,7 @@
 )
 from app.services.database.orm.library_request import insert_library_request
 from app.services.database.orm.subscription import upsert_multiple_subscription
+from app.services.limiter import limiter
 
 
 class LibraryResponse(BaseModel):
@@ -36,7 +40,14 @@ def setup():
         summary="Get libraries by language",
         description="Get libraries by language",
     )
-    async def get_by_language(request: Request, language: str):
+    @limiter.limit("60/minute")
+    async def get_by_language(
+        request: Request,
+        language: str,
+        current_community: Annotated[
+            DBCommunity, Depends(get_current_active_community)
+        ],
+    ):
         try:
             libraryList = await get_libraries_by_language(
                 language=language, session=request.app.db_session_factory
@@ -71,9 +82,13 @@ async def get_by_language(request: Request, language: str):
         summary="Create a library",
         description="Create a new library to follow",
     )
+    @limiter.limit("60/minute")
     async def create_library(
         request: Request,
         body: LibrarySchema,
+        current_community: Annotated[
+            DBCommunity, Depends(get_current_active_community)
+        ],
     ):
         library = Library(
             library_name=body.library_name,
@@ -84,6 +99,7 @@ async def create_library(
             releases_doc_url=body.releases_doc_url,
             fixed_release_url=body.fixed_release_url,
             language=body.language,
+            community_id=current_community.id,
         )
         try:
             await insert_library(library, request.app.db_session_factory)
@@ -104,10 +120,14 @@ async def create_library(
             "Subscribe to multiple libs and tags to receive libs updates"
         ),
     )
+    @limiter.limit("60/minute")
     async def subscribe_libraries(
         request: Request,
         body: SubscriptionSchema,
         user_email: Annotated[str, Header(alias="user-email")],
+        current_community: Annotated[
+            DBCommunity, Depends(get_current_active_community)
+        ],
     ):
         try:
             library_ids = await get_library_ids_by_multiple_names(
@@ -121,7 +141,10 @@ async def subscribe_libraries(
 
             subscriptions = [
                 Subscription(
-                    user_email=user_email, tags=body.tags, library_id=id
+                    user_email=user_email,
+                    tags=body.tags,
+                    library_id=id,
+                    community_id=current_community.id,
                 )
                 for id in library_ids
             ]
@@ -145,16 +168,21 @@ async def subscribe_libraries(
         summary="Request a library",
         description="Request a library to follow",
     )
+    @limiter.limit("60/minute")
     async def request_library(
         request: Request,
         body: LibraryRequestSchema,
         user_email: Annotated[str, Header(alias="user-email")],
+        current_community: Annotated[
+            DBCommunity, Depends(get_current_active_community)
+        ],
     ):
         try:
             library_request = LibraryRequest(
                 user_email=user_email,
                 library_name=body.library_name,
                 library_home_page=body.library_home_page,
+                community_id=current_community.id,
             )
 
             await insert_library_request(

app/routers/news.py

@@ -10,6 +10,7 @@
 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.limiter import limiter
 
 SECRET_KEY = os.getenv("SECRET_KEY", "default_fallback_key")
 ALGORITHM = os.getenv("ALGORITHM", "HS256")
@@ -43,6 +44,7 @@ def setup():
         summary="News endpoint",
         description="Creates news and returns a confirmation message",
     )
+    @limiter.limit("60/minute")
     async def post_news(
         request: Request,
         current_community: Annotated[
@@ -68,6 +70,7 @@ async def post_news(
         summary="Get News",
         description="Retrieves news filtered by user and query params",
     )
+    @limiter.limit("60/minute")
     async def get_news(
         request: Request,
         current_community: Annotated[
@@ -97,6 +100,7 @@ async def get_news(
         summary="News like endpoint",
         description="Allows user to like a news item",
     )
+    @limiter.limit("60/minute")
     async def post_like(
         request: Request,
         current_community: Annotated[
@@ -123,6 +127,7 @@ async def post_like(
         summary="News undo like endpoint",
         description="Allows user to undo a like to a news item",
     )
+    @limiter.limit("60/minute")
     async def delete_like(
         request: Request,
         current_community: Annotated[

app/routers/news/routes.py

@@ -96,7 +96,7 @@ async def community(session: AsyncSession):
 
 
 @pytest_asyncio.fixture()
-async def token(async_client: AsyncGenerator[AsyncClient, None]) -> str:
+async def token(async_client: AsyncClient) -> str:
     form_data = {
         "grant_type": "password",
         "username": CommunityCredentials.username,

tests/conftest.py

@@ -1,7 +1,7 @@
 from datetime import date
+from typing import Mapping
 
 import pytest
-import pytest_asyncio
 from httpx import AsyncClient
 from sqlmodel import select
 from sqlmodel.ext.asyncio.session import AsyncSession
@@ -11,15 +11,6 @@
 from app.services.database.models import Community, Library
 
 
-@pytest_asyncio.fixture
-async def community(session: AsyncSession):
-    community = Community(username="admin", email="a@a.com", password="123")
-    session.add(community)
-    await session.commit()
-    await session.refresh(community)
-    return community
-
-
 @pytest.mark.asyncio
 async def test_insert_libraries(session: AsyncSession, community: Community):
     library = Library(
@@ -60,7 +51,9 @@ async def test_insert_libraries(session: AsyncSession, community: Community):
 
 @pytest.mark.asyncio
 async def test_post_libraries_endpoint(
-    async_client: AsyncClient, session: AsyncSession
+    session: AsyncSession,
+    async_client: AsyncClient,
+    valid_auth_headers: Mapping[str, str],
 ):
     body = {
         "library_name": "FastAPI",
@@ -79,7 +72,7 @@ async def test_post_libraries_endpoint(
     response = await async_client.post(
         "/api/libraries",
         json=body,
-        headers={"Content-Type": "application/json"},
+        headers=valid_auth_headers,
     )
 
     assert response.status_code == 200
@@ -104,7 +97,10 @@ async def test_post_libraries_endpoint(
 
 
 @pytest.mark.asyncio
-async def test_get_libraries_by_language(async_client: AsyncClient):
+async def test_get_libraries_by_language(
+    async_client: AsyncClient,
+    valid_auth_headers: Mapping[str, str],
+):
     body = {
         "library_name": "FastAPI",
         "news": [
@@ -122,7 +118,7 @@ async def test_get_libraries_by_language(async_client: AsyncClient):
     responsePOST = await async_client.post(
         "/api/libraries",
         json=body,
-        headers={"Content-Type": "application/json"},
+        headers=valid_auth_headers,
     )
 
     assert responsePOST.status_code == 200
@@ -131,6 +127,7 @@ async def test_get_libraries_by_language(async_client: AsyncClient):
     response = await async_client.get(
         "/api/libraries",
         params={"language": "Python"},
+        headers=valid_auth_headers,
     )
 
     assert response.status_code == 200
@@ -153,7 +150,10 @@ async def test_get_libraries_by_language(async_client: AsyncClient):
 
 
 @pytest.mark.asyncio
-async def test_get_libraries_by_inexistent_language(async_client: AsyncClient):
+async def test_get_libraries_by_inexistent_language(
+    async_client: AsyncClient,
+    valid_auth_headers: Mapping[str, str],
+):
     body = {
         "library_name": "FastAPI",
         "news": [
@@ -171,7 +171,7 @@ async def test_get_libraries_by_inexistent_language(async_client: AsyncClient):
     responsePOST = await async_client.post(
         "/api/libraries",
         json=body,
-        headers={"Content-Type": "application/json"},
+        headers=valid_auth_headers,
     )
 
     assert responsePOST.status_code == 200
@@ -180,6 +180,7 @@ async def test_get_libraries_by_inexistent_language(async_client: AsyncClient):
     response = await async_client.get(
         "/api/libraries",
         params={"language": "NodeJS"},
+        headers=valid_auth_headers,
     )
 
     assert response.status_code == 200

tests/test_libraries.py

@@ -1,21 +1,13 @@
+from typing import Mapping
+
 import pytest
-import pytest_asyncio
 from httpx import AsyncClient
 from sqlmodel import select
 from sqlmodel.ext.asyncio.session import AsyncSession
 
 from app.services.database.models import Community, LibraryRequest
 
 
-@pytest_asyncio.fixture
-async def community(session: AsyncSession):
-    community = Community(username="admin", email="a@a.com", password="123")
-    session.add(community)
-    await session.commit()
-    await session.refresh(community)
-    return community
-
-
 @pytest.mark.asyncio
 async def test_insert_libraries(session: AsyncSession, community: Community):
     library = LibraryRequest(
@@ -41,14 +33,17 @@ async def test_insert_libraries(session: AsyncSession, community: Community):
 
 @pytest.mark.asyncio
 async def test_post_libraries_endpoint(
-    async_client: AsyncClient, session: AsyncSession
+    async_client: AsyncClient,
+    session: AsyncSession,
+    community: Community,
+    valid_auth_headers: Mapping[str, str],
 ):
     body = {"library_name": "FastAPI", "library_home_page": "http://teste.com/"}
 
     response = await async_client.post(
         "/api/libraries/request",
         json=body,
-        headers={"Content-Type": "application/json", "user-email": "a@a.com"},
+        headers=valid_auth_headers,
     )
 
     assert response.status_code == 200
@@ -61,5 +56,5 @@ async def test_post_libraries_endpoint(
     created_request = result.first()
 
     assert created_request is not None
-    assert created_request.user_email == "a@a.com"
+    assert created_request.user_email == community.email
     assert created_request.library_home_page == "http://teste.com/"