Extract services from users and links

Author: koldakov

futuramaapi/routers/__init__.py

@@ -6,12 +6,14 @@
 from .rest.crypto import router as crypto_router
 from .rest.episodes import router as episodes_router
 from .rest.favorites import router as favorites_router
+from .rest.links import router as links_router
 from .rest.notifications import router as notification_router
 from .rest.randoms import router as randoms_router
 from .rest.root import router as root_router
 from .rest.seasons import router as seasons_router
 from .rest.tokens import router as tokens_router
 from .rest.users import router as users_router
+from .rest.users_new import router as users_new_router
 
 __all__ = [
     "api_router",
@@ -30,4 +32,6 @@
 api_router.include_router(seasons_router)
 api_router.include_router(tokens_router)
 api_router.include_router(users_router)
+api_router.include_router(users_new_router)
+api_router.include_router(links_router)
 api_router.include_router(favorites_router)

futuramaapi/routers/rest/links/__init__.py

@@ -0,0 +1,5 @@
+from .api import router
+
+__all__ = [
+    "router",
+]

futuramaapi/routers/rest/links/api.py

@@ -0,0 +1,78 @@
+from typing import Annotated
+
+from fastapi import APIRouter, Depends, Path, status
+from fastapi_pagination import Page
+
+from futuramaapi.repositories import INT32
+from futuramaapi.routers.rest.users.dependencies import _oauth2_scheme
+from futuramaapi.routers.services.links.create_link import (
+    CreateLinkRequest,
+    CreateLinkResponse,
+    CreateLinkService,
+)
+from futuramaapi.routers.services.links.get_link import GetLinkResponse, GetLinkService
+from futuramaapi.routers.services.links.list_links import (
+    ListLinksResponse,
+    ListLinksService,
+)
+
+router = APIRouter(
+    prefix="/links",
+    tags=["Links"],
+)
+
+
+@router.post(
+    "",
+    name="create_link",
+)
+async def create_link(
+    token: Annotated[str, Depends(_oauth2_scheme)],
+    data: CreateLinkRequest,
+) -> CreateLinkResponse:
+    """Generate shortened URL."""
+    service: CreateLinkService = CreateLinkService(
+        token=token,
+        request_data=data,
+    )
+    return await service()
+
+
+@router.get(
+    "/{link_id}",
+    status_code=status.HTTP_200_OK,
+    response_model=GetLinkResponse,
+    name="get_link",
+)
+async def get_link(
+    link_id: Annotated[
+        int,
+        Path(
+            le=INT32,
+        ),
+    ],
+    token: Annotated[str, Depends(_oauth2_scheme)],
+) -> GetLinkResponse:
+    service: GetLinkService = GetLinkService(
+        token=token,
+        link_id=link_id,
+    )
+    return await service()
+
+
+@router.get(
+    "",
+    status_code=status.HTTP_200_OK,
+    response_model=Page[ListLinksResponse],
+    name="list_links",
+)
+async def list_links(
+    token: Annotated[str, Depends(_oauth2_scheme)],
+) -> Page[ListLinksResponse]:
+    """Retrieve user links."""
+    service: ListLinksService = ListLinksService(
+        token=token,
+        offset=0,
+        limit=20,
+    )
+    return await service()

futuramaapi/routers/rest/users/api.py

@@ -6,7 +6,7 @@
 
 from futuramaapi.repositories import INT32, FilterStatementKwargs
 from futuramaapi.repositories.session import get_async_session
-from futuramaapi.routers.exceptions import ModelExistsError, ModelNotFoundError, UnauthorizedResponse
+from futuramaapi.routers.exceptions import ModelNotFoundError, UnauthorizedResponse
 
 from .dependencies import from_form_signature, from_signature, from_token, password_from_form_data
 from .schemas import (
@@ -15,7 +15,6 @@
     PasswordChange,
     User,
     UserAlreadyActivatedError,
-    UserCreateRequest,
     UserPasswordChangeRequest,
     UserSearchResponse,
     UserUpdateRequest,
@@ -27,55 +26,6 @@
 )
 
 
-@router.post(
-    "",
-    status_code=status.HTTP_201_CREATED,
-    response_model=User,
-    name="user",
-)
-async def create_user(
-    data: UserCreateRequest,
-    session: AsyncSession = Depends(get_async_session),  # noqa: B008
-) -> User:
-    """Create User.
-
-    The user add endpoint is an API function allowing the creation of new user accounts.
-    It receives user details via HTTP requests, validates the information,
-    and stores it in the system's database.
-    This endpoint is essential for user registration and onboarding.
-
-    Please note that currently endpoint is not protected.
-    However, if there are a lot of spam requests, the endpoint will be blocked or limited.
-    """
-    try:
-        return await User.create(session, data)
-    except ModelExistsError:
-        raise HTTPException(
-            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
-            detail="User already exists.",
-        ) from None
-
-
-@router.get(
-    "/me",
-    responses={
-        status.HTTP_401_UNAUTHORIZED: {
-            "model": UnauthorizedResponse,
-        },
-    },
-    name="user_me",
-)
-async def get_me(
-    user: Annotated[User, Depends(from_token)],
-) -> User:
-    """Get user details.
-
-    Retrieve authenticated user profile information, including username, email, and account details.
-    Personalize user experiences within the application using the JSON response containing user-specific data.
-    """
-    return user
-
-
 @router.get(
     "/activate",
     include_in_schema=False,
@@ -101,29 +51,6 @@ async def activate_user(
         ) from None
 
 
-@router.put(
-    "",
-    responses={
-        status.HTTP_401_UNAUTHORIZED: {
-            "model": UnauthorizedResponse,
-        },
-    },
-    name="update_user",
-)
-async def update_user(
-    user: Annotated[User, Depends(from_token)],
-    data: UserUpdateRequest,
-    session: AsyncSession = Depends(get_async_session),  # noqa: B008
-) -> User:
-    """Update user details.
-
-    This endpoint is crucial for users to manage and maintain accurate profile information,
-    often including authentication and authorization checks for security.
-    """
-    await user.update(session, data)
-    return user
-
-
 @router.post(
     "/confirmations/resend",
     responses={
@@ -207,6 +134,8 @@ async def change_user_password(
 @router.post(
     "/links",
     name="generate_user_link",
+    description="This endpoint is deprecated and will be removed in version 1.12.1. Please use `/api/links` instead.",
+    deprecated=True,
 )
 async def create_user_link(
     data: LinkCreateRequest,
@@ -228,6 +157,8 @@ async def create_user_link(
     status_code=status.HTTP_200_OK,
     response_model=Page[Link],
     name="user_links",
+    description="This endpoint is deprecated and will be removed in version 1.12.1. Please use `/api/links` instead.",
+    deprecated=True,
 )
 async def get_user_links(
     user: Annotated[User, Depends(from_token)],
@@ -249,6 +180,9 @@ async def get_user_links(
     status_code=status.HTTP_200_OK,
     response_model=Link,
     name="user_link",
+    description="This endpoint is deprecated and will be removed in version 1.12.1. "
+    "Please use `/api/links/{link_id}` instead.",
+    deprecated=True,
 )
 async def get_user_link(
     link_id: Annotated[
@@ -302,34 +236,3 @@ async def search_user(
         },
     )
     return await UserSearchResponse.paginate(session, filter_params=filter_params)
-
-
-@router.get(
-    "",
-    status_code=status.HTTP_200_OK,
-    response_model=Page[UserSearchResponse],
-    name="users",
-)
-async def get_users(
-    query: Annotated[
-        str | None,
-        Query(
-            alias="query",
-            description="Search by username.",
-            max_length=128,
-        ),
-    ] = None,
-    session: AsyncSession = Depends(get_async_session),  # noqa: B008
-) -> UserSearchResponse:
-    """Get users.
-
-    Retrieve users. Search by username.
-    """
-    filter_params: FilterStatementKwargs = FilterStatementKwargs(
-        offset=0,
-        limit=20,
-        extra={
-            "query": query,
-        },
-    )
-    return await UserSearchResponse.paginate(session, filter_params=filter_params)

futuramaapi/routers/rest/users_new/__init__.py

@@ -0,0 +1,5 @@
+from .api import router
+
+__all__ = [
+    "router",
+]