Remove queue reference to transfers

Author: dolfinus

syncmaster/db/models/connection.py

@@ -7,7 +7,7 @@
 
 from sqlalchemy import JSON, Computed, Index, String, UniqueConstraint
 from sqlalchemy.dialects.postgresql import TSVECTOR
-from sqlalchemy.orm import Mapped, declared_attr, mapped_column, relationship
+from sqlalchemy.orm import Mapped, mapped_column, relationship
 from sqlalchemy_utils import ChoiceType
 
 from syncmaster.db.mixins import ResourceMixin, TimestampMixin
@@ -33,6 +33,11 @@ class ConnectionType(StrEnum):
 
 
 class Connection(Base, ResourceMixin, TimestampMixin):
+    __table_args__ = (
+        UniqueConstraint("name", "group_id"),
+        Index("idx_connection_search_vector", "search_vector", postgresql_using="gin"),
+    )
+
     type: Mapped[ConnectionType] = mapped_column(ChoiceType(ConnectionType, impl=String(32)), nullable=False)
     data: Mapped[dict[str, Any]] = mapped_column(JSON, nullable=False, default={})
 
@@ -71,10 +76,3 @@ class Connection(Base, ResourceMixin, TimestampMixin):
 
     def __repr__(self):
         return f"<Connection name={self.name} description={self.description} group_id={self.group_id}>"
-
-    @declared_attr
-    def __table_args__(cls) -> tuple:
-        return (
-            UniqueConstraint("name", "group_id"),
-            Index("idx_connection_search_vector", "search_vector", postgresql_using="gin"),
-        )

syncmaster/db/models/queue.py

@@ -2,27 +2,18 @@
 # SPDX-License-Identifier: Apache-2.0
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
-
 from sqlalchemy import Computed, String
 from sqlalchemy.dialects.postgresql import TSVECTOR
-from sqlalchemy.orm import Mapped, mapped_column, relationship
+from sqlalchemy.orm import Mapped, mapped_column
 
 from syncmaster.db.mixins import ResourceMixin, TimestampMixin
 from syncmaster.db.models.base import Base
 
-if TYPE_CHECKING:
-    from syncmaster.db.models.group import Group
-    from syncmaster.db.models.transfer import Transfer
-
 
 class Queue(Base, ResourceMixin, TimestampMixin):
     name: Mapped[str] = mapped_column(String(128), nullable=False)
     slug: Mapped[str] = mapped_column(String(256), nullable=False, unique=True)
 
-    transfers: Mapped[list[Transfer]] = relationship(back_populates="queue")
-    group: Mapped[Group] = relationship()
-
     search_vector: Mapped[str] = mapped_column(
         TSVECTOR,
         Computed(

syncmaster/db/models/transfer.py

@@ -15,7 +15,7 @@
     UniqueConstraint,
 )
 from sqlalchemy.dialects.postgresql import TSVECTOR
-from sqlalchemy.orm import Mapped, declared_attr, mapped_column, relationship
+from sqlalchemy.orm import Mapped, mapped_column, relationship
 
 from syncmaster.db.mixins import ResourceMixin, TimestampMixin
 from syncmaster.db.models.base import Base
@@ -31,6 +31,11 @@ class Transfer(
     ResourceMixin,
     TimestampMixin,
 ):
+    __table_args__ = (
+        UniqueConstraint("name", "group_id"),
+        Index("idx_transfer_search_vector", "search_vector", postgresql_using="gin"),
+    )
+
     source_connection_id: Mapped[int] = mapped_column(
         BigInteger,
         ForeignKey("connection.id", ondelete="CASCADE"),
@@ -110,10 +115,3 @@ class Transfer(
         nullable=False,
         deferred=True,
     )
-
-    @declared_attr
-    def __table_args__(cls) -> tuple:
-        return (
-            UniqueConstraint("name", "group_id"),
-            Index("idx_transfer_search_vector", "search_vector", postgresql_using="gin"),
-        )

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
@@ -34,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()

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}",
     }