diff --git a/app/api/v1/routers/UserCreationRouter.py b/app/api/v1/routers/UserCreationRouter.py index a29572c..8865465 100644 --- a/app/api/v1/routers/UserCreationRouter.py +++ b/app/api/v1/routers/UserCreationRouter.py @@ -71,6 +71,24 @@ def create_user( return new_user +@router.get("/departments/all") +def get_all_departments( + db: Session = Depends(get_db), + current_user: User = Depends(PermissionChecker("user.view")) +): + from app.models.DepartmentModel import Department + deps = db.query(Department).filter(Department.is_active == True).order_by(Department.name.asc()).all() + return [{"id": d.department_id, "name": d.name, "description": d.description} for d in deps] + +@router.get("/designations/all") +def get_all_designations( + db: Session = Depends(get_db), + current_user: User = Depends(PermissionChecker("user.view")) +): + from app.models.DesignationModel import Designation + desigs = db.query(Designation).filter(Designation.is_active == True).order_by(Designation.name.asc()).all() + return [{"id": d.designation_id, "name": d.name, "description": d.description} for d in desigs] + @router.get("/all", response_model=List[UserResponse]) def get_all_users( skip: int = 0, @@ -80,7 +98,19 @@ def get_all_users( ): users = user_repository.get_active_users(db, skip, limit) from app.models.AuditLogModel import AuditLog + from app.models.DepartmentModel import Department + from app.models.DesignationModel import Designation + from app.models.RoleModel import Role + + dept_map = {d.department_id: d.name for d in db.query(Department).all()} + desig_map = {d.designation_id: d.name for d in db.query(Designation).all()} + role_map = {r.role_id: r.role_name for r in db.query(Role).all()} + for u in users: + u.department_name = dept_map.get(u.department_id) or (u.department.name if getattr(u, 'department', None) else None) + u.designation_name = desig_map.get(u.designation_id) or (u.designation.name if getattr(u, 'designation', None) else None) + u.role_name = role_map.get(u.role_id) or (u.role.role_name if getattr(u, 'role', None) else None) + latest = ( db.query(AuditLog) .filter(AuditLog.user_id == u.user_id) @@ -102,6 +132,9 @@ def get_user_profile( user = user_repository.get_by_id(db, user_id) if not user or user.deleted_at is not None: raise HTTPException(status_code=404, detail="User not found") + user.department_name = user.department.name if getattr(user, 'department', None) else None + user.designation_name = user.designation.name if getattr(user, 'designation', None) else None + user.role_name = user.role.role_name if getattr(user, 'role', None) else None return user @router.put("/update/{user_id}", response_model=UserResponse) diff --git a/app/schemas/RepairErp.py b/app/schemas/RepairErp.py index a5b2e7f..5aa46f7 100644 --- a/app/schemas/RepairErp.py +++ b/app/schemas/RepairErp.py @@ -60,6 +60,15 @@ class CrmRepairTicketResponse(BaseModel): is_warranty_claim: bool notes: Optional[str] = None created_at: Optional[datetime] = None + status: Optional[str] = None + problem_description: Optional[str] = None + customer_name: Optional[str] = None + customer_phone: Optional[str] = None + brand_name: Optional[str] = None + model_name: Optional[str] = None + imei_serial: Optional[str] = None + priority: Optional[str] = "NORMAL" + sla_due_at: Optional[datetime] = None class Config: from_attributes = True diff --git a/app/schemas/User.py b/app/schemas/User.py index f518be0..bd617c3 100644 --- a/app/schemas/User.py +++ b/app/schemas/User.py @@ -44,9 +44,12 @@ class UserResponse(BaseModel): profile_image_id: Optional[str] gender: Optional[str] dob: Optional[date] - department_id: str - designation_id: str - role_id: str + department_id: Optional[str] = None + designation_id: Optional[str] = None + role_id: Optional[str] = None + department_name: Optional[str] = None + designation_name: Optional[str] = None + role_name: Optional[str] = None manager_id: Optional[str] is_active: bool email_verified: Optional[bool] = False diff --git a/app/services/RepairErpService.py b/app/services/RepairErpService.py index d3d901b..efaaaa1 100644 --- a/app/services/RepairErpService.py +++ b/app/services/RepairErpService.py @@ -1,4 +1,4 @@ -from sqlalchemy.orm import Session +from sqlalchemy.orm import Session, joinedload from sqlalchemy import select, func from typing import List, Optional, Dict, Any import ulid @@ -91,18 +91,43 @@ class RepairErpService: ) return ticket + def _enrich_ticket(self, t: Optional[CrmRepairTicket]) -> Optional[CrmRepairTicket]: + if not t: + return None + t.status = t.stage + t.problem_description = t.issue_description + t.priority = "NORMAL" + if getattr(t, "customer", None): + name_parts = [t.customer.first_name, t.customer.last_name or ""] + t.customer_name = " ".join(p for p in name_parts if p).strip() or "Customer" + t.customer_phone = t.customer.phone or "" + if getattr(t, "device", None): + t.brand_name = t.device.brand or "" + t.model_name = t.device.model_name or "" + t.imei_serial = t.device.imei_serial or "" + return t + def get_ticket(self, ticket_id: str) -> Optional[CrmRepairTicket]: - stmt = select(CrmRepairTicket).where( - CrmRepairTicket.ticket_id == ticket_id, - CrmRepairTicket.tenant_id == self.tenant_id, - CrmRepairTicket.deleted_at.is_(None) + stmt = ( + select(CrmRepairTicket) + .options(joinedload(CrmRepairTicket.customer), joinedload(CrmRepairTicket.device)) + .where( + CrmRepairTicket.ticket_id == ticket_id, + CrmRepairTicket.tenant_id == self.tenant_id, + CrmRepairTicket.deleted_at.is_(None) + ) ) - return self.db.execute(stmt).scalar_one_or_none() + ticket = self.db.execute(stmt).scalar_one_or_none() + return self._enrich_ticket(ticket) def list_tickets(self, skip: int = 0, limit: int = 50, stage: Optional[str] = None, technician_id: Optional[str] = None) -> List[CrmRepairTicket]: - stmt = select(CrmRepairTicket).where( - CrmRepairTicket.tenant_id == self.tenant_id, - CrmRepairTicket.deleted_at.is_(None) + stmt = ( + select(CrmRepairTicket) + .options(joinedload(CrmRepairTicket.customer), joinedload(CrmRepairTicket.device)) + .where( + CrmRepairTicket.tenant_id == self.tenant_id, + CrmRepairTicket.deleted_at.is_(None) + ) ) if stage: stmt = stmt.where(CrmRepairTicket.stage == stage) @@ -110,7 +135,10 @@ class RepairErpService: stmt = stmt.where(CrmRepairTicket.assigned_technician_id == technician_id) stmt = stmt.offset(skip).limit(limit).order_by(CrmRepairTicket.created_at.desc()) - return list(self.db.execute(stmt).scalars().all()) + tickets = list(self.db.execute(stmt).scalars().all()) + for t in tickets: + self._enrich_ticket(t) + return tickets def update_stage(self, ticket_id: str, data: CrmRepairTicketUpdateStage) -> Optional[CrmRepairTicket]: ticket = self.get_ticket(ticket_id)