Fixed

alembic/versions/6afe00260026_add_nick_name_to_users_table.py

@@ -1,35 +0,0 @@
-"""add nick_name to users table
-
-Revision ID: 6afe00260026
-Revises: 0875ad9f64a9
-Create Date: 2026-02-03 12:08:55.758775
-
-"""
-
-from typing import Sequence, Union
-
-from alembic import op
-import sqlalchemy as sa
-import sqlmodel.sql.sqltypes
-from sqlalchemy.dialects import postgresql
-
-# revision identifiers, used by Alembic.
-revision: str = "6afe00260026"
-down_revision: Union[str, Sequence[str], None] = "0875ad9f64a9"
-branch_labels: Union[str, Sequence[str], None] = None
-depends_on: Union[str, Sequence[str], None] = None
-
-
-def upgrade() -> None:
-    """Upgrade schema."""
-    # Only keep the column addition
-    op.add_column(
-        "users",
-        sa.Column("nick_name", sqlmodel.sql.sqltypes.AutoString(), nullable=True),
-    )
-
-
-def downgrade() -> None:
-    """Downgrade schema."""
-    # Only keep the column removal
-    op.drop_column("users", "nick_name")

alembic/versions/f15af71aacb9_add_request_type_and_target_dates_to_.py

@@ -1,52 +0,0 @@
-"""add request_type and target_dates to payslip_requests
-
-Revision ID: f15af71aacb9
-Revises: 6afe00260026
-Create Date: 2026-02-09 14:24:49.103516
-
-"""
-
-from typing import Sequence, Union
-
-from alembic import op
-import sqlalchemy as sa
-import sqlmodel.sql.sqltypes
-from sqlalchemy.dialects import postgresql
-
-# revision identifiers, used by Alembic.
-revision: str = "f15af71aacb9"
-down_revision: Union[str, Sequence[str], None] = "6afe00260026"
-branch_labels: Union[str, Sequence[str], None] = None
-depends_on: Union[str, Sequence[str], None] = None
-
-
-def upgrade() -> None:
-    """Upgrade schema."""
-    # 1. Add request_type
-    # We use server_default to fill existing rows with 'payslip' so the migration doesn't crash
-    op.add_column(
-        "payslip_requests",
-        sa.Column(
-            "request_type",
-            sqlmodel.sql.sqltypes.AutoString(),
-            nullable=False,
-            server_default=sa.text("'payslip'"),
-        ),
-    )
-
-    # 2. Optional: Remove the default constraint if you don't want it permanently (keeps schema clean)
-    op.alter_column("payslip_requests", "request_type", server_default=None)
-
-    # 3. Add target_dates (It is nullable, so no default needed)
-    op.add_column(
-        "payslip_requests",
-        sa.Column(
-            "target_dates", postgresql.JSON(astext_type=sa.Text()), nullable=True
-        ),
-    )
-
-
-def downgrade() -> None:
-    """Downgrade schema."""
-    op.drop_column("payslip_requests", "target_dates")
-    op.drop_column("payslip_requests", "request_type")

src/auth/router.py

@@ -1,4 +1,3 @@
-from src.core.models import Teams
 import uuid
 from src.core.database import get_async_session
 from fastapi import APIRouter, Depends, HTTPException, status
@@ -114,26 +113,21 @@ async def get_home(
     user_id: str = Depends(get_current_user),
     session: AsyncSession = Depends(get_async_session),
 ):
-    u_id = uuid.UUID(user_id)
-    user = await session.get(Users, u_id)
+    """
+    Protected home endpoint. Requires a valid access token (Bearer).
+    """
+    user = await session.get(Users, uuid.UUID(user_id))
     if not user:
         raise HTTPException(status_code=404, detail="User not found")
 
-    # 1) Define the statement (Do NOT await here)
-    statement = (
-        select(Roles.name, Teams.name)
+    role_join = await session.exec(
+        select(Roles.name)
         .join(UserTeamsRole, UserTeamsRole.role_id == Roles.id)
-        .join(Teams, Teams.id == UserTeamsRole.team_id)
-        .where(UserTeamsRole.user_id == u_id)
+        .where(UserTeamsRole.user_id == uuid.UUID(user_id))
     )
+    user_role = role_join.first() or "Member"
 
-    # 2) Execute it ONCE
-    exec_result = await session.exec(statement)
-    row = exec_result.first()
-
-    # Unpack values or provide defaults
-    user_role, team_name = row if row else ("Member", "No Team")
-
+    # Example payload — replace with your real app data
     return {
         "code": 200,
         "data": {
@@ -146,8 +140,6 @@ async def get_home(
                 "dob": user.dob.isoformat() if user.dob else None,
                 "profile_picture": user.profile_picture,
                 "role": user_role.lower(),
-                "team_name": team_name,
-                "nick_name": user.nick_name,
             },
             "home_data": {
                 "announcements": ["Welcome!", "New protocol released"],

src/core/config.py

@@ -38,8 +38,6 @@ class Settings(BaseSettings):
     GOOGLE_CLIENT_SECRET: str
     GOOGLE_REDIRECT_URI: str
 
-    WEB_FRONTEND_URL: str
-
     FCM_SERVER_KEY: Optional[str] = None
     SICK_LEAVE_LIMIT: int = 10
     CASUAL_LEAVE_LIMIT: int = 10
@@ -60,6 +58,7 @@ class Settings(BaseSettings):
     FIREBASE_CLIENT_X509_CERT_URL: str
     FIREBASE_UNIVERSE_DOMAIN: str
 
+
     @computed_field
     @property
     def DATABASE_URL(self) -> PostgresDsn:

src/core/database.py

@@ -12,9 +12,6 @@ async_engine = create_async_engine(
     pool_size=20,
     max_overflow=40,
     pool_timeout=30,
-    pool_recycle=300,         
-    pool_pre_ping=True,       
-    pool_use_lifo=True,       
     connect_args={"ssl": True},
 )
 

src/core/models.py

@@ -33,21 +33,18 @@ class LunchLocation(str, Enum):
     SARACON_CAMPUS = "Saracon Campus"
     SOLAR_KITCHEN = "Solar Kitchen"
 
-
 class AppVersion(SQLModel, table=True):
     __tablename__ = "app_version"
     version: str = Field(primary_key=True)
     apk_download_link: str = Field(nullable=False)
     ios_download_link: str = Field(nullable=False)
 
-
 class Users(SQLModel, table=True):
     __tablename__ = "users"
     id: uuid.UUID = Field(default_factory=uuid.uuid4, primary_key=True)
     email_id: str = Field(unique=True, nullable=False)
     password: str = Field(nullable=False)
     user_name: str = Field(nullable=False)
-    nick_name: Optional[str] = Field(default=None, nullable=True)
     is_verified: bool = Field(
         default=False, sa_column_kwargs={"server_default": "false"}
     )
@@ -59,9 +56,7 @@ class Users(SQLModel, table=True):
     asset: List["Assets"] = Relationship(back_populates="user")
     water_logs: List["WaterLogs"] = Relationship(back_populates="user")
     journal_entries: List["JournalEntry"] = Relationship(back_populates="user")
-    lunch_preference: LunchLocation = Field(
-        default=None, sa_column_kwargs={"server_default": "SOLAR_KITCHEN"}
-    )
+    lunch_preference: LunchLocation = Field(default= None,sa_column_kwargs={"server_default": "SOLAR_KITCHEN"})
 
 
 class Teams(SQLModel, table=True):
@@ -72,11 +67,7 @@ class Teams(SQLModel, table=True):
 
 class Roles(SQLModel, table=True):
     __tablename__ = "roles"
-    id: uuid.UUID = Field(
-        default_factory=uuid.uuid4,
-        primary_key=True,
-        sa_column_kwargs={"server_default": text("gen_random_uuid()")},
-    )
+    id: uuid.UUID = Field(default_factory=uuid.uuid4, primary_key=True, sa_column_kwargs={"server_default": text("gen_random_uuid()")})
     name: str = Field(unique=True, nullable=False)
 
 

src/core/utils.py

@@ -22,8 +22,8 @@ async def send_mail_as_user(
 ):
     q = (
         select(PayslipRequest)
-        .where(PayslipRequest.user_id == user_id,PayslipRequest.refresh_token.is_not(None))
-        .order_by(PayslipRequest.requested_at.desc()).limit(1)
+        .where(PayslipRequest.user_id == user_id)
+        .order_by(PayslipRequest.requested_at.desc())
     )
     entry = (await session.execute(q)).scalar_one_or_none()
 

src/foodcount/service.py

@@ -7,15 +7,12 @@ from src.core.models import Users, Roles, UserTeamsRole
 from src.foodcount.schemas import LunchNotifyRequest
 from src.core.utils import send_mail_as_user
 from src.core.models import LunchLocation
-from src.payslip.models import PayslipRequest, PayslipStatus
-from datetime import timedelta, datetime
 
 LOCATION_ROLE_MAP = {
     LunchLocation.SOLAR_KITCHEN: "LM - Solar Kitchen",
     LunchLocation.SARACON_CAMPUS: "LM - Saracon Campus",
 }
 
-
 async def get_lunch_manager_by_location(
     session: AsyncSession,
     location: LunchLocation,
@@ -26,21 +23,20 @@ async def get_lunch_manager_by_location(
         raise HTTPException(400, "Invalid lunch location")
 
     role = (
-        await session.execute(select(Roles).where(Roles.name == role_name))
+        await session.execute(
+            select(Roles).where(Roles.name == role_name)
+        )
     ).scalar_one_or_none()
 
     if not role:
         raise HTTPException(500, "Lunch manager role missing")
 
     mapping = (
-        (
-            await session.execute(
-                select(UserTeamsRole).where(UserTeamsRole.role_id == role.id)
-            )
+        await session.execute(
+            select(UserTeamsRole)
+            .where(UserTeamsRole.role_id == role.id)
         )
-        .scalars()
-        .first()
-    )
+    ).scalars().first()
 
     if not mapping:
         raise HTTPException(500, "No lunch manager assigned")
@@ -51,7 +47,6 @@ async def get_lunch_manager_by_location(
 
     return manager
 
-
 def build_lunch_mail_body(
     user_name: str,
     email: str,
@@ -72,42 +67,11 @@ def build_lunch_mail_body(
         f"The user has opted out of lunch."
     )
 
-
 async def process_lunch_notification(
     session: AsyncSession,
     user_id: uuid.UUID,
     payload: LunchNotifyRequest,
 ):
-
-    requested_dates = []
-    curr = payload.start_date
-    while curr <= payload.end_date:
-        requested_dates.append(curr.strftime("%Y-%m-%d"))
-        curr += timedelta(days=1)
-
-    # 2. CHECK DUPLICATES: Get all past lunch requests for this user
-    # We fetch only the 'target_dates' column to make it fast
-    stmt = select(PayslipRequest.target_dates).where(
-        PayslipRequest.user_id == user_id,
-        PayslipRequest.request_type == "lunch",  # Only look at lunch rows
-        PayslipRequest.status == PayslipStatus.SENT,
-    )
-    result = await session.execute(stmt)
-
-    # Flatten the list of lists into a single set of existing dates
-    existing_dates = set()
-    for row in result.scalars().all():
-        if row:  # Check if row is not None
-            existing_dates.update(row)  # Add all dates from that request
-
-    # Check if any requested date is already in the database
-    duplicates = [d for d in requested_dates if d in existing_dates]
-
-    if duplicates:
-        raise HTTPException(
-            status_code=400,
-            detail=f"Already sent a request for: {', '.join(duplicates)}",
-        )
     # fetch only needed user fields
     row = (
         await session.execute(
@@ -147,20 +111,11 @@ async def process_lunch_notification(
             body=body,
         )
     except HTTPException as e:
-        if e.status_code == 428:
-            raise HTTPException(
-                status_code=428, detail="Please connect your Gmail account"
-            )
-        raise
-
-    new_req = PayslipRequest(
-        user_id=user_id,
-        status=PayslipStatus.SENT,
-        request_type="lunch",  # Mark as lunch
-        target_dates=requested_dates,  # Save the dates ["2024-02-10"]
-        requested_at=datetime.now(),
-    )
-    session.add(new_req)
-    await session.commit()
+            if e.status_code == 428:
+                raise HTTPException(
+                    status_code=428,
+                    detail="Please connect your Gmail account"
+                )
+            raise
 
     return manager.email_id

src/main.py

@@ -17,16 +17,6 @@ from fastapi.staticfiles import StaticFiles
 
 app = FastAPI(title="Yuvabe App API")
 
-# app.add_middleware(
-#     CORSMiddleware,
-#     # REMOVE: allow_origins=["*"],
-#     # ADD THIS: Regex to match localhost on ANY port
-#     allow_origin_regex="https?://(?:localhost|127\.0\.0\.1)(?::\d+)?",
-#     allow_credentials=True,
-#     allow_methods=["*"],
-#     allow_headers=["*"],
-# )
-
 
 @app.on_event("startup")
 async def on_startup():

src/payslip/googleservice.py

@@ -18,15 +18,8 @@ def exchange_code_for_tokens(code: str):
         "grant_type": "authorization_code",
         "redirect_uri": settings.GOOGLE_REDIRECT_URI,
     }
-    print(f"🔄 Exchanging code with Redirect URI: {settings.GOOGLE_REDIRECT_URI}")
-    response = requests.post(settings.TOKEN_URL, data=data)
-    if response.status_code != 200:
-        error_text = response.text
-        print(
-            f"❌ GOOGLE TOKEN ERROR: {error_text}"
-        )  # This will show in your Hugging Face logs
-        raise HTTPException(status_code=400, detail=f"Google Error: {error_text}")
 
+    response = requests.post(settings.TOKEN_URL, data=data)
     return response.json()
 
 

src/payslip/models.py

@@ -1,9 +1,9 @@
 import uuid
 from datetime import datetime
 from enum import Enum
-from typing import Optional, List
+from typing import Optional
 
-from sqlalchemy.dialects.postgresql import UUID, JSON
+from sqlalchemy.dialects.postgresql import UUID
 from sqlalchemy import Column
 from sqlmodel import SQLModel, Field, ForeignKey
 
@@ -14,11 +14,6 @@ class PayslipStatus(str, Enum):
     FAILED = "Failed"
 
 
-class RequestType(str, Enum):
-    PAYSLIP = "payslip"
-    LUNCH = "lunch"
-
-
 class PayslipRequest(SQLModel, table=True):
     __tablename__ = "payslip_requests"
 
@@ -39,9 +34,3 @@ class PayslipRequest(SQLModel, table=True):
     refresh_token: Optional[str] = None
 
     error_message: Optional[str] = None
-
-    request_type: str = Field(default=RequestType.PAYSLIP)
-
-    # Stores list of dates like ["2024-01-01", "2024-01-02"]
-    # We use JSON type to store arrays in Postgres
-    target_dates: Optional[List[str]] = Field(default=None, sa_column=Column(JSON))

src/payslip/router.py

@@ -24,18 +24,11 @@ from src.payslip.utils import encrypt_token
 router = APIRouter(prefix="/payslips", tags=["Payslips & Gmail"])
 
 
-# Add platform parameter with default="mobile"
 @router.get("/gmail/connect-url")
-async def gmail_connect_url(
-    user_id: uuid.UUID, platform: str = "mobile", redirect_path: str = "/payslip"
-):
+async def gmail_connect_url(user_id: uuid.UUID):
     """
-    Returns the Google OAuth URL.
-    State format: "user_id|platform" (e.g., "123e4567-e89b...|web")
+    Returns the Google OAuth URL for the frontend to open in InAppBrowser.
     """
-    # 1. Combine ID and Platform into one state string
-    combined_state = f"{user_id}|{platform}|{redirect_path}"
-
     params = {
         "client_id": settings.GOOGLE_CLIENT_ID,
         "redirect_uri": settings.GOOGLE_REDIRECT_URI,
@@ -43,7 +36,7 @@ async def gmail_connect_url(
         "scope": "openid email profile https://www.googleapis.com/auth/gmail.send",
         "access_type": "offline",
         "prompt": "consent",
-        "state": combined_state,  # 👈 Send combined state
+        "state": str(user_id),
     }
     return {"auth_url": f"{settings.AUTH_BASE}?{urlencode(params)}"}
 
@@ -54,90 +47,34 @@ async def gmail_callback(
 ):
     from fastapi.responses import RedirectResponse
 
-    # --- 1. PARSE STATE ---
-    # Try to split "uuid|platform". If it fails (old app version), assume mobile.
-    parts = state.split("|")
-
-    if len(parts) >= 3:
-        user_id_str = parts[0]
-        platform = parts[1]
-        redirect_path = parts[2]
-    elif len(parts) == 2:
-        # Backward compatibility (old mobile app versions)
-        user_id_str = parts[0]
-        platform = parts[1]
-        redirect_path = "/payslip"
-    else:
-        # Fallback
-        user_id_str = state
-        platform = "mobile"
-        redirect_path = "/payslip"
-
-    try:
-        user_id = uuid.UUID(user_id_str)
-    except ValueError:
-        return RedirectResponse(
-            "yuvabe://gmail/callback?success=false&error=invalid_state"
-        )
-    # --- 2. DEFINE BASE URL BASED ON PLATFORM ---
-    if platform == "web":
-        # Point to your React Web App URL (Localhost or Production)
-        # Ideally, put "http://localhost:5173" in your settings.py as WEB_BASE_URL
-        base_redirect = f"{settings.WEB_FRONTEND_URL}{redirect_path}"
-    else:
-        # Default Mobile Deep Link
-        base_redirect = "yuvabe://gmail/callback"
-
-    # Helper to build the final URL cleanly
-    def build_redirect(success: bool, error: str = None, message: str = None):
-        params = {"success": str(success).lower()}
-        if error:
-            params["error"] = error
-        if message:
-            params["message"] = message
-        return f"{base_redirect}?{urlencode(params)}"
-
-    # --- 3. EXISTING LOGIC (Updated to use build_redirect) ---
+    user_id = uuid.UUID(state)
     user = await session.get(Users, user_id)
+
     if not user:
         return RedirectResponse(
-            build_redirect(False, "user_not_found", "No such user exists")
+            "yuvabe://gmail/callback?success=false&error=user_not_found&message=No such user exists"
         )
 
     try:
         token_data = exchange_code_for_tokens(code)
         google_email = extract_email_from_id_token(token_data["id_token"])
-    except Exception as e:
-        # ---------------------------------------------------------
-        # 🚩 NEW DEBUG LOGGING
-        # ---------------------------------------------------------
-        print("------------------------------------------------")
-        print(f"❌ OAUTH CRITICAL FAILURE: {str(e)}")
-        print("------------------------------------------------")
-
-        # Pass the actual error message to the frontend for debugging
-        error_msg = str(e).replace("400: ", "")  # Clean up message slightly
-        return RedirectResponse(build_redirect(False, "invalid_code", error_msg))
-
-    # Gmail Mismatch
+    except Exception:
+        return RedirectResponse(
+            "yuvabe://gmail/callback?success=false&error=invalid_code&message=OAuth code exchange failed"
+        )
+
+    # --- GMAIL MISMATCH ERROR ---
     if google_email.lower() != user.email_id.lower():
         return RedirectResponse(
-            build_redirect(
-                False,
-                "email_mismatch",
-                "Google account does not match registered email",
-            )
+            "yuvabe://gmail/callback?success=false&error=email_mismatch&message=Google account does not match registered email"
         )
 
     refresh_token = token_data.get("refresh_token")
     if not refresh_token:
         return RedirectResponse(
-            build_redirect(
-                False, "no_refresh_token", "No refresh token returned from Google"
-            )
+            "yuvabe://gmail/callback?success=false&error=no_refresh_token&message=No refresh token returned from Google"
         )
 
-    # ... (Database saving logic stays exactly the same) ...
     q = (
         select(PayslipRequest)
         .where(PayslipRequest.user_id == user_id)
@@ -159,9 +96,8 @@ async def gmail_callback(
 
     await session.commit()
 
-    # Success Redirect
     return RedirectResponse(
-        build_redirect(True, message="gmail_connected_successfully")
+        "yuvabe://gmail/callback?success=true&message=gmail_connected_successfully"
     )
 
 

src/payslip/service.py

@@ -22,19 +22,13 @@ from src.payslip.utils import encrypt_token
 async def user_team_name(session: AsyncSession, user_id):
     """Return user's team name."""
     q = select(UserTeamsRole).where(UserTeamsRole.user_id == user_id)
-    mappings = (await session.execute(q)).scalars().all()
+    mapping = (await session.execute(q)).scalar_one_or_none()
 
-    if not mappings:
-        return "Unknown Team"
-
-    team_ids = [m.team_id for m in mappings]
-    q_teams = select(Teams.name).where(Teams.id.in_(team_ids))
-    team_names = (await session.execute(q_teams)).scalars().all()
-
-    if not team_names:
+    if not mapping:
         return "Unknown Team"
 
-    return ", ".join(team_names)
+    team = await session.get(Teams, mapping.team_id)
+    return team.name if team else "Unknown Team"
 
 
 async def one_request_per_day(session: AsyncSession, user_id):
@@ -49,7 +43,6 @@ async def one_request_per_day(session: AsyncSession, user_id):
         PayslipRequest.user_id == user_id,
         PayslipRequest.requested_at >= today_start,
         PayslipRequest.status != PayslipStatus.PENDING,
-        PayslipRequest.request_type == "payslip"
     )
 
     result = await session.execute(q)
@@ -80,7 +73,7 @@ async def get_latest_payslip_row(session: AsyncSession, user_id):
     """
     q = (
         select(PayslipRequest)
-        .where(PayslipRequest.user_id == user_id,PayslipRequest.request_type == "payslip")
+        .where(PayslipRequest.user_id == user_id)
         .order_by(PayslipRequest.requested_at.desc())
     )
     return (await session.execute(q)).scalar_one_or_none()

src/profile/notify.py

@@ -1,6 +1,5 @@
 from src.notifications.service import get_user_device_tokens
 from src.notifications.fcm import send_fcm
-from src.core.models import Users
 
 
 def ensure_list(value):
@@ -45,7 +44,6 @@ async def send_leave_request_notification(session, user, leave, mentor_ids, lead
                 "type": "leave_request",
                 "screen": "MentorApproval",
                 "leave_id": str(leave.id),
-                "url": f"/mentor-approval/{leave.id}",
             },
             priority="high",
         )
@@ -68,7 +66,6 @@ async def send_leave_request_notification(session, user, leave, mentor_ids, lead
                 "type": "leave_request",
                 "screen": "LeaveDetails",
                 "leave_id": str(leave.id),
-                "url": f"/leave-details/{leave.id}",
             },
             priority="high",
         )
@@ -78,10 +75,6 @@ async def send_leave_request_notification(session, user, leave, mentor_ids, lead
 # SEND TO USER + TEAM LEAD
 # -------------------------------
 async def send_leave_status_notification(session, leave, mentor_name, lead_ids):
-
-    user = await session.get(Users, leave.user_id)
-    # Fallback to "Unknown" if the user isn't found for some reason
-    user_display_name = user.user_name if user else "Unknown User"
     title = "Leave status"
     body = f"Your leave was {leave.status.lower()} by {mentor_name}"
 
@@ -104,7 +97,6 @@ async def send_leave_status_notification(session, leave, mentor_name, lead_ids):
             "type": "leave_status",
             "screen": "LeaveDetails",
             "leave_id": str(leave.id),
-            "url": f"/leave-details/{leave.id}",
         },
         priority="high",
     )
@@ -113,12 +105,11 @@ async def send_leave_status_notification(session, leave, mentor_name, lead_ids):
     await send_fcm(
         lead_tokens,
         title,
-        f"Leave {leave.status} for user {user_display_name} by {mentor_name}",
+        f"Leave {leave.status} for user {leave.user_id}",
         {
             "type": "lead_update",
             "screen": "LeaveDetails",
             "leave_id": str(leave.id),
-            "url": f"/leave-details/{leave.id}",
         },
         priority="high",
     )

src/profile/router.py

@@ -119,8 +119,8 @@ async def get_leave_balance(
     )
     results = (await session.exec(stmt)).all()
 
-    sick_used = sum(l.days for l in results if l.leave_type == LeaveType.SICK)
-    casual_used = sum(l.days for l in results if l.leave_type == LeaveType.CASUAL)
+    sick_used = sum(1 for l in results if l.leave_type == LeaveType.SICK)
+    casual_used = sum(1 for l in results if l.leave_type == LeaveType.CASUAL)
 
     sick_remaining = SICK_LIMIT - sick_used
     casual_remaining = CASUAL_LIMIT - casual_used
@@ -145,10 +145,9 @@ async def get_leave_balance_for_user(
     )
     results = (await session.exec(stmt)).all()
 
-    sick_used = sum(l.days for l in results if l.leave_type == LeaveType.SICK)
-    casual_used = sum(l.days for l in results if l.leave_type == LeaveType.CASUAL)
+    sick_used = sum(1 for l in results if l.leave_type == LeaveType.SICK)
+    casual_used = sum(1 for l in results if l.leave_type == LeaveType.CASUAL)
 
-    
     sick_remaining = SICK_LIMIT - sick_used
     casual_remaining = CASUAL_LIMIT - casual_used
 
@@ -175,7 +174,7 @@ async def list_notifications(
             | (Leave.mentor_id == user_id)
             | (Leave.lead_id == user_id)
         )
-        .order_by(Leave.is_read.asc(), desc(Leave.updated_at))
+        .order_by(desc(Leave.updated_at))
     )
 
     results = (await session.exec(stmt)).all()
@@ -312,6 +311,8 @@ async def mentor_pending_leaves(
 ):
     mentor_uuid = uuid.UUID(mentor_id)
 
+    
+
     mentor_team = (
         await session.exec(
             select(UserTeamsRole).where(UserTeamsRole.user_id == mentor_uuid)
@@ -363,9 +364,7 @@ async def mentor_pending_leaves(
                 lead_id=str(leave.lead_id),
                 user_name=user_name,
                 updated_at=(leave.updated_at.isoformat() if leave.updated_at else None),
-                requested_at=(
-                    leave.requested_at.isoformat() if leave.requested_at else None
-                ),
+                requested_at=leave.requested_at.isoformat() if leave.requested_at else None,
             )
         )
 
@@ -574,7 +573,6 @@ async def get_profile_details(
         data={
             "name": user.user_name,
             "email": user.email_id,
-            "nick_name": user.nick_name,
             "team_name": team.name,
             "lead_label": lead_label,  # 🔥 Frontend uses this
             "lead_name": final_lead_name,  # 🔥 Frontend uses this
@@ -709,9 +707,6 @@ async def update_profile(
     if body.email is not None:
         user.email_id = body.email
 
-    if body.nick_name is not None:
-        user.nick_name = body.nick_name
-
     if body.dob is not None:
         dob_str = body.dob.replace(".", "-")  # convert dots to dashes
         try:
@@ -756,7 +751,6 @@ async def update_profile(
                 "id": str(user.id),
                 "name": user.user_name,
                 "email": user.email_id,
-                "nick_name": user.nick_name,
                 "dob": getattr(user, "dob", None),
                 "address": getattr(user, "address", None),
             }

src/profile/schemas.py

@@ -111,7 +111,7 @@ class UpdateProfileRequest(BaseModel):
     email: Optional[EmailStr] = None
     dob: Optional[str] = None
     address: Optional[str] = None
-    nick_name: Optional[str] = None
+
     current_password: Optional[str] = None
     new_password: Optional[str] = None
 

src/profile/service.py

@@ -14,7 +14,6 @@ from src.profile.models import (
     Leave,
     UserDevices,
 )
-from sqlalchemy import select, and_, or_, not_
 from src.profile.notify import send_leave_request_notification
 
 from src.profile.schemas import CreateLeaveRequest, LeaveStatus, ApproveRejectRequest
@@ -39,7 +38,7 @@ async def _get_team_roles(session: AsyncSession, user_id: uuid.UUID):
         await session.exec(
             select(UserTeamsRole).where(UserTeamsRole.user_id == user_id)
         )
-    ).scalars().first()
+    ).first()
 
     if not user_team:
         raise ValueError("User has no team mapping")
@@ -47,10 +46,10 @@ async def _get_team_roles(session: AsyncSession, user_id: uuid.UUID):
     # 2) Get Mentor role
     mentor_role = (
         await session.exec(select(Roles).where(Roles.name == "Mentor"))
-    ).scalars().first()
+    ).first()
     sub_mentor_role = (
         await session.exec(select(Roles).where(Roles.name == "Sub Mentor"))
-    ).scalars().first()
+    ).first()
 
     if not mentor_role and not sub_mentor_role:
         raise ValueError("No Mentor / Sub Mentor roles defined in system")
@@ -64,7 +63,7 @@ async def _get_team_roles(session: AsyncSession, user_id: uuid.UUID):
     # 3) Get Team Lead role
     lead_role = (
         await session.exec(select(Roles).where(Roles.name == "Team Lead"))
-    ).scalars().first()
+    ).first()
 
     # 4) Find mentor in same team
     mentor_users = (
@@ -74,7 +73,7 @@ async def _get_team_roles(session: AsyncSession, user_id: uuid.UUID):
             .where(UserTeamsRole.team_id == user_team.team_id)
             .where(UserTeamsRole.role_id.in_(mentor_role_ids))
         )
-    ).scalars().all()
+    ).all()
 
     if not mentor_users:
         raise ValueError("No Mentor or Sub Mentor found in user's team")
@@ -89,7 +88,7 @@ async def _get_team_roles(session: AsyncSession, user_id: uuid.UUID):
                 .where(UserTeamsRole.team_id == user_team.team_id)
                 .where(UserTeamsRole.role_id == lead_role.id)
             )
-        ).scalars().all()
+        ).all()
 
     return mentor_users, lead_users
 
@@ -112,26 +111,6 @@ async def _get_tokens_for_users(
 
 
 async def create_leave(session, user_id, body):
-
-    overlap_query = select(Leave).where(
-        and_(
-            Leave.user_id == user_id,
-            # We use a list of strings if LeaveStatus is an Enum/String
-            Leave.status.notin_([LeaveStatus.REJECTED, LeaveStatus.CANCELLED]),
-            Leave.from_date <= body.to_date,
-            Leave.to_date >= body.from_date,
-        )
-    )
-
-    # Use .exec() to match your existing style
-    result = await session.exec(overlap_query)
-    existing_overlap = result.scalars().first()
-
-    if existing_overlap:
-        raise HTTPException(
-            status_code=400,
-            detail=f"You have already submitted a leave request that covers {body.from_date} to {body.to_date}. Please check your leave history.",
-        )
     # Get the user
     user = await session.get(Users, user_id)