chore:merge leave and assets in profile

src/assets/router.py

@@ -1,30 +0,0 @@
-from fastapi import APIRouter, Depends
-from sqlmodel.ext.asyncio.session import AsyncSession
-from src.core.database import get_async_session
-from src.auth.utils import get_current_user
-from src.assets.schemas import BaseResponse
-from src.assets.service import list_user_assets
-
-router = APIRouter(prefix="/assets", tags=["Assets"])
-
-@router.get("/", response_model=BaseResponse)
-async def get_assets(
-    user_id: str = Depends(get_current_user),
-    session: AsyncSession = Depends(get_async_session)
-):
-    assets = await list_user_assets(session, user_id)
-
-    data = {
-        "assets": [
-            {
-                "id": a.id,
-                "name": a.name,
-                "type": a.type,
-                "status": a.status,
-            }
-            for a in assets
-        ]
-    }
-
-    return {"code": 200, "data": data}
-    

src/assets/schemas.py

@@ -1,31 +0,0 @@
-from typing import Optional
-from pydantic import BaseModel
-import uuid
-from enum import Enum
-
-class AssetStatus(str, Enum):
-    ACTIVE = "Active"
-    UNAVAILABLE = "Unavailable"
-    ON_REQUEST = "On Request"
-    IN_SERVICE = "In Service"
-
-class AssetCreateRequest(BaseModel):
-    name: str
-    type: str
-    status: Optional[AssetStatus] = AssetStatus.UNAVAILABLE
-
-class AssetUpdateRequest(BaseModel):
-    name: Optional[str] = None
-    type: Optional[str] = None
-    status: Optional[AssetStatus] = None
-
-class AssetResponse(BaseModel):
-    id: uuid.UUID
-    user_id: uuid.UUID
-    name: str
-    type: str
-    status: AssetStatus
-
-class BaseResponse(BaseModel):
-    code: int
-    data: dict

src/assets/service.py

@@ -1,11 +0,0 @@
-import uuid
-from typing import List
-from sqlmodel import select
-from sqlmodel.ext.asyncio.session import AsyncSession
-from src.core.models import Assets
-
-async def list_user_assets(session: AsyncSession, user_id: str) -> List[Assets]:
-    q = await session.exec(
-        select(Assets).where(Assets.user_id == uuid.UUID(user_id))
-    )
-    return q.all()

src/leave/router.py

@@ -1,91 +0,0 @@
-from src.leave.utils import send_email
-from fastapi import APIRouter, Depends, HTTPException
-from sqlmodel import select
-from sqlmodel.ext.asyncio.session import AsyncSession
-from src.auth.utils import get_current_user
-from src.core.database import get_async_session
-from src.core.models import Users, Teams, Roles, UserTeamsRole
-from src.auth.schemas import BaseResponse
-from fastapi import BackgroundTasks
-
-router = APIRouter(prefix="/leave", tags=["leave"])
-
-
-@router.get("/contacts", response_model=BaseResponse)
-async def get_leave_contacts(
-    current_user=Depends(get_current_user),
-    session: AsyncSession = Depends(get_async_session),
-):
-    # get_current_user returns a STRING user_id
-    user_id = current_user
-
-    if not user_id:
-        raise HTTPException(status_code=400, detail="Invalid user token")
-
-    # 1) Get user's team
-    stmt = select(UserTeamsRole).where(UserTeamsRole.user_id == user_id)
-    ut = (await session.exec(stmt)).first()
-
-    if not ut:
-        raise HTTPException(status_code=404, detail="User-Team mapping not found")
-
-    # 2) Get Team Lead role
-    lead_role = (
-        await session.exec(select(Roles).where(Roles.name == "Team Lead"))
-    ).first()
-
-    if not lead_role:
-        raise HTTPException(status_code=500, detail="Team Lead role not found")
-
-    # 3) Find Team Lead user in same team
-    lead_user = (
-        await session.exec(
-            select(Users)
-            .join(UserTeamsRole)
-            .where(UserTeamsRole.team_id == ut.team_id)
-            .where(UserTeamsRole.role_id == lead_role.id)
-        )
-    ).all()
-
-    if not lead_user:
-        raise HTTPException(status_code=404, detail="Team lead not found")
-
-    to_email = ", ".join([u.email_id for u in lead_user])
-
-    # 4) HR CC emails
-    hr_team = (await session.exec(select(Teams).where(Teams.name == "HR Team"))).first()
-
-    cc = []
-    if hr_team:
-        hr_users = (
-            await session.exec(
-                select(Users)
-                .join(UserTeamsRole)
-                .where(UserTeamsRole.team_id == hr_team.id)
-            )
-        ).all()
-
-        cc = [str(row.email_id) for row in hr_users]
-
-    return BaseResponse(code=200, message="success", data={"to": to_email, "cc": cc})
-
-
-@router.post("/send", response_model=BaseResponse)
-async def send_leave_email(
-    payload: dict,
-    background: BackgroundTasks,
-    current_user=Depends(get_current_user),
-):
-    from_email = payload.get("from_email")
-    to_email = payload.get("to")
-    cc = payload.get("cc", [])
-    subject = payload.get("subject")
-    body = payload.get("body")
-
-    if not subject or not body:
-        raise HTTPException(status_code=400, detail="Subject and body required")
-
-    # send in background so API returns fast
-    background.add_task(send_email, to_email, subject, body, cc, from_email)
-
-    return BaseResponse(code=200, message="Leave request sent", data=None)

src/leave/utils.py

@@ -1,50 +0,0 @@
-# src/core/email_utils.py
-import smtplib
-from email.message import EmailMessage
-from src.core.config import settings
-from typing import List
-
-
-SMTP_HOST = settings.EMAIL_SERVER
-SMTP_PORT = settings.EMAIL_PORT
-SMTP_USER = settings.EMAIL_USERNAME
-SMTP_PASS = settings.EMAIL_PASSWORD
-FROM_DEFAULT = settings.EMAIL_USERNAME
-
-
-def send_email(
-    to_email: str, subject: str, body: str, cc: list[str] = None, from_email: str = None
-):
-    """
-    Gmail cannot send as another user.
-    So we set 'From' = your Gmail, but 'Reply-To' = user email.
-    """
-
-    cc = cc or []
-
-    msg = EmailMessage()
-    msg["Subject"] = subject
-
-    # Always send FROM your SMTP account
-    msg["From"] = settings.EMAIL_USERNAME
-
-    # Show this as reply address
-    if from_email:
-        msg["Reply-To"] = from_email
-
-    msg["To"] = to_email
-
-    if cc:
-        msg["Cc"] = ", ".join(cc)
-
-    msg.set_content(body)
-
-    try:
-        with smtplib.SMTP(settings.EMAIL_SERVER, settings.EMAIL_PORT) as server:
-            server.starttls()
-            server.login(settings.EMAIL_USERNAME, settings.EMAIL_PASSWORD)
-
-            server.send_message(msg)
-
-    except Exception as e:
-        raise Exception(f"Email sending failed: {str(e)}")

src/main.py

@@ -17,9 +17,9 @@ app.include_router(auth_router)
 
 app.include_router(profile)
 
-app.include_router(assets)
+# app.include_router(assets)
 
-app.include_router(leave)
+# app.include_router(leave)
 
 
 @app.get("/")

src/profile/router.py

@@ -6,10 +6,46 @@ from sqlalchemy.ext.asyncio.session import AsyncSession
 from fastapi.params import Depends
 from .schemas import UpdateProfileRequest
 from src.profile.service import update_user_profile
+from fastapi import APIRouter, Depends
+from sqlmodel.ext.asyncio.session import AsyncSession
+from src.core.database import get_async_session
+from src.auth.utils import get_current_user
+from src.assets.schemas import BaseResponse
+from src.assets.service import list_user_assets
+from src.leave.utils import send_email
+from fastapi import APIRouter, Depends, HTTPException
+from sqlmodel import select
+from sqlmodel.ext.asyncio.session import AsyncSession
+from src.auth.utils import get_current_user
+from src.core.models import Users, Teams, Roles, UserTeamsRole
+from fastapi import BackgroundTasks
+
 
 router = APIRouter(prefix="/profile", tags=["Profile"])
 
 
+@router.get("/", response_model=BaseResponse)
+async def get_assets(
+    user_id: str = Depends(get_current_user),
+    session: AsyncSession = Depends(get_async_session),
+):
+    assets = await list_user_assets(session, user_id)
+
+    data = {
+        "assets": [
+            {
+                "id": a.id,
+                "name": a.name,
+                "type": a.type,
+                "status": a.status,
+            }
+            for a in assets
+        ]
+    }
+
+    return {"code": 200, "data": data}
+
+
 @router.put("/update-profile", response_model=BaseResponse)
 async def update_profile(
     payload: UpdateProfileRequest,
@@ -18,3 +54,85 @@ async def update_profile(
 ):
     result = await update_user_profile(session, user_id, payload)
     return {"code": 200, "data": result}
+
+
+
+@router.get("/contacts", response_model=BaseResponse)
+async def get_leave_contacts(
+    current_user=Depends(get_current_user),
+    session: AsyncSession = Depends(get_async_session),
+):
+    # get_current_user returns a STRING user_id
+    user_id = current_user
+
+    if not user_id:
+        raise HTTPException(status_code=400, detail="Invalid user token")
+
+    # 1) Get user's team
+    stmt = select(UserTeamsRole).where(UserTeamsRole.user_id == user_id)
+    ut = (await session.exec(stmt)).first()
+
+    if not ut:
+        raise HTTPException(status_code=404, detail="User-Team mapping not found")
+
+    # 2) Get Team Lead role
+    lead_role = (
+        await session.exec(select(Roles).where(Roles.name == "Team Lead"))
+    ).first()
+
+    if not lead_role:
+        raise HTTPException(status_code=500, detail="Team Lead role not found")
+
+    # 3) Find Team Lead user in same team
+    lead_user = (
+        await session.exec(
+            select(Users)
+            .join(UserTeamsRole)
+            .where(UserTeamsRole.team_id == ut.team_id)
+            .where(UserTeamsRole.role_id == lead_role.id)
+        )
+    ).all()
+
+    if not lead_user:
+        raise HTTPException(status_code=404, detail="Team lead not found")
+
+    to_email = ", ".join([u.email_id for u in lead_user])
+
+    # 4) HR CC emails
+    hr_team = (await session.exec(select(Teams).where(Teams.name == "HR Team"))).first()
+
+    cc = []
+    if hr_team:
+        hr_users = (
+            await session.exec(
+                select(Users)
+                .join(UserTeamsRole)
+                .where(UserTeamsRole.team_id == hr_team.id)
+            )
+        ).all()
+
+        cc = [str(row.email_id) for row in hr_users]
+
+    return BaseResponse(code=200, message="success", data={"to": to_email, "cc": cc})
+
+
+@router.post("/send", response_model=BaseResponse)
+async def send_leave_email(
+    payload: dict,
+    background: BackgroundTasks,
+    current_user=Depends(get_current_user),
+):
+    from_email = payload.get("from_email")
+    to_email = payload.get("to")
+    cc = payload.get("cc", [])
+    subject = payload.get("subject")
+    body = payload.get("body")
+
+    if not subject or not body:
+        raise HTTPException(status_code=400, detail="Subject and body required")
+
+    # send in background so API returns fast
+    background.add_task(send_email, to_email, subject, body, cc, from_email)
+
+    return BaseResponse(code=200, message="Leave request sent", data=None)
+

src/profile/schemas.py

@@ -1,5 +1,35 @@
 from pydantic import BaseModel, EmailStr
 from typing import Optional
+import uuid
+from enum import Enum
+
+class AssetStatus(str, Enum):
+    ACTIVE = "Active"
+    UNAVAILABLE = "Unavailable"
+    ON_REQUEST = "On Request"
+    IN_SERVICE = "In Service"
+
+class AssetCreateRequest(BaseModel):
+    name: str
+    type: str
+    status: Optional[AssetStatus] = AssetStatus.UNAVAILABLE
+
+class AssetUpdateRequest(BaseModel):
+    name: Optional[str] = None
+    type: Optional[str] = None
+    status: Optional[AssetStatus] = None
+
+class AssetResponse(BaseModel):
+    id: uuid.UUID
+    user_id: uuid.UUID
+    name: str
+    type: str
+    status: AssetStatus
+
+class BaseResponse(BaseModel):
+    code: int
+    data: dict
+
 
 class UpdateProfileRequest(BaseModel):
     name: Optional[str] = None

src/profile/service.py

@@ -1,8 +1,15 @@
+from src.core.models import Assets
+from ast import List
 from datetime import datetime
 import uuid
 from fastapi import HTTPException
 from passlib.context import CryptContext
 from src.core.models import Users
+import uuid
+from typing import List
+from sqlmodel import select
+from sqlmodel.ext.asyncio.session import AsyncSession
+from src.core.models import Assets
 
 pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto")
 
@@ -63,3 +70,9 @@ async def update_user_profile(session, user_id: str, data):
             "is_verified": user.is_verified,
         },
     }
+
+async def list_user_assets(session: AsyncSession, user_id: str) -> List[Assets]:
+    q = await session.exec(
+        select(Assets).where(Assets.user_id == uuid.UUID(user_id))
+    )
+    return q.all()

src/profile/utils.py

@@ -0,0 +1,50 @@
+# src/core/email_utils.py
+import smtplib
+from email.message import EmailMessage
+from src.core.config import settings
+from typing import List
+
+
+SMTP_HOST = settings.EMAIL_SERVER
+SMTP_PORT = settings.EMAIL_PORT
+SMTP_USER = settings.EMAIL_USERNAME
+SMTP_PASS = settings.EMAIL_PASSWORD
+FROM_DEFAULT = settings.EMAIL_USERNAME
+
+
+def send_email(
+    to_email: str, subject: str, body: str, cc: list[str] = None, from_email: str = None
+):
+    """
+    Gmail cannot send as another user.
+    So we set 'From' = your Gmail, but 'Reply-To' = user email.
+    """
+
+    cc = cc or []
+
+    msg = EmailMessage()
+    msg["Subject"] = subject
+
+    # Always send FROM your SMTP account
+    msg["From"] = settings.EMAIL_USERNAME
+
+    # Show this as reply address
+    if from_email:
+        msg["Reply-To"] = from_email
+
+    msg["To"] = to_email
+
+    if cc:
+        msg["Cc"] = ", ".join(cc)
+
+    msg.set_content(body)
+
+    try:
+        with smtplib.SMTP(settings.EMAIL_SERVER, settings.EMAIL_PORT) as server:
+            server.starttls()
+            server.login(settings.EMAIL_USERNAME, settings.EMAIL_PASSWORD)
+
+            server.send_message(msg)
+
+    except Exception as e:
+        raise Exception(f"Email sending failed: {str(e)}")