Fix display number bug

Author: lickem22

core_backend/app/contents/models.py

@@ -69,14 +69,14 @@ class ContentDB(Base):
     created_datetime_utc: Mapped[datetime] = mapped_column(
         DateTime(timezone=True), nullable=False
     )
+    display_number: Mapped[int] = mapped_column(Integer, nullable=False, default=0)
     is_archived: Mapped[bool] = mapped_column(Boolean, nullable=False, default=False)
     positive_votes: Mapped[int] = mapped_column(Integer, nullable=False, default=0)
     negative_votes: Mapped[int] = mapped_column(Integer, nullable=False, default=0)
     query_count: Mapped[int] = mapped_column(Integer, nullable=False, default=0)
     updated_datetime_utc: Mapped[datetime] = mapped_column(
         DateTime(timezone=True), nullable=False
     )
-    display_number: Mapped[int] = mapped_column(Integer, nullable=False, default=0)
     workspace_id: Mapped[int] = mapped_column(
         Integer,
         ForeignKey("workspace.workspace_id", ondelete="CASCADE"),
@@ -100,6 +100,7 @@ def __repr__(self) -> str:
             f"content_metadata={self.content_metadata}, "
             f"content_tags={self.content_tags}, "
             f"created_datetime_utc={self.created_datetime_utc}, "
+            f"display_number={self.display_number}, "
             f"is_archived={self.is_archived}), "
             f"updated_datetime_utc={self.updated_datetime_utc}), "
             f"workspace_id={self.workspace_id}"
@@ -352,7 +353,7 @@ async def get_list_of_content_from_db(
         select(ContentDB)
         .options(selectinload(ContentDB.content_tags))
         .where(ContentDB.workspace_id == workspace_id)
-        .order_by(ContentDB.content_id)
+        .order_by(ContentDB.display_number)
     )
     if exclude_archived:
         stmt = stmt.where(ContentDB.is_archived == false())
@@ -361,7 +362,7 @@ async def get_list_of_content_from_db(
     if isinstance(limit, int) and limit > 0:
         stmt = stmt.limit(limit)
     content_rows = (await asession.execute(stmt)).all()
-
+    print([c[0] for c in content_rows])
     return [c[0] for c in content_rows] if content_rows else []
 
 

core_backend/app/contents/routers.py

@@ -1045,6 +1045,7 @@ def _convert_record_to_schema(*, record: ContentDB) -> ContentRetrieve:
         content_text=record.content_text,
         content_title=record.content_title,
         created_datetime_utc=record.created_datetime_utc,
+        display_number=record.display_number,
         is_archived=record.is_archived,
         negative_votes=record.negative_votes,
         positive_votes=record.positive_votes,

core_backend/app/contents/schemas.py

@@ -33,6 +33,7 @@ class ContentRetrieve(ContentCreate):
     """Pydantic model for content retrieval response."""
 
     content_id: int
+    display_number: int
     created_datetime_utc: datetime
     is_archived: bool
     negative_votes: int

core_backend/migrations/versions/2025_03_12_b1daed9f42c4_add_display_number.py

@@ -20,24 +20,27 @@
 
 def upgrade() -> None:
     # ### commands auto generated by Alembic - please adjust! ###
-    op.add_column("content", sa.Column("display_number", sa.Integer(), nullable=False))
+    op.add_column(
+        "content",
+        sa.Column("display_number", sa.Integer(), nullable=False, server_default="0"),
+    )
 
     connection = op.get_bind()
 
     # 2
-    workspaces = connection.execute(sa.text('SELECT * FROM "workspaces"')).mappings()
+    workspaces = connection.execute(sa.text('SELECT * FROM "workspace"')).mappings()
     for workspace in workspaces:
-        workspace_id = workspace["id"]
+        workspace_id = workspace["workspace_id"]
         content = connection.execute(
             sa.text(
-                f'SELECT * FROM "content" WHERE "workspace_id" = {workspace_id}'
+                f'SELECT * FROM "content" WHERE "workspace_id" = {workspace_id} '
                 f'ORDER BY "created_datetime_utc"'
             )
         ).mappings()
         for i, row in enumerate(content):
             connection.execute(
                 sa.text(
-                    f'UPDATE "content" SET "display_number" = {i + 1}'
+                    f'UPDATE "content" SET "display_number" = {i + 1} '
                     f'WHERE "content_id" = {row["content_id"]}'
                 )
             )