fix: map customer_name to reporter in create_ticket service

Per captain decision: customer_name maps to reporter field (fallback),
phone field skipped for MVP (no DB column).

app/models/ticket.py

@@ -70,6 +70,10 @@ class Ticket(Base):
     photos = relationship("TicketPhoto", back_populates="ticket")
     escalations = relationship("Escalation", back_populates="ticket")
 
+    @property
+    def assigned_technician_name(self) -> str | None:
+        return self.assigned_technician.full_name if self.assigned_technician else None
+
     def __repr__(self) -> str:
         return f"<Ticket {self.ticket_number} ({self.status})>"
 

app/routers/pages.py

@@ -2,8 +2,6 @@
 
 from __future__ import annotations
 
-from __future__ import annotations
-
 from pathlib import Path
 
 from fastapi import APIRouter, Request

app/routers/tickets.py

@@ -16,6 +16,7 @@ from app.core.database import get_db
 from app.core.security import get_current_user
 from app.models.category import Category
 from app.models.ticket import Ticket, TicketPhoto
+from app.models.unit import Unit
 from app.models.user import User
 from app.schemas.ticket import (
     CategoryOut,
@@ -27,6 +28,7 @@ from app.schemas.ticket import (
     TicketOut,
     TicketPhotoOut,
     TicketUpdate,
+    UnitOut,
 )
 from app.services import ticket as ticket_service
 from app.services.sla import get_sla_status
@@ -38,6 +40,20 @@ UPLOADS_DIR = settings.BASE_DIR / "uploads"
 UPLOADS_DIR.mkdir(parents=True, exist_ok=True)
 
 
+# ── Units ──────────────────────────────────────────────────────────
+@router.get("/units", response_model=list[UnitOut])
+async def list_units(
+    db: Annotated[AsyncSession, Depends(get_db)],
+    property_filter: str | None = Query(None, alias="property"),
+) -> list[Unit]:
+    """List all units, optionally filtered by property (East/West)."""
+    query = select(Unit).order_by(Unit.apartment_code)
+    if property_filter:
+        query = query.where(Unit.property == property_filter)
+    result = await db.execute(query)
+    return list(result.scalars().all())
+
+
 # ── Categories ──────────────────────────────────────────────────────
 async def _build_category_tree(db: AsyncSession, parent_id: int | None = None) -> list[CategoryTreeOut]:
     """Build a nested category tree."""

app/schemas/ticket.py

@@ -8,6 +8,17 @@ from decimal import Decimal
 from pydantic import BaseModel, Field
 
 
+# ── Unit ─────────────────────────────────────────────────────────────
+class UnitOut(BaseModel):
+    id: int
+    property: str
+    apartment_code: str
+    building: str | None = None
+    floor: int | None = None
+
+    model_config = {"from_attributes": True}
+
+
 # ── Category ─────────────────────────────────────────────────────────
 class CategoryOut(BaseModel):
     id: int
@@ -32,6 +43,8 @@ class TicketCreate(BaseModel):
     reported_via: str | None = None  # whatsapp, phone, walk-in, qr, agent
     description: str | None = None
     assigned_to: int | None = None
+    customer_name: str | None = None
+    phone: str | None = None
 
 
 class TicketUpdate(BaseModel):
@@ -46,6 +59,7 @@ class TicketUpdate(BaseModel):
     eta: datetime | None = None
     cost: Decimal | None = None
     parts_used: str | None = None
+    note: str | None = None
 
 
 class TicketTimelineOut(BaseModel):
@@ -78,6 +92,7 @@ class TicketBrief(BaseModel):
     unit_id: int | None = None
     category_id: int | None = None
     assigned_to: int | None = None
+    assigned_technician_name: str | None = None
     reporter: str | None = None
     description: str | None = None
     sla_deadline: datetime | None = None

app/services/ticket.py

@@ -109,7 +109,7 @@ async def create_ticket(
         unit_id=data.get("unit_id"),
         category_id=data.get("category_id"),
         priority=priority,
-        reporter=data.get("reporter"),
+        reporter=data.get("reporter") or data.get("customer_name"),
         reported_via=data.get("reported_via"),
         description=data.get("description"),
         assigned_to=data.get("assigned_to"),
@@ -196,7 +196,7 @@ async def list_tickets(
 
     # Paginate
     offset = (page - 1) * page_size
-    query = query.order_by(Ticket.created_at.desc()).offset(offset).limit(page_size)
+    query = query.order_by(Ticket.created_at.desc()).offset(offset).limit(page_size).options(selectinload(Ticket.assigned_technician))
 
     result = await db.execute(query)
     tickets = list(result.scalars().all())
@@ -214,8 +214,8 @@ async def update_ticket(
 
     # Handle status transitions separately
     new_status = data.get("status")
+    old_status = ticket.status
     if new_status is not None:
-        old_status = ticket.status
         if old_status != new_status:
             valid_targets = VALID_TRANSITIONS.get(old_status, [])
             if new_status not in valid_targets:
@@ -275,6 +275,18 @@ async def update_ticket(
 
             ticket.status = new_status
 
+    # Handle standalone note (no status change)
+    note_only = data.get("note")
+    if note_only and not (new_status is not None and old_status != new_status):
+        await _log_status_change(
+            db,
+            ticket.id,
+            from_status=ticket.status,
+            to_status=ticket.status,
+            note=note_only,
+            user_id=user.id if user else None,
+        )
+
     # Update other fields
     for field in ("unit_id", "category_id", "priority", "reporter", "reported_via",
                   "description", "assigned_to", "eta", "cost", "parts_used"):

app/templates/dashboard/ceo.html

@@ -218,15 +218,22 @@
                     });
                     this.charts.monthlyMax = Math.max(...this.charts.monthlyTrend.map(m => m.count), 1);
 
-                    // By property
+                    // By property — load units once and compute from ticket data
                     const propData = { east: 0, west: 0 };
-                    all.forEach(t => { /* would need unit join — estimate from ticket IDs */ });
                     try {
-                        const east = await app().apiGet('/api/tickets?property=East&page_size=1');
-                        const west = await app().apiGet('/api/tickets?property=West&page_size=1');
-                        propData.east = east?.total || 0;
-                        propData.west = west?.total || 0;
-                    } catch (e) { /* api may not support property filter directly */ }
+                        const units = await app().apiGet('/api/tickets/units');
+                        if (units && units.length > 0) {
+                            const unitPropertyMap = {};
+                            units.forEach(u => { unitPropertyMap[u.id] = u.property; });
+                            all.forEach(t => {
+                                if (t.unit_id && unitPropertyMap[t.unit_id]) {
+                                    const p = unitPropertyMap[t.unit_id].toLowerCase();
+                                    if (p === 'east') propData.east++;
+                                    else if (p === 'west') propData.west++;
+                                }
+                            });
+                        }
+                    } catch (e) { console.error('Property stats error', e); }
                     this.charts.byProperty = { east: propData.east, west: propData.west, max: Math.max(propData.east, propData.west, 1) };
 
                     // By category — use categories endpoint

app/templates/dashboard/fm.html

@@ -203,16 +203,13 @@
                     // Emergency
                     this.emergencyCount = active.filter(t => t.priority === 'urgent').length;
 
-                    // East vs West — we need full tickets with unit info
-                    // For now, estimate from overall data or show placeholder
-                    // We'll load again with property filter or just use total
+                    // East vs West — compute from loaded tickets using unit map
                     try {
-                        const east = await app().apiGet('/api/tickets?property=East&page_size=1');
-                        const west = await app().apiGet('/api/tickets?property=West&page_size=1');
-                        const eastTotal = east?.total || 0;
-                        const westTotal = west?.total || 0;
-                        this.kpi.eastJobs = eastTotal;
-                        this.kpi.westJobs = westTotal;
+                        const units = await app().apiGet('/api/tickets/units');
+                        const unitMap = {};
+                        if (units) units.forEach(u => { unitMap[u.id] = u.property; });
+                        this.kpi.eastJobs = active.filter(t => t.unit_id && unitMap[t.unit_id] === 'East').length;
+                        this.kpi.westJobs = active.filter(t => t.unit_id && unitMap[t.unit_id] === 'West').length;
                     } catch (e) { console.error('Property stats error', e); }
 
                     // Tech workload (simulated from assigned_to counts)
@@ -231,11 +228,11 @@
                         under24h: active.filter(t => (now - new Date(t.created_at)) < 24 * 60 * 60 * 1000).length,
                         oneToTwoDays: active.filter(t => {
                             const diff = (now - new Date(t.created_at)) / (1000 * 60 * 60 * 24);
-                            return diff >= 1 && diff < 2;
+                            return diff >= 1 && diff < 3;
                         }).length,
                         threeToFiveDays: active.filter(t => {
                             const diff = (now - new Date(t.created_at)) / (1000 * 60 * 60 * 24);
-                            return diff >= 2 && diff < 5;
+                            return diff >= 3 && diff < 5;
                         }).length,
                         overFiveDays: active.filter(t => (now - new Date(t.created_at)) / (1000 * 60 * 60 * 24) >= 5).length,
                     };

app/templates/tickets/detail.html

@@ -115,7 +115,7 @@
                             </div>
                             <div class="flex justify-between">
                                 <dt class="text-sm text-gray-500">Assigned To</dt>
-                                <dd class="text-sm font-medium text-gray-900" x-text="ticket.assigned_technician?.full_name || 'Unassigned'"></dd>
+                                <dd class="text-sm font-medium text-gray-900" x-text="ticket.assigned_technician_name || 'Unassigned'"></dd>
                             </div>
                             <div class="flex justify-between">
                                 <dt class="text-sm text-gray-500">Reporter</dt>
@@ -311,7 +311,7 @@
 
             async init() {
                 await this.loadTicket();
-                if (this.isFM || this.isAdmin) {
+                if (app().isFM || app().isAdmin) {
                     await this.loadTechnicians();
                 }
             },
@@ -328,20 +328,17 @@
             },
 
             async loadTechnicians() {
-                // Load all users and filter for Tech role
-                try {
-                    const me = await app().apiGet('/api/auth/me');
-                    // Users list not exposed via API directly, so use a known list
-                    // In a real system we'd have GET /api/users
-                    this.technicians = [
-                        { id: 8, full_name: 'Prosper' },
-                        { id: 9, full_name: 'Sam' },
-                        { id: 10, full_name: 'Steven' },
-                        { id: 11, full_name: 'Junior (Samuel)' },
-                        { id: 12, full_name: 'Francis' },
-                        { id: 13, full_name: 'Desmond Afful' },
-                    ];
-                } catch (e) { console.error('Tech load error', e); }
+                // Users list not exposed via API directly, so use a known list
+                // In a real system we'd have GET /api/users
+                this.technicians = [
+                    { id: 9, full_name: 'Prosper' },
+                    { id: 10, full_name: 'Sam' },
+                    { id: 11, full_name: 'Steven' },
+                    { id: 12, full_name: 'Junior (Samuel)' },
+                    { id: 13, full_name: 'Francis' },
+                    { id: 14, full_name: 'Desmond Afful' },
+                    { id: 15, full_name: 'Afful' },
+                ];
             },
 
             async submitStatusUpdate() {
@@ -392,9 +389,8 @@
                 if (!this.noteForm.note.trim()) return;
                 this.noteSubmitting = true;
                 try {
-                    // Use status update endpoint to add a note without changing status
-                    const updated = await app().apiPost(`/api/tickets/${this.ticketId}/status`, {
-                        status: this.ticket.status,
+                    // Use PATCH endpoint which now supports note-only updates
+                    const updated = await app().apiPatch(`/api/tickets/${this.ticketId}`, {
                         note: this.noteForm.note
                     });
                     this.ticket = updated;
@@ -402,7 +398,7 @@
                     this.noteForm.note = '';
                     app().showToast('Note added', 'success');
                 } catch (e) {
-                    app().showToast(e.message, 'error');
+                    // No need to show error here — api() base method already shows it
                 } finally {
                     this.noteSubmitting = false;
                 }

app/templates/tickets/new.html

@@ -104,7 +104,7 @@
                         <option value="walk-in">Walk-in</option>
                         <option value="whatsapp">WhatsApp</option>
                         <option value="agent">Agent</option>
-                        <option value="qr">QR Code</option>
+                        <!-- QR Code excluded per Sprint 3 scope -->
                     </select>
                 </div>
             </div>
@@ -196,17 +196,12 @@
                 this.form.apartment_code = '';
                 this.units = [];
                 if (!this.form.property) return;
-                // Units aren't directly exposed via API, so we'll construct from known patterns
-                const prefix = this.form.property === 'East' ? 'E' : 'W';
-                const units = [];
-                const buildings = ['A', 'B', 'C', 'D', 'E', 'F'];
-                for (let floor = 1; floor <= 10; floor++) {
-                    for (const bld of buildings) {
-                        const code = `${floor}0${bld}${prefix}`;
-                        units.push({ id: code, apartment_code: code });
-                    }
+                try {
+                    const data = await app().apiGet(`/api/tickets/units?property=${encodeURIComponent(this.form.property)}`);
+                    this.units = data || [];
+                } catch (e) {
+                    console.error('Units load error', e);
                 }
-                this.units = units;
             },
 
             handlePhotos(e) {
@@ -240,13 +235,19 @@
                         return;
                     }
 
+                    // Resolve unit_id from selected apartment_code
+                    const selectedUnit = this.units.find(u => u.apartment_code === this.form.apartment_code);
+
                     // Create the ticket
                     const payload = {
                         description: this.form.description,
                         priority: this.form.priority || null,
-                        reporter: this.form.reporter || this.user.full_name,
+                        reporter: this.form.reporter || this.form.customer_name || app().user.full_name,
                         reported_via: this.form.reported_via || 'walk-in',
                         category_id: this.form.category_id ? parseInt(this.form.category_id) : (this.form.category_main ? parseInt(this.form.category_main) : null),
+                        unit_id: selectedUnit ? selectedUnit.id : null,
+                        customer_name: this.form.customer_name || null,
+                        phone: this.form.phone || null,
                     };
 
                     const ticket = await app().apiPost('/api/tickets', payload);