Skip to content

Feature/locator all backend for my req Frontend #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Ajey95 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Feature/locator all backend for my req Frontend #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
82bb5c3
Add locator and faculty credential features
Ajey95 Jan 1, 2026
891b2cf
Add locator and faculty credential features
Ajey95 Jan 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions app/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
faculty_projects,
dashboard,
applications,
notifications
notifications,
locator
)

@asynccontextmanager
Expand Down Expand Up @@ -63,4 +64,5 @@ def read_root():
app.include_router(faculty_projects.router, prefix="/faculty-projects", tags=["Faculty Research"])
app.include_router(dashboard.router, prefix="/dashboard", tags=["Dashboard"])
app.include_router(applications.router, prefix="/applications", tags=["Applications"]) # <--- NEW REGISTER
app.include_router(notifications.router, prefix="/notifications", tags=["Notifications"]) # <--- 2. REGISTER IT
app.include_router(notifications.router, prefix="/notifications", tags=["Notifications"]) # <--- 2. REGISTER IT
app.include_router(locator.router, prefix="/locator", tags=["Locator"])
153 changes: 142 additions & 11 deletions app/routers/dashboard.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,46 @@
from app.core.security import get_current_user
from app.core.database import db
import uuid
import json
from datetime import datetime, date
from pydantic import BaseModel

router = APIRouter(tags=["Dashboard"])

# =========================================================
# 0. MODELS
# =========================================================

class ShortlistRequest(BaseModel):
opening_id: str

class WorkItem(BaseModel):
title: str
type: str
year: str
outcome: Optional[str] = None
collaborators: Optional[str] = None

# --- NEW: Model for Profile Updates ---
class FacultyProfileUpdate(BaseModel):
name: Optional[str] = None
profile_picture: Optional[str] = None
email: Optional[str] = None
phone: Optional[str] = None
designation: Optional[str] = None
department: Optional[str] = None
office_hours: Optional[str] = None
cabin_block: Optional[str] = None
cabin_floor: Optional[str] = None
cabin_number: Optional[str] = None
ug_details: List[str] = []
pg_details: List[str] = []
phd_details: List[str] = []
domain_interests: List[str] = []
previous_work: List[WorkItem] = []
current_status: Optional[str] = None
status_source: Optional[str] = None
Comment on lines +19 to +44
Copy link

@coderabbitai coderabbitai bot Jan 2, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion | 🟠 Major

Code duplication: Models defined in multiple places.

WorkItem and FacultyProfileUpdate are duplicated in:

  • app/routers/dashboard.py (here)
  • app/routers/users.py
  • app/models/user.py

Import from a single source (app/models/user.py) to avoid inconsistencies.

🔎 Proposed fix 
+from app.models.user import WorkItem, FacultyProfileUpdate
+
-class WorkItem(BaseModel):
-    title: str
-    type: str
-    year: str
-    outcome: Optional[str] = None
-    collaborators: Optional[str] = None
-
-# --- NEW: Model for Profile Updates ---
-class FacultyProfileUpdate(BaseModel):
-    # ... all fields ...

Committable suggestion skipped: line range outside the PR's diff.

🤖 Prompt for AI Agents 
In app/routers/dashboard.py around lines 19 to 44, the WorkItem and
FacultyProfileUpdate Pydantic models are duplicated here while canonical
definitions live in app/models/user.py; remove these duplicate class definitions
and import the models from app.models.user instead, updating the import block to
pull WorkItem and FacultyProfileUpdate (and any needed typing/BaseModel symbols
only if they are no longer used locally) so all routers use the single source of
truth and avoid divergence.

Copy link
Collaborator Author

@Ajey95 Ajey95 Jan 8, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@coderabbitai configuration

Copy link

@coderabbitai coderabbitai bot Jan 8, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🧩 Analysis chain

🏁 Script executed:

#!/bin/bash
# Fetch CodeRabbit configuration schema and documentation
curl -s https://coderabbit.ai/integrations/schema.v2.json > /tmp/schema.json
curl -s https://docs.coderabbit.ai/guides/review-instructions > /tmp/instructions.html
curl -s https://docs.coderabbit.ai/faq/ > /tmp/faq.html

echo "=== Configuration Schema Keys ==="
jq -r '.properties | keys[]' /tmp/schema.json 2>/dev/null | head -20

echo -e "\n=== Review Instructions Documentation ==="
grep -A 5 "path-based\|AST-based\|configuration" /tmp/instructions.html | head -30

echo -e "\n=== FAQ about Configuration ==="
grep -A 3 "configure\|YAML\|settings" /tmp/faq.html | head -30

Length of output: 137449

@Ajey95, could you please clarify what configuration help you need? Here are the options:

If you want to configure CodeRabbit:

  • YAML Configuration: Configure review behavior via .coderabbit.yaml in your repository (docs)
  • Path Filters: Exclude specific files/paths from review using path_filters configuration (docs)
  • Review Instructions: Add custom path-based or AST-based review instructions
  • Settings Dashboard: Adjust organization and repository preferences through the UI

However, the code duplication issue I flagged is a legitimate code quality concern. Having duplicate model definitions in multiple files (app/routers/dashboard.py, app/routers/users.py, and potentially app/models/user.py) can lead to:

  • Inconsistencies when models evolve
  • Maintenance difficulties
  • Potential bugs if one copy is updated but others aren't

Recommended approach: Rather than configuring CodeRabbit to ignore this, I'd suggest refactoring to import the models from a single source (likely app/models/user.py) as originally suggested.

If you have a specific reason to keep the current structure, please let me know and I can help find the best solution!

Copy link
Collaborator Author

@Ajey95 Ajey95 Jan 8, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@coderabbitai help


# =========================================================
# HELPER FUNCTIONS
# =========================================================
Expand All @@ -20,7 +52,6 @@ def safe_date(date_obj):
if not date_obj:
return "N/A"
try:
# If it's a Neo4j DateTime/Date or Python datetime/date
if hasattr(date_obj, 'isoformat'):
return date_obj.isoformat().split('T')[0]
return str(date_obj)
Expand Down Expand Up @@ -183,7 +214,7 @@ def get_student_dashboard(current_user: dict = Depends(get_current_user)):
"faculty_pic": r["fpic"],
"match_score": f"{min(99, 60 + (r['match_count'] * 10))}%",
"skills_required": r["skills_required"][:3],
"deadline": safe_date(r["deadline"]) # <--- FIXED DATE
"deadline": safe_date(r["deadline"])
})

# C. All Openings List
Expand All @@ -209,7 +240,7 @@ def get_student_dashboard(current_user: dict = Depends(get_current_user)):
"description": r["desc"],
"faculty_pic": r["fpic"],
"skills_required": r["skills"],
"deadline": safe_date(r["deadline"]) # <--- FIXED DATE
"deadline": safe_date(r["deadline"])
})

return {
Expand Down Expand Up @@ -379,6 +410,9 @@ def get_all_students(search: Optional[str] = None, department: Optional[str] = N
finally:
session.close()

# ---------------------------------------------------------------------
# CRITICAL UPDATE: ALL FACULTY LIST WITH MAP DATA & REAL STATUS
# ---------------------------------------------------------------------
@router.get("/student/all-faculty")
def get_all_faculty(search: Optional[str] = None, department: Optional[str] = None, domain: Optional[str] = None, current_user: dict = Depends(get_current_user)):
if current_user["role"].lower() != "student":
Expand All @@ -392,31 +426,53 @@ def get_all_faculty(search: Optional[str] = None, department: Optional[str] = No
if department:
query += " AND f.department = $dept"

# 1. Fetch Domains
query += """
OPTIONAL MATCH (f)-[:INTERESTED_IN]->(c:Concept)
WITH f, collect(c.name) as domains
"""

# 2. Fetch Cabin & Map Data
query += """
OPTIONAL MATCH (f)-[:LOCATED_AT]->(cab:Cabin)
WITH f, cab, collect(c.name) as domains
"""

if domain:
query += " WHERE $domain IN domains"

# 3. Return EVERYTHING needed for the Frontend (ID, Map, Status)
query += """
RETURN f.user_id as id, f.name as name, f.department as dept,
f.profile_picture as pic, f.designation as designation,
f.current_status as status, f.status_source as status_source,
cab.code as cabin_number, cab.coordinates as coordinates,
domains
ORDER BY f.name ASC
"""

res = session.run(query, search=search, dept=department, domain=domain)
results = []
for r in res:
# Parse Coordinates safely
coords = None
if r["coordinates"]:
try:
coords = json.loads(r["coordinates"])
except:
coords = None

results.append({
"faculty_id": r["id"],
"id": r["id"],
"faculty_id": r["id"],
"name": r["name"],
"department": r["dept"],
"designation": r.get("designation", "Professor"),
"profile_picture": r["pic"],
"domains": r["domains"][:3],
"status": "Available"
"status": r["status"] or "Available",
"status_source": r["status_source"] or "Manual",
"cabin_number": r["cabin_number"],
"coordinates": coords
})
return results
finally:
Expand Down Expand Up @@ -452,7 +508,7 @@ def get_student_applications(current_user: dict = Depends(get_current_user)):
"department": row["dept"] or "General",
"faculty_pic": row["pic"],
"status": row["status"] or "Pending",
"applied_date": safe_date(row["applied_date"]) # <--- FIXED DATE
"applied_date": safe_date(row["applied_date"])
})
return applications
finally:
Expand Down Expand Up @@ -530,7 +586,8 @@ def get_faculty_public_profile(faculty_id: str, current_user: dict = Depends(get
f.cabin_block as block, f.cabin_floor as floor, f.cabin_number as cabin_no,
f.office_hours as office_hours,
f.ug_details as ug, f.pg_details as pg, f.phd_details as phd,
collect(DISTINCT c.name) as interests
collect(DISTINCT c.name) as interests,
f.current_status as status
"""
profile = session.run(profile_query, fid=faculty_id).single()

Expand All @@ -552,7 +609,7 @@ def get_faculty_public_profile(faculty_id: str, current_user: dict = Depends(get
"pg_details": profile["pg"] or [],
"phd_details": profile["phd"] or [],
"interests": profile["interests"],
"availability_status": "Available Now"
"availability_status": profile["status"] or "Available"
},
"schedule": profile["office_hours"] or "Mon-Fri 9AM-5PM",
"openings": [],
Expand Down Expand Up @@ -597,6 +654,80 @@ def get_faculty_public_profile(faculty_id: str, current_user: dict = Depends(get
# 5. ACTIONS & NOTIFICATIONS
# =========================================================

# --- NEW: FACULTY PROFILE UPDATE ENDPOINT (THE FIX) ---
@router.put("/faculty/profile")
def update_faculty_profile(update: FacultyProfileUpdate, current_user: dict = Depends(get_current_user)):
if current_user["role"].lower() != "faculty":
raise HTTPException(status_code=403, detail="Access denied")

session = db.get_session()
user_id = current_user["user_id"]

try:
work_data = [w.dict() for w in update.previous_work]

# 1. Update Basic Text Properties
basic_query = """
MATCH (f:Faculty {user_id: $uid})
SET f.name = coalesce($name, f.name),
f.designation = coalesce($desig, f.designation),
f.department = coalesce($dept, f.department),
f.email = coalesce($email, f.email),
f.phone = coalesce($phone, f.phone),
f.profile_picture = coalesce($pic, f.profile_picture),
f.office_hours = coalesce($hours, f.office_hours),
f.cabin_block = coalesce($block, f.cabin_block),
f.cabin_floor = coalesce($floor, f.cabin_floor),
f.cabin_number = coalesce($num, f.cabin_number),
f.ug_details = $ug,
f.pg_details = $pg,
f.phd_details = $phd
"""
session.run(basic_query,
uid=user_id,
name=update.name, desig=update.designation, dept=update.department,
email=update.email, phone=update.phone, pic=update.profile_picture,
hours=update.office_hours, block=update.cabin_block, floor=update.cabin_floor,
num=update.cabin_number, ug=update.ug_details, pg=update.pg_details, phd=update.phd_details
)

# 2. Update Domain Interests
if update.domain_interests is not None:
session.run("MATCH (f:Faculty {user_id: $uid})-[r:INTERESTED_IN]->() DELETE r", uid=user_id)
for domain in update.domain_interests:
session.run("MATCH (f:Faculty {user_id: $uid}) MERGE (c:Concept {name: $domain}) MERGE (f)-[:INTERESTED_IN]->(c)", uid=user_id, domain=domain)

# 3. Update Previous Work
if update.previous_work:
session.run("MATCH (f:Faculty {user_id: $uid})-[r:WORKED_ON]->() DELETE r", uid=user_id)
for item in work_data:
session.run("""
MATCH (f:Faculty {user_id: $uid})
CREATE (w:Work {id: randomUUID(), title: $title, type: $type, year: $year, outcome: $outcome, collaborators: $collab, created_at: datetime()})
CREATE (f)-[:WORKED_ON]->(w)
""", uid=user_id, title=item['title'], type=item['type'], year=item['year'], outcome=item['outcome'], collab=item['collaborators'])

# 4. CRITICAL: Update Map Connection if Cabin Number changed
# This fixes the issue where map pins wouldn't move!
if update.cabin_number:
map_query = """
MATCH (f:Faculty {user_id: $uid})
OPTIONAL MATCH (f)-[r:LOCATED_AT]->(:Cabin)
DELETE r
WITH f
MATCH (c:Cabin {code: $code})
MERGE (f)-[:LOCATED_AT]->(c)
"""
session.run(map_query, uid=user_id, code=update.cabin_number)
Comment on lines +694 to +721
Copy link

@coderabbitai coderabbitai bot Jan 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟠 Major

Non-atomic database operations risk data inconsistency.

Multiple separate session.run() calls for domains, work, and map updates aren't wrapped in a transaction. If one fails, the profile could be left in an inconsistent state.

🔎 Consider using a transaction 
def do_profile_update(tx, user_id, update, work_data):
    # Run all queries within the transaction
    tx.run(basic_query, ...)
    tx.run(domain_delete_query, ...)
    # ... etc
    
# Then:
session.write_transaction(do_profile_update, user_id, update, work_data)
🤖 Prompt for AI Agents 
In app/routers/dashboard.py around lines 694 to 721, the profile update uses
multiple separate session.run() calls (domains, previous work, map updates)
which are not executed inside a single transaction, risking partial updates on
failure; refactor by wrapping all database operations in a single write
transaction function that accepts tx, user_id, update, work_data and performs
the delete/merge/create statements via tx.run(...) so they commit or roll back
together, then call session.write_transaction(...) (or
session.execute_write(...) depending on driver) to run that function, and
propagate errors so failures rollback and maintain consistency.


return {"message": "Profile updated successfully"}

except Exception as e:
print(f"Update Error: {str(e)}")
raise HTTPException(status_code=500, detail="Failed to update profile")
finally:
session.close()

@router.post("/shortlist/{student_id}")
def shortlist_student(
student_id: str,
Expand Down Expand Up @@ -670,7 +801,7 @@ def get_notifications(current_user: dict = Depends(get_current_user)):
"message": r["message"],
"type": r["type"],
"is_read": r["is_read"],
"date": safe_date(r["date"]), # <--- FIXED DATE
"date": safe_date(r["date"]),
"trigger_id": r["trigger_id"],
"trigger_role": r["trigger_role"]
})
Expand Down Expand Up @@ -725,7 +856,7 @@ def get_faculty_projects(current_user: dict = Depends(get_current_user)):
"title": r["title"],
"status": "Active",
"domain": "Research",
"posted_date": safe_date(r["date"]), # <--- FIXED DATE
"posted_date": safe_date(r["date"]),
"applicant_count": r["applicant_count"],
"shortlisted_count": r["shortlisted_count"]
})
Expand Down
Loading