@@ -215,7 +229,8 @@
description: '',
reporter: '',
reported_via: '',
- reported_date: ''
+ reported_date: '',
+ assigned_to: ''
},
todayStr: '',
priorityAuto: false,
@@ -230,10 +245,12 @@
photoPreviews: [],
submitting: false,
error: '',
+ technicians: [],
async init() {
await this.loadCategories();
await this.loadUnits();
+ await this.loadTechnicians();
// Default reported date to today (local), allow backdating via the date picker
this.todayStr = this.localDateStr(new Date());
if (!this.form.reported_date) this.form.reported_date = this.todayStr;
@@ -279,6 +296,15 @@
} catch (e) { console.error('Units load error', e); }
},
+ async loadTechnicians() {
+ try {
+ // "Assign to" pool: the 5 client-confirmed technicians
+ // plus sub-contractors (client directive 2026-09-28).
+ const data = await app().apiGet('/api/auth/assignees');
+ this.technicians = data || [];
+ } catch (e) { console.error('Assignees load error', e); }
+ },
+
// ── Location cascade ─────────────────────────────────────
onPropertyChange() {
this.form.building = '';
@@ -404,6 +430,7 @@
customer_name: this.form.customer_name || null,
phone: this.form.phone || null,
reported_at: this.form.reported_date || null,
+ assigned_to: this.form.assigned_to ? parseInt(this.form.assigned_to) : null,
};
const ticket = await app().apiPost('/api/tickets', payload);
diff --git a/tests/test_categories_and_units.py b/tests/test_categories_and_units.py
index 3956a35..9ac8568 100644
--- a/tests/test_categories_and_units.py
+++ b/tests/test_categories_and_units.py
@@ -192,12 +192,19 @@ async def test_units_grouped_shape(client):
assert "East" in grouped and "West" in grouped
east = grouped["East"]
assert "Pavilion East" in east
- assert len(east["Pavilion East"]) == 60
+ # 10 floors x 6 apartments + 2 penthouse units (PH1E, PH2E) —
+ # client directive 2026-09-28: penthouses must be selectable.
+ assert len(east["Pavilion East"]) == 62
unit = east["Pavilion East"][0]
assert {"id", "property", "apartment_code", "building", "floor"} <= set(unit.keys())
# Distinct apartment codes
codes = [u["apartment_code"] for u in east["Pavilion East"]]
assert len(set(codes)) == len(codes)
+ # Penthouse units (East/West) are present and selectable
+ assert {"PH1E", "PH2E"} <= set(codes)
+ west = grouped["West"]
+ west_codes = [u["apartment_code"] for u in west["Pavilion West"]]
+ assert {"PH1W", "PH2W"} <= set(west_codes)
async def test_units_grouped_property_filter(client):
diff --git a/tests/test_tech_performance.py b/tests/test_tech_performance.py
index 1ce0802..8bdb32f 100644
--- a/tests/test_tech_performance.py
+++ b/tests/test_tech_performance.py
@@ -44,6 +44,7 @@ async def _user_id(email: str) -> int:
return user.id
+
async def _seed_tickets(specs: list[dict]) -> None:
"""Insert tickets directly so tests control status/timestamps exactly."""
async with async_session_factory() as session:
@@ -84,7 +85,7 @@ async def test_workload_sources_report_real_technician_names(client):
ticket both must expose the technician's real full name, never a
``Tech #`` placeholder.
"""
- prosper = await _user_id("prosper@denya.com")
+ prosper = await _make_user("prosper@denya.com", "Prosper")
await _seed_tickets([_ticket("In Progress", prosper), _ticket("Escalated", prosper)])
token = await _login(client)
@@ -156,8 +157,8 @@ async def test_tech_performance_empty_state(client):
async def test_tech_performance_aggregates_by_real_name(client):
"""Counts, completion rate, aging, sorting and totals per technician."""
- prosper = await _user_id("prosper@denya.com")
- sam = await _user_id("sam@denya.com")
+ prosper = await _make_user("prosper@denya.com", "Prosper")
+ sam = await _make_user("sam@denya.com", "Sam")
await _seed_tickets(
[
@@ -249,7 +250,7 @@ async def test_tech_performance_aggregates_by_real_name(client):
async def test_tech_performance_reports_counts_when_timestamps_absent(client):
"""Finished tasks without ``closed_at`` yield no average but a count."""
- afful = await _user_id("afful@denya.com")
+ afful = await _make_user("afful@denya.com", "Afful")
await _seed_tickets([
_ticket("Completed", afful),
_ticket("Closed", afful),
diff --git a/tests/test_wahab_directives_20260928.py b/tests/test_wahab_directives_20260928.py
new file mode 100644
index 0000000..9045bcb
--- /dev/null
+++ b/tests/test_wahab_directives_20260928.py
@@ -0,0 +1,197 @@
+"""Regression tests for Wahab Abdul's 2026-09-28 directives.
+
+Covers the three client decisions:
+1. Technician roster converges to exactly 5 named techs (others deactivated,
+ never deleted — ticket history must survive).
+2. Sub-contractors appear in the "Assign to" pool alongside technicians.
+3. Penthouse units (East/West) are selectable when raising a ticket.
+"""
+
+import pytest
+import pytest_asyncio
+
+from app.core.database import async_session_factory
+from app.core.roles import (
+ ASSIGNEE_POOL_ROLES,
+ SUBCONTRACTOR_ROLE,
+ TECHNICIAN_ROLE,
+)
+from app.models.ticket import Ticket
+from app.models.user import User
+
+pytestmark = pytest.mark.asyncio
+
+
+@pytest_asyncio.fixture
+async def db():
+ """Direct DB session bound to the same test database as `client`.
+
+ conftest.py only exposes `client`, so DB-level assertions open their own
+ session against the same engine.
+ """
+ async with async_session_factory() as session:
+ yield session
+
+CONFIRMED_TECHS = (
+ "Samuel Shang",
+ "Desmond Afful",
+ "Desmond Odekyi",
+ "Francis Norgbey",
+ "Nicholas Nartey",
+)
+
+
+async def _make_user(db, email, full_name, role, active=True):
+ """Insert a user row directly (no HTTP admin round-trip)."""
+ user = User(
+ email=email,
+ full_name=full_name,
+ role=role,
+ password_hash="not-a-real-hash",
+ active=active,
+ )
+ db.add(user)
+ await db.flush()
+ return user
+
+
+def _grouped_codes(grouped):
+ """Flatten {property: {building: [units]}} to a set of apartment codes."""
+ return {
+ u["apartment_code"]
+ for wing in grouped.values()
+ for units in wing.values()
+ for u in units
+ }
+
+
+# ── 1. Technician roster ───────────────────────────────────────────────
+
+
+async def test_confirmed_techs_are_active_and_assignable(client, db):
+ """All 5 client-confirmed technicians exist, active, role=Tech."""
+ for name in CONFIRMED_TECHS:
+ user = await _make_user(
+ db, f"{name.lower().replace(' ', '.')}@denya.test", name, TECHNICIAN_ROLE
+ )
+ assert user.active is True
+ assert user.role in ASSIGNEE_POOL_ROLES
+
+
+async def test_roster_converge_is_idempotent(client, db):
+ """Running convergence twice leaves exactly the 5 confirmed techs."""
+ from sqlalchemy import select
+
+ from app.services.roster import converge_tech_roster
+
+ await converge_tech_roster(db)
+ await db.flush()
+ await converge_tech_roster(db)
+ await db.flush()
+
+ result = await db.execute(
+ select(User).where(User.role == TECHNICIAN_ROLE, User.active.is_(True))
+ )
+ active_techs = result.scalars().all()
+ assert {t.full_name for t in active_techs} == set(CONFIRMED_TECHS)
+
+
+async def test_roster_converge_deactivates_not_deletes(client, db):
+ """Off-roster techs are deactivated, never hard-deleted.
+
+ Deleting would orphan ticket history. The account row must survive so
+ previously-raised tickets keep a valid assignee reference.
+ """
+ from sqlalchemy import select
+
+ from app.services.roster import converge_tech_roster
+
+ stale = await _make_user(db, "stale.tech@denya.test", "Stale Tech", TECHNICIAN_ROLE)
+ stale_id = stale.id
+ await db.flush()
+
+ await converge_tech_roster(db)
+ await db.flush()
+
+ row = (
+ await db.execute(select(User).where(User.id == stale_id))
+ ).scalar_one_or_none()
+ assert row is not None, "off-roster tech must NOT be deleted"
+ assert row.active is False, "off-roster tech must be deactivated"
+
+
+# ── 2. Sub-contractors in the assign-to pool ───────────────────────────
+
+
+async def test_subcontractor_role_is_in_assignee_pool():
+ """Sub-contractor is a canonical role inside the assignee pool."""
+ assert SUBCONTRACTOR_ROLE in ASSIGNEE_POOL_ROLES
+ assert TECHNICIAN_ROLE in ASSIGNEE_POOL_ROLES
+
+
+async def test_subcontractor_can_own_a_ticket(client, db):
+ """A ticket can reference an active sub-contractor as assignee.
+
+ Sub-contractors are external, tracked "under tech" by the FM
+ coordinator, but they must be assignable.
+
+ The ticket is created in this session rather than via the `seed_tickets`
+ fixture: that fixture opens its own session against the same file-backed
+ SQLite DB and the two concurrent writers deadlock it.
+ """
+ from sqlalchemy import select
+
+ sub = await _make_user(
+ db, "sub.assign@denya.test", "External Sub", SUBCONTRACTOR_ROLE
+ )
+ ticket = Ticket(
+ ticket_number="PAV-SUB-00001",
+ status="Logged",
+ priority="medium",
+ description="Sub-contractor assignment check",
+ )
+ db.add(ticket)
+ await db.flush()
+
+ ticket.assigned_to = sub.id
+ await db.flush()
+
+ ticket_id = ticket.id
+
+ reloaded = (
+ await db.execute(select(Ticket).where(Ticket.id == ticket_id))
+ ).scalar_one()
+ assert reloaded.assigned_to == sub.id
+
+
+# ── 3. Penthouse units selectable ──────────────────────────────────────
+
+
+async def test_penthouse_units_present_and_selectable(client):
+ """All 4 penthouse units are selectable when raising a ticket."""
+ resp = await client.get("/api/tickets/units/grouped")
+ assert resp.status_code == 200
+ codes = _grouped_codes(resp.json())
+ for code in ("PH1E", "PH1W", "PH2E", "PH2W"):
+ assert code in codes, f"{code} must be selectable"
+
+
+async def test_penthouse_codes_have_no_dangling_dash(client):
+ """Legacy malformed codes (PH1E-) are renamed to clean form."""
+ resp = await client.get("/api/tickets/units/grouped")
+ codes = _grouped_codes(resp.json())
+ assert not any(c.endswith("-") for c in codes), "no dangling-dash codes"
+
+
+async def test_penthouse_units_have_floors(client):
+ """Penthouse units carry a floor so the 3-level picker can group them."""
+ resp = await client.get("/api/tickets/units/grouped")
+ penthouses = [
+ u
+ for wing in resp.json().values()
+ for units in wing.values()
+ for u in units
+ if u["apartment_code"].startswith("PH")
+ ]
+ assert len(penthouses) == 4
+ assert all(u["floor"] is not None for u in penthouses)