Fix unit tests

dolfinus · dolfinus · commit baca4819677f · 2025-12-26T17:39:22.000+03:00
diff --git a/syncmaster/db/repositories/transfer.py b/syncmaster/db/repositories/transfer.py
@@ -32,7 +32,7 @@ async def paginate(
         self,
         page: int,
         page_size: int,
-        group_id: int | None = None,
+        group_id: int,
         search_query: str | None = None,
         source_connection_id: int | None = None,
         target_connection_id: int | None = None,
diff --git a/syncmaster/server/api/v1/connections.py b/syncmaster/server/api/v1/connections.py
@@ -41,7 +41,7 @@ async def read_connections(  # noqa: PLR0913
     group_id: int,
     current_user: Annotated[User, Depends(get_user())],
     unit_of_work: Annotated[UnitOfWork, Depends(UnitOfWork)],
-    page: Annotated[int, Query(gt=0)] = 20,
+    page: Annotated[int, Query(gt=0)] = 1,
     page_size: Annotated[int, Query(gt=0, le=50)] = 20,
     type: Annotated[list[ConnectionType] | None, Query()] = None,
     search_query: Annotated[
diff --git a/syncmaster/server/api/v1/groups.py b/syncmaster/server/api/v1/groups.py
@@ -30,7 +30,7 @@
 async def read_groups(  # noqa: PLR0913
     current_user: Annotated[User, Depends(get_user())],
     unit_of_work: Annotated[UnitOfWork, Depends(UnitOfWork)],
-    page: Annotated[int, Query(gt=0)] = 20,
+    page: Annotated[int, Query(gt=0)] = 1,
     page_size: Annotated[int, Query(gt=0, le=50)] = 20,
     role: Annotated[str | None, Query()] = None,
     search_query: Annotated[
@@ -157,7 +157,7 @@ async def read_group_users(
     group_id: int,
     current_user: Annotated[User, Depends(get_user())],
     unit_of_work: Annotated[UnitOfWork, Depends(UnitOfWork)],
-    page: Annotated[int, Query(gt=0)] = 20,
+    page: Annotated[int, Query(gt=0)] = 1,
     page_size: Annotated[int, Query(gt=0, le=50)] = 20,
 ) -> UserPageSchemaAsGroupMember:
     resource_role = await unit_of_work.group.get_group_permission(
diff --git a/syncmaster/server/api/v1/queue.py b/syncmaster/server/api/v1/queue.py
@@ -28,7 +28,7 @@ async def read_queues(  # noqa: PLR0913
     group_id: int,
     current_user: Annotated[User, Depends(get_user())],
     unit_of_work: Annotated[UnitOfWork, Depends(UnitOfWork)],
-    page: Annotated[int, Query(gt=0)] = 20,
+    page: Annotated[int, Query(gt=0)] = 1,
     page_size: Annotated[int, Query(gt=0, le=50)] = 20,
     search_query: Annotated[
         str | None,
@@ -141,13 +141,10 @@ async def delete_queue(
         raise ActionNotAllowedError
 
     queue = await unit_of_work.queue.read_by_id(queue_id=queue_id)
-
-    transfers = await unit_of_work.transfer.paginate(queue_id=queue.id, page=1, page_size=1)
-    if transfers.total:
+    transfers = await unit_of_work.transfer.paginate(group_id=queue.group_id, queue_id=queue.id, page=1, page_size=1)
+    if transfers.items:
         msg = f"The queue has an associated transfers(s). Number of the linked transfers: {transfers.total}"
-        raise QueueDeleteError(
-            msg,
-        )
+        raise QueueDeleteError(msg)
 
     async with unit_of_work:
         await unit_of_work.queue.delete(queue_id=queue_id)
diff --git a/syncmaster/server/api/v1/runs.py b/syncmaster/server/api/v1/runs.py
@@ -32,7 +32,7 @@ async def read_runs(  # noqa: PLR0913
     transfer_id: int,
     unit_of_work: Annotated[UnitOfWork, Depends(UnitOfWork)],
     current_user: Annotated[User, Depends(get_user())],
-    page: Annotated[int, Query(gt=0)] = 20,
+    page: Annotated[int, Query(gt=0)] = 1,
     page_size: Annotated[int, Query(gt=0, le=50)] = 20,
     status: Annotated[list[Status] | None, Query()] = None,
     started_at_since: Annotated[datetime | None, Query()] = None,
diff --git a/syncmaster/server/api/v1/transfers.py b/syncmaster/server/api/v1/transfers.py
@@ -35,7 +35,7 @@ async def read_transfers(  # noqa: PLR0913
     group_id: int,
     current_user: Annotated[User, Depends(get_user())],
     unit_of_work: Annotated[UnitOfWork, Depends(UnitOfWork)],
-    page: Annotated[int, Query(gt=0)] = 20,
+    page: Annotated[int, Query(gt=0)] = 1,
     page_size: Annotated[int, Query(gt=0, le=50)] = 20,
     search_query: Annotated[
         str | None,
diff --git a/syncmaster/server/api/v1/users.py b/syncmaster/server/api/v1/users.py
@@ -21,7 +21,7 @@
 async def get_users(
     current_user: Annotated[User, Depends(get_user())],
     unit_of_work: Annotated[UnitOfWork, Depends(UnitOfWork)],
-    page: Annotated[int, Query(gt=0)] = 20,
+    page: Annotated[int, Query(gt=0)] = 1,
     page_size: Annotated[int, Query(gt=0, le=50)] = 20,
     search_query: Annotated[str | None, Query(title="Search Query", description="fuzzy search for users")] = None,
 ) -> UserPageSchema:
diff --git a/tests/test_integration/test_run_transfer/connection_fixtures/s3_fixtures.py b/tests/test_integration/test_run_transfer/connection_fixtures/s3_fixtures.py
@@ -1,4 +1,3 @@
-import logging
 import secrets
 from pathlib import PosixPath, PurePosixPath
 from typing import NamedTuple
@@ -14,8 +13,6 @@
 from tests.settings import TestSettings
 from tests.test_unit.utils import create_connection, create_credentials, upload_files
 
-logger = logging.getLogger(__name__)
-
 
 @pytest.fixture(
     scope="session",
@@ -141,17 +138,14 @@ def prepare_s3(
     s3_file_connection: S3,
     s3_file_df_connection_with_path: tuple[SparkS3, PurePosixPath],
 ):
-    logger.info("START PREPARE S3")
     connection, remote_path = s3_file_df_connection_with_path
 
     s3_file_connection.remove_dir(remote_path, recursive=True)
     files = upload_files(resource_path, remote_path, s3_file_connection)
 
     yield connection, remote_path, files
 
-    logger.info("START POST-CLEANUP S3")
     s3_file_connection.remove_dir(remote_path, recursive=True)
-    logger.info("END POST-CLEANUP S3")
 
 
 @pytest_asyncio.fixture
diff --git a/tests/test_integration/test_run_transfer/test_ftps.py b/tests/test_integration/test_run_transfer/test_ftps.py
@@ -135,7 +135,6 @@ async def test_run_transfer_ftps_to_postgres_with_full_strategy(
     strategy: dict,
 ):
     postgres, _ = prepare_postgres
-    _file_format, _ = source_file_format
 
     await run_transfer_and_verify(client, group_owner, ftps_to_postgres.id)
 
diff --git a/tests/test_integration/test_run_transfer/test_samba.py b/tests/test_integration/test_run_transfer/test_samba.py
@@ -135,7 +135,6 @@ async def test_run_transfer_samba_to_postgres_with_full_strategy(
     strategy: dict,
 ):
     postgres, _ = prepare_postgres
-    _file_format, _ = source_file_format
 
     await run_transfer_and_verify(client, group_owner, samba_to_postgres.id)
 
diff --git a/tests/test_integration/test_run_transfer/test_sftp.py b/tests/test_integration/test_run_transfer/test_sftp.py
@@ -139,7 +139,6 @@ async def test_run_transfer_sftp_to_postgres_with_full_strategy(
     transformations: list[dict],
 ):
     postgres, _ = prepare_postgres
-    _file_format, _ = source_file_format
 
     await run_transfer_and_verify(client, group_owner, sftp_to_postgres.id)
 
diff --git a/tests/test_unit/test_queues/test_delete_queue.py b/tests/test_unit/test_queues/test_delete_queue.py
@@ -119,14 +119,14 @@ async def test_maintainer_plus_cannot_delete_queue_with_linked_transfer(
         headers={"Authorization": f"Bearer {user.token}"},
     )
 
+    assert response.status_code == 409, response.text
     assert response.json() == {
         "error": {
             "code": "conflict",
             "message": "The queue has an associated transfers(s). Number of the linked transfers: 1",
             "details": None,
         },
     }
-    assert response.status_code == 409, response.text
 
 
 async def test_superuser_cannot_delete_queue_with_linked_transfer(
@@ -139,14 +139,14 @@ async def test_superuser_cannot_delete_queue_with_linked_transfer(
         headers={"Authorization": f"Bearer {superuser.token}"},
     )
 
+    assert response.status_code == 409, response.text
     assert response.json() == {
         "error": {
             "code": "conflict",
             "message": "The queue has an associated transfers(s). Number of the linked transfers: 1",
             "details": None,
         },
     }
-    assert response.status_code == 409, response.text
 
 
 async def test_anon_user_cannot_delete_queue(
@@ -157,14 +157,15 @@ async def test_anon_user_cannot_delete_queue(
     response = await client.delete(
         f"v1/queues/{group_queue.id}",
     )
+
+    assert response.status_code == 401, response.text
     assert response.json() == {
         "error": {
             "code": "unauthorized",
             "message": "Not authenticated",
             "details": None,
         },
     }
-    assert response.status_code == 401, response.text
 
 
 async def test_maintainer_plus_cannot_delete_unknown_queue_error(
@@ -179,6 +180,8 @@ async def test_maintainer_plus_cannot_delete_unknown_queue_error(
         "v1/queues/-1",
         headers={"Authorization": f"Bearer {user.token}"},
     )
+
+    assert response.status_code == 404, response.text
     assert response.json() == {
         "error": {
             "code": "not_found",
@@ -190,15 +193,13 @@ async def test_maintainer_plus_cannot_delete_unknown_queue_error(
 
 async def test_superuser_cannot_delete_unknown_queue_error(
     client: AsyncClient,
-    session: AsyncSession,
-    group_queue: Queue,
-    mock_group: MockGroup,
     superuser: MockUser,
 ):
     response = await client.delete(
         "v1/queues/-1",
         headers={"Authorization": f"Bearer {superuser.token}"},
     )
+
     assert response.status_code == 404, response.text
     assert response.json() == {
         "error": {
