[BREAKING] - remove is_deleted for Connection model

Author: maxim-lixakov

syncmaster/db/migrations/versions/2023-11-23_0004_create_connection_table.py

@@ -33,7 +33,6 @@ def upgrade():
         sa.Column("name", sa.String(length=128), nullable=False),
         sa.Column("description", sa.String(length=512), nullable=False),
         sa.Column("data", sa.JSON(), nullable=False),
-        sa.Column("is_deleted", sa.Boolean(), nullable=False),
         sa.Column("created_at", sa.DateTime(), server_default=sa.text("now()"), nullable=False),
         sa.Column("updated_at", sa.DateTime(), server_default=sa.text("now()"), nullable=False),
         sa.Column("search_vector", postgresql.TSVECTOR(), sa.Computed(sql_expression, persisted=True), nullable=False),

syncmaster/db/models/connection.py

@@ -8,12 +8,12 @@
 from sqlalchemy.dialects.postgresql import TSVECTOR
 from sqlalchemy.orm import Mapped, declared_attr, mapped_column, relationship
 
-from syncmaster.db.mixins import DeletableMixin, ResourceMixin, TimestampMixin
+from syncmaster.db.mixins import ResourceMixin, TimestampMixin
 from syncmaster.db.models.base import Base
 from syncmaster.db.models.group import Group
 
 
-class Connection(Base, ResourceMixin, DeletableMixin, TimestampMixin):
+class Connection(Base, ResourceMixin, TimestampMixin):
     data: Mapped[dict[str, Any]] = mapped_column(JSON, nullable=False, default={})
 
     group: Mapped[Group] = relationship("Group")

syncmaster/db/repositories/connection.py

@@ -32,7 +32,6 @@ async def paginate(
         connection_type: list[str] | None = None,
     ) -> Pagination:
         stmt = select(Connection).where(
-            Connection.is_deleted.is_(False),
             Connection.group_id == group_id,
         )
         if search_query:
@@ -53,7 +52,7 @@ async def read_by_id(
         self,
         connection_id: int,
     ) -> Connection:
-        stmt = select(Connection).where(Connection.id == connection_id, Connection.is_deleted.is_(False))
+        stmt = select(Connection).where(Connection.id == connection_id)
         result: ScalarResult[Connection] = await self._session.scalars(stmt)
         try:
             return result.one()
@@ -99,7 +98,6 @@ async def update(
 
             return await self._update(
                 Connection.id == connection_id,
-                Connection.is_deleted.is_(False),
                 name=name or connection.name,
                 description=description or connection.description,
                 data=data,

tests/test_unit/test_connections/test_copy_connection.py

@@ -13,11 +13,9 @@
 pytestmark = [pytest.mark.asyncio, pytest.mark.backend]
 
 
-@pytest.mark.parametrize("is_delete_source", [True, False])
 async def test_maintainer_plus_can_copy_connection_with_delete_source(
     client: AsyncClient,
     session: AsyncSession,
-    is_delete_source: bool,
     settings: Settings,
     group_connection: MockConnection,
     empty_group: MockGroup,
@@ -44,7 +42,6 @@ async def test_maintainer_plus_can_copy_connection_with_delete_source(
         "user": "user",
         "password": "password",
     }
-    assert not current.is_deleted
 
     query_copy_not_exist = select(Connection).filter(
         Connection.group_id == empty_group.id,
@@ -61,7 +58,6 @@ async def test_maintainer_plus_can_copy_connection_with_delete_source(
         headers={"Authorization": f"Bearer {user.token}"},
         json={
             "new_group_id": empty_group.id,
-            "remove_source": is_delete_source,
         },
     )
 
@@ -73,7 +69,6 @@ async def test_maintainer_plus_can_copy_connection_with_delete_source(
     }
     assert result.status_code == 200
 
-    await session.refresh(group_connection.connection)
     query_prev_row = select(Connection).where(Connection.id == curr_id)
     result_prev_row = await session.scalars(query_prev_row)
     origin = result_prev_row.one()
@@ -100,19 +95,15 @@ async def test_maintainer_plus_can_copy_connection_with_delete_source(
         "user": "user",
         "password": "password",
     }
-    assert origin.is_deleted == is_delete_source
-    assert not new.is_deleted
     assert not creds_new
 
 
-@pytest.mark.parametrize("is_delete_source", [True, False])
 async def test_superuser_can_copy_connection(
     client: AsyncClient,
     group_connection: MockConnection,
     superuser: MockUser,
     empty_group: MockGroup,
     session: AsyncSession,
-    is_delete_source: str,
     settings: Settings,
 ):
     # Arrange
@@ -132,7 +123,6 @@ async def test_superuser_can_copy_connection(
         "user": "user",
         "password": "password",
     }
-    assert not current.is_deleted
 
     query_copy_not_exist = select(Connection).filter(
         Connection.group_id == empty_group.id,
@@ -149,7 +139,6 @@ async def test_superuser_can_copy_connection(
         headers={"Authorization": f"Bearer {superuser.token}"},
         json={
             "new_group_id": empty_group.id,
-            "remove_source": is_delete_source,
         },
     )
 
@@ -189,8 +178,6 @@ async def test_superuser_can_copy_connection(
         "user": "user",
         "password": "password",
     }
-    assert origin.is_deleted == is_delete_source
-    assert not new.is_deleted
     assert not creds_new
 
 
@@ -280,7 +267,7 @@ async def test_not_in_both_groups_user_can_not_copy_connection(
     query_current_row = select(Connection).where(Connection.id == group_connection.id)
 
     result_current_row = await session.scalars(query_current_row)
-    current = result_current_row.one()
+    result_current_row.one()
 
     query_current_creds = select(AuthData).where(AuthData.connection_id == group_connection.id)
     result_current_creds = await session.scalars(query_current_creds)
@@ -291,7 +278,6 @@ async def test_not_in_both_groups_user_can_not_copy_connection(
         "user": "user",
         "password": "password",
     }
-    assert not current.is_deleted
 
     query_copy_not_exist = select(Connection).filter(
         Connection.group_id == empty_group.id,
@@ -338,7 +324,7 @@ async def test_groupless_user_can_not_copy_connection(
     query_current_row = select(Connection).where(Connection.id == group_connection.id)
 
     result_current_row = await session.scalars(query_current_row)
-    current = result_current_row.one()
+    result_current_row.one()
 
     query_current_creds = select(AuthData).where(AuthData.connection_id == group_connection.id)
     result_current_creds = await session.scalars(query_current_creds)
@@ -349,7 +335,6 @@ async def test_groupless_user_can_not_copy_connection(
         "user": "user",
         "password": "password",
     }
-    assert not current.is_deleted
 
     query_copy_not_exist = select(Connection).filter(
         Connection.group_id == empty_group.id,

tests/test_unit/test_connections/test_delete_connection.py

@@ -17,8 +17,7 @@ async def test_maintainer_plus_can_delete_connection(
     # Arraange
     user = group_connection.owner_group.get_member_of_role(role_maintainer_plus)
     connection_id = group_connection.connection.id
-    connection = await session.get(Connection, connection_id)
-    assert not connection.is_deleted
+    await session.get(Connection, connection_id)
 
     # Act
     result = await client.delete(
@@ -33,9 +32,6 @@ async def test_maintainer_plus_can_delete_connection(
         "message": "Connection was deleted",
     }
     assert result.status_code == 200
-    deleted_connection = await session.get(Connection, connection_id)
-    await session.refresh(deleted_connection)
-    assert deleted_connection.is_deleted
 
 
 async def test_groupless_user_cannot_delete_connection(
@@ -59,8 +55,6 @@ async def test_groupless_user_cannot_delete_connection(
             "details": None,
         },
     }
-    await session.refresh(group_connection.connection)
-    assert not group_connection.connection.is_deleted
 
 
 async def test_maintainer_plus_cannot_delete_connection_with_linked_transfer(
@@ -87,8 +81,6 @@ async def test_maintainer_plus_cannot_delete_connection_with_linked_transfer(
         },
     }
     assert result.status_code == 409
-    await session.refresh(group_transfer.source_connection)
-    assert not group_transfer.source_connection.is_deleted
 
 
 async def test_other_group_member_cannot_delete_group_connection(