Switch from flake8 to ruff

Author: dolfinus

syncmaster/db/models/transfer.py

@@ -60,7 +60,7 @@ class Transfer(
 
     source_connection: Mapped[Connection] = relationship(foreign_keys=source_connection_id)
     target_connection: Mapped[Connection] = relationship(foreign_keys=target_connection_id)
-    queue: Mapped[Queue] = relationship(back_populates="transfers")
+    queue: Mapped[Queue] = relationship()
 
     search_vector: Mapped[str] = mapped_column(
         TSVECTOR,

syncmaster/db/repositories/queue.py

@@ -5,7 +5,6 @@
 from sqlalchemy import ScalarResult, insert, select
 from sqlalchemy.exc import DBAPIError, IntegrityError, NoResultFound
 from sqlalchemy.ext.asyncio import AsyncSession
-from sqlalchemy.orm import selectinload
 
 from syncmaster.db.models import Group, GroupMemberRole, Queue, User, UserGroup
 from syncmaster.db.repositories.repository_with_owner import RepositoryWithOwner
@@ -15,9 +14,6 @@
 from syncmaster.exceptions.group import GroupNotFoundError
 from syncmaster.exceptions.queue import DuplicatedQueueNameError, QueueNotFoundError
 
-# TODO: remove HTTP response schemes from repositories, these are different layers
-from syncmaster.schemas.v1.queue import UpdateQueueSchema
-
 
 class QueueRepository(RepositoryWithOwner[Queue]):
     def __init__(self, session: AsyncSession):
@@ -37,12 +33,7 @@ async def read_by_id(
         self,
         queue_id: int,
     ) -> Queue:
-        stmt = (
-            select(Queue)
-            .where(Queue.id == queue_id)
-            .options(selectinload(Queue.transfers))
-            .options(selectinload(Queue.group))
-        )
+        stmt = select(Queue).where(Queue.id == queue_id)
         try:
             result: ScalarResult[Queue] = await self._session.scalars(stmt)
             return result.one()
@@ -69,16 +60,12 @@ async def paginate(
             page_size=page_size,
         )
 
-    async def update(
-        self,
-        queue_id: int,
-        queue_data: UpdateQueueSchema,
-    ) -> Queue:
+    async def update(self, queue_id: int, name: str, description: str) -> Queue:
         try:
             return await self._update(
                 Queue.id == queue_id,
-                name=queue_data.name,
-                description=queue_data.description,
+                name=name,
+                description=description,
             )
         except IntegrityError as e:
             self._raise_error(e)

syncmaster/server/api/v1/queue.py

@@ -118,7 +118,8 @@ async def update_queue(
     async with unit_of_work:
         queue = await unit_of_work.queue.update(
             queue_id=queue_id,
-            queue_data=queue_data,
+            name=queue_data.name,
+            description=queue_data.description,
         )
     return ReadQueueSchema.model_validate(queue, from_attributes=True)
 

tests/test_unit/test_connections/test_update_connection.py

@@ -480,7 +480,7 @@ async def test_developer_plus_update_oracle_connection_both_sid_and_service_name
     role_developer_plus: UserTestRoles,
 ):
     user = group_connection.owner_group.get_member_of_role(role_developer_plus)
-    group_id = group_connection.connection.group.id
+    group_id = group_connection.connection.group_id
 
     response = await client.put(
         f"v1/connections/{group_connection.id}",

tests/test_unit/test_queues/test_create_queue.py

@@ -309,7 +309,7 @@ async def test_maintainer_plus_can_not_create_queue_with_duplicate_name_error(
         json={
             "name": group_queue.name,  # duplicated name
             "description": "Some interesting description",
-            "group_id": group_queue.group.id,
+            "group_id": group_queue.group_id,
         },
     )
 

tests/test_unit/test_queues/test_read_queue.py

@@ -26,7 +26,7 @@ async def test_group_member_can_read_queue(
         "name": group_queue.name,
         "description": group_queue.description,
         "group_id": group_queue.group_id,
-        "slug": f"{group_queue.group.id}-{group_queue.name}",
+        "slug": f"{group_queue.group_id}-{group_queue.name}",
     }
 
 
@@ -46,7 +46,7 @@ async def test_superuser_can_read_queue(
         "name": group_queue.name,
         "description": group_queue.description,
         "group_id": group_queue.group_id,
-        "slug": f"{group_queue.group.id}-{group_queue.name}",
+        "slug": f"{group_queue.group_id}-{group_queue.name}",
     }