Skip to content
This repository has been archived by the owner on Oct 11, 2024. It is now read-only.

feat(guideline): enable non-admin users to fetch their own guidelines #113

Merged
merged 4 commits into from
Mar 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/app/api/api_v1/endpoints/guidelines.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,11 @@ async def get_guideline(
@router.get("/", status_code=status.HTTP_200_OK, summary="Fetch all the guidelines")
async def fetch_guidelines(
guidelines: GuidelineCRUD = Depends(get_guideline_crud),
token_payload: TokenPayload = Security(get_token_payload, scopes=[UserScope.ADMIN]),
token_payload: TokenPayload = Security(get_token_payload, scopes=[UserScope.USER, UserScope.ADMIN]),
) -> List[Guideline]:
telemetry_client.capture(token_payload.user_id, event="guideline-fetch")
return [elt for elt in await guidelines.fetch_all()]
filter_pair = ("creator_id", token_payload.user_id) if UserScope.ADMIN not in token_payload.scopes else None
return [elt for elt in await guidelines.fetch_all(filter_pair=filter_pair)]


@router.patch("/{guideline_id}", status_code=status.HTTP_200_OK, summary="Update a guideline content")
Expand Down
13 changes: 7 additions & 6 deletions src/tests/endpoints/test_guidelines.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from typing import Any, Dict, Union
from typing import Any, Dict, List, Union

import pytest
from httpx import AsyncClient
Expand Down Expand Up @@ -73,11 +73,11 @@ async def test_get_guideline(


@pytest.mark.parametrize(
("user_idx", "status_code", "status_detail"),
("user_idx", "status_code", "status_detail", "expected_result"),
[
(None, 401, "Not authenticated"),
(0, 200, None),
(1, 403, "Incompatible token scope."),
(None, 401, "Not authenticated", None),
(0, 200, None, pytest.guideline_table),
(1, 200, None, pytest.guideline_table[1:]),
],
)
@pytest.mark.asyncio()
Expand All @@ -87,6 +87,7 @@ async def test_fetch_guidelines(
user_idx: Union[int, None],
status_code: int,
status_detail: Union[str, None],
expected_result: Union[List[Dict[str, Any]], None],
):
auth = None
if isinstance(user_idx, int):
Expand All @@ -97,7 +98,7 @@ async def test_fetch_guidelines(
if isinstance(status_detail, str):
assert response.json()["detail"] == status_detail
if response.status_code // 100 == 2:
assert response.json() == pytest.guideline_table
assert response.json() == expected_result


@pytest.mark.parametrize(
Expand Down
Loading