add more device fields

app/routers/device.py

@@ -35,12 +35,16 @@ def _device_exists(db: Session, mac: str) -> bool:
 @router.get("/", response_model=Page[DeviceOut])
 def list_devices(page: PageParams = Depends(), db: Session = Depends(get_db)):
     """List devices — MAC, group and status, joined from customers + radusergroup."""
-    base = select(Customer.mac_address, RadUserGroup.groupname, Customer.status).outerjoin(
-        RadUserGroup, RadUserGroup.username == Customer.username
-    )
+    base = select(
+        Customer.mac_address, RadUserGroup.groupname, Customer.status,
+        Customer.name, Customer.phone, Customer.device_alias,
+    ).outerjoin(RadUserGroup, RadUserGroup.username == Customer.username)
     total = db.execute(select(func.count()).select_from(Customer)).scalar_one()
     rows = db.execute(base.order_by(Customer.id.desc()).limit(page.limit).offset(page.offset)).all()
-    items = [DeviceOut(mac_address=mac, group=gn, status=st) for mac, gn, st in rows]
+    items = [
+        DeviceOut(mac_address=mac, group=gn, status=st, name=nm, phone=ph, alias=al)
+        for mac, gn, st, nm, ph, al in rows
+    ]
     return Page(total=int(total), limit=page.limit, offset=page.offset, items=items)
 
 
@@ -48,14 +52,20 @@ def list_devices(page: PageParams = Depends(), db: Session = Depends(get_db)):
 def get_device(mac_address: str, db: Session = Depends(get_db)):
     mac = mac_address.strip().upper().replace(":", "-")
     stmt = (
-        select(Customer.mac_address, RadUserGroup.groupname, Customer.status)
+        select(
+            Customer.mac_address, RadUserGroup.groupname, Customer.status,
+            Customer.name, Customer.phone, Customer.device_alias,
+        )
         .outerjoin(RadUserGroup, RadUserGroup.username == Customer.username)
         .where(Customer.username == mac)
     )
     row = db.execute(stmt).first()
     if row is None:
         raise APIError(status_code=404, detail=f"Device '{mac}' not found")
-    return DeviceOut(mac_address=row[0], group=row[1], status=row[2])
+    return DeviceOut(
+        mac_address=row[0], group=row[1], status=row[2],
+        name=row[3], phone=row[4], alias=row[5],
+    )
 
 
 @router.post("/add", response_model=DeviceOut, status_code=201)
@@ -70,14 +80,20 @@ def add_device(payload: DeviceCreate, db: Session = Depends(get_db)):
 
     db.add(RadCheck(username=mac, attribute="Cleartext-Password", op=":=", value=mac))
     db.add(RadUserGroup(username=mac, groupname=payload.group, priority=1))
-    db.add(Customer(username=mac, mac_address=mac, status="paid"))
+    db.add(Customer(
+        username=mac, mac_address=mac, status="paid",
+        name=payload.name, phone=payload.phone, device_alias=payload.alias,
+    ))
     db.commit()
-    return DeviceOut(mac_address=mac, group=payload.group, status="paid")
+    return DeviceOut(
+        mac_address=mac, group=payload.group, status="paid",
+        name=payload.name, phone=payload.phone, alias=payload.alias,
+    )
 
 
 @router.post("/edit", response_model=DeviceOut)
 def edit_device(payload: DeviceEdit, db: Session = Depends(get_db)):
-    """Edit a device's group and/or status. Any single field may be supplied."""
+    """Edit a device — any subset of group, status, name, phone, alias."""
     mac = payload.mac_address
     customer = db.execute(select(Customer).where(Customer.username == mac)).scalar_one_or_none()
     if customer is None:
@@ -92,13 +108,22 @@ def edit_device(payload: DeviceEdit, db: Session = Depends(get_db)):
 
     if payload.status is not None:
         customer.status = payload.status
+    if payload.name is not None:
+        customer.name = payload.name
+    if payload.phone is not None:
+        customer.phone = payload.phone
+    if payload.alias is not None:
+        customer.device_alias = payload.alias
 
     db.commit()
 
     group = db.execute(
         select(RadUserGroup.groupname).where(RadUserGroup.username == mac).limit(1)
     ).scalar_one_or_none()
-    return DeviceOut(mac_address=mac, group=group, status=customer.status)
+    return DeviceOut(
+        mac_address=mac, group=group, status=customer.status,
+        name=customer.name, phone=customer.phone, alias=customer.device_alias,
+    )
 
 
 @router.delete("/{mac_address}", status_code=204)