fix:updated assets and payslip body

alembic/versions/c5bdab52a98c_modified_assets_id.py

@@ -0,0 +1,39 @@
+"""modified assets id
+
+Revision ID: c5bdab52a98c
+Revises: a34f13019598
+Create Date: 2025-12-08 14:05:03.769843
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+import sqlmodel.sql.sqltypes
+
+
+# revision identifiers, used by Alembic.
+revision: str = 'c5bdab52a98c'
+down_revision: Union[str, Sequence[str], None] = 'a34f13019598'
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    """Upgrade schema."""
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.alter_column('assets', 'id',
+               existing_type=sa.UUID(),
+               type_=sqlmodel.sql.sqltypes.AutoString(),
+               existing_nullable=False)
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    """Downgrade schema."""
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.alter_column('assets', 'id',
+               existing_type=sqlmodel.sql.sqltypes.AutoString(),
+               type_=sa.UUID(),
+               existing_nullable=False)
+    # ### end Alembic commands ###

requirements.txt

@@ -15,6 +15,7 @@ cryptography==46.0.3
 dnspython==2.8.0
 ecdsa==0.19.1
 email-validator==2.3.0
+et_xmlfile==2.0.0
 fastapi==0.121.0
 filelock==3.20.0
 flatbuffers==25.9.23
@@ -40,7 +41,9 @@ mpmath==1.3.0
 numpy==2.2.6
 oauthlib==3.3.1
 onnxruntime==1.23.2
+openpyxl==3.1.5
 packaging==25.0
+pandas==2.3.3
 passlib==1.7.4
 pgvector==0.4.1
 proto-plus==1.26.1
@@ -58,6 +61,7 @@ python-dateutil==2.9.0.post0
 python-dotenv==1.2.1
 python-jose==3.5.0
 python-multipart==0.0.20
+pytz==2025.2
 PyYAML==6.0.3
 regex==2025.11.3
 requests==2.32.5
@@ -75,6 +79,7 @@ tqdm==4.67.1
 transformers==4.57.1
 typing-inspection==0.4.2
 typing_extensions==4.15.0
+tzdata==2025.2
 uritemplate==4.2.0
 urllib3==2.5.0
 uvicorn==0.38.0

src/core/models.py

@@ -18,6 +18,7 @@ class AssetStatus(str, Enum):
     ON_REQUEST = "On Request"
     IN_SERVICE = "In Service"
 
+
 class Emotion(str, Enum):
     JOYFUL = "joyful"
     HAPPY = "happy"
@@ -26,12 +27,14 @@ class Emotion(str, Enum):
     ANXIOUS = "anxious"
     SAD = "sad"
     FRUSTRATED = "frustrated"
-    
+
+
 class AppVersion(SQLModel, table=True):
     __tablename__ = "app_version"
     version: str = Field(primary_key=True)
     apk_download_link: str
 
+
 class Users(SQLModel, table=True):
     __tablename__ = "users"
     id: uuid.UUID = Field(default_factory=uuid.uuid4, primary_key=True)
@@ -91,7 +94,7 @@ class UserTeamsRole(SQLModel, table=True):
 
 class Assets(SQLModel, table=True):
     __tablename__ = "assets"
-    id: uuid.UUID = Field(default_factory=uuid.uuid4, primary_key=True)
+    id: str = Field(primary_key=True)
     user_id: uuid.UUID = Field(
         sa_column=Column(
             UUID(as_uuid=True),
@@ -120,11 +123,14 @@ class EmotionLogs(SQLModel, table=True):
     )
 
     morning_emotion: Optional[Emotion] = Field(
-    sa_column=Column(SQLEnum(Emotion, name="emotion_enum", native_enum=True), nullable=True)
-)
+        sa_column=Column(
+            SQLEnum(Emotion, name="emotion_enum", native_enum=True), nullable=True
+        )
+    )
     evening_emotion: Optional[Emotion] = Field(
-    sa_column=Column(SQLEnum(Emotion, name="emotion_enum", native_enum=True), nullable=True)
-)
+        sa_column=Column(
+            SQLEnum(Emotion, name="emotion_enum", native_enum=True), nullable=True
+        )
+    )
 
     log_date: date = Field(default_factory=date.today)
-

src/data_add/seed_from_excel.py

@@ -0,0 +1,214 @@
+import pandas as pd
+import asyncio
+import math
+import json
+from datetime import datetime, date
+from sqlmodel import select
+from sqlmodel.ext.asyncio.session import AsyncSession
+
+from passlib.context import CryptContext
+
+from src.core.database import async_session
+from src.core.models import Users, Teams, Roles, UserTeamsRole, Assets, AssetStatus
+
+
+# ---------------------------------------------
+# PASSWORD HASHER
+# ---------------------------------------------
+pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto")
+
+
+def hash_password(password: str) -> str:
+    return pwd_context.hash(password)
+
+
+# ---------------------------------------------
+# CLEAN NaN / EMPTY VALUES
+# ---------------------------------------------
+def clean(value):
+    if value is None:
+        return None
+    if isinstance(value, float) and math.isnan(value):
+        return None
+    if isinstance(value, str) and value.strip() == "":
+        return None
+    return value
+
+
+# ---------------------------------------------
+# NORMALIZE ASSET ID (NEW)
+# ---------------------------------------------
+def normalize_asset_id(value: str) -> str:
+    """Convert messy input to clean format YB-73-M or YB-77-MS"""
+    if not value:
+        return None
+
+    value = value.strip().replace(" ", "")
+    value = value.upper()
+
+    # Fix repeated hyphens
+    while "--" in value:
+        value = value.replace("--", "-")
+
+    # If looks like YB73M (missing hyphens)
+    if "-" not in value:
+        prefix = value[:2]  # YB
+        number = "".join(filter(str.isdigit, value))
+        suffix = value[len(prefix) + len(number) :]
+        return f"{prefix}-{number}-{suffix}"
+
+    return value
+
+
+# ---------------------------------------------
+# ASSET TYPE MAP (fallback)
+# ---------------------------------------------
+ASSET_TYPE_MAP = {
+    "M": "Monitor",
+    "L": "Laptop",
+    "H": "Headphone",
+    "MS": "Mouse",
+}
+
+
+# ---------------------------------------------
+# get_or_create
+# ---------------------------------------------
+async def get_or_create(session: AsyncSession, model, name: str):
+    result = await session.exec(select(model).where(model.name == name))
+    row = result.first()
+    if row:
+        return row
+
+    row = model(name=name)
+    session.add(row)
+    await session.commit()
+    await session.refresh(row)
+    return row
+
+
+# ---------------------------------------------
+# PARSE ASSETS JSON
+# ---------------------------------------------
+def parse_assets_from_excel(raw_value):
+    if raw_value is None:
+        return []
+
+    raw = str(raw_value).strip()
+    raw = raw.replace('""', '"')
+
+    if raw.startswith('"') and raw.endswith('"'):
+        raw = raw[1:-1]
+
+    try:
+        parsed = json.loads(raw)
+        if isinstance(parsed, list):
+            return parsed
+        return []
+    except:
+        return []
+
+
+# ---------------------------------------------
+# MAIN IMPORT
+# ---------------------------------------------
+async def seed_from_excel(session: AsyncSession, excel_path="src/data_add/users.xlsx"):
+    df = pd.read_excel(excel_path)
+    print("\n📌 Importing users from Excel...\n")
+
+    for _, row in df.iterrows():
+
+        # --- DOB ---
+        raw_dob = clean(row["dob"])
+        dob = None
+        if isinstance(raw_dob, str):
+            try:
+                dob = datetime.strptime(raw_dob, "%d.%m.%Y").date()
+            except:
+                dob = None
+        elif isinstance(raw_dob, datetime):
+            dob = raw_dob.date()
+        else:
+            dob = raw_dob
+
+        # --- CREATE USER (is_verified = True) ---
+        user = Users(
+            email_id=row["email"],
+            password=hash_password(row["password"]),
+            user_name=row["User_name"],
+            dob=dob,
+            address=clean(row["address"]),
+            join_date=str(clean(row["join_date"])),
+            is_verified=True,  # <--- Added here
+        )
+
+        session.add(user)
+        await session.commit()
+        await session.refresh(user)
+
+        # --- TEAM / ROLE ---
+        team = await get_or_create(session, Teams, row["team"])
+        role = await get_or_create(session, Roles, row["role"])
+
+        mapping = UserTeamsRole(
+            user_id=user.id,
+            team_id=team.id,
+            role_id=role.id,
+        )
+        session.add(mapping)
+
+        # --- ASSETS JSON ---
+        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")
+
+            if not asset_id:
+                continue
+
+            asset_obj = Assets(
+                id=asset_id,  # cleaned ID like YB-73-M
+                user_id=user.id,
+                name=asset_type,  # Monitor
+                type=asset_type,  # Monitor
+                status=AssetStatus.ACTIVE,
+            )
+
+            session.add(asset_obj)
+
+        await session.commit()
+
+    print("\n🎉 Excel Import Completed Successfully!\n")
+
+
+# ---------------------------------------------
+# RUN SEEDS
+# ---------------------------------------------
+async def run_all_seeds():
+
+    async with async_session() as session:
+
+        print("\n🟦 Seeding TEAMS...")
+        for t in [
+            "AI/Tech",
+            "Shared services",
+            "Digital Marketing",
+            "Bevolve",
+            "Bridge",
+            "HR",
+        ]:
+            await get_or_create(session, Teams, t)
+
+        print("\n🟦 Seeding ROLES...")
+        for r in ["Mentor", "Team Lead", "HR", "Member"]:
+            await get_or_create(session, Roles, r)
+
+        print("\n🟦 Importing USERS from Excel...")
+        await seed_from_excel(session, "src/data_add/users.xlsx")
+
+        print("\n✔ All seeding complete!\n")
+
+
+if __name__ == "__main__":
+    asyncio.run(run_all_seeds())

src/payslip/service.py

@@ -51,7 +51,7 @@ async def one_request_per_day(session: AsyncSession, user_id):
 
 
 async def get_hr_email(session: AsyncSession):
-    q = select(Roles).where(Roles.name == "HR Manager")
+    q = select(Roles).where(Roles.name == "HR")
     role = (await session.execute(q)).scalar_one_or_none()
     if not role:
         raise HTTPException(500, "HR role missing")
@@ -118,9 +118,14 @@ async def process_payslip_request(
     # 8. Build email body
     subject = "Payslip Request"
     body = (
-        f"Payslip request from {user.user_name} ({user.email_id})\n"
-        f"Team: {team}\n"
-        f"Period: {period_start} → {period_end}\n"
+        f"Dear Team,\n\n"
+        f"I would like to request the payslip for the following period:\n\n"
+        f"Employee Name : {user.user_name}\n"
+        f"Email         : {user.email_id}\n"
+        f"Team          : {team}\n"
+        f"Period        : {period_start} → {period_end}\n\n"
+        f"Kindly process this request at the earliest.\n"
+        f"Thank you.\n"
     )
 
     raw = build_email(user.email_id, hr_email, subject, body)

src/profile/schemas.py

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