Skip to content

Commit 3a325f9

Browse files
[BREAKING] - remove is_deleted for Connection model (#170)
* [BREAKING] - remove is_deleted for Connection model * [BREAKING] - split tests
1 parent b61a019 commit 3a325f9

File tree

6 files changed

+174
-90
lines changed

6 files changed

+174
-90
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Add deletion of **connections** records instead of marking them as deleted

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ def upgrade():
3333
sa.Column("name", sa.String(length=128), nullable=False),
3434
sa.Column("description", sa.String(length=512), nullable=False),
3535
sa.Column("data", sa.JSON(), nullable=False),
36-
sa.Column("is_deleted", sa.Boolean(), nullable=False),
3736
sa.Column("created_at", sa.DateTime(), server_default=sa.text("now()"), nullable=False),
3837
sa.Column("updated_at", sa.DateTime(), server_default=sa.text("now()"), nullable=False),
3938
sa.Column("search_vector", postgresql.TSVECTOR(), sa.Computed(sql_expression, persisted=True), nullable=False),

syncmaster/db/models/connection.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
from sqlalchemy.dialects.postgresql import TSVECTOR
99
from sqlalchemy.orm import Mapped, declared_attr, mapped_column, relationship
1010

11-
from syncmaster.db.mixins import DeletableMixin, ResourceMixin, TimestampMixin
11+
from syncmaster.db.mixins import ResourceMixin, TimestampMixin
1212
from syncmaster.db.models.base import Base
1313
from syncmaster.db.models.group import Group
1414

1515

16-
class Connection(Base, ResourceMixin, DeletableMixin, TimestampMixin):
16+
class Connection(Base, ResourceMixin, TimestampMixin):
1717
data: Mapped[dict[str, Any]] = mapped_column(JSON, nullable=False, default={})
1818

1919
group: Mapped[Group] = relationship("Group")

syncmaster/db/repositories/connection.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ async def paginate(
3232
connection_type: list[str] | None = None,
3333
) -> Pagination:
3434
stmt = select(Connection).where(
35-
Connection.is_deleted.is_(False),
3635
Connection.group_id == group_id,
3736
)
3837
if search_query:
@@ -53,7 +52,7 @@ async def read_by_id(
5352
self,
5453
connection_id: int,
5554
) -> Connection:
56-
stmt = select(Connection).where(Connection.id == connection_id, Connection.is_deleted.is_(False))
55+
stmt = select(Connection).where(Connection.id == connection_id)
5756
result: ScalarResult[Connection] = await self._session.scalars(stmt)
5857
try:
5958
return result.one()
@@ -99,7 +98,6 @@ async def update(
9998

10099
return await self._update(
101100
Connection.id == connection_id,
102-
Connection.is_deleted.is_(False),
103101
name=name or connection.name,
104102
description=description or connection.description,
105103
data=data,

0 commit comments

Comments
 (0)