Refactor user endpoint tests to include pagination and response structure validation

- Updated tests for listing users to validate pagination and response format.
- Changed mock return values to include total count and pagination details.
- Refactored user creation mocks for clarity and consistency.
- Enhanced assertions to check for presence of pagination fields in responses.
- Adjusted test cases for user retrieval and updates to ensure proper handling of user data.
- Improved readability by restructuring mock definitions and assertions across various test files.

app/api/v1/extractions.py

@@ -60,68 +60,13 @@ async def create_extraction(
         }
 
 
-@router.get("/{extraction_id}")
-async def get_extraction(
-    extraction_id: int,
-    current_user: Annotated[User, Depends(get_current_active_user_flexible)],  # noqa: ARG001
-    extraction_service: Annotated[ExtractionService, Depends(get_extraction_service)],
-) -> ExtractionInfo:
-    """Get extraction information by ID."""
-    try:
-        extraction_info = await extraction_service.get_extraction_by_id(extraction_id)
-
-        if not extraction_info:
-            raise HTTPException(
-                status_code=status.HTTP_404_NOT_FOUND,
-                detail=f"Extraction {extraction_id} not found",
-            )
-
-    except HTTPException:
-        raise
-    except Exception as e:
-        raise HTTPException(
-            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
-            detail=f"Failed to get extraction: {e!s}",
-        ) from e
-    else:
-        return extraction_info
-
-
-@router.get("/")
-async def get_all_extractions(
-    extraction_service: Annotated[ExtractionService, Depends(get_extraction_service)],
-    search: Annotated[str | None, Query(description="Search in title, URL, or service")] = None,
-    sort_by: Annotated[str, Query(description="Sort by field")] = "created_at",
-    sort_order: Annotated[str, Query(description="Sort order (asc/desc)")] = "desc",
-    status_filter: Annotated[str | None, Query(description="Filter by status")] = None,
-    page: Annotated[int, Query(description="Page number", ge=1)] = 1,
-    limit: Annotated[int, Query(description="Items per page", ge=1, le=100)] = 50,
-) -> dict:
-    """Get all extractions with optional filtering, search, and sorting."""
-    try:
-        result = await extraction_service.get_all_extractions(
-            search=search,
-            sort_by=sort_by,
-            sort_order=sort_order,
-            status_filter=status_filter,
-            page=page,
-            limit=limit,
-        )
-
-    except Exception as e:
-        raise HTTPException(
-            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
-            detail=f"Failed to get extractions: {e!s}",
-        ) from e
-    else:
-        return result
-
-
 @router.get("/user")
-async def get_user_extractions(
+async def get_user_extractions(  # noqa: PLR0913
     current_user: Annotated[User, Depends(get_current_active_user_flexible)],
     extraction_service: Annotated[ExtractionService, Depends(get_extraction_service)],
-    search: Annotated[str | None, Query(description="Search in title, URL, or service")] = None,
+    search: Annotated[
+        str | None, Query(description="Search in title, URL, or service"),
+    ] = None,
     sort_by: Annotated[str, Query(description="Sort by field")] = "created_at",
     sort_order: Annotated[str, Query(description="Sort order (asc/desc)")] = "desc",
     status_filter: Annotated[str | None, Query(description="Filter by status")] = None,
@@ -153,3 +98,62 @@ async def get_user_extractions(
         ) from e
     else:
         return result
+
+
+@router.get("/{extraction_id}")
+async def get_extraction(
+    extraction_id: int,
+    current_user: Annotated[User, Depends(get_current_active_user_flexible)],  # noqa: ARG001
+    extraction_service: Annotated[ExtractionService, Depends(get_extraction_service)],
+) -> ExtractionInfo:
+    """Get extraction information by ID."""
+    try:
+        extraction_info = await extraction_service.get_extraction_by_id(extraction_id)
+
+        if not extraction_info:
+            raise HTTPException(
+                status_code=status.HTTP_404_NOT_FOUND,
+                detail=f"Extraction {extraction_id} not found",
+            )
+
+    except HTTPException:
+        raise
+    except Exception as e:
+        raise HTTPException(
+            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
+            detail=f"Failed to get extraction: {e!s}",
+        ) from e
+    else:
+        return extraction_info
+
+
+@router.get("/")
+async def get_all_extractions(  # noqa: PLR0913
+    extraction_service: Annotated[ExtractionService, Depends(get_extraction_service)],
+    search: Annotated[
+        str | None, Query(description="Search in title, URL, or service"),
+    ] = None,
+    sort_by: Annotated[str, Query(description="Sort by field")] = "created_at",
+    sort_order: Annotated[str, Query(description="Sort order (asc/desc)")] = "desc",
+    status_filter: Annotated[str | None, Query(description="Filter by status")] = None,
+    page: Annotated[int, Query(description="Page number", ge=1)] = 1,
+    limit: Annotated[int, Query(description="Items per page", ge=1, le=100)] = 50,
+) -> dict:
+    """Get all extractions with optional filtering, search, and sorting."""
+    try:
+        result = await extraction_service.get_all_extractions(
+            search=search,
+            sort_by=sort_by,
+            sort_order=sort_order,
+            status_filter=status_filter,
+            page=page,
+            limit=limit,
+        )
+
+    except Exception as e:
+        raise HTTPException(
+            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
+            detail=f"Failed to get extractions: {e!s}",
+        ) from e
+    else:
+        return result