From c5ba684bdc6313a1536d669dccfb9b6b6701f8e7 Mon Sep 17 00:00:00 2001 From: iFixKart Dev Date: Mon, 16 Nov 2026 18:54:30 +0530 Subject: [PATCH] fix(repair): populate assigned_technician_name and ensure model imports --- app/models/RepairErpModel.py | 1 + app/models/ServiceModel.py | 1 + app/schemas/RepairErp.py | 2 ++ app/services/RepairErpService.py | 16 ++++++++++++++++ 4 files changed, 20 insertions(+) diff --git a/app/models/RepairErpModel.py b/app/models/RepairErpModel.py index 841da67..efbf72a 100644 --- a/app/models/RepairErpModel.py +++ b/app/models/RepairErpModel.py @@ -5,6 +5,7 @@ import ulid from app.core.database.db_session import Base from app.models.audit_base import AuditMixin +from app.models.CrmModel import CrmCustomer class CrmCustomerDevice(Base, AuditMixin): __tablename__ = "crm_customer_devices" diff --git a/app/models/ServiceModel.py b/app/models/ServiceModel.py index d366266..41cdd97 100644 --- a/app/models/ServiceModel.py +++ b/app/models/ServiceModel.py @@ -2,6 +2,7 @@ from sqlalchemy import Column, String, Boolean, DateTime, Integer, Numeric, Fore from sqlalchemy.sql import func from sqlalchemy.orm import relationship from app.core.database.db_session import Base +from app.models.CustomerDeviceModel import CustomerDevice class ServiceCatalog(Base): __tablename__ = "service_catalog" diff --git a/app/schemas/RepairErp.py b/app/schemas/RepairErp.py index 5aa46f7..3ce923b 100644 --- a/app/schemas/RepairErp.py +++ b/app/schemas/RepairErp.py @@ -26,6 +26,7 @@ class CrmRepairTicketCreate(BaseModel): device_id: str issue_description: str assigned_technician_id: Optional[str] = None + assigned_technician_name: Optional[str] = None is_warranty_claim: Optional[bool] = False notes: Optional[str] = None @@ -51,6 +52,7 @@ class CrmRepairTicketResponse(BaseModel): customer_id: str device_id: str assigned_technician_id: Optional[str] = None + assigned_technician_name: Optional[str] = None stage: str issue_description: str diagnostic_checklist_json: Optional[Dict[str, Any]] = None diff --git a/app/services/RepairErpService.py b/app/services/RepairErpService.py index 8d8a84b..dbe0f93 100644 --- a/app/services/RepairErpService.py +++ b/app/services/RepairErpService.py @@ -117,6 +117,11 @@ class RepairErpService: ) ) ticket = self.db.execute(stmt).scalar_one_or_none() + if ticket and ticket.assigned_technician_id: + from app.models.UserModel import User + tech_user = self.db.query(User).filter(User.user_id == ticket.assigned_technician_id).first() + if tech_user: + ticket.assigned_technician_name = (tech_user.display_name or f"{tech_user.first_name} {tech_user.last_name}").strip() 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]: @@ -135,8 +140,19 @@ class RepairErpService: stmt = stmt.offset(skip).limit(limit).order_by(CrmRepairTicket.created_at.desc()) tickets = list(self.db.execute(stmt).scalars().all()) + tech_ids = {t.assigned_technician_id for t in tickets if t.assigned_technician_id} + tech_map = {} + if tech_ids: + from app.models.UserModel import User + tech_users = self.db.query(User).filter(User.user_id.in_(tech_ids)).all() + tech_map = { + u.user_id: (u.display_name or f"{u.first_name} {u.last_name}").strip() + for u in tech_users + } for t in tickets: self._enrich_ticket(t) + if t.assigned_technician_id: + t.assigned_technician_name = tech_map.get(t.assigned_technician_id) return tickets def update_stage(self, ticket_id: str, data: CrmRepairTicketUpdateStage) -> Optional[CrmRepairTicket]: