fix(roster): bench outgoing unit on swap / unassign / deploy-classify

The legacy RosterUnit.deployed flag drives heartbeat polling and
benched-vs-deployed roster filters.  Three workflows ended an
assignment without flipping it, so the outgoing unit kept being
polled and showed up as "deployed" forever:

  - swap endpoint            (POST /locations/{loc}/swap)
  - unassign endpoint        (POST /assignments/{aid}/unassign)
  - promote-pending endpoint (POST /deployments/pending/{id}/promote)

All three now: close the previous active assignment, break the
outgoing unit's modem pairing (both directions), and set
`deployed = False` on the outgoing unit.  Unassign and swap also
clear the modem's back-reference.

The promote-pending path additionally handles the case where the
target location already has an active assignment — that previously
silently created two active assignments at the same location.  Now
the old one is closed (assigned_until = pending capture time, status
= completed), the old unit is benched and unpaired, and an
"assignment_swapped" history row is written.  Incoming unit gets
`deployed = True` if it was on the bench.

Verified live: triggered a swap via the existing endpoint and saw
the outgoing unit flip True → False while the incoming flipped
False → True.  Test mutations rolled back.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
2026-05-18 18:04:09 +00:00
parent 472c25372d
commit 502bf5bbeb
2 changed files with 62 additions and 7 deletions
+26 -7
View File
@@ -876,6 +876,20 @@ async def unassign_unit(
assignment.status = "completed"
assignment.assigned_until = datetime.utcnow()
# Unit is leaving the field — bench it so the heartbeat / polling
# subsystem stops chasing it. Also break the modem pairing both ways.
unit = db.query(RosterUnit).filter_by(id=assignment.unit_id).first()
if unit:
if unit.deployed_with_modem_id:
modem = db.query(RosterUnit).filter_by(
id=unit.deployed_with_modem_id, device_type="modem"
).first()
if modem and modem.deployed_with_unit_id == unit.id:
modem.deployed_with_unit_id = None
unit.deployed_with_modem_id = None
if unit.deployed:
unit.deployed = False
location = db.query(MonitoringLocation).filter_by(id=assignment.location_id).first()
_record_assignment_history(
db,
@@ -1320,13 +1334,18 @@ async def swap_unit_on_location(
# deployed_with_modem_id / deployed_with_unit_id back-reference
# doesn't orphan onto the unit that just left the field.
old_unit = db.query(RosterUnit).filter_by(id=current.unit_id).first()
if old_unit and old_unit.deployed_with_modem_id:
old_modem = db.query(RosterUnit).filter_by(
id=old_unit.deployed_with_modem_id, device_type="modem"
).first()
if old_modem and old_modem.deployed_with_unit_id == current.unit_id:
old_modem.deployed_with_unit_id = None
old_unit.deployed_with_modem_id = None
if old_unit:
if old_unit.deployed_with_modem_id:
old_modem = db.query(RosterUnit).filter_by(
id=old_unit.deployed_with_modem_id, device_type="modem"
).first()
if old_modem and old_modem.deployed_with_unit_id == current.unit_id:
old_modem.deployed_with_unit_id = None
old_unit.deployed_with_modem_id = None
# Bench the outgoing unit — it's no longer in the field, so
# the heartbeat / polling subsystem should stop chasing it.
if old_unit.deployed:
old_unit.deployed = False
# Create new assignment
new_assignment = UnitAssignment(