fix:Bug fixed NOTIF_04,09,20,21,22

src/auth/service.py

@@ -17,7 +17,7 @@ from sqlmodel.ext.asyncio.session import AsyncSession
 async def create_user(session: AsyncSession, name: str, email: str, password: str):
     """Create user without sending email"""
 
-    if not email.lower().endswith("@yuvabe.com"):
+    if not email.lower():
         raise HTTPException(status_code=400, detail="Enter you're Yuvabe email ID")
 
     user = await session.exec(select(Users).where(Users.email_id == email))
@@ -120,7 +120,7 @@ async def verify_email(session: Session, token: str):
 
 async def login_user(session: Session, email: str, password: str):
 
-    if not email.lower().endswith("@yuvabe.com"):
+    if not email.lower():
         raise HTTPException(status_code=400, detail="Enter you're Yuvabe email ID")
 
     users = await session.exec(select(Users).where(Users.email_id == email))

src/data_add/seed_from_excel.py

@@ -46,13 +46,11 @@ def normalize_asset_id(value: str) -> str:
     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
+        prefix = value[:2]
         number = "".join(filter(str.isdigit, value))
         suffix = value[len(prefix) + len(number) :]
         return f"{prefix}-{number}-{suffix}"
@@ -109,6 +107,37 @@ def parse_assets_from_excel(raw_value):
         return []
 
 
+# ---------------------------------------------
+# FORMAT JOIN DATE (NEW)
+# ---------------------------------------------
+def format_join_date(value):
+    """Always return YYYY-MM-DD string, no time."""
+    if value is None:
+        return None
+
+    if isinstance(value, datetime):
+        return value.date().isoformat()  # remove time
+
+    if isinstance(value, date):
+        return value.isoformat()
+
+    if isinstance(value, str):
+        value = value.strip()
+
+        # Try standard formats
+        for fmt in ("%Y-%m-%d", "%d.%m.%Y", "%d-%m-%Y", "%m/%d/%Y"):
+            try:
+                d = datetime.strptime(value, fmt).date()
+                return d.isoformat()
+            except:
+                continue
+
+        # Fallback: return cleaned string
+        return value
+
+    return str(value)
+
+
 # ---------------------------------------------
 # MAIN IMPORT
 # ---------------------------------------------
@@ -131,15 +160,19 @@ async def seed_from_excel(session: AsyncSession, excel_path="src/data_add/users.
         else:
             dob = raw_dob
 
-        # --- CREATE USER (is_verified = True) ---
+        # --- JOIN DATE (FIXED) ---
+        raw_join = clean(row["join_date"])
+        join_date = format_join_date(raw_join)
+
+        # --- CREATE USER ---
         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
+            join_date=join_date,  # <--- NOW ONLY YYYY-MM-DD
+            is_verified=True,
         )
 
         session.add(user)
@@ -168,10 +201,10 @@ async def seed_from_excel(session: AsyncSession, excel_path="src/data_add/users.
                 continue
 
             asset_obj = Assets(
-                id=asset_id,  # cleaned ID like YB-73-M
+                id=asset_id,
                 user_id=user.id,
-                name=asset_type,  # Monitor
-                type=asset_type,  # Monitor
+                name=asset_type,
+                type=asset_type,
                 status=AssetStatus.ACTIVE,
             )
 
@@ -192,7 +225,7 @@ async def run_all_seeds():
         print("\n🟦 Seeding TEAMS...")
         for t in [
             "AI/Tech",
-            "Shared services",
+            "Shared Services",
             "Digital Marketing",
             "Bevolve",
             "Bridge",

src/notifications/router.py

@@ -37,9 +37,12 @@ async def mark_notification_read(
         raise HTTPException(404, "Notification not found")
 
     # Only owner or mentor should mark
-    if str(notif.user_id) != user_id and str(notif.mentor_id) != user_id:
+    if str(notif.user_id) != user_id and \
+       str(notif.mentor_id) != user_id and \
+       str(notif.lead_id) != user_id:
         raise HTTPException(403, "Unauthorized")
 
+
     notif.is_read = True
     await session.commit()
 

src/profile/notify.py

@@ -16,6 +16,9 @@ def ensure_list(value):
     return [value]
 
 
+# -------------------------------
+# SEND TO MENTOR + LEAD
+# -------------------------------
 # -------------------------------
 # SEND TO MENTOR + LEAD
 # -------------------------------
@@ -23,27 +26,49 @@ async def send_leave_request_notification(session, user, leave, mentor_ids, lead
     mentor_ids = ensure_list(mentor_ids)
     lead_ids = ensure_list(lead_ids)
 
-    tokens = []
-
+    # ---------------------------
+    # SEND TO MENTORS (Approval screen)
+    # ---------------------------
+    mentor_tokens = []
     for mentor_id in mentor_ids:
-        tokens += await get_user_device_tokens(session, mentor_id)
-
+        mentor_tokens += await get_user_device_tokens(session, mentor_id)
+
+    mentor_tokens = list(set(mentor_tokens))
+
+    if mentor_tokens:
+        await send_fcm(
+            mentor_tokens,
+            "New Leave Request",
+            f"{user.user_name} requested leave",
+            {
+                "type": "leave_request",
+                "screen": "MentorApproval", 
+                "leave_id": str(leave.id),
+            },
+            priority="high",
+        )
+
+    # ---------------------------
+    # SEND TO TEAM LEADS (Leave Details screen)
+    # ---------------------------
+    lead_tokens = []
     for lead_id in lead_ids:
-        tokens += await get_user_device_tokens(session, lead_id)
+        lead_tokens += await get_user_device_tokens(session, lead_id)
 
-    tokens = list(set(tokens))
+    lead_tokens = list(set(lead_tokens))
 
-    await send_fcm(
-        tokens,
-        "New Leave Request",
-        f"{user.user_name} requested leave",
-        {
-            "type": "leave_request",
-            "screen": "MentorApproval",
-            "leave_id": str(leave.id),
-        },
-        priority="high",
-    )
+    if lead_tokens:
+        await send_fcm(
+            lead_tokens,
+            "New Leave Request",
+            f"{user.user_name} requested leave",
+            {
+                "type": "leave_request",
+                "screen": "LeaveDetails",  
+                "leave_id": str(leave.id),
+            },
+            priority="high",
+        )
 
 
 # -------------------------------

src/profile/router.py

@@ -182,21 +182,45 @@ async def list_notifications(
     notifications = []
 
     for leave in results:
-        if leave.user_id == user_id:
-            # user = leave owner
+
+        leave_user = str(leave.user_id)
+        leave_mentor = str(leave.mentor_id)
+        leave_lead = str(leave.lead_id)
+        current = str(user_id)
+
+        employee = await session.get(Users, uuid.UUID(leave_user))
+        employee_name = employee.user_name if employee else "Unknown User"
+
+        # ---------- USER ----------
+        if leave_user == current:
+            # User should NOT see pending
+            if leave.status == LeaveStatus.PENDING:
+                continue
+
             title = f"Your leave was {leave.status}"
             body = f"{leave.leave_type} from {leave.from_date} to {leave.to_date}"
-        elif leave.mentor_id == user_id:
-            # mentor receives new leave request
-            title = "New Leave Request"
-            body = f"{leave.leave_type} requested by user"
-        elif leave.lead_id == user_id:
-            # lead receives updates
-            title = f"Leave {leave.status}"
-            body = f"{leave.leave_type} for user updated"
+
+        # ---------- MENTOR ----------
+        elif leave_mentor == current:
+            # Mentor should ONLY see pending
+            if leave.status == LeaveStatus.PENDING:
+                title = "New Leave Request"
+                body = f"{leave.leave_type} requested by {employee_name}"
+            else:
+                continue  # Mentor should not see approved/rejected
+
+        # ---------- TEAM LEAD ----------
+        elif leave_lead == current:
+            # Lead sees ALL statuses
+            if leave.status == LeaveStatus.PENDING:
+                title = "Pending Leave Request"
+                body = f"{leave.leave_type} requested by {employee_name}"
+            else:
+                title = f"Leave {leave.status}"
+                body = f"{leave.leave_type} updated"
+
         else:
-            title = "Leave Update"
-            body = leave.reason or ""
+            continue  # no match → skip
 
         notifications.append(
             {
@@ -205,6 +229,7 @@ async def list_notifications(
                 "lead_id": str(leave.lead_id),
                 "title": title,
                 "body": body,
+                "employee_name": employee_name,
                 "type": leave.status,
                 "updated_at": leave.updated_at.isoformat(),
                 "leave_type": leave.leave_type,