fix:Bug fixed sorting and assets

alembic/versions/81425575a724_modified_assets_and_leave_table.py

@@ -0,0 +1,83 @@
+"""modified assets and leave table
+
+Revision ID: 711b27b4aefb
+Revises: c5bdab52a98c
+Create Date: 2025-12-11 09:57:04.269110
+"""
+
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+revision: str = "81425575a724"
+down_revision: Union[str, Sequence[str], None] = "c5bdab52a98c"
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+
+    # 1️⃣ Add asset_id as NULLABLE first (to avoid NOT NULL error)
+    op.add_column("assets", sa.Column("asset_id", sa.String(), nullable=True))
+
+    # 2️⃣ Populate asset_id for existing rows (if any)
+    op.execute("UPDATE assets SET asset_id = 'TEMP-' || id::text")
+
+    # 3️⃣ Make asset_id NOT NULL
+    op.alter_column("assets", "asset_id", nullable=False)
+
+    # 4️⃣ Add unique constraint
+    op.create_unique_constraint("unique_assetid_type", "assets", ["asset_id", "type"])
+
+    # 5️⃣ Drop old 'name' column safely
+    op.drop_column("assets", "name")
+
+    # 6️⃣ Leave the `id` column alone — DO NOT convert VARCHAR → UUID
+    # (This fixes the UUID casting error)
+
+    # 7️⃣ Convert leave timestamps
+    op.alter_column(
+        "leave",
+        "requested_at",
+        existing_type=sa.DATE(),
+        type_=sa.DateTime(),
+        existing_nullable=False,
+    )
+
+    op.alter_column(
+        "leave",
+        "updated_at",
+        existing_type=sa.DATE(),
+        type_=sa.DateTime(),
+        existing_nullable=False,
+    )
+
+
+def downgrade() -> None:
+
+    # Reverse leave changes
+    op.alter_column(
+        "leave",
+        "updated_at",
+        existing_type=sa.DateTime(),
+        type_=sa.DATE(),
+        existing_nullable=False,
+    )
+
+    op.alter_column(
+        "leave",
+        "requested_at",
+        existing_type=sa.DateTime(),
+        type_=sa.DATE(),
+        existing_nullable=False,
+    )
+
+    # Restore name field
+    op.add_column("assets", sa.Column("name", sa.String(), nullable=False))
+
+    # Drop unique constraint
+    op.drop_constraint("unique_assetid_type", "assets", type_="unique")
+
+    # Remove asset_id
+    op.drop_column("assets", "asset_id")

src/core/models.py

@@ -94,7 +94,10 @@ class UserTeamsRole(SQLModel, table=True):
 
 class Assets(SQLModel, table=True):
     __tablename__ = "assets"
-    id: str = Field(primary_key=True)
+    id: uuid.UUID = Field(
+        default_factory=uuid.uuid4,
+        primary_key=True,
+    )
     user_id: uuid.UUID = Field(
         sa_column=Column(
             UUID(as_uuid=True),
@@ -102,10 +105,11 @@ class Assets(SQLModel, table=True):
             nullable=False,
         )
     )
-    name: str = Field(nullable=False)
+    asset_id: str = Field(sa_column=Column("asset_id", String, nullable=False))
     type: str = Field(nullable=False)
     status: AssetStatus = Field(default=AssetStatus.UNAVAILABLE)
     user: "Users" = Relationship(back_populates="asset")
+    __table_args__ = (UniqueConstraint("asset_id", "type", name="unique_assetid_type"),)
 
 
 class EmotionLogs(SQLModel, table=True):

src/data_add/seed_from_excel.py

@@ -194,16 +194,30 @@ async def seed_from_excel(session: AsyncSession, excel_path="src/data_add/users.
         assets_list = parse_assets_from_excel(clean(row["assets"]))
 
         for asset in assets_list:
-            asset_id = normalize_asset_id(asset.get("id"))
-            asset_type = asset.get("type", "Unknown")
+            raw_id = clean(asset.get("id"))
+            raw_type = clean(asset.get("type"))
 
-            if not asset_id:
+            if not raw_id:
                 continue
 
+            # Clean & normalize asset id (your YB-12 format)
+            asset_id = normalize_asset_id(raw_id)
+            asset_type = raw_type or "Unknown"
+
+            # Skip duplicates (because of unique constraint asset_id + type)
+            existing = await session.exec(
+                select(Assets).where(
+                    Assets.asset_id == asset_id, Assets.type == asset_type
+                )
+            )
+            if existing.first():
+                print(f"⚠ Skipping duplicate asset: {asset_id} ({asset_type})")
+                continue
+
+            # Insert new asset
             asset_obj = Assets(
-                id=asset_id,
                 user_id=user.id,
-                name=asset_type,
+                asset_id=asset_id,
                 type=asset_type,
                 status=AssetStatus.ACTIVE,
             )

src/profile/models.py

@@ -48,8 +48,8 @@ class Leave(SQLModel, table=True):
     status: LeaveStatus = Field(default=LeaveStatus.PENDING)
     is_delivered: bool = Field(default= False)
     is_read: bool = Field(default=False)
-    requested_at: date = Field(default_factory=date.today)
-    updated_at: date = Field(default_factory=date.today)
+    requested_at: datetime = Field(default_factory=datetime.utcnow)
+    updated_at: datetime = Field(default_factory=datetime.utcnow)
     reject_reason: Optional[str] = None
 
 class UserDevices(SQLModel, table=True):

src/profile/router.py

@@ -645,9 +645,9 @@ async def get_profile(
     # Convert SQL rows → Pydantic
     assets_dto = [
         AssetResponse(
-            id=a.id,
+            id=str(a.id),
             user_id=a.user_id,
-            name=a.name,
+            asset_id=a.asset_id,
             type=a.type,
             status=a.status,
         )

src/profile/schemas.py

@@ -95,7 +95,7 @@ class AssetUpdateRequest(BaseModel):
 class AssetResponse(BaseModel):
     id: str
     user_id: uuid.UUID
-    name: str
+    asset_id: str
     type: str
     status: AssetStatus